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

Prepare for 2.8.0 release #62

Merged
merged 32 commits into from
Jul 11, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
51a6ae4
Prevent race condition on writing cache files
Feb 17, 2017
f22e3ab
#53 adding entry for the changelog - merged config race condition pre…
Ocramius Feb 20, 2017
124ed83
Merge branch 'fix/#53-use-exclusive-lock-on-merged-config-write-race-…
Ocramius Feb 20, 2017
a31d1d7
Merge branch 'hotfix/51' into develop
Xerkus Mar 12, 2017
54769f5
Merge branch 'hotfix/55' into develop
Xerkus Mar 12, 2017
8937403
Merge pull request #56 from webimpress/feature/zend-config-3
Xerkus Mar 18, 2017
1f5074a
Merge branch 'hotfix/49' into develop
Xerkus Mar 18, 2017
c1180a8
Merge branch 'hotfix/59' into develop
Xerkus Mar 31, 2017
c5a7bdb
Merge branch 'hotfix/41' into develop
Xerkus Mar 31, 2017
48e7243
Merge branch 'hotfix/44' into develop
weierophinney Jul 11, 2017
b423f3b
Add module manager option not to use Zend\Loader
Xerkus Sep 6, 2015
74f06db
Adds more descriptive info to zend-loader composer suggestion
weierophinney Jul 11, 2017
0000db5
Documents the use_zend_loader option
weierophinney Jul 11, 2017
0161951
Added CHANGELOG for #4
weierophinney Jul 11, 2017
86473f4
Merge branch 'feature/4' into develop
weierophinney Jul 11, 2017
5a2ea49
Corrects issue identifier from 44 to 4
weierophinney Jul 11, 2017
bfddbda
Fixes long line, per phpcs
weierophinney Jul 11, 2017
1b22c26
Split test
Maks3w Sep 14, 2015
25be2f0
Refactor test as data provider
Maks3w Sep 14, 2015
6946d55
Resolve modules using PHP 5.5 ::class constant
Maks3w Sep 14, 2015
4b41db6
Add test for arbitrary class name
Maks3w Sep 14, 2015
f224c6c
Fixes failing tests from #5
weierophinney Jul 11, 2017
4ee0580
Documents ability to use any class name for modules
weierophinney Jul 11, 2017
ae9a630
Adds CHANGELOG for #5
weierophinney Jul 11, 2017
f8c2762
Merge branch 'feature/5' into develop
weierophinney Jul 11, 2017
6834301
Merge branch 'hotfix/36' into develop
weierophinney Jul 11, 2017
a23c8bf
Merge branch 'hotfix/39' into develop
weierophinney Jul 11, 2017
40b7746
Merge branch 'hotfix/58' into develop
weierophinney Jul 11, 2017
998c664
2.7.3 readiness
weierophinney Jul 11, 2017
ee2e76e
Merging develop to master in preparation for 2.8.0 release.
weierophinney Jul 11, 2017
83f23f7
No longer support PHP 5.5 or HHVM
weierophinney Jul 11, 2017
88ba1f0
Updates PHPUnit and PHP dependencies
weierophinney Jul 11, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ doc/html/
zf-mkdoc-theme/

clover.xml
composer.lock
coveralls-upload.json
phpunit.xml
vendor
61 changes: 26 additions & 35 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ cache:

env:
global:
- EVENT_MANAGER_VERSION="^3.0"
- SERVICE_MANAGER_VERSION="^3.0.3"
- COMPOSER_ARGS="--no-interaction"
- COVERAGE_DEPS="satooshi/php-coveralls"
- LEGACY_DEPS="phpunit/phpunit"
- SITE_URL: https://zendframework.github.io/zend-modulemanager
- GH_USER_NAME: "Matthew Weier O'Phinney"
- GH_USER_EMAIL: matthew@weierophinney.net
Expand All @@ -25,49 +26,49 @@ env:

matrix:
include:
- php: 5.5
env:
- CS_CHECK=true
- php: 5.5
- php: 5.6
env:
- EVENT_MANAGER_VERSION="^2.6.2"
- SERVICE_MANAGER_VERSION="^2.7.5"
- DEPS=lowest
- php: 5.6
env:
- DEPS=locked
- TEST_COVERAGE=true
- DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
- PATH="$HOME/.local/bin:$PATH"
- php: 5.6
env:
- EVENT_MANAGER_VERSION="^2.6.2"
- SERVICE_MANAGER_VERSION="^2.7.5"
- DEPS=latest
- php: 7
env:
- DEPS=lowest
- php: 7
env:
- EVENT_MANAGER_VERSION="^2.6.2"
- SERVICE_MANAGER_VERSION="^2.7.5"
- DEPS=locked
- CS_CHECK=true
- php: 7
env:
- DEPS=latest
- php: 7.1
env:
- DEPS=lowest
- php: 7.1
env:
- EVENT_MANAGER_VERSION="^2.6.2"
- SERVICE_MANAGER_VERSION="^2.7.5"
- php: hhvm
- php: hhvm
- DEPS=locked
- php: 7.1
env:
- EVENT_MANAGER_VERSION="^2.6.2"
- SERVICE_MANAGER_VERSION="^2.7.5"
allow_failures:
- php: hhvm
- DEPS=latest

before_install:
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
- composer self-update
- if [[ $TEST_COVERAGE == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls ; fi
- composer require --no-update "zendframework/zend-eventmanager:$EVENT_MANAGER_VERSION"
- composer require --dev --no-update "zendframework/zend-servicemanager:$SERVICE_MANAGER_VERSION"
- travis_retry composer self-update

install:
- travis_retry composer install --no-interaction --ignore-platform-reqs
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
- if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
- composer show

script:
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
Expand All @@ -82,13 +83,3 @@ after_script:

notifications:
email: false
irc:
channels:
- "irc.freenode.org#zftalk.dev"
on_success: change
on_failure: always
slack:
rooms:
- secure: "FAFyl1egzrcsOB+9cDBWivXdbFzMfE6kN97vLQme4g935bAD+Mgt/PXQoKtAvVm2Sq0kxdXTzXulBfmYh+S+qK4LJbAWF5nsl/QEqdHIsQjvujbuHcvqOVljkHQhvHT9JLZicxQgEfux9Mi+OFkiylakpTro4XtFvT86xGbW8AMeHyLUH1bTGNHvY4og2UJD1LLUdEZQPoxKXxUV0/rC4KK2woaEMTgbhwRoglLv68n5nHHd9s2pSK8p74MIbRF5DpFVtKpHJmruoNgCwSmrtNlKMtrqMPhzNEbvc1IV2id09itaN2+QojSR3yUoUANQ9zORDAIy4BdlIyD+5T4emn+0ONMg9JQVnozOluxWqHZ4VfyCQfBbAA2B1zpdKKzhT1ZAOLWi2aSRw04gknTtM+fnpNOAbMBF9kx2Y4B2U1vMaUdPR92wsVzjuHg9hRpAeBgfrzPfq47cGi0kfVXkO+c/hrLu6AZbtdE6f6OMh7uwNIvs8TqnoDiPLGgutMrl6Ww0znDsL6rtOrzId2FeuzZ7O8LUVtcR6P/NDqRE6TJy/g1c2q1xXni7w/l0SYs+jjtwFvZ++ksQywkNb9C+iZ6xZKxqKDzn3GlpgOg/1oHECd6n4AmssOwWhFDGNrLPiYGhD8z4oYJgLYU36UoUk7TM6jXy/2ASUnGAaY9iqWA="
on_success: change
on_failure: always
27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,33 @@

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

## 2.8.0 - TBD

### Added

- [#4](https://github.com/zendframework/zend-modulemanager/pull/4) adds a new
`ListenerOptions` option, `use_zend_loader`. The option defaults to `true`,
which keeps the current behavior of registering the `ModuleAutoloader` and
`AutoloaderProvider`. If you disable it, these features will no longer be
loaded, allowing `ModuleManager` to be used without zend-loader.
- [#5](https://github.com/zendframework/zend-modulemanager/pull/5) adds the
ability to use a class of any name for a module, so long as you provide the
fully qualified class name when registering the module with the module
manager.

### Deprecated

- Nothing.

### Removed

- Nothing.

### Fixed

- [#53](https://github.com/zendframework/zend-modulemanager/pull/53) preventing race conditions
when writing cache files (merged configuration)

## 2.7.3 - 2017-07-11

### Added
Expand Down
20 changes: 11 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,36 +13,38 @@
}
},
"require": {
"php": "^5.5 || ^7.0",
"zendframework/zend-config": "^2.6 || ^3.1",
"zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
"zendframework/zend-stdlib": "^2.7 || ^3.0"
"php": "^5.6 || ^7.0",
"zendframework/zend-config": "^3.1 || ^2.6",
"zendframework/zend-eventmanager": "^3.2 || ^2.6.3",
"zendframework/zend-stdlib": "^3.0 || ^2.7"
},
"require-dev": {
"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",
"phpunit/PHPUnit": "~4.0",
"zendframework/zend-servicemanager": "^3.0.3 || ^2.7.5",
"phpunit/phpunit": "^6.0.8 || ^5.7.15",
"zendframework/zend-coding-standard": "~1.0.0"
},
"suggest": {
"zendframework/zend-console": "Zend\\Console component",
"zendframework/zend-loader": "Zend\\Loader component",
"zendframework/zend-loader": "Zend\\Loader component if you are not using Composer autoloading for your modules",
"zendframework/zend-mvc": "Zend\\Mvc component",
"zendframework/zend-servicemanager": "Zend\\ServiceManager component"
},
"minimum-stability": "dev",
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "2.7-dev",
"dev-develop": "2.8-dev"
}
},
"autoload-dev": {
"files": [
"test/autoload.php"
],
"psr-4": {
"ListenerTestModule\\": "test/TestAsset/ListenerTestModule/",
"ZendTest\\ModuleManager\\": "test/"
}
},
Expand Down
Loading