Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'test/classes/Gis/GisGeometryCollectionTest.php')
-rw-r--r--test/classes/Gis/GisGeometryCollectionTest.php20
1 files changed, 2 insertions, 18 deletions
diff --git a/test/classes/Gis/GisGeometryCollectionTest.php b/test/classes/Gis/GisGeometryCollectionTest.php
index 50ecca2b0c..1efd91dde7 100644
--- a/test/classes/Gis/GisGeometryCollectionTest.php
+++ b/test/classes/Gis/GisGeometryCollectionTest.php
@@ -9,9 +9,6 @@ use PhpMyAdmin\Image\ImageWrapper;
use PhpMyAdmin\Tests\AbstractTestCase;
use TCPDF;
-use function method_exists;
-use function preg_match;
-
/**
* @covers \PhpMyAdmin\Gis\GisGeometryCollection
* @runTestsInSeparateProcesses
@@ -253,21 +250,8 @@ class GisGeometryCollectionTest extends AbstractTestCase
array $scaleData,
string $output
): void {
- $string = $this->object->prepareRowAsSvg($spatial, $label, $lineColor, $scaleData);
- $this->assertEquals(1, preg_match($output, $string));
-
- if (method_exists($this, 'assertMatchesRegularExpression')) {
- $this->assertMatchesRegularExpression(
- $output,
- $this->object->prepareRowAsSvg($spatial, $label, $lineColor, $scaleData)
- );
- } else {
- /** @psalm-suppress DeprecatedMethod */
- $this->assertRegExp(
- $output,
- $this->object->prepareRowAsSvg($spatial, $label, $lineColor, $scaleData)
- );
- }
+ $svg = $this->object->prepareRowAsSvg($spatial, $label, $lineColor, $scaleData);
+ $this->assertMatchesRegularExpression($output, $svg);
}
/**