Merge pull request #37 from Maks3w/remove-deprecated

Remove deprecated
zendframework · Feb 3, 2016 · f7a2761 · f7a2761
2 parents 15b1d18 + 6b0adc3
commit f7a2761
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 405 deletions.
diff --git a/.travis.yml b/.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

diff --git a/composer.json b/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",

diff --git a/src/DateTime.php b/src/DateTime.php
diff --git a/src/Exception/InvalidCallbackException.php b/src/Exception/InvalidCallbackException.php
diff --git a/src/Guard/GuardUtils.php b/src/Guard/GuardUtils.php
diff --git a/src/compatibility/autoload.php b/src/compatibility/autoload.php
diff --git a/test/ArrayUtilsTest.php b/test/ArrayUtilsTest.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],
         ];
     }
 

diff --git a/test/DateTimeTest.php b/test/DateTimeTest.php
diff --git a/test/Guard/GuardUtilsTest.php b/test/Guard/GuardUtilsTest.php