#15 replaced build*() functions with raw() in Builder\Bags

andrei-popa88 · Dec 10, 2018 · c0b7e41 · c0b7e41
1 parent de04947
commit c0b7e41
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/src/Builder/Bags/PathBag.php b/src/Builder/Bags/PathBag.php
@@ -165,7 +165,7 @@ public function insertBefore(string $index, string $component): self
      *
      * @return string
      */
-    public function buildPath(bool $withTrailingSlash = true): string
+    public function raw(bool $withTrailingSlash = true): string
     {
         if (empty($this->pathComponents)) {
             return '';

diff --git a/src/Builder/Bags/QueryBag.php b/src/Builder/Bags/QueryBag.php
@@ -33,7 +33,7 @@ public function setQueryComponents(array $queryComponents): self
     /**
      * @return string
      */
-    public function buildQuery(): string
+    public function raw(): string
     {
         if (empty($this->queryComponents)) {
             return '';

diff --git a/src/Builder/Builder.php b/src/Builder/Builder.php
@@ -179,8 +179,8 @@ public function getUrl(bool $withTrailingSlash = true): string
 
         $url .= $this->schema.'://';
         $url .= $this->buildAuthority();
-        $url .= $this->path->buildPath($withTrailingSlash);
-        $url .= $this->query->buildQuery();
+        $url .= $this->path->raw($withTrailingSlash);
+        $url .= $this->query->raw();
         if (null !== $this->fragment) {
             $url .= '#'.$this->fragment;
         }

diff --git a/tests/Builder/Bags/PathBagTest.php b/tests/Builder/Bags/PathBagTest.php
@@ -83,9 +83,9 @@ public function test_should_build_correct_path()
         $url = 'https://john.doe@www.example.com:123/forum/questions/phpunit/exceptions/?tag=networking&order=newest#top';
         $parser = Parser::from($url);
         $builder = Builder::from($parser);
-        $builder->path->buildPath();
+        $builder->path->raw();
 
-        $this->assertEquals('/forum/questions/phpunit/exceptions/', ($builder->path->buildPath()));
+        $this->assertEquals('/forum/questions/phpunit/exceptions/', ($builder->path->raw()));
     }
 
     public function test_remove_should_throw_exception_when_missing_component()

diff --git a/tests/Builder/Bags/QueryBagTest.php b/tests/Builder/Bags/QueryBagTest.php
@@ -84,7 +84,7 @@ public function test_should_build_correct_query()
         $parser = Parser::from($url);
         $builder = Builder::from($parser);
 
-        $this->assertEquals('?tag=networking&order=newest', ($builder->query->buildQuery()));
+        $this->assertEquals('?tag=networking&order=newest', ($builder->query->raw()));
     }
 
     public function test_remove_should_throw_exception_when_missing_component()