Skip to content
This repository has been archived by the owner on Jan 1, 2020. It is now read-only.

Commit

Permalink
Merging develop to master in preparation for 3.1.0 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
weierophinney committed Nov 15, 2019
2 parents cda8fa6 + eca0470 commit 67c3293
Show file tree
Hide file tree
Showing 22 changed files with 10,718 additions and 9,153 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ config/development.config.php
data/cache/*
!data/cache/.gitkeep
phpunit.xml
composer.lock
39 changes: 39 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Changelog

All notable changes to this project will be documented in this file, in reverse chronological order by release.

## 3.1.0 - 2019-11-15

### Added

- Nothing.

### Changed

- [#431](https://github.com/zendframework/ZendSkeletonApplication/pull/431) updates the skeleton to use Bootstrap 4.

- [#428](https://github.com/zendframework/ZendSkeletonApplication/pull/428) changes the default `module_listener_options` in the `config/application.config.php` file to remove the `module_paths` and set `use_zend_loader` to false.

- [#448](https://github.com/zendframework/ZendSkeletonApplication/pull/448) removes the `composer.lock` to ensure users creating a new project receive the latest versions of all dependencies as supported by their current PHP version. Additionally, it adds an entry to the `post-create-project-cmd` Composer hook to remove the `composer.lock` entry from the `.gitignore` file, to promote checking in a `composer.lock` in user projects.

- [#448](https://github.com/zendframework/ZendSkeletonApplication/pull/448) bumps the version constraints of all optional packages to the latest versions supported by all PHP versions the skeleton supports.

- [#448](https://github.com/zendframework/ZendSkeletonApplication/pull/448) bumps the minimum supported version of zf-development-mode to 3.2

- [#448](https://github.com/zendframework/ZendSkeletonApplication/pull/448) bumps the minimum supported version of zend-mvc to 3.1.1.

- [#448](https://github.com/zendframework/ZendSkeletonApplication/pull/448) bumps the allowed versions of zend-component-installer to the 1.0 and 2.0 series.

- [#448](https://github.com/zendframework/ZendSkeletonApplication/pull/448) bumps the minimum supported version of zend-skeleton-installer to 0.1.7.

### Deprecated

- Nothing.

### Removed

- Nothing.

### Fixed

- [#430](https://github.com/zendframework/ZendSkeletonApplication/pull/430) updates the `serve` command to work cross-platform, and across all supported PHP versions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Once installed, you can test it out immediately using PHP's built-in web server:

```bash
$ cd path/to/install
$ php -S 0.0.0.0:8080 -t public/ public/index.php
$ php -S 0.0.0.0:8080 -t public
# OR use the composer alias:
$ composer run --timeout 0 serve
```
Expand Down
41 changes: 21 additions & 20 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@
"zf"
],
"homepage": "http://framework.zend.com/",
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"php": "^5.6 || ^7.0",
"zendframework/zend-component-installer": "^1.0 || ^0.7 || ^1.0.0-dev@dev",
"zendframework/zend-skeleton-installer": "^1.0 || ^0.1.3 || ^1.0.0-dev@dev",
"zendframework/zend-mvc": "^3.0.1",
"zfcampus/zf-development-mode": "^3.0"
"zendframework/zend-component-installer": "^1.0 || ^2.1",
"zendframework/zend-skeleton-installer": "^0.1.7 || ^1.0",
"zendframework/zend-mvc": "^3.1.1",
"zfcampus/zf-development-mode": "^3.2"
},
"autoload": {
"psr-4": {
Expand All @@ -32,20 +30,20 @@
"zend-skeleton-installer": [
{
"name": "zendframework/zend-developer-tools",
"constraint": "^1.1.0",
"constraint": "^1.2.3",
"prompt": "Would you like to install the developer toolbar?",
"module": true,
"dev": true
},
{
"name": "zendframework/zend-cache",
"constraint": "^2.7.1",
"constraint": "^2.9.0",
"prompt": "Would you like to install caching support?",
"module": true
},
{
"name": "zendframework/zend-db",
"constraint": "^2.8.1",
"constraint": "^2.10.0",
"prompt": "Would you like to install database support (installs zend-db)?",
"module": true
},
Expand All @@ -57,24 +55,24 @@
},
{
"name": "zendframework/zend-json",
"constraint": "^3.0",
"constraint": "^3.1.2",
"prompt": "Would you like to install JSON de/serialization support?"
},
{
"name": "zendframework/zend-log",
"constraint": "^2.9",
"constraint": "^2.11",
"prompt": "Would you like to install logging support?",
"module": true
},
{
"name": "zendframework/zend-mvc-console",
"constraint": "^1.1.10",
"constraint": "^1.2.0",
"prompt": "Would you like to install MVC-based console support? (We recommend migrating to zf-console, symfony/console, or Aura.CLI)",
"module": true
},
{
"name": "zendframework/zend-mvc-i18n",
"constraint": "^1.0",
"constraint": "^1.1.1",
"prompt": "Would you like to install i18n support?",
"module": true
},
Expand All @@ -86,30 +84,30 @@
},
{
"name": "zendframework/zend-psr7bridge",
"constraint": "^0.2.2",
"constraint": "^1.2.0",
"prompt": "Would you like to use the PSR-7 middleware dispatcher?"
},
{
"name": "zendframework/zend-session",
"constraint": "^2.7.1",
"constraint": "^2.9.1",
"prompt": "Would you like to install sessions support?",
"module": true
},
{
"name": "phpunit/phpunit",
"constraint": "^7.5.12 || ^6.5.14 || ^5.7.14",
"constraint": "^5.7.27 || ^6.5.14 || ^7.5.17",
"prompt": "Would you like to install testing support?",
"dev": true
},
{
"name": "zendframework/zend-test",
"constraint": "^3.0.1",
"constraint": "^3.3.0",
"prompt": "Would you like to install MVC testing tools for testing support?",
"dev": true
},
{
"name": "zendframework/zend-servicemanager-di",
"constraint": "^1.0",
"constraint": "^1.2.1",
"prompt": "Would you like to install the zend-di integration for zend-servicemanager?",
"module": true
}
Expand All @@ -121,8 +119,11 @@
"development-disable": "zf-development-mode disable",
"development-enable": "zf-development-mode enable",
"development-status": "zf-development-mode status",
"post-create-project-cmd": ["@development-enable"],
"serve": "php -S 0.0.0.0:8080 -t public public/index.php",
"post-create-project-cmd": [
"@development-enable",
"php -r '$file = file_get_contents(\".gitignore\"); $file = str_replace(\"composer.lock\", \"\", $file); file_put_contents(\".gitignore\", $file);"
],
"serve": "php -S 0.0.0.0:8080 -t public",
"test": "phpunit"
}
}
Loading

0 comments on commit 67c3293

Please sign in to comment.