Merge pull request #42 from jdecool/fix-tests-2.6

Fix tests on 2.6 branch
jakzal · Apr 14, 2023 · 9b69242 · 9b69242
2 parents c623f14 + 2556286
commit 9b69242
Show file tree

Hide file tree

Showing 10 changed files with 319 additions and 265 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -13,7 +13,6 @@
     <env name="USER" value="test" force="true"/>
   </php>
   <extensions>
-    <extension class="Zalas\PHPUnit\Globals\AnnotationExtension"/>
-    <extension class="Zalas\PHPUnit\Globals\AttributeExtension"/>
+    <extension class="Zalas\PHPUnit\Globals\Tests\Stub\CombinedExtension"/>
   </extensions>
 </phpunit>
diff --git a/src/AnnotationExtension.php b/src/AnnotationExtension.php
@@ -3,130 +3,19 @@
 
 namespace Zalas\PHPUnit\Globals;
 
-use PHPUnit\Framework\TestCase;
 use PHPUnit\Runner\AfterTestHook;
 use PHPUnit\Runner\BeforeTestHook;
-use PHPUnit\Util\Test;
 
 class AnnotationExtension implements BeforeTestHook, AfterTestHook
 {
-    private $server;
-    private $env;
-    private $getenv;
-
     public function executeBeforeTest(string $test): void
     {
-        $this->backupGlobals();
-        $this->readGlobalAnnotations($test);
+        GlobalsContainer::getInstance()->backupGlobals();
+        AnnotationReader::getInstance()->readGlobalAnnotations($test);
     }
 
     public function executeAfterTest(string $test, float $time): void
     {
-        $this->restoreGlobals();
-    }
-
-    private function backupGlobals(): void
-    {
-        $this->server = $_SERVER;
-        $this->env = $_ENV;
-        $this->getenv = \getenv();
-    }
-
-    private function restoreGlobals(): void
-    {
-        $_SERVER = $this->server;
-        $_ENV = $this->env;
-
-        foreach (\array_diff_assoc($this->getenv, \getenv()) as $name => $value) {
-            \putenv(\sprintf('%s=%s', $name, $value));
-        }
-        foreach (\array_diff_assoc(\getenv(), $this->getenv) as $name => $value) {
-            \putenv($name);
-        }
-    }
-
-    private function readGlobalAnnotations(string $test)
-    {
-        $globalVars = $this->parseGlobalAnnotations($test);
-
-        foreach ($globalVars['env'] as $name => $value) {
-            $_ENV[$name] = $value;
-        }
-        foreach ($globalVars['server'] as $name => $value) {
-            $_SERVER[$name] = $value;
-        }
-        foreach ($globalVars['putenv'] as $name => $value) {
-            \putenv(\sprintf('%s=%s', $name, $value));
-        }
-
-        $unsetVars = $this->findUnsetVarAnnotations($test);
-
-        foreach ($unsetVars['unset-env'] as $name) {
-            unset($_ENV[$name]);
-        }
-        foreach ($unsetVars['unset-server'] as $name) {
-            unset($_SERVER[$name]);
-        }
-        foreach ($unsetVars['unset-getenv'] as $name) {
-            \putenv($name);
-        }
-    }
-
-    private function parseGlobalAnnotations(string $test): array
-    {
-        return \array_map(function (array $annotations) {
-            return \array_reduce($annotations, function ($carry, $annotation) {
-                list($name, $value) = \strpos($annotation, '=') ? \explode('=', $annotation, 2) : [$annotation, ''];
-                $carry[$name] = $value;
-
-                return $carry;
-            }, []);
-        }, $this->findSetVarAnnotations($test));
-    }
-
-    private function findSetVarAnnotations(string $test): array
-    {
-        $annotations = $this->parseTestMethodAnnotations($test);
-
-        return \array_filter(
-            \array_merge_recursive(
-                ['env' => [], 'server' => [], 'putenv' => []],
-                $annotations['class'] ?? [],
-                $annotations['method'] ?? []
-            ),
-            function (string $annotationName) {
-                return \in_array($annotationName, ['env', 'server', 'putenv']);
-            },
-            ARRAY_FILTER_USE_KEY
-        );
-    }
-
-    private function findUnsetVarAnnotations(string $test): array
-    {
-        $annotations = $this->parseTestMethodAnnotations($test);
-
-        return \array_filter(
-            \array_merge_recursive(
-                ['unset-env' => [], 'unset-server' => [], 'unset-getenv' => []],
-                $annotations['class'] ?? [],
-                $annotations['method'] ?? []
-            ),
-            function (string $annotationName) {
-                return \in_array($annotationName, ['unset-env', 'unset-server', 'unset-getenv']);
-            },
-            ARRAY_FILTER_USE_KEY
-        );
-    }
-
-    private function parseTestMethodAnnotations(string $test): array
-    {
-        $parts = \preg_split('/ |::/', $test);
-
-        if (!\class_exists($parts[0]) || !\is_subclass_of($parts[0], TestCase::class)) {
-            return [];
-        }
-
-        // @see PHPUnit\Framework\TestCase::getAnnotations
-        return Test::parseTestMethodAnnotations(...$parts);
+        GlobalsContainer::getInstance()->restoreGlobals();
     }
 }
diff --git a/src/AnnotationReader.php b/src/AnnotationReader.php
@@ -0,0 +1,98 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Zalas\PHPUnit\Globals;
+
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Util\Test;
+
+class AnnotationReader
+{
+    use SingletonTrait;
+
+    public function readGlobalAnnotations(string $test)
+    {
+        $globalVars = $this->parseGlobalAnnotations($test);
+
+        foreach ($globalVars['env'] as $name => $value) {
+            $_ENV[$name] = $value;
+        }
+        foreach ($globalVars['server'] as $name => $value) {
+            $_SERVER[$name] = $value;
+        }
+        foreach ($globalVars['putenv'] as $name => $value) {
+            \putenv(\sprintf('%s=%s', $name, $value));
+        }
+
+        $unsetVars = $this->findUnsetVarAnnotations($test);
+
+        foreach ($unsetVars['unset-env'] as $name) {
+            unset($_ENV[$name]);
+        }
+        foreach ($unsetVars['unset-server'] as $name) {
+            unset($_SERVER[$name]);
+        }
+        foreach ($unsetVars['unset-getenv'] as $name) {
+            \putenv($name);
+        }
+    }
+
+    private function parseGlobalAnnotations(string $test): array
+    {
+        return \array_map(function (array $annotations) {
+            return \array_reduce($annotations, function ($carry, $annotation) {
+                list($name, $value) = \strpos($annotation, '=') ? \explode('=', $annotation, 2) : [$annotation, ''];
+                $carry[$name] = $value;
+
+                return $carry;
+            }, []);
+        }, $this->findSetVarAnnotations($test));
+    }
+
+    private function findSetVarAnnotations(string $test): array
+    {
+        $annotations = $this->parseTestMethodAnnotations($test);
+
+        return \array_filter(
+            \array_merge_recursive(
+                ['env' => [], 'server' => [], 'putenv' => []],
+                $annotations['class'] ?? [],
+                $annotations['method'] ?? []
+            ),
+            function (string $annotationName) {
+                return \in_array($annotationName, ['env', 'server', 'putenv']);
+            },
+            ARRAY_FILTER_USE_KEY
+        );
+    }
+
+    private function findUnsetVarAnnotations(string $test): array
+    {
+        $annotations = $this->parseTestMethodAnnotations($test);
+
+        return \array_filter(
+            \array_merge_recursive(
+                ['unset-env' => [], 'unset-server' => [], 'unset-getenv' => []],
+                $annotations['class'] ?? [],
+                $annotations['method'] ?? []
+            ),
+            function (string $annotationName) {
+                return \in_array($annotationName, ['unset-env', 'unset-server', 'unset-getenv']);
+            },
+            ARRAY_FILTER_USE_KEY
+        );
+    }
+
+    private function parseTestMethodAnnotations(string $test): array
+    {
+        $parts = \preg_split('/ |::/', $test);
+
+        if (!\class_exists($parts[0]) || !\is_subclass_of($parts[0], TestCase::class)) {
+            return [];
+        }
+
+        // @see PHPUnit\Framework\TestCase::getAnnotations
+        return Test::parseTestMethodAnnotations(...$parts);
+    }
+}