Merge branch 'hotfix/qa-tools'

Author: weierophinney

.php_cs

@@ -1,18 +1,39 @@
-language: php
+sudo: false
 
-php:
-  - 5.3
-  - 5.4
-  - 5.5
+language: php
 
-before_script:
-  - composer self-update
-  - composer install --dev --prefer-source
+cache:
+  directories:
+    - $HOME/.composer/cache
 
-script:
-  - ./vendor/bin/phpunit
-  - ./vendor/bin/php-cs-fixer -v fix . --dry-run --config-file ./.php_cs
+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_install:
+  - if [[ $EXECUTE_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
+  - composer self-update
+
+install:
+  - travis_retry composer install --no-interaction --ignore-platform-reqs --prefer-source
+
+script:
+  - ./vendor/bin/phpunit
+  - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/phpcs ; fi

.travis.yml

@@ -28,17 +28,17 @@
     },
     "require": {
         "php": ">=5.3.23",
-        "zendframework/zend-eventmanager": "~2.3",
-        "zendframework/zend-http": "~2.3",
-        "zendframework/zend-json": "~2.3",
-        "zendframework/zend-mvc": "~2.3",
-        "zendframework/zend-view": "~2.3"
+        "zendframework/zend-eventmanager": ">=2.3,<2.5",
+        "zendframework/zend-http": ">=2.3,<2.5",
+        "zendframework/zend-json": ">=2.3,<2.5",
+        "zendframework/zend-mvc": ">=2.3,<2.5",
+        "zendframework/zend-view": ">=2.3,<2.5"
     },
     "require-dev": {
-        "fabpot/php-cs-fixer": "*@dev",
         "phpunit/PHPUnit": "3.7.*",
-        "zendframework/zend-console": "~2.3",
-        "zendframework/zend-loader": "~2.3"
+        "zendframework/zend-console": ">=2.3,<2.5",
+        "zendframework/zend-loader": ">=2.3,<2.5",
+        "squizlabs/php_codesniffer": "^2.3"
     },
     "autoload": {
         "psr-4": {

composer.json

@@ -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>

phpcs.xml

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

phpunit.xml

@@ -148,21 +148,39 @@ public function testProvidedTitleIsUsedVerbatim()
 
     public function testCanPassArbitraryDetailsToConstructor()
     {
-        $problem = new ApiProblem(400, 'Invalid input', 'http://example.com/api/problem/400', 'Invalid entity', array('foo' => 'bar'));
+        $problem = new ApiProblem(
+            400,
+            'Invalid input',
+            'http://example.com/api/problem/400',
+            'Invalid entity',
+            array('foo' => 'bar')
+        );
         $this->assertEquals('bar', $problem->foo);
     }
 
     public function testArraySerializationIncludesArbitraryDetails()
     {
-        $problem = new ApiProblem(400, 'Invalid input', 'http://example.com/api/problem/400', 'Invalid entity', array('foo' => 'bar'));
+        $problem = new ApiProblem(
+            400,
+            'Invalid input',
+            'http://example.com/api/problem/400',
+            'Invalid entity',
+            array('foo' => 'bar')
+        );
         $array   = $problem->toArray();
         $this->assertArrayHasKey('foo', $array);
         $this->assertEquals('bar', $array['foo']);
     }
 
     public function testArbitraryDetailsShouldNotOverwriteRequiredFieldsInArraySerialization()
     {
-        $problem = new ApiProblem(400, 'Invalid input', 'http://example.com/api/problem/400', 'Invalid entity', array('title' => 'SHOULD NOT GET THIS'));
+        $problem = new ApiProblem(
+            400,
+            'Invalid input',
+            'http://example.com/api/problem/400',
+            'Invalid entity',
+            array('title' => 'SHOULD NOT GET THIS')
+        );
         $array   = $problem->toArray();
         $this->assertArrayHasKey('title', $array);
         $this->assertEquals('Invalid entity', $array['title']);