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

Commit 3419600

Browse files
committed
Merge branch 'feature/v3-preparation' into develop
Close #51
2 parents b997a3f + 039af57 commit 3419600

16 files changed

+109
-919
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
.*.sw*
77
.*.un~
88
nbproject
9+
doc/html/
910
tmp/
11+
zf-mkdoc-theme/
1012

1113
clover.xml
1214
composer.lock

.travis.yml

+16-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,16 @@ branches:
1010
cache:
1111
directories:
1212
- $HOME/.composer/cache
13+
- $HOME/.local
14+
- zf-mkdoc-theme
15+
16+
env:
17+
global:
18+
- SITE_URL: https://zendframework.github.io/zend-servicemanager
19+
- GH_USER_NAME: "Matthew Weier O'Phinney"
20+
- GH_USER_EMAIL: [email protected]
21+
- GH_REF: github.com/zendframework/zend-servicemanager.git
22+
- secure: "l+YU9Igd9IUA60PE+iC4AZt2hHY9hpsSB7S2jck9fjPm0+15UCGk2G1qg5hCi+FlPslXhk6wOLLDPc40BiCrwH+m5CP9cIdkGTuNc9rVF9S5IiRLkOVxeTcdE+JRm7hZ2NBgxEiTuBLs5RlN39o41zPDFllgnJv69UmmUIMHuG3NwJJiRE9NA2EMIhZwx3UT/Zqq94MzAbYXi2xspoQ53Z/rfvVSJK6tdARp31q4NWvlYsc2YVcEWv+j3VY5luMSCMVQVNBIuXdd0hYpGt2o3H6S9azzcKRQB7saoAT/tiAEj5121tv3j3cKNQQMzI4xv7RrtQEiAhumeU3AsVDyqBmqqUQNwpnWH0RZdRry4jUKJgx0TK0yZH8ewdz6DhktBqS+c2a/FzfO3yc+LeuIy3i73NezNwCgwviOBYbWPAo4LqKtJ7gdTbVVdJaUeCtKTZ1b1k4MtaxjZjz0IK5+rxJsZ1DQF5fhJIzkjXqEEON2mHQu/qE+I7ow4Jvfs0T+KYJW6Yf5qFzBkrTUNjV60rmawaEjgxgMvtwN+MvcQ/X2OWkdjdzqzQIDdjssdRu9IBPU/G2uqzS8POL9o1j8H3NE430Tsbg+jiENlqmU+ra5wuRrmTBToli1kpgl9LyhgvjGokxAB+mwwKv7FiIQtBmSgEvsD112eSYl3HVWpdE="
1323

1424
matrix:
1525
fast_finish: true
@@ -20,10 +30,11 @@ matrix:
2030
- php: 5.6
2131
env:
2232
- EXECUTE_TEST_COVERALLS=true
33+
- DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
34+
- PATH="$HOME/.local/bin:$PATH"
2335
- php: 7
2436
- php: hhvm
2537
allow_failures:
26-
- php: 7
2738
- php: hhvm
2839

2940
notifications:
@@ -42,6 +53,10 @@ script:
4253
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/phpunit --coverage-clover clover.xml ; fi
4354
- if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then ./vendor/bin/phpunit ; fi
4455
- if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/php-cs-fixer fix -v --diff --dry-run ; fi
56+
- 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
57+
58+
after_success:
59+
- if [[ $DEPLOY_DOCS == "true" ]]; then echo "Preparing to build and deploy documentation" ; ./zf-mkdoc-theme/deploy.sh ; echo "Completed deploying documentation" ; fi
4560

4661
after_script:
4762
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/coveralls ; fi

CHANGELOG.md

+10-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,13 @@ All notable changes to this project will be documented in this file, in reverse
66

77
### Added
88

9-
- Nothing.
9+
- [#51](https://github.com/zendframework/zend-stdlib/pull/51) adds PHP 7 as a
10+
supported PHP version.
11+
- [#51](https://github.com/zendframework/zend-stdlib/pull/51) adds a migration
12+
document from v2 to v3. Hint: if you use hydrators, you need to be using
13+
zend-hydrator instead!
14+
- [#51](https://github.com/zendframework/zend-stdlib/pull/51) adds automated
15+
documentation builds to gh-pages.
1016

1117
### Deprecated
1218

@@ -31,6 +37,9 @@ All notable changes to this project will be documented in this file, in reverse
3137
unneeded dependencies:
3238
- zend-config (used only in testing ArrayUtils, and the test was redundant)
3339
- zend-serializer (no longer used)
40+
- [#51](https://github.com/zendframework/zend-stdlib/pull/51) removes the
41+
documentation for hydrators, as those are part of the zend-hydrator
42+
component.
3443

3544
### Fixed
3645

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
}
1414
},
1515
"require": {
16-
"php": ">=5.5"
16+
"php": "^5.5 || ^7.0"
1717
},
1818
"require-dev": {
1919
"fabpot/php-cs-fixer": "1.7.*",

doc/book/index.html

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<div class="container">
2+
<div class="jumbotron">
3+
<h1>zend-stdlib</h1>
4+
5+
<p>SPL extensions, array utilities, error handlers, and more.</p>
6+
7+
<pre><code class="language-bash">$ composer require zendframework/zend-stdlib</code></pre>
8+
</div>
9+
</div>
10+

doc/book/index.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../README.md

doc/book/migration.md

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
# Migration Guide
2+
3+
## From v2 to v3
4+
5+
The changes made going from v2 to v3 were:
6+
7+
- Removal of the Hydrator subcomponent.
8+
- Removal of the `CallbackHandler` class.
9+
- Removal of `Zend\Stdlib\Guard\GuardUtils`.
10+
11+
### Hydrators
12+
13+
The biggest single change from version 2 to version 3 is that the hydrator
14+
subcomponent, which was deprecated in v2.7.0, is now removed. This means that if
15+
you were using zend-stdlib principally for the hydrators, you need to convert
16+
your code to use [zend-hydrator](https://github.com/zendframework/zend-hydrator).
17+
18+
This will also mean a multi-step migration. zend-stdlib v3 pre-dates
19+
zend-hydrator v2.1, which will be the first version that supports zend-stdlib v3
20+
and zend-servicemanager v3. If you are using Composer, the migration should be
21+
seamless:
22+
23+
- Remove your zend-stdlib dependency:
24+
25+
```bash
26+
$ composer remove zendframework/zend-stdlib
27+
```
28+
29+
- Update to use zend-hydrator:
30+
31+
```bash
32+
$ composer require zendframework/zend-hydrator
33+
```
34+
35+
When zend-hydrator updates to newer versions of zend-stdlib and
36+
zend-servicemanager, you will either automatically get those versions, or you
37+
can tell composer to use those specific versions:
38+
39+
```bash
40+
$ composer require "zendframework/zend-stdlib:^3.0"
41+
```
42+
43+
### CallbackHandler
44+
45+
`Zend\Stdlib\CallbackHandler` primarily existed for legacy purposes; it was
46+
created before the `callable` typehint existed, so that we could typehint PHP
47+
callables. It also provided some minimal features around lazy-loading callables
48+
from instantiable classes, but these features were rarely used, and better
49+
approaches already exist for handling such functinality in zend-servicemanager
50+
and zend-expressive.
51+
52+
As such, the class was marked deprecated in v2.7.0, and removed for v3.0.0.
53+
54+
### GuardUtils
55+
56+
Version 3 removes `Zend\Stdlib\Guard\GuardUtils`. This abstract class existed to
57+
provide the functionality of the various traits also present in that
58+
subcomponent, for consumers on versions of PHP earlier than 5.4. Since the
59+
minimum required version is now PHP 5.5, the class is unnecessary. If you were
60+
using it previously, compose the related traits instead.

doc/book/zend.stdlib.hydrator.aggregate.md

-141
This file was deleted.

0 commit comments

Comments
 (0)