diff --git a/libraries/classes/Git.php b/libraries/classes/Git.php index 6282e1a627..0aa3c6ff8c 100644 --- a/libraries/classes/Git.php +++ b/libraries/classes/Git.php @@ -509,7 +509,6 @@ class Git $gitFolder .= DIRECTORY_SEPARATOR . trim($common_dir_contents); } - [$hash, $branch] = $this->getHashFromHeadRef($gitFolder, $ref_head); if ($hash === null) { return; diff --git a/test/classes/BookmarkTest.php b/test/classes/BookmarkTest.php index f82137f454..dca9f25e72 100644 --- a/test/classes/BookmarkTest.php +++ b/test/classes/BookmarkTest.php @@ -7,7 +7,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests; use PhpMyAdmin\Bookmark; -use PhpMyAdmin\Tests\AbstractTestCase; /** * Tests for Bookmark class diff --git a/test/classes/BrowseForeignersTest.php b/test/classes/BrowseForeignersTest.php index 40e776a4ed..c9e1a0478f 100644 --- a/test/classes/BrowseForeignersTest.php +++ b/test/classes/BrowseForeignersTest.php @@ -8,7 +8,6 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\BrowseForeigners; use PhpMyAdmin\Template; -use PhpMyAdmin\Tests\AbstractTestCase; /** * Tests for PhpMyAdmin\BrowseForeigners diff --git a/test/classes/CentralColumnsTest.php b/test/classes/CentralColumnsTest.php index 22046a697e..d08de1a676 100644 --- a/test/classes/CentralColumnsTest.php +++ b/test/classes/CentralColumnsTest.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Types; use PhpMyAdmin\Url; use PhpMyAdmin\Util; use PhpMyAdmin\Message; -use PhpMyAdmin\Tests\AbstractTestCase; use function array_slice; use function ceil; diff --git a/test/classes/CharsetsTest.php b/test/classes/CharsetsTest.php index 2a996411f9..14719d1d79 100644 --- a/test/classes/CharsetsTest.php +++ b/test/classes/CharsetsTest.php @@ -7,7 +7,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests; use PhpMyAdmin\Charsets; -use PhpMyAdmin\Tests\AbstractTestCase; /** * Tests for MySQL Charsets diff --git a/test/classes/CheckUserPrivilegesTest.php b/test/classes/CheckUserPrivilegesTest.php index d5f1214e6c..7eca4b5463 100644 --- a/test/classes/CheckUserPrivilegesTest.php +++ b/test/classes/CheckUserPrivilegesTest.php @@ -7,7 +7,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests; use PhpMyAdmin\CheckUserPrivileges; -use PhpMyAdmin\Tests\AbstractTestCase; /** * tests for PhpMyAdmin\CheckUserPrivileges diff --git a/test/classes/CreateAddFieldTest.php b/test/classes/CreateAddFieldTest.php index 5bf4a3265f..26abc5d8f0 100644 --- a/test/classes/CreateAddFieldTest.php +++ b/test/classes/CreateAddFieldTest.php @@ -7,7 +7,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests; use PhpMyAdmin\CreateAddField; -use PhpMyAdmin\Tests\AbstractTestCase; /** * This class is for testing PhpMyAdmin\CreateAddField methods diff --git a/test/classes/EncodingTest.php b/test/classes/EncodingTest.php index 7822515ca0..238d9e9db5 100644 --- a/test/classes/EncodingTest.php +++ b/test/classes/EncodingTest.php @@ -7,7 +7,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests; use PhpMyAdmin\Encoding; -use PhpMyAdmin\Tests\AbstractTestCase; use const PHP_INT_SIZE; use function fclose; use function file_get_contents; diff --git a/test/classes/EnvironmentTest.php b/test/classes/EnvironmentTest.php index 6dd82a1c45..d41579b7e6 100644 --- a/test/classes/EnvironmentTest.php +++ b/test/classes/EnvironmentTest.php @@ -6,7 +6,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests; -use PhpMyAdmin\Tests\AbstractTestCase; use const PHP_VERSION; use function version_compare; diff --git a/test/classes/ErrorReportTest.php b/test/classes/ErrorReportTest.php index 9c48334504..6da40a92bc 100644 --- a/test/classes/ErrorReportTest.php +++ b/test/classes/ErrorReportTest.php @@ -11,7 +11,6 @@ use PhpMyAdmin\ErrorReport; use PhpMyAdmin\Relation; use PhpMyAdmin\Template; use PhpMyAdmin\Utils\HttpRequest; -use PhpMyAdmin\Tests\AbstractTestCase; use const JSON_PRETTY_PRINT; use const JSON_UNESCAPED_SLASHES; use function define; diff --git a/test/classes/ExportTest.php b/test/classes/ExportTest.php index dd9fd94d41..f88d4b0d1b 100644 --- a/test/classes/ExportTest.php +++ b/test/classes/ExportTest.php @@ -8,7 +8,6 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Export; use PhpMyAdmin\Plugins\Export\ExportPhparray; -use PhpMyAdmin\Tests\AbstractTestCase; /** * PhpMyAdmin\ExportTest class diff --git a/test/classes/FileListingTest.php b/test/classes/FileListingTest.php index e2379fe04a..bda369ea70 100644 --- a/test/classes/FileListingTest.php +++ b/test/classes/FileListingTest.php @@ -6,7 +6,6 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\FileListing; -use PhpMyAdmin\Tests\AbstractTestCase; use function array_values; use function extension_loaded; diff --git a/test/classes/FilesTest.php b/test/classes/FilesTest.php index c01103e990..4dfc89dbe1 100644 --- a/test/classes/FilesTest.php +++ b/test/classes/FilesTest.php @@ -7,7 +7,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests; use PhpMyAdmin\OutputBuffering; -use PhpMyAdmin\Tests\AbstractTestCase; /** * tests for PhpMyAdmin\Bookmark diff --git a/test/classes/ImportTest.php b/test/classes/ImportTest.php index 9ab3df7e25..b7c68d1199 100644 --- a/test/classes/ImportTest.php +++ b/test/classes/ImportTest.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Import; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\Url; -use PhpMyAdmin\Tests\AbstractTestCase; use const PHP_INT_MAX; use function implode; use function sprintf; diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php index cc34e0d3e4..4e03d91481 100644 --- a/test/classes/InsertEditTest.php +++ b/test/classes/InsertEditTest.php @@ -15,7 +15,6 @@ use PhpMyAdmin\Url; use PhpMyAdmin\Message; use PhpMyAdmin\Scripts; use PhpMyAdmin\Header; -use PhpMyAdmin\Tests\AbstractTestCase; use ReflectionProperty; use stdClass; use function md5; diff --git a/test/classes/IpAllowDenyTest.php b/test/classes/IpAllowDenyTest.php index 8f01d2b774..bee613b3bd 100644 --- a/test/classes/IpAllowDenyTest.php +++ b/test/classes/IpAllowDenyTest.php @@ -8,7 +8,6 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Core; use PhpMyAdmin\IpAllowDeny; -use PhpMyAdmin\Tests\AbstractTestCase; /** * PhpMyAdmin\Tests\IpAllowDenyTest class diff --git a/test/classes/MimeTest.php b/test/classes/MimeTest.php index 9fc88dfd4f..94d3f2383b 100644 --- a/test/classes/MimeTest.php +++ b/test/classes/MimeTest.php @@ -7,7 +7,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests; use PhpMyAdmin\Mime; -use PhpMyAdmin\Tests\AbstractTestCase; use function chr; /** diff --git a/test/classes/NormalizationTest.php b/test/classes/NormalizationTest.php index c78ab336e2..bca7935086 100644 --- a/test/classes/NormalizationTest.php +++ b/test/classes/NormalizationTest.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Transformations; use PhpMyAdmin\Types; use PhpMyAdmin\Url; use PhpMyAdmin\Message; -use PhpMyAdmin\Tests\AbstractTestCase; use stdClass; use function json_encode; diff --git a/test/classes/RelationCleanupTest.php b/test/classes/RelationCleanupTest.php index b4a85703d9..9f565bc858 100644 --- a/test/classes/RelationCleanupTest.php +++ b/test/classes/RelationCleanupTest.php @@ -9,7 +9,6 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Relation; use PhpMyAdmin\RelationCleanup; use PHPUnit\Framework\MockObject\MockObject; -use PhpMyAdmin\Tests\AbstractTestCase; use function array_merge; /** diff --git a/test/classes/RelationTest.php b/test/classes/RelationTest.php index 78a4e9b432..8d0a11263d 100644 --- a/test/classes/RelationTest.php +++ b/test/classes/RelationTest.php @@ -8,7 +8,6 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Relation; -use PhpMyAdmin\Tests\AbstractTestCase; /** * Tests for PhpMyAdmin\Relation diff --git a/test/classes/ReplicationGuiTest.php b/test/classes/ReplicationGuiTest.php index ae7f9d5e29..bbc7e05ea7 100644 --- a/test/classes/ReplicationGuiTest.php +++ b/test/classes/ReplicationGuiTest.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Replication; use PhpMyAdmin\ReplicationGui; use PhpMyAdmin\ReplicationInfo; use PhpMyAdmin\Template; -use PhpMyAdmin\Tests\AbstractTestCase; /** * PhpMyAdmin\Tests\ReplicationGuiTest class diff --git a/test/classes/SanitizeTest.php b/test/classes/SanitizeTest.php index 9774f458e8..8f111eece9 100644 --- a/test/classes/SanitizeTest.php +++ b/test/classes/SanitizeTest.php @@ -7,7 +7,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests; use PhpMyAdmin\Sanitize; -use PhpMyAdmin\Tests\AbstractTestCase; /** * Tests for methods in Sanitize class diff --git a/test/classes/SqlQueryFormTest.php b/test/classes/SqlQueryFormTest.php index 0be08a6c3f..42c25119b5 100644 --- a/test/classes/SqlQueryFormTest.php +++ b/test/classes/SqlQueryFormTest.php @@ -13,7 +13,6 @@ use PhpMyAdmin\Html\MySQLDocumentation; use PhpMyAdmin\SqlQueryForm; use PhpMyAdmin\Template; use PhpMyAdmin\Url; -use PhpMyAdmin\Tests\AbstractTestCase; use function htmlspecialchars; /** diff --git a/test/classes/SqlTest.php b/test/classes/SqlTest.php index 6bf4bc5dbe..3fe48b052a 100644 --- a/test/classes/SqlTest.php +++ b/test/classes/SqlTest.php @@ -7,7 +7,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests; use PhpMyAdmin\Sql; -use PhpMyAdmin\Tests\AbstractTestCase; use ReflectionMethod; use stdClass; diff --git a/test/classes/TrackingTest.php b/test/classes/TrackingTest.php index 6287d87dd1..6463295ef1 100644 --- a/test/classes/TrackingTest.php +++ b/test/classes/TrackingTest.php @@ -12,7 +12,6 @@ use PhpMyAdmin\SqlQueryForm; use PhpMyAdmin\Template; use PhpMyAdmin\Tracking; use PhpMyAdmin\Url; -use PhpMyAdmin\Tests\AbstractTestCase; use function htmlspecialchars; use function sprintf; diff --git a/test/classes/TransformationsTest.php b/test/classes/TransformationsTest.php index 7d3522a559..559561a462 100644 --- a/test/classes/TransformationsTest.php +++ b/test/classes/TransformationsTest.php @@ -8,7 +8,6 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Transformations; -use PhpMyAdmin\Tests\AbstractTestCase; /** * tests for transformation wrappers diff --git a/test/classes/UrlTest.php b/test/classes/UrlTest.php index 8fb89e3687..60d6269aa3 100644 --- a/test/classes/UrlTest.php +++ b/test/classes/UrlTest.php @@ -7,7 +7,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests; use PhpMyAdmin\Url; -use PhpMyAdmin\Tests\AbstractTestCase; use function htmlentities; /**