prepare 1.4.0 release

CHANGELOG.md

@@ -2,6 +2,28 @@
 
 - All Notable changes to `uri-manipulations` will be documented in this file
 
+## 1.4.0 - TDB
+
+### Added
+
+- `League\Uri\Modifiers\PublicSuffix`
+- `League\Uri\replace_publicsuffix`
+
+### Fixed
+
+- `League\Uri\replace_registrabledomain` now can take a optional `League\Uri\PublicSuffix\Rules` object
+- `League\Uri\replace_subdomain` now can take a optional `League\Uri\PublicSuffix\Rules` object
+- `League\Uri\Modifiers\RegisterableDomain` constructor now can take a optional `League\Uri\PublicSuffix\Rules` object
+- `League\Uri\Modifiers\SubDomain` constructor now can take a optional `League\Uri\PublicSuffix\Rules` object
+
+### Deprecated
+
+- None
+
+### Removed
+
+- None
+
 ## 1.3.0 - 2017-11-24
 
 ### Added
@@ -19,7 +41,7 @@
 
 ### Removed
 
-- Nonce
+- None
 
 ## 1.2.0 - 2017-11-22
 

composer.json

@@ -30,7 +30,7 @@
     },
     "minimun-stability" : "dev",
     "require": {
-        "league/uri-components": "^1.4.1",
+        "league/uri-components": "^1.7.0",
         "league/uri-interfaces": "^1.0",
         "php" : ">=7.0",
         "psr/http-message": "^1.0"

src/Modifiers/AddBasePath.php

@@ -7,7 +7,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 declare(strict_types=1);

src/Modifiers/AddLeadingSlash.php

@@ -7,7 +7,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 declare(strict_types=1);

src/Modifiers/AddRootLabel.php

@@ -7,7 +7,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 declare(strict_types=1);

src/Modifiers/AddTrailingSlash.php

@@ -7,7 +7,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 declare(strict_types=1);

src/Modifiers/AppendLabel.php

@@ -7,7 +7,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 declare(strict_types=1);

src/Modifiers/AppendQuery.php

@@ -7,7 +7,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 declare(strict_types=1);

src/Modifiers/AppendSegment.php

@@ -7,7 +7,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 declare(strict_types=1);

src/Modifiers/Basename.php

@@ -7,7 +7,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 declare(strict_types=1);

src/Modifiers/CallableAdapter.php

@@ -7,7 +7,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 declare(strict_types=1);

src/Modifiers/DataUriParameters.php

@@ -7,7 +7,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 declare(strict_types=1);

src/Modifiers/DataUriToAscii.php

@@ -7,7 +7,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 declare(strict_types=1);

src/Modifiers/DataUriToBinary.php

@@ -7,7 +7,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 declare(strict_types=1);

src/Modifiers/DecodeUnreservedCharacters.php

@@ -7,7 +7,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 declare(strict_types=1);

src/Modifiers/Dirname.php

@@ -7,7 +7,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 declare(strict_types=1);

src/Modifiers/Exception.php

@@ -7,7 +7,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 declare(strict_types=1);

src/Modifiers/Extension.php

@@ -7,7 +7,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 declare(strict_types=1);

src/Modifiers/Formatter.php

@@ -7,22 +7,23 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 declare(strict_types=1);
 
 namespace League\Uri\Modifiers;
 
 use InvalidArgumentException;
+use League\Uri;
 use League\Uri\Components\ComponentInterface;
 use League\Uri\Components\EncodingInterface;
 use League\Uri\Components\Fragment;
 use League\Uri\Components\Host;
 use League\Uri\Components\Path;
 use League\Uri\Components\Query;
 use League\Uri\Components\UserInfo;
-use League\Uri\Interfaces\Uri;
+use League\Uri\Interfaces\Uri as LeagueUriInterface;
 use Psr\Http\Message\UriInterface;
 
 /**
@@ -145,14 +146,14 @@ public function preserveFragment(bool $status)
     public function __invoke($input)
     {
         if ($input instanceof Query) {
-            return Query::build($input->getPairs(), $this->query_separator, $this->enc_type);
+            return Uri\build_query($input->getPairs(), $this->query_separator, $this->enc_type);
         }
 
         if ($input instanceof ComponentInterface) {
             return $input->getContent($this->enc_type);
         }
 
-        if ($input instanceof Uri || $input instanceof UriInterface) {
+        if ($input instanceof LeagueUriInterface || $input instanceof UriInterface) {
             return $this->formatUri($input);
         }
 
@@ -212,7 +213,7 @@ protected function formatUri($uri): string
 
         $query = $uri->getQuery();
         if ('' != $query || $this->preserve_query) {
-            $query = '?'.Query::build(Query::parse((string) $query), $this->query_separator, $this->enc_type);
+            $query = '?'.Uri\build_query(Uri\parse_query((string) $query), $this->query_separator, $this->enc_type);
         }
 
         $fragment = $uri->getFragment();

src/Modifiers/HostMiddlewareTrait.php

@@ -7,7 +7,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 

src/Modifiers/HostToAscii.php

@@ -7,7 +7,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 declare(strict_types=1);

src/Modifiers/HostToUnicode.php

@@ -7,7 +7,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 declare(strict_types=1);

src/Modifiers/KsortQuery.php

@@ -7,7 +7,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 declare(strict_types=1);

src/Modifiers/MergeQuery.php

@@ -7,7 +7,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 declare(strict_types=1);

src/Modifiers/Normalize.php

@@ -7,7 +7,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 declare(strict_types=1);

src/Modifiers/PathMiddlewareTrait.php

@@ -7,7 +7,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 

src/Modifiers/Pipeline.php

@@ -7,7 +7,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 declare(strict_types=1);

src/Modifiers/PrependLabel.php

@@ -7,7 +7,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 declare(strict_types=1);

src/Modifiers/PrependSegment.php

@@ -7,7 +7,7 @@
  * @author     Ignace Nyamagana Butera <[email protected]>
  * @copyright  2016 Ignace Nyamagana Butera
  * @license    https://github.com/thephpleague/uri-manipulations/blob/master/LICENSE (MIT License)
- * @version    1.3.0
+ * @version    1.4.0
  * @link       https://github.com/thephpleague/uri-manipulations
  */
 declare(strict_types=1);