[DomCrawler] Rename UriExpander.php -> UriResolver

lyrixx · lyrixx · commit ba30cb17f76b · 2020-02-10T18:29:35.000+01:00
diff --git a/src/Symfony/Component/DomCrawler/CHANGELOG.md b/src/Symfony/Component/DomCrawler/CHANGELOG.md
@@ -5,7 +5,7 @@ CHANGELOG
 -----
 
 * Added an internal cache layer on top of the CssSelectorConverter
-* Added `UriExpander` to expand an URL according to another URL
+* Added `UriResolved` to resolve an URI according to another URI
 
 5.0.0
 -----
diff --git a/src/Symfony/Component/DomCrawler/Tests/UriResolverTest.php b/src/Symfony/Component/DomCrawler/Tests/UriResolverTest.php
@@ -12,19 +12,19 @@
 namespace Symfony\Component\DomCrawler\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\DomCrawler\UriExpander;
+use Symfony\Component\DomCrawler\UriResolver;
 
-class UriExpanderTest extends TestCase
+class UriResolverTest extends TestCase
 {
     /**
-     * @dataProvider provideExpandUriTests
+     * @dataProvider provideResolverTests
      */
-    public function testExpandUri(string $uri, string $currentUri, string $expected)
+    public function testResolver(string $uri, string $currentUri, string $expected)
     {
-        $this->assertEquals($expected, UriExpander::expand($uri, $currentUri));
+        $this->assertEquals($expected, UriResolver::resolve($uri, $currentUri));
     }
 
-    public function provideExpandUriTests()
+    public function provideResolverTests()
     {
         return [
             ['/foo', 'http://localhost/bar/foo/', 'http://localhost/foo'],
diff --git a/src/Symfony/Component/DomCrawler/UriResolver.php b/src/Symfony/Component/DomCrawler/UriResolver.php
@@ -12,22 +12,23 @@
 namespace Symfony\Component\DomCrawler;
 
 /**
- * Expand an URI according a current URI.
+ * The UriResolver class takes an URI (relative, absolute, fragment, etc.)
+ * and turns it into an absolute URI against another given base URI.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Grégoire Pineau <lyrixx@lyrixx.info>
  */
-class UriExpander
+class UriResolver
 {
     /**
-     * Expand an URI according to a current Uri.
+     * Resolve an URI according to a current Uri.
      *
      * For example if $uri=/foo/bar and $currentUri=https://symfony.com it will
      * return https://symfony.com/foo/bar
      *
      * If the $uri is not absolute you must pass an absolute $currentUri
      */
-    public static function expand(string $uri, ?string $currentUri): string
+    public static function resolve(string $uri, ?string $currentUri): string
     {
         $uri = trim($uri);
 

Original file line number	Diff line number	Diff line change
`@@ -12,19 +12,19 @@`
`12`	`12`	`namespace Symfony\Component\DomCrawler\Tests;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`		`-use Symfony\Component\DomCrawler\UriExpander;`
	`15`	`+use Symfony\Component\DomCrawler\UriResolver;`
`16`	`16`
`17`		`-class UriExpanderTest extends TestCase`
	`17`	`+class UriResolverTest extends TestCase`
`18`	`18`	`{`
`19`	`19`	`/**`
`20`		`- * @dataProvider provideExpandUriTests`
	`20`	`+ * @dataProvider provideResolverTests`
`21`	`21`	`*/`
`22`		`- public function testExpandUri(string $uri, string $currentUri, string $expected)`
	`22`	`+ public function testResolver(string $uri, string $currentUri, string $expected)`
`23`	`23`	`{`
`24`		`- $this->assertEquals($expected, UriExpander::expand($uri, $currentUri));`
	`24`	`+ $this->assertEquals($expected, UriResolver::resolve($uri, $currentUri));`
`25`	`25`	`}`
`26`	`26`
`27`		`- public function provideExpandUriTests()`
	`27`	`+ public function provideResolverTests()`
`28`	`28`	`{`
`29`	`29`	`return [`
`30`	`30`	`['/foo', 'http://localhost/bar/foo/', 'http://localhost/foo'],`
Original file line number	Diff line number	Diff line change
`@@ -12,22 +12,23 @@`
`12`	`12`	`namespace Symfony\Component\DomCrawler;`
`13`	`13`
`14`	`14`	`/**`
`15`		`- * Expand an URI according a current URI.`
	`15`	`+ * The UriResolver class takes an URI (relative, absolute, fragment, etc.)`
	`16`	`+ * and turns it into an absolute URI against another given base URI.`
`16`	`17`	`*`
`17`	`18`	`* @author Fabien Potencier <[email protected]>`
`18`	`19`	`* @author Grégoire Pineau <[email protected]>`
`19`	`20`	`*/`
`20`		`-class UriExpander`
	`21`	`+class UriResolver`
`21`	`22`	`{`
`22`	`23`	`/**`
`23`		`- * Expand an URI according to a current Uri.`
	`24`	`+ * Resolve an URI according to a current Uri.`
`24`	`25`	`*`
`25`	`26`	`* For example if $uri=/foo/bar and $currentUri=https://symfony.com it will`
`26`	`27`	`* return https://symfony.com/foo/bar`
`27`	`28`	`*`
`28`	`29`	`* If the $uri is not absolute you must pass an absolute $currentUri`
`29`	`30`	`*/`
`30`		`- public static function expand(string $uri, ?string $currentUri): string`
	`31`	`+ public static function resolve(string $uri, ?string $currentUri): string`
`31`	`32`	`{`
`32`	`33`	`$uri = trim($uri);`
`33`	`34`