Remove dead code for old PHP versions

MauricioFauth · MauricioFauth · commit 930f8826d3eb · 2023-02-12T13:59:40.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php
@@ -66,7 +66,6 @@
 use const PHP_OS;
 use const PHP_URL_PATH;
 use const PHP_URL_SCHEME;
-use const PHP_VERSION_ID;
 
 /**
  * Configuration handling
@@ -952,18 +951,6 @@ public function setCookie(
             /** @psalm-var 'Lax'|'Strict'|'None' $cookieSameSite */
             $cookieSameSite = $this->get('CookieSameSite');
 
-            if (PHP_VERSION_ID < 70300) {
-                return setcookie(
-                    $httpCookieName,
-                    $value,
-                    $validity,
-                    $this->getRootPath() . '; SameSite=' . $cookieSameSite,
-                    '',
-                    $this->isHttps(),
-                    $httponly
-                );
-            }
-
             $optionalParams = [
                 'expires' => $validity,
                 'path' => $this->getRootPath(),
diff --git a/libraries/classes/ErrorHandler.php b/libraries/classes/ErrorHandler.php
@@ -34,7 +34,6 @@
 use const E_USER_NOTICE;
 use const E_USER_WARNING;
 use const E_WARNING;
-use const PHP_VERSION_ID;
 
 /**
  * handling errors
@@ -202,9 +201,6 @@ public function handleError(
             * See: https://github.com/phpmyadmin/phpmyadmin/issues/16729
             */
             $isSilenced = ! (error_reporting() & $errno);
-            if (PHP_VERSION_ID < 80000) {
-                $isSilenced = error_reporting() == 0;
-            }
 
             if (
                 isset($GLOBALS['cfg']['environment'])
diff --git a/libraries/classes/Image/ImageWrapper.php b/libraries/classes/Image/ImageWrapper.php
@@ -4,7 +4,6 @@
 
 namespace PhpMyAdmin\Image;
 
-use function count;
 use function extension_loaded;
 use function function_exists;
 use function imagearc;
@@ -22,8 +21,6 @@
 use function imagesx;
 use function imagesy;
 
-use const PHP_VERSION_ID;
-
 final class ImageWrapper
 {
     /** @var resource */
@@ -141,19 +138,11 @@ public function copyResampled(
 
     public function destroy(): bool
     {
-        if (PHP_VERSION_ID >= 80000) {
-            return true;
-        }
-
-        return imagedestroy($this->image);
+        return true;
     }
 
     public function filledPolygon(array $points, int $color): bool
     {
-        if (PHP_VERSION_ID < 80000) {
-            return imagefilledpolygon($this->image, $points, (int) (count($points) / 2), $color);
-        }
-
         return imagefilledpolygon($this->image, $points, $color);
     }
 
diff --git a/libraries/classes/Plugins/Auth/AuthenticationSignon.php b/libraries/classes/Plugins/Auth/AuthenticationSignon.php
@@ -23,9 +23,6 @@
 use function session_set_cookie_params;
 use function session_start;
 use function session_write_close;
-use function version_compare;
-
-use const PHP_VERSION;
 
 /**
  * Handles the SignOn authentication method
@@ -110,18 +107,7 @@ public function setCookieParams(?array $sessionCookieParams = null): void
             unset($sessionCookieParams['samesite']);
         }
 
-        if (version_compare(PHP_VERSION, '7.3.0', '>=')) {
-            /** @psalm-suppress InvalidArgument */
-            session_set_cookie_params($sessionCookieParams);
-        } else {
-            session_set_cookie_params(
-                $sessionCookieParams['lifetime'],
-                $sessionCookieParams['path'],
-                $sessionCookieParams['domain'],
-                $sessionCookieParams['secure'],
-                $sessionCookieParams['httponly']
-            );
-        }
+        session_set_cookie_params($sessionCookieParams);
     }
 
     /**
diff --git a/libraries/classes/Plugins/Import/ImportOds.php b/libraries/classes/Plugins/Import/ImportOds.php
@@ -23,14 +23,12 @@
 use function __;
 use function count;
 use function implode;
-use function libxml_disable_entity_loader;
 use function rtrim;
 use function simplexml_load_string;
 use function strcmp;
 use function strlen;
 
 use const LIBXML_COMPACT;
-use const PHP_VERSION_ID;
 
 /**
  * Handles the import for the ODS format
@@ -130,14 +128,6 @@ public function doImport(?File $importHandle = null): array
             $buffer .= $data;
         }
 
-        /**
-         * Disable loading of external XML entities for PHP versions below 8.0.
-         */
-        if (PHP_VERSION_ID < 80000) {
-            // phpcs:ignore Generic.PHP.DeprecatedFunctions.Deprecated
-            libxml_disable_entity_loader();
-        }
-
         /**
          * Load the XML string
          *
diff --git a/libraries/classes/Plugins/Import/ImportXml.php b/libraries/classes/Plugins/Import/ImportXml.php
@@ -20,14 +20,12 @@
 use function __;
 use function count;
 use function in_array;
-use function libxml_disable_entity_loader;
 use function simplexml_load_string;
 use function str_replace;
 use function strcmp;
 use function strlen;
 
 use const LIBXML_COMPACT;
-use const PHP_VERSION_ID;
 
 /**
  * Handles the import for the XML format
@@ -86,14 +84,6 @@ public function doImport(?File $importHandle = null): array
             $buffer .= $data;
         }
 
-        /**
-         * Disable loading of external XML entities for PHP versions below 8.0.
-         */
-        if (PHP_VERSION_ID < 80000) {
-            // phpcs:ignore Generic.PHP.DeprecatedFunctions.Deprecated
-            libxml_disable_entity_loader();
-        }
-
         /**
          * Load the XML string
          *
diff --git a/libraries/classes/Session.php b/libraries/classes/Session.php
@@ -26,7 +26,6 @@
 use function setcookie;
 
 use const PHP_SESSION_ACTIVE;
-use const PHP_VERSION_ID;
 
 class Session
 {
@@ -132,18 +131,15 @@ public static function setUp(Config $config, ErrorHandler $errorHandler): void
         /** @psalm-var 'Lax'|'Strict'|'None' $cookieSameSite */
         $cookieSameSite = $config->get('CookieSameSite') ?? 'Strict';
         $cookiePath = $config->getRootPath();
-        if (PHP_VERSION_ID < 70300) {
-            $cookiePath .= '; SameSite=' . $cookieSameSite;
-        }
 
-        // session cookie settings
-        session_set_cookie_params(
-            0,
-            $cookiePath,
-            '',
-            $config->isHttps(),
-            true
-        );
+        session_set_cookie_params([
+            'lifetime' => 0,
+            'path' => $cookiePath,
+            'domain' => '',
+            'secure' => $config->isHttps(),
+            'httponly' => true,
+            'samesite' => $cookieSameSite,
+        ]);
 
         // cookies are safer (use ini_set() in case this function is disabled)
         ini_set('session.use_cookies', 'true');
@@ -164,10 +160,8 @@ public static function setUp(Config $config, ErrorHandler $errorHandler): void
         ini_set('session.use_strict_mode', '1');
         // make the session cookie HttpOnly
         ini_set('session.cookie_httponly', '1');
-        if (PHP_VERSION_ID >= 70300) {
-            // add SameSite to the session cookie
-            ini_set('session.cookie_samesite', $cookieSameSite);
-        }
+        // add SameSite to the session cookie
+        ini_set('session.cookie_samesite', $cookieSameSite);
 
         // do not force transparent session ids
         ini_set('session.use_trans_sid', '0');
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -4795,14 +4795,9 @@ parameters:
 			count: 1
 			path: libraries/classes/Image/ImageWrapper.php
 
-		-
-			message: "#^Parameter \\#1 \\$image of function imagedestroy expects GdImage, resource given\\.$#"
-			count: 1
-			path: libraries/classes/Image/ImageWrapper.php
-
 		-
 			message: "#^Parameter \\#1 \\$image of function imagefilledpolygon expects GdImage, resource given\\.$#"
-			count: 2
+			count: 1
 			path: libraries/classes/Image/ImageWrapper.php
 
 		-
@@ -11250,11 +11245,6 @@ parameters:
 			count: 1
 			path: test/classes/Plugins/Auth/AuthenticationHttpTest.php
 
-		-
-			message: "#^Casting to string something that's already string\\.$#"
-			count: 1
-			path: test/classes/Plugins/Auth/AuthenticationSignonTest.php
-
 		-
 			message: "#^Parameter \\#2 \\$haystack of method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, mixed given\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -8958,8 +8958,6 @@
       <code>$this-&gt;image</code>
       <code>$this-&gt;image</code>
       <code>$this-&gt;image</code>
-      <code>$this-&gt;image</code>
-      <code>$this-&gt;image</code>
     </InvalidArgument>
     <PossiblyUnusedReturnValue>
       <code>bool</code>
@@ -10859,11 +10857,6 @@
   </file>
   <file src="libraries/classes/Plugins/Auth/AuthenticationSignon.php">
     <MixedArgument>
-      <code>$sessionCookieParams['domain']</code>
-      <code>$sessionCookieParams['httponly']</code>
-      <code>$sessionCookieParams['lifetime']</code>
-      <code>$sessionCookieParams['path']</code>
-      <code>$sessionCookieParams['secure']</code>
       <code>$single_signon_cfgupdate</code>
     </MixedArgument>
     <MixedArgumentTypeCoercion>
diff --git a/test/classes/Plugins/Auth/AuthenticationSignonTest.php b/test/classes/Plugins/Auth/AuthenticationSignonTest.php
@@ -11,11 +11,9 @@
 
 use function ob_get_clean;
 use function ob_start;
-use function phpversion;
 use function session_get_cookie_params;
 use function session_id;
 use function session_name;
-use function version_compare;
 
 /**
  * @covers \PhpMyAdmin\Plugins\Auth\AuthenticationSignon
@@ -348,10 +346,6 @@ public function testSetCookieParamsDefaults(): void
             'httponly' => false,
             'samesite' => '',
         ];
-        // php did not set 'samesite' attribute in session_get_cookie_params since not yet implemented
-        if (version_compare((string) phpversion(), '7.3.0', '<')) {
-            unset($defaultOptions['samesite']);
-        }
 
         $this->assertSame(
             $defaultOptions,
