Merge branch 'hotfix/qa-tools'

.travis.yml

@@ -1,24 +1,39 @@
+sudo: false
+
 language: php
 
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
+cache:
+  directories:
+    - $HOME/.composer/cache
 
-matrix: 
+matrix:
+  fast_finish: true
+  include:
+    - php: 5.3
+    - php: 5.4
+    - php: 5.5
+      env:
+        - EXECUTE_CS_CHECK=true
+    - php: 5.6
+      env:
+        - EXECUTE_COVERAGE=true
+    - php: 7
+    - php: hhvm 
   allow_failures:
+    - php: 7
     - php: hhvm
+
+notifications:
+  irc: "irc.freenode.org#apigility-dev"
+  email: false
 
-before_script:
+before_install:
+  - if [[ $EXECUTE_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
   - composer self-update
-  - composer install --dev --prefer-source
+
+install:
+  - travis_retry composer install --no-interaction --ignore-platform-reqs --prefer-source
 
 script:
   - ./vendor/bin/phpunit
-  - ./vendor/bin/phpcs --standard=PSR2 --ignore=test/Bootstrap.php src test
-
-notifications:
-  irc: "irc.freenode.org#apigility-dev"
-  email: false
+  - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/phpcs ; fi

composer.json

@@ -29,24 +29,24 @@
     "require": {
         "php": ">=5.3.23",
         "zfcampus/zf-api-problem": "~1.0",
-        "zendframework/zend-escaper": "~2.3",
-        "zendframework/zend-eventmanager": "~2.3",
-        "zendframework/zend-json": "~2.3",
-        "zendframework/zend-mvc": "~2.3",
-        "zendframework/zend-paginator": "~2.3",
-        "zendframework/zend-uri": "~2.3",
-        "zendframework/zend-view": "~2.3",
-        "zendframework/zend-stdlib": "~2.3"
+        "zendframework/zend-escaper": ">=2.3,<2.5",
+        "zendframework/zend-eventmanager": ">=2.3,<2.5",
+        "zendframework/zend-json": ">=2.3,<2.5",
+        "zendframework/zend-mvc": ">=2.3,<2.5",
+        "zendframework/zend-paginator": ">=2.3,<2.5",
+        "zendframework/zend-uri": ">=2.3,<2.5",
+        "zendframework/zend-view": ">=2.3,<2.5",
+        "zendframework/zend-stdlib": ">=2.3,<2.5"
     },
     "require-dev": {
         "phpunit/PHPUnit": "3.7.*",
-        "squizlabs/php_codesniffer": "1.5.*",
-        "zendframework/zend-console": "~2.3",
-        "zendframework/zend-filter": "~2.3",
-        "zendframework/zend-http": "~2.3",
-        "zendframework/zend-loader": "~2.3",
-        "zendframework/zend-servicemanager": "~2.3",
-        "zendframework/zend-validator": "~2.3"
+        "squizlabs/php_codesniffer": "^2.3",
+        "zendframework/zend-console": ">=2.3,<2.5",
+        "zendframework/zend-filter": ">=2.3,<2.5",
+        "zendframework/zend-http": ">=2.3,<2.5",
+        "zendframework/zend-loader": ">=2.3,<2.5",
+        "zendframework/zend-servicemanager": ">=2.3,<2.5",
+        "zendframework/zend-validator": ">=2.3,<2.5"
     },
     "autoload": {
         "psr-4": {

phpcs.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<ruleset name="Zend Framework coding standard">
+    <description>Zend Framework coding standard</description>
+
+    <!-- display progress -->
+    <arg value="p"/>
+    <arg name="colors"/>
+
+    <!-- inherit rules from: -->
+    <rule ref="PSR2"/>
+    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
+        <properties>
+            <property name="ignoreBlankLines" value="false"/>
+        </properties>
+    </rule>
+
+    <!-- Paths to check -->
+    <file>src</file>
+    <file>test</file>
+</ruleset>

phpunit.xml

@@ -1,4 +1,4 @@
-<phpunit bootstrap="./test/Bootstrap.php" colors="true">
+<phpunit bootstrap="./vendor/autoload.php" colors="true">
     <testsuites>
         <testsuite name="ZFHal Module Tests">
             <directory>./test</directory>

src/Link/LinkCollectionAwareInterface.php

@@ -13,7 +13,7 @@ interface LinkCollectionAwareInterface
      * @return mixed
      */
     public function setLinks(LinkCollection $links);
-    
+
     /**
      * @return LinkCollection
      */

src/Metadata/MetadataMap.php

@@ -145,8 +145,8 @@ public function get($class)
 
     /**
      * Retrieve a metadata instance.
-     * 
-     * @param string $class 
+     *
+     * @param string $class
      * @return Metadata
      */
     private function getMetadataInstance($class)