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

Commit 78f1174

Browse files
weierophinneyweierophinney
committed
Merging develop to master in preparation for 2.6.0 release.
2 parents f580cf3 + 78b8030 commit 78f1174

File tree

85 files changed

+2118
-645
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+2118
-645
lines changed

‎.coveralls.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
coverage_clover: clover.xml
22
json_path: coveralls-upload.json
3-
src_dir: src

‎.gitattributes

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
/test export-ignore
2-
/vendor export-ignore
3-
.coveralls.yml export-ignore
4-
.gitattributes export-ignore
5-
.gitignore export-ignore
6-
.travis.yml export-ignore
7-
.php_cs export-ignore
8-
phpunit.xml.dist export-ignore
1+
/.coveralls.yml export-ignore
2+
/.gitattributes export-ignore
3+
/.gitignore export-ignore
4+
/.travis.yml export-ignore
5+
/composer.lock export-ignore
6+
/docs/ export-ignore
7+
/mkdocs.yml export-ignore
8+
/phpcs.xml export-ignore
9+
/phpunit.xml.dist export-ignore
10+
/test/ export-ignore

‎.gitignore

+7-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
1-
.buildpath
2-
.DS_Store
3-
.idea
4-
.project
5-
.settings/
6-
.*.sw*
7-
.*.un~
8-
nbproject
9-
doc/html/
10-
tmp/
11-
vendor/
12-
zf-mkdoc-theme/
13-
14-
clover.xml
15-
composer.lock
16-
coveralls-upload.json
17-
phpunit.xml
1+
/clover.xml
2+
/coveralls-upload.json
3+
/docs/html/
4+
/phpunit.xml
5+
/vendor/
6+
/zf-mkdoc-theme.tgz
7+
/zf-mkdoc-theme/

‎.php_cs

-45
This file was deleted.

‎.travis.yml

+51-38
Original file line numberDiff line numberDiff line change
@@ -2,62 +2,75 @@ sudo: false
22

33
language: php
44

5-
branches:
6-
except:
7-
- /^release-\d+\.\d+\.\d+.*$/
8-
- /^ghgfk-.*$/
9-
105
cache:
116
directories:
127
- $HOME/.composer/cache
13-
- vendor
14-
- $HOME/.local
15-
- zf-mkdoc-theme
168

179
env:
1810
global:
19-
- SITE_URL: https://zendframework.github.io/zend-loader
20-
- GH_USER_NAME: "Matthew Weier O'Phinney"
21-
- GH_USER_EMAIL: [email protected]
22-
- GH_REF: github.com/zendframework/zend-loader.git
23-
- secure: "ChmsX2Olq+bR36Fqtm9xJv3+19hBJr4kG4cgFfZoAzJm9GQS6N4iQNmAkZLBjLN3qskBW6sl4pDXGuyCBMOMPdBnQr1d6OE37NzcIXDrmFmZTNuRi8dWqJDuKDsY/ifcZe3HwsavP+/2y4RzbaxXIyyAcIbVCrI/3RnrMl11XB7TIh/UBRBrxtOad+SvKtpJBidRM41Tp919K3VQscYIAlsmBIWx7gbnc6ZQUbL0p0H0uVbHng9w7RmznGKZDQcoPhXE3/p4ify09WUqK2JKPqoTvQf3E1pF5MNxSNoLjZtrXTs4AmzMfw9Fxxpxx85clUKejfdoiI4kjWsJdUd5E4oNuUf+rnjIyPSg8SmhbQVz9Fiuj2vh16x9uacFgi2QBWfKK4MQpcmWlB+zjMCfP5PMyBWlXswMe3hbFdGvYDhjbxoV3cswjp8JivLh7Gh3C7aFLW5EoJPonsS2FtkJt5IZOofwiauS9lVwbTX7y2r2BBUPAEcW3ffnhaDTiO0cnli47I4ZemKaMrHCtucimMZ3SCuTIIGLU4/tE0obVAetE530TX5Y1mZ4Os23qm5KEO9Yb5Surm2zcNJhAdmTzNjlpYHW9ZI5Q9LnA//lUaTlt6eCq0B4MsswN0ijJUhu+Wrc+gSEMRzMq0bv4I2kbgVwapi0dL0raDdkmvc5dGQ="
11+
- COMPOSER_ARGS="--no-interaction"
12+
- COVERAGE_DEPS="php-coveralls/php-coveralls"
2413

2514
matrix:
26-
fast_finish: true
2715
include:
28-
- php: 5.5
16+
- php: 5.6
17+
env:
18+
- DEPS=lowest
19+
- php: 5.6
2920
env:
30-
- EXECUTE_CS_CHECK=true
21+
- DEPS=locked
22+
- LEGACY_DEPS="phpunit/phpunit"
3123
- php: 5.6
3224
env:
33-
- EXECUTE_TEST_COVERALLS=true
34-
- DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
35-
- PATH="$HOME/.local/bin:$PATH"
25+
- DEPS=latest
3626
- php: 7
37-
- php: hhvm
38-
allow_failures:
39-
- php: hhvm
40-
41-
notifications:
42-
irc: "irc.freenode.org#zftalk.dev"
43-
email: false
27+
env:
28+
- DEPS=lowest
29+
- php: 7
30+
env:
31+
- DEPS=locked
32+
- LEGACY_DEPS="phpunit/phpunit"
33+
- php: 7
34+
env:
35+
- DEPS=latest
36+
- php: 7.1
37+
env:
38+
- DEPS=lowest
39+
- php: 7.1
40+
env:
41+
- DEPS=locked
42+
- CS_CHECK=true
43+
- TEST_COVERAGE=true
44+
- php: 7.1
45+
env:
46+
- DEPS=latest
47+
- php: 7.2
48+
env:
49+
- DEPS=lowest
50+
- php: 7.2
51+
env:
52+
- DEPS=locked
53+
- php: 7.2
54+
env:
55+
- DEPS=latest
4456

4557
before_install:
46-
- if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
47-
- composer self-update
48-
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls ; fi
58+
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
4959

5060
install:
51-
- travis_retry composer install --no-interaction --ignore-platform-reqs
61+
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
62+
- if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
63+
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
64+
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
65+
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
66+
- stty cols 120 && composer show
5267

5368
script:
54-
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/phpunit --coverage-clover clover.xml ; fi
55-
- if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then ./vendor/bin/phpunit ; fi
56-
- if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/php-cs-fixer fix -v --diff --dry-run ; fi
57-
- if [[ $DEPLOY_DOCS == "true" && "$TRAVIS_TEST_RESULT" == "0" ]]; then wget -O theme-installer.sh "https://raw.githubusercontent.com/zendframework/zf-mkdoc-theme/master/theme-installer.sh" ; chmod 755 theme-installer.sh ; ./theme-installer.sh ; fi
58-
59-
after_success:
60-
- if [[ $DEPLOY_DOCS == "true" ]]; then echo "Preparing to build and deploy documentation" ; ./zf-mkdoc-theme/deploy.sh ; echo "Completed deploying documentation" ; fi
69+
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
70+
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
6171

6272
after_script:
63-
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/coveralls ; fi
73+
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi
74+
75+
notifications:
76+
email: false

‎CHANGELOG.md

+11-4
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,27 @@
22

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

5-
## 2.5.2 - TBD
5+
## 2.6.0 - 2018-04-30
66

77
### Added
88

9-
- [#8](https://github.com/zendframework/zend-loader/pull/8) adds
10-
documentation at https://zendframework.github.io/zend-loader/
9+
- [#16](https://github.com/zendframework/zend-loader/pull/16) adds support for PHP 7.1 and 7.2.
10+
11+
- [#8](https://github.com/zendframework/zend-loader/pull/8) adds documentation at https://docs.zendframework.com/zend-loader/
12+
13+
### Changed
14+
15+
- Nothing.
1116

1217
### Deprecated
1318

1419
- Nothing.
1520

1621
### Removed
1722

18-
- Nothing.
23+
- [#16](https://github.com/zendframework/zend-loader/pull/16) removes support for PHP 5.5.
24+
25+
- [#16](https://github.com/zendframework/zend-loader/pull/16) removes support for HHVM.
1926

2027
### Fixed
2128

‎LICENSE.md

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
Copyright (c) 2005-2015, Zend Technologies USA, Inc.
2-
1+
Copyright (c) 2005-2018, Zend Technologies USA, Inc.
32
All rights reserved.
43

54
Redistribution and use in source and binary forms, with or without modification,
65
are permitted provided that the following conditions are met:
76

8-
- Redistributions of source code must retain the above copyright notice,
9-
this list of conditions and the following disclaimer.
7+
- Redistributions of source code must retain the above copyright notice, this
8+
list of conditions and the following disclaimer.
109

11-
- Redistributions in binary form must reproduce the above copyright notice,
12-
this list of conditions and the following disclaimer in the documentation
13-
and/or other materials provided with the distribution.
10+
- Redistributions in binary form must reproduce the above copyright notice, this
11+
list of conditions and the following disclaimer in the documentation and/or
12+
other materials provided with the distribution.
1413

1514
- Neither the name of Zend Technologies USA, Inc. nor the names of its
1615
contributors may be used to endorse or promote products derived from this

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# zend-loader
22

33
[![Build Status](https://secure.travis-ci.org/zendframework/zend-loader.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-loader)
4-
[![Coverage Status](https://coveralls.io/repos/zendframework/zend-loader/badge.svg?branch=master)](https://coveralls.io/r/zendframework/zend-loader?branch=master)
4+
[![Coverage Status](https://coveralls.io/repos/github/zendframework/zend-loader/badge.svg?branch=master)](https://coveralls.io/github/zendframework/zend-loader?branch=master)
55

66
zend-loader provides different strategies for autoloading PHP classes.
77

88
- File issues at https://github.com/zendframework/zend-loader/issues
9-
- Documentation is at https://zendframework.github.io/zend-loader/
9+
- Documentation is at https://docs.zendframework.com/zend-loader/

‎composer.json

+36-17
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,54 @@
11
{
22
"name": "zendframework/zend-loader",
3-
"description": " ",
3+
"description": "Autoloading and plugin loading strategies",
44
"license": "BSD-3-Clause",
55
"keywords": [
6-
"zf2",
6+
"zf",
7+
"zendframework",
78
"loader"
89
],
9-
"homepage": "https://github.com/zendframework/zend-loader",
10-
"autoload": {
11-
"psr-4": {
12-
"Zend\\Loader\\": "src/"
13-
}
10+
"support": {
11+
"docs": "https://docs.zendframework.com/zend-loader/",
12+
"issues": "https://github.com/zendframework/zend-loader/issues",
13+
"source": "https://github.com/zendframework/zend-loader",
14+
"rss": "https://github.com/zendframework/zend-loader/releases.atom",
15+
"chat": "https://zendframework-slack.herokuapp.com",
16+
"forum": "https://discourse.zendframework.com/c/questions/components"
1417
},
1518
"require": {
16-
"php": "^5.5 || ^7.0"
19+
"php": "^5.6 || ^7.0"
1720
},
18-
"minimum-stability": "dev",
19-
"prefer-stable": true,
20-
"extra": {
21-
"branch-alias": {
22-
"dev-master": "2.5-dev",
23-
"dev-develop": "2.6-dev"
21+
"require-dev": {
22+
"phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
23+
"zendframework/zend-coding-standard": "~1.0.0"
24+
},
25+
"autoload": {
26+
"psr-4": {
27+
"Zend\\Loader\\": "src/"
2428
}
2529
},
2630
"autoload-dev": {
2731
"psr-4": {
2832
"ZendTest\\Loader\\": "test/"
2933
}
3034
},
31-
"require-dev": {
32-
"fabpot/php-cs-fixer": "1.7.*",
33-
"phpunit/PHPUnit": "^4.8"
35+
"config": {
36+
"sort-packages": true
37+
},
38+
"extra": {
39+
"branch-alias": {
40+
"dev-master": "2.6.x-dev",
41+
"dev-develop": "2.7.x-dev"
42+
}
43+
},
44+
"scripts": {
45+
"check": [
46+
"@cs-check",
47+
"@test"
48+
],
49+
"cs-check": "phpcs",
50+
"cs-fix": "phpcbf",
51+
"test": "phpunit --colors=always",
52+
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
3453
}
3554
}

0 commit comments

Comments
 (0)