Merge pull request #2 from Megatherium/master

Conditionally avoid method calls deprecated in PHP8

Author: falkenhawk

PHPUnit/Util/Class.php

@@ -149,24 +149,19 @@ public static function getMethodParameters($method, $forCall = FALSE)
             $typeHint  = '';
 
             if (!$forCall) {
-                if ($parameter->isArray()) {
-                    $typeHint = 'array ';
-                }
-
-                else if (version_compare(PHP_VERSION, '5.4', '>') &&
+                if (PHP_VERSION_ID >= 80000 ) {
+                    $typeHint = $parameter->hasType() ? (string)$parameter->getType() : 'mixed';
+                } elseif ($parameter->isArray()) {
+                    $typeHint = 'array';
+                } elseif (version_compare(PHP_VERSION, '5.4', '>') &&
                          $parameter->isCallable()) {
                     $typeHint = 'callable ';
-                }
-
-                else {
+                } else {
                     try {
                         $class = $parameter->getClass();
-                    }
-
-                    catch (ReflectionException $e) {
+                    } catch (ReflectionException $e) {
                         $class = FALSE;
                     }
-
                     if ($class) {
                         $typeHint = $class->getName() . ' ';
                     }

PHPUnit/Util/Configuration.php

@@ -196,7 +196,7 @@ protected function __construct($filename)
     /**
      * @since  Method available since Release 3.4.0
      */
-    private final function __clone()
+    private function __clone()
     {
     }
 

Tests/_files/Singleton.php

@@ -7,7 +7,7 @@ protected function __construct()
     {
     }
 
-    private final function __clone()
+    private function __clone()
     {
     }