Merge pull request #1 from Riimu/build-update

Build update

.travis.yml

@@ -5,6 +5,8 @@ php:
   - 5.6
   - 5.5
   - 5.4
+  - 7.0
+  - hhvm
 
 cache:
   directories:
@@ -14,8 +16,8 @@ before_install:
   - composer self-update
 
 install:
-  - composer require --no-update --no-interaction "phpunit/phpunit:4.*" "squizlabs/php_codesniffer:2.*" "fabpot/php-cs-fixer:1.*"
-  - travis_retry composer install --no-interaction
+  - composer require --no-update --no-interaction "phpunit/phpunit:*" "squizlabs/php_codesniffer:*" "fabpot/php-cs-fixer:*"
+  - travis_retry composer install --no-interaction --prefer-source
   - travis_retry wget https://scrutinizer-ci.com/ocular.phar
 
 script:
@@ -24,4 +26,6 @@ script:
   - vendor/bin/php-cs-fixer fix --dry-run --diff
 
 after_script:
-  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+  - if [ -f coverage.clover ]; then
+      php ocular.phar code-coverage:upload --format=php-clover coverage.clover;
+    fi

CHANGES.md

@@ -1,5 +1,10 @@
 # Changelog #
 
+## v2.0.1 (2015-10-04) ##
+
+  * Fix forward slash normalization in some URIs in PHP7
+  * Fix several methods accidentally accepting string arrays
+
 ## v2.0.0 (2015-09-11) ##
 
   * The `UrlInfo` has been renamed to`Uri`

README.md

@@ -363,6 +363,10 @@ may encounter are as follows:
   * The number of forward slashes in the beginning of the path in the string
     returned by `__toString()` may change depending on whether the URL has an
     `authority` component or not.
+  * Percent encoded characters in parsed and generated URIs in the `userinfo`
+    component may differ due to the fact that the `UriParser` works with the
+    PSR-7 specification which does not provide a way to provide encoded username
+    or password.
 
 ## Credits ##
 

src/Uri.php

@@ -54,9 +54,10 @@ public function __construct($uri = '', $mode = UriParser::MODE_RFC3986)
                 throw new \InvalidArgumentException("Invalid URI '$uri'");
             }
 
-            foreach (get_object_vars($parsed) as $name => $value) {
+            $properties = get_object_vars($parsed);
+            array_walk($properties, function ($value, $name) {
                 $this->$name = $value;
-            }
+            });
         }
     }
 
@@ -373,7 +374,7 @@ private function normalize($string)
             function ($match) {
                 return strtoupper($match[0]);
             },
-            $string
+            (string) $string
         );
     }
 
@@ -424,7 +425,7 @@ private function getNormalizedUriPath()
 
         if ($this->getAuthority() === '') {
             return preg_replace('#^/+#', '/', $path);
-        } elseif (in_array(substr($path, 0, 1), [false, '/'], true)) {
+        } elseif ($path === '' || $path[0] === '/') {
             return $path;
         }
 

tests/tests/UriTest.php

@@ -38,14 +38,14 @@ public function testEmptyUserInfo()
         $this->assertUri('', (new Uri())->withUserInfo('', 'password'));
     }
 
-    public function testPath()
+    public function testPathWithoutAuthorityOrScheme()
     {
         $this->assertUri('path/to/file.html', (new Uri())->withPath('path/to/file.html'));
         $this->assertUri('/path/to/file.html', (new Uri())->withPath('/path/to/file.html'));
         $this->assertUri('/path/to/file.html', (new Uri())->withPath('//path/to/file.html'));
     }
 
-    public function testSchemePath()
+    public function testPathWithScheme()
     {
         $uri = (new Uri())->withScheme('scheme');
 
@@ -54,7 +54,7 @@ public function testSchemePath()
         $this->assertUri('scheme:/path/to/file.html', $uri->withPath('//path/to/file.html'));
     }
 
-    public function testAuthorityPath()
+    public function testPathWithAuthority()
     {
         $uri = (new Uri())->withHost('www.example.com');
 
@@ -141,6 +141,18 @@ public function testCaseNormalization()
         $this->assertUri('scheme:', (new Uri())->withScheme('SCHEME'));
     }
 
+    public function testArrayAsPath()
+    {
+        $uri = new Uri();
+
+        try {
+            $uri = $uri->withPath(['foo', 'bar']);
+        } catch (\Exception $exception) {
+        }
+
+        $this->assertInternalType('string', $uri->getPath());
+    }
+
     public function testImmutability()
     {
         $uri = new Uri();