Improve Package

- Update package dependencies
- Update package settings
- Bug fix Query::build see https://github.com/thephpleague/uri/issues/94

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All Notable changes to `League\Uri\Components` will be documented in this file
 
-## Next
+## 0.5.0 - 2016-12-09
 
 ### Added
 
@@ -14,6 +14,10 @@ All Notable changes to `League\Uri\Components` will be documented in this file
     - `League\Uri\Components\Host`
     - `League\Uri\Components\HierarchicalPath`
 
+- Bug fix `League\Uri\Components\Query::build`
+
+- Update dependencies on `League\Uri\Interfaces`
+
 ### Deprecated
 
 - None

composer.json

@@ -31,7 +31,7 @@
         "ext-intl" : "*",
         "ext-fileinfo": "*",
         "jeremykendall/php-domain-parser": "^3.0",
-        "league/uri-interfaces": "~0.3"
+        "league/uri-interfaces": "~0.4"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^1.0",

phpunit.xml

@@ -12,22 +12,18 @@
          stopOnFailure="false">
 
     <testsuites>
-        <testsuite name="Uri Test Suite">
+        <testsuite name="Uri Components Test Suite">
             <directory>test</directory>
         </testsuite>
     </testsuites>
 
     <filter>
         <whitelist>
             <directory suffix=".php">src</directory>
-            <exclude>
-                <directory suffix="include.php">src</directory>
-            </exclude>
         </whitelist>
     </filter>
 
     <logging>
-        <log type="tap" target="build/report.tap"/>
         <log type="junit" target="build/report.junit.xml"/>
         <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
         <log type="coverage-text" target="build/coverage.txt"/>

src/DataPath.php

@@ -12,10 +12,8 @@
  */
 namespace League\Uri\Components;
 
-use InvalidArgumentException;
 use League\Uri\Components\Traits\PathInfo;
-use League\Uri\Interfaces\PathComponent;
-use RuntimeException;
+use League\Uri\Interfaces\Path as PathInterface;
 use SplFileObject;
 
 /**
@@ -32,7 +30,7 @@
  * @since      1.0.0
  * @see        https://tools.ietf.org/html/rfc3986#section-3.3
  */
-class DataPath extends Component implements PathComponent
+class DataPath extends Component implements PathInterface
 {
     use PathInfo;
 
@@ -85,7 +83,7 @@ public static function __set_state(array $properties)
      *
      * @param string $path
      *
-     * @throws RuntimeException If the File is not readable
+     * @throws Exception If the File is not readable
      *
      * @return static
      */
@@ -166,7 +164,7 @@ protected function validate($path)
      *
      * @param string|null $mimetype
      *
-     * @throws InvalidArgumentException If the mimetype is invalid
+     * @throws Exception If the mimetype is invalid
      *
      * @return string
      */
@@ -188,7 +186,7 @@ protected function filterMimeType($mimetype)
      *
      * @param string $parameters
      *
-     * @throws InvalidArgumentException If the mediatype parameters contain invalid data
+     * @throws Exception If the mediatype parameters contain invalid data
      *
      * @return string[]
      */
@@ -230,7 +228,7 @@ protected function validateParameter($parameter)
     /**
      * Validate the path document string representation
      *
-     * @throws InvalidArgumentException If the data is invalid
+     * @throws Exception If the data is invalid
      */
     protected function validateDocument()
     {
@@ -338,8 +336,6 @@ public function getMediaType()
      * @param string $path The path to the file where to save the data
      * @param string $mode The mode parameter specifies the type of access you require to the stream.
      *
-     * @throws RuntimeException if the path is not reachable
-     *
      * @return SplFileObject
      */
     public function save($path, $mode = 'w')
@@ -407,7 +403,7 @@ public function toAscii()
      *
      * @param string $parameters The mediatype parameters to use with the new instance.
      *
-     * @throws InvalidArgumentException for invalid query strings.
+     * @throws Exception for invalid query strings.
      *
      * @return static A new instance with the specified mediatype parameters.
      */

src/HierarchicalPath.php

@@ -15,7 +15,7 @@
 use Countable;
 use IteratorAggregate;
 use League\Uri\Components\Traits\PathInfo;
-use League\Uri\Interfaces\PathComponent;
+use League\Uri\Interfaces\Path as PathInterface;
 use Traversable;
 
 /**
@@ -26,7 +26,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @since      1.0.0
  */
-class HierarchicalPath extends HierarchicalComponent implements PathComponent, Countable, IteratorAggregate
+class HierarchicalPath extends HierarchicalComponent implements PathInterface, Countable, IteratorAggregate
 {
     use PathInfo;
 

src/Path.php

@@ -13,7 +13,7 @@
 namespace League\Uri\Components;
 
 use League\Uri\Components\Traits\PathInfo;
-use League\Uri\Interfaces\PathComponent;
+use League\Uri\Interfaces\Path as PathInterface;
 
 /**
  * Value object representing a URI path component.
@@ -23,7 +23,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @since      1.0.0
  */
-class Path extends Component implements PathComponent
+class Path extends Component implements PathInterface
 {
     use PathInfo;
 

src/Traits/ImmutableCollection.php

@@ -112,7 +112,7 @@ public function without(array $offsets)
      *
      * @param array $data
      *
-     * @return static
+     * @return $this
      */
     abstract protected function newCollectionInstance(array $data);
 
@@ -141,7 +141,7 @@ public function filter(callable $callable, $flag = 0)
     /**
      * Validate an Iterator or an array
      *
-     * @param iterable $data
+     * @param Traversable|array $data
      *
      * @throws InvalidArgumentException if the value can not be converted
      *

src/Traits/ImmutableComponent.php

@@ -86,8 +86,11 @@ protected static function encode($str, $regexp)
         };
 
         $res = preg_replace_callback($regexp, $encoder, $str);
+        if (null !== $res) {
+            return $res;
+        }
 
-        return $res;
+        return rawurlencode($str);
     }
 
     /**

test/QueryTest.php

@@ -449,6 +449,14 @@ public function buildProvider()
         ];
     }
 
+    public function testBuildWithMalformedUtf8Chars()
+    {
+        $this->assertSame(
+            'badutf8=%A0TM1TMS061114IP1',
+            Query::build(['badutf8' => rawurldecode('%A0TM1TMS061114IP1')])
+        );
+    }
+
     public function testThrowsExceptionOnInvalidEncodingType()
     {
         $this->expectException(Exception::class);