Merge branch 'feature/37' into develop

Close #37

Author: weierophinney

.travis.yml

@@ -36,7 +36,7 @@ before_install:
   - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls ; fi
 
 install:
-  -  COMPOSER_ROOT_VERSION=2.8.0 travis_retry composer install --no-interaction --ignore-platform-reqs
+  - travis_retry composer install --no-interaction --ignore-platform-reqs
 
 script:
   - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/phpunit --coverage-clover clover.xml ; fi

CHANGELOG.md

@@ -14,10 +14,23 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Removed
 
-- [#33](https://github.com/zendframework/zend-stdlib/pull/20) - 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)
 
 ### Fixed
 

composer.json

@@ -16,17 +16,10 @@
         "php": ">=5.5"
     },
     "require-dev": {
-        "zendframework/zend-config": "dev-develop as 2.6.0",
-        "zendframework/zend-serializer": "~2.5",
         "fabpot/php-cs-fixer": "1.7.*",
         "phpunit/PHPUnit": "~4.0",
         "athletic/athletic": "~0.1"
     },
-    "suggest": {
-        "zendframework/zend-serializer": "Zend\\Serializer component"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
     "extra": {
         "branch-alias": {
             "dev-master": "2.7-dev",

src/DateTime.php

@@ -12,9 +12,9 @@
 use ArrayObject;
 use PHPUnit_Framework_TestCase as TestCase;
 use stdClass;
-use Zend\Config\Config;
 use Zend\Stdlib\ArrayUtils;
 use Zend\Stdlib\ArrayUtils\MergeRemoveKey;
+use Zend\Stdlib\Parameters;
 
 class ArrayUtilsTest extends TestCase
 {
@@ -316,46 +316,23 @@ public function testAllowsRemovingKeys()
 
     public static function validIterators()
     {
-        return [
-            [[
-                'foo' => 'bar',
-            ], [
-                'foo' => 'bar',
-            ]],
-            [new Config([
-                'foo' => [
-                    'bar' => [
-                        'baz' => [
-                            'baz' => 'bat',
-                        ],
+        $array = [
+            'foo' => [
+                'bar' => [
+                    'baz' => [
+                        'baz' => 'bat',
                     ],
                 ],
-            ]), [
-                'foo' => [
-                    'bar' => [
-                        'baz' => [
-                            'baz' => 'bat',
-                        ],
-                    ],
-                ],
-            ]],
-            [new ArrayObject([
-                'foo' => [
-                    'bar' => [
-                        'baz' => [
-                            'baz' => 'bat',
-                        ],
-                    ],
-                ],
-            ]), [
-                'foo' => [
-                    'bar' => [
-                        'baz' => [
-                            'baz' => 'bat',
-                        ],
-                    ],
-                ],
-            ]],
+            ],
+        ];
+        $arrayAccess = new ArrayObject($array);
+        $toArray = new Parameters($array);
+
+        return [
+            // Description => [input, expected array]
+            'array' => [$array, $array],
+            'Traversable' => [$arrayAccess, $array],
+            'Traversable and toArray' => [$toArray, $array],
         ];
     }