Merge db9c5ca into 86d5a28

.travis.yml

@@ -29,7 +29,7 @@ install:
 script:
   - if [[ $EXECUTE_COVERAGE == 'true' ]]; then ./vendor/bin/phpunit --coverage-clover clover.xml ; fi
   - if [[ $EXECUTE_COVERAGE != 'true' ]]; then ./vendor/bin/phpunit ; fi
-  - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/phpcs --standard=PSR2 src test ; fi
+  - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/phpcs ; fi
 
 after_script:
   - if [[ $EXECUTE_COVERAGE == 'true' ]]; then composer require satooshi/php-coveralls:dev-master ; fi

composer.json

@@ -25,7 +25,7 @@
   },
   "require-dev": {
     "phpunit/PHPUnit": "~4.6",
-    "squizlabs/php_codesniffer": "~2.0"
+    "squizlabs/php_codesniffer": "^2.3.1"
   },
   "provide": {
     "psr/http-message-implementation": "~1.0.0"

phpcs.xml

@@ -0,0 +1,21 @@
+<?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>
+
+    <!-- Paths to check -->
+    <file>src</file>
+    <file>test</file>
+</ruleset>

src/HeaderSecurity.php

@@ -140,7 +140,7 @@ public static function assertValid($value)
             throw new InvalidArgumentException('Invalid header value');
         }
     }
-    
+
     /**
      * Assert whether or not a header name is valid.
      *

src/RequestTrait.php

@@ -262,7 +262,7 @@ public function withUri(UriInterface $uri, $preserveHost = false)
         }
 
         $new->headerNames['host'] = 'Host';
-        $new->headers['Host'] = array($host);
+        $new->headers['Host'] = [$host];
 
         return $new;
     }

src/Response.php

@@ -29,7 +29,7 @@ class Response implements ResponseInterface
      *
      * @var array
      */
-    private $phrases = array(
+    private $phrases = [
         // INFORMATIONAL CODES
         100 => 'Continue',
         101 => 'Switching Protocols',
@@ -92,7 +92,7 @@ class Response implements ResponseInterface
         507 => 'Insufficient Storage',
         508 => 'Loop Detected',
         511 => 'Network Authentication Required',
-    );
+    ];
 
     /**
      * @var string

src/ServerRequestFactory.php

@@ -194,7 +194,7 @@ public static function normalizeFiles(array $files)
      */
     public static function marshalHeaders(array $server)
     {
-        $headers = array();
+        $headers = [];
         foreach ($server as $key => $value) {
             if (strpos($key, 'HTTP_COOKIE') === 0) {
                 // Cookies are handled using the $_COOKIE superglobal

src/Stream.php

@@ -190,7 +190,7 @@ public function seek($offset, $whence = SEEK_SET)
         if (! $this->resource) {
             throw new RuntimeException('No resource available; cannot seek position');
         }
-        
+
         if (! $this->isSeekable()) {
             throw new RuntimeException('Stream is not seekable');
         }

src/UploadedFile.php

@@ -158,7 +158,7 @@ public function moveTo($targetPath)
 
         $this->moved = true;
     }
-    
+
     /**
      * {@inheritdoc}
      *
@@ -168,7 +168,7 @@ public function getSize()
     {
         return $this->size;
     }
-    
+
     /**
      * {@inheritdoc}
      *
@@ -179,7 +179,7 @@ public function getError()
     {
         return $this->error;
     }
-    
+
     /**
      * {@inheritdoc}
      *
@@ -190,7 +190,7 @@ public function getClientFilename()
     {
         return $this->clientFilename;
     }
-    
+
     /**
      * {@inheritdoc}
      */

test/HeaderSecurityTest.php

@@ -28,19 +28,19 @@ class HeaderSecurityTest extends TestCase
      */
     public function getFilterValues()
     {
-        return array(
-            array("This is a\n test", "This is a test"),
-            array("This is a\r test", "This is a test"),
-            array("This is a\n\r test", "This is a test"),
-            array("This is a\r\n  test", "This is a\r\n  test"),
-            array("This is a \r\ntest", "This is a test"),
-            array("This is a \r\n\n test", "This is a  test"),
-            array("This is a\n\n test", "This is a test"),
-            array("This is a\r\r test", "This is a test"),
-            array("This is a \r\r\n test", "This is a \r\n test"),
-            array("This is a \r\n\r\ntest", "This is a test"),
-            array("This is a \r\n\n\r\n test", "This is a \r\n test")
-        );
+        return [
+            ["This is a\n test", "This is a test"],
+            ["This is a\r test", "This is a test"],
+            ["This is a\n\r test", "This is a test"],
+            ["This is a\r\n  test", "This is a\r\n  test"],
+            ["This is a \r\ntest", "This is a test"],
+            ["This is a \r\n\n test", "This is a  test"],
+            ["This is a\n\n test", "This is a test"],
+            ["This is a\r\r test", "This is a test"],
+            ["This is a \r\r\n test", "This is a \r\n test"],
+            ["This is a \r\n\r\ntest", "This is a test"],
+            ["This is a \r\n\n\r\n test", "This is a \r\n test"]
+        ];
     }
 
     /**
@@ -54,19 +54,19 @@ public function testFiltersValuesPerRfc7230($value, $expected)
 
     public function validateValues()
     {
-        return array(
-            array("This is a\n test", 'assertFalse'),
-            array("This is a\r test", 'assertFalse'),
-            array("This is a\n\r test", 'assertFalse'),
-            array("This is a\r\n  test", 'assertTrue'),
-            array("This is a \r\ntest", 'assertFalse'),
-            array("This is a \r\n\n test", 'assertFalse'),
-            array("This is a\n\n test", 'assertFalse'),
-            array("This is a\r\r test", 'assertFalse'),
-            array("This is a \r\r\n test", 'assertFalse'),
-            array("This is a \r\n\r\ntest", 'assertFalse'),
-            array("This is a \r\n\n\r\n test", 'assertFalse')
-        );
+        return [
+            ["This is a\n test", 'assertFalse'],
+            ["This is a\r test", 'assertFalse'],
+            ["This is a\n\r test", 'assertFalse'],
+            ["This is a\r\n  test", 'assertTrue'],
+            ["This is a \r\ntest", 'assertFalse'],
+            ["This is a \r\n\n test", 'assertFalse'],
+            ["This is a\n\n test", 'assertFalse'],
+            ["This is a\r\r test", 'assertFalse'],
+            ["This is a \r\r\n test", 'assertFalse'],
+            ["This is a \r\n\r\ntest", 'assertFalse'],
+            ["This is a \r\n\n\r\n test", 'assertFalse']
+        ];
     }
 
     /**
@@ -80,18 +80,18 @@ public function testValidatesValuesPerRfc7230($value, $assertion)
 
     public function assertValues()
     {
-        return array(
-            array("This is a\n test"),
-            array("This is a\r test"),
-            array("This is a\n\r test"),
-            array("This is a \r\ntest"),
-            array("This is a \r\n\n test"),
-            array("This is a\n\n test"),
-            array("This is a\r\r test"),
-            array("This is a \r\r\n test"),
-            array("This is a \r\n\r\ntest"),
-            array("This is a \r\n\n\r\n test")
-        );
+        return [
+            ["This is a\n test"],
+            ["This is a\r test"],
+            ["This is a\n\r test"],
+            ["This is a \r\ntest"],
+            ["This is a \r\n\n test"],
+            ["This is a\n\n test"],
+            ["This is a\r\r test"],
+            ["This is a \r\r\n test"],
+            ["This is a \r\n\r\ntest"],
+            ["This is a \r\n\n\r\n test"]
+        ];
     }
 
     /**

test/RequestTest.php

@@ -307,7 +307,7 @@ public function testGetHostHeaderReturnsUriHostWhenPresent()
     {
         $request = new Request('http://example.com');
         $header = $request->getHeader('host');
-        $this->assertEquals(array('example.com'), $header);
+        $this->assertEquals(['example.com'], $header);
     }
 
     /**

test/TestAsset/Functions.php

@@ -29,14 +29,14 @@ class HeaderStack
     /**
      * @var array
      */
-    private static $data = array();
+    private static $data = [];
 
     /**
      * Reset state
      */
     public static function reset()
     {
-        self::$data = array();
+        self::$data = [];
     }
 
     /**