change assertRegExp() => assertMatchesRegularExpression()

gpslab · Nov 18, 2024 · 61ef19d · 61ef19d
1 parent 2bcc3f9
commit 61ef19d
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/tests/Downloader/MaxMindDownloaderTest.php b/tests/Downloader/MaxMindDownloaderTest.php
@@ -82,9 +82,9 @@ public function testNotFoundDatabase(): void
                 $this->assertIsString($files[0]);
                 $this->assertIsString($files[1]);
                 $this->assertIsString($files[2]);
-                $this->assertRegExp($tmp_zip_regexp, $files[0]);
-                $this->assertRegExp($tmp_unzip_regexp, $files[1]);
-                $this->assertRegExp($tmp_untar_regexp, $files[2]);
+                $this->assertMatchesRegularExpression($tmp_zip_regexp, $files[0]);
+                $this->assertMatchesRegularExpression($tmp_unzip_regexp, $files[1]);
+                $this->assertMatchesRegularExpression($tmp_untar_regexp, $files[2]);
             });
         $this->fs
             ->expects($this->at($fs_call++))
@@ -96,7 +96,7 @@ public function testNotFoundDatabase(): void
                 $this->assertSame($url, $origin_file);
                 $this->assertIsString($target_file);
                 $this->assertTrue($overwrite_newer_files);
-                $this->assertRegExp($tmp_zip_regexp, $target_file);
+                $this->assertMatchesRegularExpression($tmp_zip_regexp, $target_file);
 
                 // make test GeoLite2 db
                 file_put_contents($target_file, base64_decode(self::TAR_GZ_BAD));
@@ -137,9 +137,9 @@ public function testDownload(): void
                 $this->assertIsString($files[0]);
                 $this->assertIsString($files[1]);
                 $this->assertIsString($files[2]);
-                $this->assertRegExp($tmp_zip_regexp, $files[0]);
-                $this->assertRegExp($tmp_unzip_regexp, $files[1]);
-                $this->assertRegExp($tmp_untar_regexp, $files[2]);
+                $this->assertMatchesRegularExpression($tmp_zip_regexp, $files[0]);
+                $this->assertMatchesRegularExpression($tmp_unzip_regexp, $files[1]);
+                $this->assertMatchesRegularExpression($tmp_untar_regexp, $files[2]);
             });
         $this->fs
             ->expects($this->at($fs_call++))
@@ -151,7 +151,7 @@ public function testDownload(): void
                 $this->assertSame($url, $origin_file);
                 $this->assertIsString($target_file);
                 $this->assertTrue($overwrite_newer_files);
-                $this->assertRegExp($tmp_zip_regexp, $target_file);
+                $this->assertMatchesRegularExpression($tmp_zip_regexp, $target_file);
 
                 // make test GeoLite2 db
                 file_put_contents($target_file, base64_decode(self::TAR_GZ));
@@ -175,7 +175,7 @@ public function testDownload(): void
                     '#^%s/[\da-f]+\.\d+_GeoLite2/GeoLite2-City_20200114/GeoLite2.mmdb$#',
                     $path_quote
                 );
-                $this->assertRegExp($regexp, $origin_file);
+                $this->assertMatchesRegularExpression($regexp, $origin_file);
                 $this->assertFileExists($origin_file);
                 $this->assertSame('TestGeoLite2', file_get_contents($origin_file));
             });
@@ -195,9 +195,9 @@ public function testDownload(): void
                 $this->assertIsString($files[0]);
                 $this->assertIsString($files[1]);
                 $this->assertIsString($files[2]);
-                $this->assertRegExp($tmp_zip_regexp, $files[0]);
-                $this->assertRegExp($tmp_unzip_regexp, $files[1]);
-                $this->assertRegExp($tmp_untar_regexp, $files[2]);
+                $this->assertMatchesRegularExpression($tmp_zip_regexp, $files[0]);
+                $this->assertMatchesRegularExpression($tmp_unzip_regexp, $files[1]);
+                $this->assertMatchesRegularExpression($tmp_untar_regexp, $files[2]);
             });
 
         $this->downloader->download($url, $target);