feat(PhpUnit) - add php 8.0 compatibility

- Update CodeHelper add support for T_NAME_QUALIFIED constant - Update TestGenerator, remove using deprecated method getClass() from ReflectionParameter - Update TestClass, fix logic in generating class namespaces
temafey · Jan 22, 2021 · 961b6bb · 961b6bb
1 parent 1d6b433
commit 961b6bb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/src/Generator/Helper/CodeHelper.php b/src/Generator/Helper/CodeHelper.php
@@ -348,6 +348,9 @@ public function getNamespacesFromSource(string $sourceName): array
      */
     private function parseUseStatements(ReflectionClass $reflection): array
     {
+        if (!defined('T_NAME_QUALIFIED')) {
+            define('T_NAME_QUALIFIED', 314);
+        }
         $filename = $reflection->getFileName();
 
         if (false === $filename) {
@@ -385,6 +388,7 @@ private function parseUseStatements(ReflectionClass $reflection): array
                 }
                 switch ($token[0]) {
                     case T_STRING:
+                    case T_NAME_QUALIFIED:
                     case T_NS_SEPARATOR:
                         $builtNamespace .= $token[1];
 
@@ -427,6 +431,7 @@ private function parseUseStatements(ReflectionClass $reflection): array
                 if ($record) {
                     switch ($token[0]) {
                         case T_STRING:
+                        case T_NAME_QUALIFIED:
                         case T_NS_SEPARATOR:
                             $currentUse[$record] .= $token[1];
 

diff --git a/src/Generator/TestGenerator.php b/src/Generator/TestGenerator.php
@@ -787,8 +787,8 @@ protected function processMethodDocComment(ReflectionClass $reflectionClass, Ref
                             );
                         }
 
-                        if (!$excludeConstructor && $param->getClass()) {
-                            $className = $param->getClass() ?: $annotationParams[$i];
+                        if (!$excludeConstructor && $param->getType()) {
+                            $className = (string) $param->getType() ?: $annotationParams[$i];
 
                             if (null === $className) {
                                 throw new InvalidClassnameException(sprintf('Class name could not be null.'));

diff --git a/src/Service/TestClass.php b/src/Service/TestClass.php
@@ -274,13 +274,15 @@ private function getTestPathFromSource(string $sourcePath, string $namespace): a
         $dataProviderTestPath = $testPath . DIRECTORY_SEPARATOR . self::DEFAULT_DATA_PROVIDER_NAMESPACE;
         $mockTestPath = $testPath . DIRECTORY_SEPARATOR . self::DEFAULT_MOCK_NAMESPACE;
         $namespace = explode(DIRECTORY_SEPARATOR, $namespace);
-        $baseNamespace = implode('\\', array_slice($namespace, $testFolderPosition));
-        $basePath = implode(DIRECTORY_SEPARATOR, array_slice($namespace, $testFolderPosition));
-        $projectNamespace = implode('\\', array_slice($namespace, 0, $testFolderPosition));
+        $projectNamespace = $namespace;
+        $baseNamespace = array_splice($projectNamespace, -$testFolderPosition+1);
+        $basePath = implode(DIRECTORY_SEPARATOR, $baseNamespace);
+        $baseNamespace = implode('\\', $baseNamespace);
+        $projectNamespace = implode('\\', $projectNamespace);
         $dataProviderNamespace = $projectNamespace . '\\' . self::DEFAULT_TEST_NAMESPACE . '\\' . $this->unitTestFolder . '\\' . self::DEFAULT_DATA_PROVIDER_NAMESPACE;
         $mockNamespace = $projectNamespace . '\\' . self::DEFAULT_TEST_NAMESPACE . '\\' . $this->unitTestFolder . '\\' . self::DEFAULT_MOCK_NAMESPACE;
         $baseTestNamespace = $projectNamespace . '\\' . self::DEFAULT_TEST_NAMESPACE . '\\' . $this->unitTestFolder;
-        array_splice($namespace, $testFolderPosition, 0, [self::DEFAULT_TEST_NAMESPACE, $this->unitTestFolder]);
+        array_splice($namespace, -$testFolderPosition+1, 0, [self::DEFAULT_TEST_NAMESPACE, $this->unitTestFolder]);
         $testNamespace = implode('\\', $namespace);
         $localTestPath .= self::DEFAULT_TEST_NAMESPACE . DIRECTORY_SEPARATOR . $this->unitTestFolder;
         $testPath .= DIRECTORY_SEPARATOR . $basePath;