Merge branch 'develop'

Merging develop to master in preparation for 3.0.0.

Author: weierophinney

.gitignore

@@ -6,7 +6,9 @@
 .*.sw*
 .*.un~
 nbproject
+doc/html/
 tmp/
+zf-mkdoc-theme/
 
 clover.xml
 composer.lock

.travis.yml

@@ -10,6 +10,16 @@ branches:
 cache:
   directories:
     - $HOME/.composer/cache
+    - $HOME/.local
+    - zf-mkdoc-theme
+
+env:
+  global:
+    - SITE_URL: https://zendframework.github.io/zend-servicemanager
+    - GH_USER_NAME: "Matthew Weier O'Phinney"
+    - GH_USER_EMAIL: [email protected]
+    - GH_REF: github.com/zendframework/zend-servicemanager.git
+    - 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="
 
 matrix:
   fast_finish: true
@@ -20,10 +30,11 @@ matrix:
     - php: 5.6
       env:
         - EXECUTE_TEST_COVERALLS=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: 7
     - php: hhvm 
   allow_failures:
-    - php: 7
     - php: hhvm
 
 notifications:
@@ -42,6 +53,10 @@ script:
   - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/phpunit --coverage-clover clover.xml ; fi
   - if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then ./vendor/bin/phpunit ; fi
   - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/php-cs-fixer fix -v --diff --dry-run ; fi
+  - 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
+
+after_success:
+  - if [[ $DEPLOY_DOCS == "true" ]]; then echo "Preparing to build and deploy documentation" ; ./zf-mkdoc-theme/deploy.sh ; echo "Completed deploying documentation" ; fi
 
 after_script:
   - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/coveralls ; fi

CHANGELOG.md

@@ -2,6 +2,67 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 3.0.0 - TBD
+
+### Added
+
+- [#51](https://github.com/zendframework/zend-stdlib/pull/51) adds PHP 7 as a
+  supported PHP version.
+- [#51](https://github.com/zendframework/zend-stdlib/pull/51) adds a migration
+  document from v2 to v3. Hint: if you use hydrators, you need to be using
+  zend-hydrator instead!
+- [#51](https://github.com/zendframework/zend-stdlib/pull/51) adds automated
+  documentation builds to gh-pages.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [#33](https://github.com/zendframework/zend-stdlib/pull/33) - removed
+  deprecated classes
+  - *All Hydrator classes* see #22.
+  - `Zend\Stdlib\CallbackHandler` see #35
+- [#37](https://github.com/zendframework/zend-stdlib/pull/37) - removed
+  deprecated classes and polyfills:
+  - `Zend\Stdlib\DateTime`; this had been deprecated since 2.5, and only
+    existed as a polyfill for the `createFromISO8601()` support, now standard
+    in all PHP versions we support.
+  - `Zend\Stdlib\Exception\InvalidCallbackException`, which was unused since #33.
+  - `Zend\Stdlib\Guard\GuardUtils`, which duplicated `Zend\Stdlib\Guard\AllGuardsTrait`
+    to allow usage with pre-PHP 5.4 versions.
+  - `src/compatibility/autoload.php`, which has been dprecated since 2.5.
+- [#37](https://github.com/zendframework/zend-stdlib/pull/37) - removed
+  unneeded dependencies:
+  - zend-config (used only in testing ArrayUtils, and the test was redundant)
+  - zend-serializer (no longer used)
+- [#51](https://github.com/zendframework/zend-stdlib/pull/51) removes the
+  documentation for hydrators, as those are part of the zend-hydrator
+  component.
+
+### Fixed
+
+- Nothing.
+
+## 2.8.0 - TBD
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 2.7.5 - TBD
 
 ### Added

README.md

@@ -7,7 +7,6 @@
 class for different scopes like:
 
 - array utilities functions;
-- hydrators;
 - json serializable interfaces;
 - general messaging systems;
 - string wrappers;

composer.json

@@ -13,32 +13,17 @@
         }
     },
     "require": {
-        "php": ">=5.5",
-        "zendframework/zend-hydrator": "~1.0"
+        "php": "^5.5 || ^7.0"
     },
     "require-dev": {
-        "zendframework/zend-config": "~2.5",
-        "zendframework/zend-eventmanager": "~2.5",
-        "zendframework/zend-inputfilter": "~2.5",
-        "zendframework/zend-serializer": "~2.5",
-        "zendframework/zend-servicemanager": "~2.5",
-        "zendframework/zend-filter": "~2.5",
         "fabpot/php-cs-fixer": "1.7.*",
         "phpunit/PHPUnit": "~4.0",
         "athletic/athletic": "~0.1"
     },
-    "suggest": {
-        "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
-        "zendframework/zend-serializer": "Zend\\Serializer component",
-        "zendframework/zend-servicemanager": "To support hydrator plugin manager usage",
-        "zendframework/zend-filter": "To support naming strategy hydrator usage"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
     "extra": {
         "branch-alias": {
             "dev-master": "2.7-dev",
-            "dev-develop": "2.8-dev"
+            "dev-develop": "3.0-dev"
         }
     },
     "autoload-dev": {

doc/book/index.html

@@ -0,0 +1,10 @@
+<div class="container">
+  <div class="jumbotron">
+    <h1>zend-stdlib</h1>
+    
+    <p>SPL extensions, array utilities, error handlers, and more.</p>
+
+    <pre><code class="language-bash">$ composer require zendframework/zend-stdlib</code></pre>
+  </div>
+</div>
+

doc/book/index.md

@@ -0,0 +1 @@
+../../README.md

doc/book/migration.md

@@ -0,0 +1,60 @@
+# Migration Guide
+
+## From v2 to v3
+
+The changes made going from v2 to v3 were:
+
+- Removal of the Hydrator subcomponent.
+- Removal of the `CallbackHandler` class.
+- Removal of `Zend\Stdlib\Guard\GuardUtils`.
+
+### Hydrators
+
+The biggest single change from version 2 to version 3 is that the hydrator
+subcomponent, which was deprecated in v2.7.0, is now removed. This means that if
+you were using zend-stdlib principally for the hydrators, you need to convert
+your code to use [zend-hydrator](https://github.com/zendframework/zend-hydrator).
+
+This will also mean a multi-step migration. zend-stdlib v3 pre-dates
+zend-hydrator v2.1, which will be the first version that supports zend-stdlib v3
+and zend-servicemanager v3. If you are using Composer, the migration should be
+seamless:
+
+- Remove your zend-stdlib dependency:
+
+  ```bash
+  $ composer remove zendframework/zend-stdlib
+  ```
+
+- Update to use zend-hydrator:
+
+  ```bash
+  $ composer require zendframework/zend-hydrator
+  ```
+
+When zend-hydrator updates to newer versions of zend-stdlib and
+zend-servicemanager, you will either automatically get those versions, or you
+can tell composer to use those specific versions:
+
+```bash
+$ composer require "zendframework/zend-stdlib:^3.0"
+```
+
+### CallbackHandler
+
+`Zend\Stdlib\CallbackHandler` primarily existed for legacy purposes; it was
+created before the `callable` typehint existed, so that we could typehint PHP
+callables. It also provided some minimal features around lazy-loading callables
+from instantiable classes, but these features were rarely used, and better
+approaches already exist for handling such functinality in zend-servicemanager
+and zend-expressive.
+
+As such, the class was marked deprecated in v2.7.0, and removed for v3.0.0.
+
+### GuardUtils
+
+Version 3 removes `Zend\Stdlib\Guard\GuardUtils`. This abstract class existed to
+provide the functionality of the various traits also present in that
+subcomponent, for consumers on versions of PHP earlier than 5.4. Since the
+minimum required version is now PHP 5.5, the class is unnecessary. If you were
+using it previously, compose the related traits instead.