fix(Module/Support/DbDump.php) handling of locahost:port URLs in repl…

…acement fixes #430
lucatume · Aug 4, 2020 · d103370 · d103370
1 parent a14506d
commit d103370
Show file tree

Hide file tree

Showing 5 changed files with 624 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [unreleased] Unreleased
 
+### Fixed
+
+- URL replacement function in `WPDb` module that would incorrectly handling the replacement of `locahost:port` URLs, fixes #430
+
 ## [2.6.5] 2020-07-16;
 
 ### Fixed

diff --git a/src/Codeception/Module/WPLoader.php b/src/Codeception/Module/WPLoader.php
@@ -776,7 +776,8 @@ public function _loadPlugins()
      * $userId = $I->factory()->user->create(['role' => 'administrator']);
      * ```
      *
-     * @return \tad\WPBrowser\Module\WPLoader\FactoryStore A factory store, proxy to get hold of the Core suite object factories.
+     * @return \tad\WPBrowser\Module\WPLoader\FactoryStore A factory store, proxy to get hold of the Core suite object
+     *                                                     factories.
      *
      * @link https://make.wordpress.org/core/handbook/testing/automated-testing/writing-phpunit-tests/
      */

diff --git a/src/tad/WPBrowser/Module/Support/DbDump.php b/src/tad/WPBrowser/Module/Support/DbDump.php
@@ -103,8 +103,14 @@ public function replaceSiteDomainInSqlString($sql, $debug = false)
         }
 
         $originalFrags = parse_url($this->originalUrl);
-        $originalFrags = array_intersect_key($originalFrags, array_flip(['host', 'path']));
-        $originalHostAndPath = rtrim(implode('', array_merge(['host' => '', 'path' => ''], $originalFrags)), '/');
+        $originalFrags = array_intersect_key($originalFrags, array_flip(['host', 'path','port']));
+        if (!empty($originalFrags['port'])) {
+            $originalFrags['port'] = ':' . $originalFrags['port'];
+        }
+        $originalHostAndPath = rtrim(
+            implode('', array_merge(['host' => '', 'path' => '', 'port' => ''], $originalFrags)),
+            '/'
+        );
         $replaceScheme = parse_url($this->url, PHP_URL_SCHEME);
         $replaceHost = parse_url($this->url, PHP_URL_HOST);
 

diff --git a/tests/_data/dump-test/url-replacement-test-01.sql b/tests/_data/dump-test/url-replacement-test-01.sql
diff --git a/tests/unit/tad/WPBrowser/Module/Support/DbDumpTest.php b/tests/unit/tad/WPBrowser/Module/Support/DbDumpTest.php
@@ -303,4 +303,24 @@ public function should_correctly_replace_subdomain_urls_in_multisite_installatio
             $this->assertEquals($expectedLine, $replaced, 'Error at line number ' . $lineNumber);
         }
     }
+
+    /**
+     * It should correctly replace localhost host address with pretty URL
+     *
+     * @test
+     */
+    public function should_correctly_replace_localhost_host_address_with_pretty_url()
+    {
+        $inputFile = codecept_data_dir('dump-test/url-replacement-test-01.sql');
+        $sql         = file_get_contents($inputFile);
+
+        $dbDump      = $this->make_instance();
+        $dbDump->setUrl('http://some-nice-host-name');
+        $originalUrl = $dbDump->getOriginalUrlFromSqlString($sql);
+
+        $this->assertEquals('http://localhost:5100', $originalUrl);
+
+        $replacedSql = $dbDump->replaceSiteDomainInSqlString($sql);
+        $this->assertEquals('http://some-nice-host-name', $dbDump->getOriginalUrlFromSqlString($replacedSql));
+    }
 }