Update zend-servicemanager constraints and reduce overall dependencies

- Updates zend-servicemanager constraints to reference `^2.7.5` and `^3.0.3`.
- Removes the dependency on zend-config by refactoring tests to test against
  `ArrayObject`. Since the implementations were only checking for `Traversable`
  instances and casting them, this is a reasonable substitution.
- Modifies the PHP dependency to `^5.5 || ^7.0`.
- Updates the dev-develop branch alias to 2.6-dev; after this refactor, it stays
  backwards compatible with v2.

Author: weierophinney

.travis.yml

@@ -19,21 +19,21 @@ matrix:
         - EXECUTE_CS_CHECK=true
     - php: 5.5
       env:
-        - SERVICE_MANAGER_VERSION='^2.7.3'
+        - SERVICE_MANAGER_VERSION='^2.7.5'
     - php: 5.6
       env:
         - EXECUTE_TEST_COVERALLS=true
     - php: 5.6
       env:
-        - SERVICE_MANAGER_VERSION='^2.7.3'
+        - SERVICE_MANAGER_VERSION='^2.7.5'
     - php: 7
     - php: 7
       env:
-        - SERVICE_MANAGER_VERSION='^2.7.3'
+        - SERVICE_MANAGER_VERSION='^2.7.5'
     - php: hhvm
     - php: hhvm
       env:
-        - SERVICE_MANAGER_VERSION='^2.7.3'
+        - SERVICE_MANAGER_VERSION='^2.7.5'
   allow_failures:
     - php: hhvm
 
@@ -46,7 +46,7 @@ before_install:
   - composer self-update
   - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls ; fi
   - if [[ $SERVICE_MANAGER_VERSION != '' ]]; then composer require --dev --no-update "zendframework/zend-servicemanager:$SERVICE_MANAGER_VERSION" ; fi
-  - if [[ $SERVICE_MANAGER_VERSION == '' ]]; then composer require --dev --no-update "zendframework/zend-servicemanager:^3.0" ; fi
+  - if [[ $SERVICE_MANAGER_VERSION == '' ]]; then composer require --dev --no-update "zendframework/zend-servicemanager:^3.0.3" ; fi
 
 install:
   - travis_retry composer install --no-interaction --ignore-platform-reqs

composer.json

@@ -13,13 +13,12 @@
         }
     },
     "require": {
-        "php": ">=5.5",
-        "zendframework/zend-escaper": "~2.5",
+        "php": "^5.5 || ^7.0",
+        "zendframework/zend-escaper": "^2.5",
         "zendframework/zend-stdlib": "^3.0"
     },
     "require-dev": {
-        "zendframework/zend-config": "dev-develop as 2.6.0",
-        "zendframework/zend-servicemanager": "^2.7.4 || ^3.0.3",
+        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
         "fabpot/php-cs-fixer": "1.7.*",
         "phpunit/PHPUnit": "~4.0"
     },
@@ -31,7 +30,7 @@
     "extra": {
         "branch-alias": {
             "dev-master": "2.5-dev",
-            "dev-develop": "3.0-dev"
+            "dev-develop": "2.6-dev"
         }
     },
     "autoload-dev": {

test/Cloud/CloudTest.php

@@ -9,6 +9,7 @@
 
 namespace ZendTest\Tag\Cloud;
 
+use ArrayObject;
 use stdClass;
 use Zend\ServiceManager\ServiceManager;
 use Zend\ServiceManager\Config as SMConfig;
@@ -229,9 +230,14 @@ public function testConstructorWithArray()
         $this->assertEquals('foo', $list[0]->getTitle());
     }
 
+    /**
+     * This test uses ArrayObject, which will have essentially the
+     * same behavior as Zend\Config\Config; the code is looking only
+     * for a Traversable.
+     */
     public function testConstructorWithConfig()
     {
-        $cloud = $this->getCloud(new \Zend\Config\Config([
+        $cloud = $this->getCloud(new ArrayObject([
             'tags' => [
                 [
                     'title'  => 'foo',

test/Cloud/Decorator/HtmlCloudTest.php

@@ -9,6 +9,7 @@
 
 namespace ZendTest\Tag\Cloud\Decorator;
 
+use ArrayObject;
 use Zend\Tag\Cloud\Decorator;
 
 /**
@@ -72,58 +73,54 @@ public function testSeparator()
     public function testConstructorWithArray()
     {
         $decorator = new Decorator\HtmlCloud([
-                                                  'htmlTags'  => ['div'],
-                                                  'separator' => ' '
-                                             ]);
+            'htmlTags'  => ['div'],
+            'separator' => ' ',
+        ]);
 
         $this->assertEquals(
-            '<div>foo bar</div>', $decorator->render(
-                [
-                     'foo',
-                     'bar'
-                ]
-            )
+            '<div>foo bar</div>',
+            $decorator->render([
+                'foo',
+                'bar'
+            ])
         );
     }
 
+    /**
+     * This test uses ArrayObject, which will have essentially the
+     * same behavior as Zend\Config\Config; the code is looking only
+     * for a Traversable.
+     */
     public function testConstructorWithConfig()
     {
-        $decorator = new Decorator\HtmlCloud(
-            new \Zend\Config\Config(
-                [
-                     'htmlTags'  => ['div'],
-                     'separator' => ' '
-                ]
-            )
-        );
+        $decorator = new Decorator\HtmlCloud(new ArrayObject([
+            'htmlTags'  => ['div'],
+            'separator' => ' '
+        ]));
 
         $this->assertEquals(
-            '<div>foo bar</div>', $decorator->render(
-                [
-                     'foo',
-                     'bar'
-                ]
-            )
+            '<div>foo bar</div>',
+            $decorator->render([
+                'foo',
+                'bar'
+            ])
         );
     }
 
     public function testSetOptions()
     {
         $decorator = new Decorator\HtmlCloud();
-        $decorator->setOptions(
-            [
-                 'htmlTags'  => ['div'],
-                 'separator' => ' '
-            ]
-        );
+        $decorator->setOptions([
+            'htmlTags'  => ['div'],
+            'separator' => ' '
+        ]);
 
         $this->assertEquals(
-            '<div>foo bar</div>', $decorator->render(
-                [
-                     'foo',
-                     'bar'
-                ]
-            )
+            '<div>foo bar</div>',
+            $decorator->render([
+                'foo',
+                'bar'
+            ])
         );
     }
 

test/Cloud/Decorator/HtmlTagTest.php

@@ -9,6 +9,7 @@
 
 namespace ZendTest\Tag\Cloud\Decorator;
 
+use ArrayObject;
 use Zend\Tag;
 use Zend\Tag\Cloud\Decorator;
 
@@ -114,9 +115,18 @@ public function testConstructorWithArray()
         $this->assertEquals('pt', $decorator->getFontSizeUnit());
     }
 
+    /**
+     * This test uses ArrayObject, which will have essentially the
+     * same behavior as Zend\Config\Config; the code is looking only
+     * for a Traversable.
+     */
     public function testConstructorWithConfig()
     {
-        $decorator = new Decorator\HtmlTag(new \Zend\Config\Config(['minFontSize' => 5, 'maxFontSize' => 10, 'fontSizeUnit' => 'pt']));
+        $decorator = new Decorator\HtmlTag(new ArrayObject([
+            'minFontSize' => 5,
+            'maxFontSize' => 10,
+            'fontSizeUnit' => 'pt',
+        ]));
 
         $this->assertEquals(5, $decorator->getMinFontSize());
         $this->assertEquals(10, $decorator->getMaxFontSize());

test/ItemTest.php

@@ -9,6 +9,7 @@
 
 namespace ZendTest\Tag;
 
+use ArrayObject;
 use Zend\Tag;
 
 /**
@@ -108,9 +109,14 @@ public function testMissingWeight()
         $tag = new Tag\Item(['title' => 'foo']);
     }
 
+    /**
+     * This test uses ArrayObject, which will have essentially the
+     * same behavior as Zend\Config\Config; the code is looking only
+     * for a Traversable.
+     */
     public function testConfigOptions()
     {
-        $tag = new Tag\Item(new \Zend\Config\Config(['title' => 'foo', 'weight' => 1]));
+        $tag = new Tag\Item(new ArrayObject(['title' => 'foo', 'weight' => 1]));
 
         $this->assertEquals($tag->getTitle(), 'foo');
         $this->assertEquals($tag->getWeight(), 1);