diff --git a/.gitignore b/.gitignore index 4c23710a8e..37328e5390 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ config/development.config.php data/cache/* !data/cache/.gitkeep phpunit.xml +composer.lock diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000000..1a40719fcf --- /dev/null +++ b/CHANGELOG.md @@ -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. diff --git a/README.md b/README.md index 16e6e756e8..50e5ebe000 100644 --- a/README.md +++ b/README.md @@ -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 ``` diff --git a/composer.json b/composer.json index 418fb9addc..0e2f7def56 100644 --- a/composer.json +++ b/composer.json @@ -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": { @@ -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 }, @@ -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 }, @@ -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 } @@ -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" } } diff --git a/composer.lock b/composer.lock deleted file mode 100644 index 5c40755f64..0000000000 --- a/composer.lock +++ /dev/null @@ -1,987 +0,0 @@ -{ - "_readme": [ - "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", - "This file is @generated automatically" - ], - "content-hash": "2ec0c8035714db56f3a0a5f83836151e", - "packages": [ - { - "name": "container-interop/container-interop", - "version": "1.2.0", - "source": { - "type": "git", - "url": "https://github.com/container-interop/container-interop.git", - "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8", - "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8", - "shasum": "" - }, - "require": { - "psr/container": "^1.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Interop\\Container\\": "src/Interop/Container/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", - "homepage": "https://github.com/container-interop/container-interop", - "time": "2017-02-14T19:40:03+00:00" - }, - { - "name": "psr/container", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Container\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common Container Interface (PHP FIG PSR-11)", - "homepage": "https://github.com/php-fig/container", - "keywords": [ - "PSR-11", - "container", - "container-interface", - "container-interop", - "psr" - ], - "time": "2017-02-14T16:28:37+00:00" - }, - { - "name": "zendframework/zend-component-installer", - "version": "0.7.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-component-installer.git", - "reference": "aa05b53a29af282258df3cd27bb6618aa16f4047" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-component-installer/zipball/aa05b53a29af282258df3cd27bb6618aa16f4047", - "reference": "aa05b53a29af282258df3cd27bb6618aa16f4047", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0", - "php": "^5.6 || ^7.0" - }, - "require-dev": { - "composer/composer": "^1.3.2", - "malukenho/docheader": "^0.1.5", - "mikey179/vfsstream": "^1.6", - "phpunit/phpunit": "^6.0.7 || ^5.7.14", - "zendframework/zend-coding-standard": "~1.0.0" - }, - "type": "composer-plugin", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - }, - "class": "Zend\\ComponentInstaller\\ComponentInstaller" - }, - "autoload": { - "psr-4": { - "Zend\\ComponentInstaller\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Composer plugin for automating component registration in zend-mvc and Expressive applications", - "time": "2017-02-22T17:44:09+00:00" - }, - { - "name": "zendframework/zend-config", - "version": "2.6.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-config.git", - "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-config/zipball/2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d", - "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-filter": "^2.6", - "zendframework/zend-i18n": "^2.5", - "zendframework/zend-json": "^2.6.1", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" - }, - "suggest": { - "zendframework/zend-filter": "Zend\\Filter component", - "zendframework/zend-i18n": "Zend\\I18n component", - "zendframework/zend-json": "Zend\\Json to use the Json reader or writer classes", - "zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Config\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "provides a nested object property based user interface for accessing this configuration data within application code", - "homepage": "https://github.com/zendframework/zend-config", - "keywords": [ - "config", - "zf2" - ], - "time": "2016-02-04T23:01:10+00:00" - }, - { - "name": "zendframework/zend-escaper", - "version": "2.5.2", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-escaper.git", - "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/2dcd14b61a72d8b8e27d579c6344e12c26141d4e", - "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e", - "shasum": "" - }, - "require": { - "php": ">=5.5" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Escaper\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-escaper", - "keywords": [ - "escaper", - "zf2" - ], - "time": "2016-06-30T19:48:38+00:00" - }, - { - "name": "zendframework/zend-eventmanager", - "version": "3.1.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-eventmanager.git", - "reference": "c3bce7b7d47c54040b9ae51bc55491c72513b75d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/c3bce7b7d47c54040b9ae51bc55491c72513b75d", - "reference": "c3bce7b7d47c54040b9ae51bc55491c72513b75d", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0" - }, - "require-dev": { - "athletic/athletic": "^0.1", - "container-interop/container-interop": "^1.1.0", - "phpunit/phpunit": "^5.6", - "zendframework/zend-coding-standard": "~1.0.0", - "zendframework/zend-stdlib": "^2.7.3 || ^3.0" - }, - "suggest": { - "container-interop/container-interop": "^1.1.0, to use the lazy listeners feature", - "zendframework/zend-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1-dev", - "dev-develop": "3.2-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\EventManager\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Trigger and listen to events within a PHP application", - "homepage": "https://github.com/zendframework/zend-eventmanager", - "keywords": [ - "event", - "eventmanager", - "events", - "zf2" - ], - "time": "2016-12-19T21:47:12+00:00" - }, - { - "name": "zendframework/zend-http", - "version": "2.6.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-http.git", - "reference": "09f4d279f46d86be63171ff62ee0f79eca878678" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-http/zipball/09f4d279f46d86be63171ff62ee0f79eca878678", - "reference": "09f4d279f46d86be63171ff62ee0f79eca878678", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-loader": "^2.5", - "zendframework/zend-stdlib": "^2.5 || ^3.0", - "zendframework/zend-uri": "^2.5", - "zendframework/zend-validator": "^2.5" - }, - "require-dev": { - "phpunit/phpunit": "^4.0", - "zendframework/zend-coding-standard": "~1.0.0", - "zendframework/zend-config": "^2.5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Http\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests", - "homepage": "https://github.com/zendframework/zend-http", - "keywords": [ - "http", - "zf2" - ], - "time": "2017-01-31T14:41:02+00:00" - }, - { - "name": "zendframework/zend-loader", - "version": "2.5.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-loader.git", - "reference": "c5fd2f071bde071f4363def7dea8dec7393e135c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/c5fd2f071bde071f4363def7dea8dec7393e135c", - "reference": "c5fd2f071bde071f4363def7dea8dec7393e135c", - "shasum": "" - }, - "require": { - "php": ">=5.3.23" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Loader\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-loader", - "keywords": [ - "loader", - "zf2" - ], - "time": "2015-06-03T14:05:47+00:00" - }, - { - "name": "zendframework/zend-modulemanager", - "version": "2.7.2", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-modulemanager.git", - "reference": "2a59ab9a0dd7699a55050dff659ab0f28272b46e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-modulemanager/zipball/2a59ab9a0dd7699a55050dff659ab0f28272b46e", - "reference": "2a59ab9a0dd7699a55050dff659ab0f28272b46e", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-config": "^2.6", - "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-console": "^2.6", - "zendframework/zend-di": "^2.6", - "zendframework/zend-loader": "^2.5", - "zendframework/zend-mvc": "^2.7", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" - }, - "suggest": { - "zendframework/zend-config": "Zend\\Config component", - "zendframework/zend-console": "Zend\\Console component", - "zendframework/zend-loader": "Zend\\Loader component", - "zendframework/zend-mvc": "Zend\\Mvc component", - "zendframework/zend-servicemanager": "Zend\\ServiceManager component" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\ModuleManager\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-modulemanager", - "keywords": [ - "modulemanager", - "zf2" - ], - "time": "2016-05-16T21:21:11+00:00" - }, - { - "name": "zendframework/zend-mvc", - "version": "3.0.4", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-mvc.git", - "reference": "e25f04a71b70985620f5ff3e762475848d049025" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/e25f04a71b70985620f5ff3e762475848d049025", - "reference": "e25f04a71b70985620f5ff3e762475848d049025", - "shasum": "" - }, - "require": { - "container-interop/container-interop": "^1.1", - "php": "^5.6 || ^7.0", - "zendframework/zend-eventmanager": "^3.0", - "zendframework/zend-http": "^2.5.4", - "zendframework/zend-modulemanager": "^2.7.1", - "zendframework/zend-router": "^3.0.1", - "zendframework/zend-servicemanager": "^3.0.3", - "zendframework/zend-stdlib": "^3.0", - "zendframework/zend-view": "^2.6.7" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "^4.5", - "zendframework/zend-json": "^2.6.1 || ^3.0", - "zendframework/zend-psr7bridge": "^0.2" - }, - "suggest": { - "zendframework/zend-json": "(^2.6.1 || ^3.0) To auto-deserialize JSON body content in AbstractRestfulController extensions, when json_decode is unavailable", - "zendframework/zend-mvc-console": "zend-mvc-console provides the ability to expose zend-mvc as a console application", - "zendframework/zend-mvc-i18n": "zend-mvc-i18n provides integration with zend-i18n, including a translation bridge and translatable route segments", - "zendframework/zend-mvc-plugin-fileprg": "To provide Post/Redirect/Get functionality around forms that container file uploads", - "zendframework/zend-mvc-plugin-flashmessenger": "To provide flash messaging capabilities between requests", - "zendframework/zend-mvc-plugin-identity": "To access the authenticated identity (per zend-authentication) in controllers", - "zendframework/zend-mvc-plugin-prg": "To provide Post/Redirect/Get functionality within controllers", - "zendframework/zend-psr7bridge": "(^0.2) To consume PSR-7 middleware within the MVC workflow", - "zendframework/zend-servicemanager-di": "zend-servicemanager-di provides utilities for integrating zend-di and zend-servicemanager in your zend-mvc application" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev", - "dev-develop": "3.1-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Mvc\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-mvc", - "keywords": [ - "mvc", - "zf2" - ], - "time": "2016-12-20T15:33:49+00:00" - }, - { - "name": "zendframework/zend-router", - "version": "3.0.2", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-router.git", - "reference": "03763610632a9022aff22a0e8f340852e68392a1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-router/zipball/03763610632a9022aff22a0e8f340852e68392a1", - "reference": "03763610632a9022aff22a0e8f340852e68392a1", - "shasum": "" - }, - "require": { - "container-interop/container-interop": "^1.1", - "php": "^5.5 || ^7.0", - "zendframework/zend-http": "^2.5", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", - "zendframework/zend-stdlib": "^2.7.5 || ^3.0" - }, - "conflict": { - "zendframework/zend-mvc": "<3.0.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.5", - "sebastian/version": "^1.0.4", - "squizlabs/php_codesniffer": "^2.3", - "zendframework/zend-i18n": "^2.6" - }, - "suggest": { - "zendframework/zend-i18n": "^2.6, if defining translatable HTTP path segments" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev", - "dev-develop": "3.1-dev" - }, - "zf": { - "component": "Zend\\Router", - "config-provider": "Zend\\Router\\ConfigProvider" - } - }, - "autoload": { - "psr-4": { - "Zend\\Router\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-router", - "keywords": [ - "mvc", - "routing", - "zf2" - ], - "time": "2016-05-31T20:47:48+00:00" - }, - { - "name": "zendframework/zend-servicemanager", - "version": "3.3.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-servicemanager.git", - "reference": "c3036efb81f71bfa36cc9962ee5d4474f36581d0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/c3036efb81f71bfa36cc9962ee5d4474f36581d0", - "reference": "c3036efb81f71bfa36cc9962ee5d4474f36581d0", - "shasum": "" - }, - "require": { - "container-interop/container-interop": "^1.2", - "php": "^5.6 || ^7.0", - "psr/container": "^1.0", - "zendframework/zend-stdlib": "^3.1" - }, - "provide": { - "container-interop/container-interop-implementation": "^1.2", - "psr/container-implementation": "^1.0" - }, - "require-dev": { - "mikey179/vfsstream": "^1.6", - "ocramius/proxy-manager": "^1.0 || ^2.0", - "phpbench/phpbench": "^0.10.0", - "phpunit/phpunit": "^5.7 || ^6.0.6", - "zendframework/zend-coding-standard": "~1.0.0" - }, - "suggest": { - "ocramius/proxy-manager": "ProxyManager 1.* to handle lazy initialization of services", - "zendframework/zend-stdlib": "zend-stdlib ^2.5 if you wish to use the MergeReplaceKey or MergeRemoveKey features in Config instances" - }, - "bin": [ - "bin/generate-deps-for-config-factory", - "bin/generate-factory-for-class" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.3-dev", - "dev-develop": "3.4-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\ServiceManager\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-servicemanager", - "keywords": [ - "service-manager", - "servicemanager", - "zf" - ], - "time": "2017-03-01T22:08:02+00:00" - }, - { - "name": "zendframework/zend-skeleton-installer", - "version": "0.1.4", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-skeleton-installer.git", - "reference": "3a819fa3ac0fef121dfdb82d10f13649a41d88ed" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-skeleton-installer/zipball/3a819fa3ac0fef121dfdb82d10f13649a41d88ed", - "reference": "3a819fa3ac0fef121dfdb82d10f13649a41d88ed", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0", - "php": "^5.6 || ^7.0", - "zendframework/zend-component-installer": "^1.0 || ^0.7 || ^1.0.0-dev@dev" - }, - "require-dev": { - "composer/composer": "^1.4.1", - "malukenho/docheader": "^0.1.5", - "mikey179/vfsstream": "^1.6.4", - "phpunit/phpunit": "^6.0.8 || ^5.7.15", - "zendframework/zend-coding-standard": "~1.0.0" - }, - "type": "composer-plugin", - "extra": { - "class": "Zend\\SkeletonInstaller\\Plugin", - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\SkeletonInstaller\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Installer plugin for Zend Framework skeleton application", - "time": "2017-03-10T23:37:26+00:00" - }, - { - "name": "zendframework/zend-stdlib", - "version": "3.1.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-stdlib.git", - "reference": "debedcfc373a293f9250cc9aa03cf121428c8e78" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/debedcfc373a293f9250cc9aa03cf121428c8e78", - "reference": "debedcfc373a293f9250cc9aa03cf121428c8e78", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0" - }, - "require-dev": { - "athletic/athletic": "~0.1", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "^2.6.2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1-dev", - "dev-develop": "3.2-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Stdlib\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-stdlib", - "keywords": [ - "stdlib", - "zf2" - ], - "time": "2016-09-13T14:38:50+00:00" - }, - { - "name": "zendframework/zend-uri", - "version": "2.5.2", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-uri.git", - "reference": "0bf717a239432b1a1675ae314f7c4acd742749ed" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/0bf717a239432b1a1675ae314f7c4acd742749ed", - "reference": "0bf717a239432b1a1675ae314f7c4acd742749ed", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-escaper": "^2.5", - "zendframework/zend-validator": "^2.5" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Uri\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "a component that aids in manipulating and validating ยป Uniform Resource Identifiers (URIs)", - "homepage": "https://github.com/zendframework/zend-uri", - "keywords": [ - "uri", - "zf2" - ], - "time": "2016-02-17T22:38:51+00:00" - }, - { - "name": "zendframework/zend-validator", - "version": "2.8.2", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-validator.git", - "reference": "99b528e01276054458da9553b587cfb959dfa436" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/99b528e01276054458da9553b587cfb959dfa436", - "reference": "99b528e01276054458da9553b587cfb959dfa436", - "shasum": "" - }, - "require": { - "container-interop/container-interop": "^1.1", - "php": "^5.5 || ^7.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "^4.0", - "zendframework/zend-cache": "^2.6.1", - "zendframework/zend-config": "^2.6", - "zendframework/zend-db": "^2.7", - "zendframework/zend-filter": "^2.6", - "zendframework/zend-http": "^2.5.4", - "zendframework/zend-i18n": "^2.6", - "zendframework/zend-math": "^2.6", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", - "zendframework/zend-session": "^2.6.2", - "zendframework/zend-uri": "^2.5" - }, - "suggest": { - "zendframework/zend-db": "Zend\\Db component", - "zendframework/zend-filter": "Zend\\Filter component, required by the Digits validator", - "zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages as well as to use the various Date validators", - "zendframework/zend-i18n-resources": "Translations of validator messages", - "zendframework/zend-math": "Zend\\Math component", - "zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains", - "zendframework/zend-session": "Zend\\Session component", - "zendframework/zend-uri": "Zend\\Uri component, required by the Uri and Sitemap\\Loc validators" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.8-dev", - "dev-develop": "2.9-dev" - }, - "zf": { - "component": "Zend\\Validator", - "config-provider": "Zend\\Validator\\ConfigProvider" - } - }, - "autoload": { - "psr-4": { - "Zend\\Validator\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "provides a set of commonly needed validators", - "homepage": "https://github.com/zendframework/zend-validator", - "keywords": [ - "validator", - "zf2" - ], - "time": "2017-01-29T17:24:24+00:00" - }, - { - "name": "zendframework/zend-view", - "version": "2.8.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-view.git", - "reference": "71b4ebd0c4c9a2d0e0438f9d3a435e08dd769ff8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-view/zipball/71b4ebd0c4c9a2d0e0438f9d3a435e08dd769ff8", - "reference": "71b4ebd0c4c9a2d0e0438f9d3a435e08dd769ff8", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", - "zendframework/zend-loader": "^2.5", - "zendframework/zend-stdlib": "^2.7 || ^3.0" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "^4.5", - "zendframework/zend-authentication": "^2.5", - "zendframework/zend-cache": "^2.6.1", - "zendframework/zend-config": "^2.6", - "zendframework/zend-console": "^2.6", - "zendframework/zend-escaper": "^2.5", - "zendframework/zend-feed": "^2.7", - "zendframework/zend-filter": "^2.6.1", - "zendframework/zend-http": "^2.5.4", - "zendframework/zend-i18n": "^2.6", - "zendframework/zend-json": "^2.6.1", - "zendframework/zend-log": "^2.7", - "zendframework/zend-modulemanager": "^2.7.1", - "zendframework/zend-mvc": "^2.7 || ^3.0", - "zendframework/zend-navigation": "^2.5", - "zendframework/zend-paginator": "^2.5", - "zendframework/zend-permissions-acl": "^2.6", - "zendframework/zend-router": "^3.0.1", - "zendframework/zend-serializer": "^2.6.1", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", - "zendframework/zend-session": "^2.6.2", - "zendframework/zend-uri": "^2.5" - }, - "suggest": { - "zendframework/zend-authentication": "Zend\\Authentication component", - "zendframework/zend-escaper": "Zend\\Escaper component", - "zendframework/zend-feed": "Zend\\Feed component", - "zendframework/zend-filter": "Zend\\Filter component", - "zendframework/zend-http": "Zend\\Http component", - "zendframework/zend-i18n": "Zend\\I18n component", - "zendframework/zend-json": "Zend\\Json component", - "zendframework/zend-mvc": "Zend\\Mvc component", - "zendframework/zend-navigation": "Zend\\Navigation component", - "zendframework/zend-paginator": "Zend\\Paginator component", - "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component", - "zendframework/zend-servicemanager": "Zend\\ServiceManager component", - "zendframework/zend-uri": "Zend\\Uri component" - }, - "bin": [ - "bin/templatemap_generator.php" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.8-dev", - "dev-develop": "2.9-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\View\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "provides a system of helpers, output filters, and variable escaping", - "homepage": "https://github.com/zendframework/zend-view", - "keywords": [ - "view", - "zf2" - ], - "time": "2016-06-30T22:28:07+00:00" - }, - { - "name": "zfcampus/zf-development-mode", - "version": "3.1.0", - "source": { - "type": "git", - "url": "https://github.com/zfcampus/zf-development-mode.git", - "reference": "ffef6ab8cf84ee1d1a77a2b51ba2240d2707c05d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zfcampus/zf-development-mode/zipball/ffef6ab8cf84ee1d1a77a2b51ba2240d2707c05d", - "reference": "ffef6ab8cf84ee1d1a77a2b51ba2240d2707c05d", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0" - }, - "require-dev": { - "mikey179/vfsstream": "^1.6", - "phpunit/phpunit": "^5.4", - "squizlabs/php_codesniffer": "^2.3.1" - }, - "bin": [ - "bin/zf-development-mode" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1-dev", - "dev-develop": "3.2-dev" - } - }, - "autoload": { - "psr-4": { - "ZF\\DevelopmentMode\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Zend Framework development mode script", - "homepage": "http://github.com/zfcampus/zf-development-mode", - "keywords": [ - "framework", - "zf2" - ], - "time": "2017-01-09T23:34:49+00:00" - } - ], - "packages-dev": [], - "aliases": [], - "minimum-stability": "dev", - "stability-flags": { - "zendframework/zend-component-installer": 20, - "zendframework/zend-skeleton-installer": 20 - }, - "prefer-stable": true, - "prefer-lowest": false, - "platform": { - "php": "^5.6 || ^7.0" - }, - "platform-dev": [] -} diff --git a/config/application.config.php b/config/application.config.php index 61026080f7..66e466d71f 100644 --- a/config/application.config.php +++ b/config/application.config.php @@ -11,15 +11,10 @@ // These are various options for the listeners attached to the ModuleManager 'module_listener_options' => [ - // This should be an array of paths in which modules reside. - // If a string key is provided, the listener will consider that a module - // namespace, the value of that key the specific path to that module's - // Module class. - 'module_paths' => [ - './module', - './vendor', - ], - + + // use composer autoloader instead of zend-loader + 'use_zend_loader' => false, + // An array of paths from which to glob configuration files after // modules are loaded. These effectively override configuration // provided by modules themselves. Paths may use GLOB_BRACE notation. diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php index 92bafd1cad..a6a39b1cf0 100644 --- a/module/Application/config/module.config.php +++ b/module/Application/config/module.config.php @@ -15,7 +15,7 @@ 'router' => [ 'routes' => [ 'home' => [ - 'type' => Literal::class, + 'type' => Literal::class, 'options' => [ 'route' => '/', 'defaults' => [ diff --git a/module/Application/src/Module.php b/module/Application/src/Module.php index 29ef49e18b..4d2d850e50 100644 --- a/module/Application/src/Module.php +++ b/module/Application/src/Module.php @@ -9,7 +9,7 @@ class Module { - const VERSION = '3.0.3-dev'; + const VERSION = '3.1.0'; public function getConfig() { diff --git a/module/Application/view/application/index/index.phtml b/module/Application/view/application/index/index.phtml index 0332274926..ca2781520f 100644 --- a/module/Application/view/application/index/index.phtml +++ b/module/Application/view/application/index/index.phtml @@ -15,11 +15,11 @@
-
-
-

Follow Development

+
+
+

Follow Development

-
+

Zend Framework is under active development. If you are interested in following the development of ZF, you can check @@ -35,11 +35,11 @@

-
-
-

Discover Modules

+
+
+

Discover Modules

-
+

The community is working on developing a community site to serve as a repository and gallery for ZF modules. The @@ -54,11 +54,11 @@

-
-
-

Help & Support

+
+
+

Help & Support

-
+

If you need any help or support while developing with ZF, you may reach us via IRC: #zftalk on Freenode. diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml index aa47ad0c6b..62a1a62bb7 100644 --- a/module/Application/view/layout/layout.phtml +++ b/module/Application/view/layout/layout.phtml @@ -13,32 +13,31 @@ headLink(['rel' => 'shortcut icon', 'type' => 'image/vnd.microsoft.icon', 'href' => $this->basePath() . '/img/favicon.ico']) ->prependStylesheet($this->basePath('css/style.css')) - ->prependStylesheet($this->basePath('css/bootstrap-theme.min.css')) ->prependStylesheet($this->basePath('css/bootstrap.min.css')) ?> - headScript() + inlineScript() ->prependFile($this->basePath('js/bootstrap.min.js')) - ->prependFile($this->basePath('js/jquery-3.1.0.min.js')) + ->prependFile($this->basePath('js/jquery-3.3.1.min.js')) ?> -