Merge branch 'hotfix/213' into develop

Forward port #213

Author: weierophinney

CONTRIBUTING.md

@@ -78,14 +78,14 @@ standards checks, and provides configuration for our selected checks.
 To run checks only:
 
 ```console
-$ ./vendor/bin/phpcs --standard=PSR2 src test
+$ composer cs-check
 ```
 
 `phpcs` also installs a tool named `phpcbf` which can attempt to fix problems
 for you:
 
 ```console
-$ ./vendor/bin/phpcbf --standard=PSR2 src test
+$ composer cs-fix
 ```
 
 If you allow phpcbf to fix CS issues, please re-run the tests to ensure

composer.json

@@ -25,7 +25,7 @@
   },
   "require-dev": {
     "phpunit/phpunit": "^4.6 || ^5.5",
-    "squizlabs/php_codesniffer": "^2.3.1"
+    "zendframework/zend-coding-standard": "~1.0.0"
   },
   "provide": {
     "psr/http-message-implementation": "~1.0.0"

composer.lock

@@ -1,19 +1,6 @@
 <?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="Generic.Arrays.DisallowLongArraySyntax"/>
-    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
-        <properties>
-            <property name="ignoreBlankLines" value="false"/>
-        </properties>
-    </rule>
+    <rule ref="./vendor/zendframework/zend-coding-standard/ruleset.xml"/>
 
     <!-- Paths to check -->
     <file>src</file>

phpcs.xml

@@ -442,12 +442,12 @@ private function parseUri($uri)
             );
         }
 
-        $this->scheme    = isset($parts['scheme'])   ? $this->filterScheme($parts['scheme']) : '';
-        $this->userInfo  = isset($parts['user'])     ? $parts['user']     : '';
-        $this->host      = isset($parts['host'])     ? $parts['host']     : '';
-        $this->port      = isset($parts['port'])     ? $parts['port']     : null;
-        $this->path      = isset($parts['path'])     ? $this->filterPath($parts['path']) : '';
-        $this->query     = isset($parts['query'])    ? $this->filterQuery($parts['query']) : '';
+        $this->scheme    = isset($parts['scheme']) ? $this->filterScheme($parts['scheme']) : '';
+        $this->userInfo  = isset($parts['user']) ? $parts['user'] : '';
+        $this->host      = isset($parts['host']) ? $parts['host'] : '';
+        $this->port      = isset($parts['port']) ? $parts['port'] : null;
+        $this->path      = isset($parts['path']) ? $this->filterPath($parts['path']) : '';
+        $this->query     = isset($parts['query']) ? $this->filterQuery($parts['query']) : '';
         $this->fragment  = isset($parts['fragment']) ? $this->filterFragment($parts['fragment']) : '';
 
         if (isset($parts['pass'])) {

src/Uri.php

@@ -468,7 +468,7 @@ public function headersWithInjectionVectors()
     public function testConstructorRaisesExceptionForHeadersWithCRLFVectors($name, $value)
     {
         $this->setExpectedException('InvalidArgumentException');
-        $request = new Request(null, null, 'php://memory', [$name =>  $value]);
+        $request = new Request(null, null, 'php://memory', [$name => $value]);
     }
 
     public function hostHeaderKeys()

test/RequestTest.php

@@ -197,6 +197,6 @@ public function headersWithInjectionVectors()
     public function testConstructorRaisesExceptionForHeadersWithCRLFVectors($name, $value)
     {
         $this->setExpectedException('InvalidArgumentException');
-        $request = new Response('php://memory', 200, [$name =>  $value]);
+        $request = new Response('php://memory', 200, [$name => $value]);
     }
 }

test/ResponseTest.php

@@ -288,7 +288,7 @@ private function findNonExistentTempName()
     {
         while (true) {
             $tmpnam = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'diac' . uniqid();
-            if (!file_exists(sys_get_temp_dir() . $tmpnam)) {
+            if (! file_exists(sys_get_temp_dir() . $tmpnam)) {
                 break;
             }
         }