Suggestions for #4618 (#4)

contao · May 9, 2022 · 4405ac8 · 4405ac8
1 parent 32306fa
commit 4405ac8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/core-bundle/src/Resources/contao/library/Contao/Input.php b/core-bundle/src/Resources/contao/library/Contao/Input.php
@@ -39,23 +39,23 @@ class Input
 	/**
 	 * Parameters set via setGet() are stored by request
 	 *
-	 * @var \WeakMap<Request,array<string,array|string>>|null
+	 * @var \WeakMap<Request,array<string,array|string>>
 	 */
-	private static \WeakMap|null $setGet = null;
+	private static \WeakMap $setGet;
 
 	/**
 	 * Parameters set via setPost() are stored by request
 	 *
-	 * @var \WeakMap<Request,array<string,array|string>>|null
+	 * @var \WeakMap<Request,array<string,array|string>>
 	 */
-	private static \WeakMap|null $setPost = null;
+	private static \WeakMap $setPost;
 
 	/**
 	 * Parameters set via setCookie() are stored by request
 	 *
-	 * @var \WeakMap<Request,array<string,array|string>>|null
+	 * @var \WeakMap<Request,array<string,array|string>>
 	 */
-	private static \WeakMap|null $setCookie = null;
+	private static \WeakMap $setCookie;
 
 	/**
 	 * Clean the global GPC arrays

diff --git a/core-bundle/tests/Contao/InputTest.php b/core-bundle/tests/Contao/InputTest.php
@@ -57,6 +57,7 @@ protected function tearDown(): void
     {
         unset($GLOBALS['TL_CONFIG']);
 
+        $_COOKIE = [];
         $this->restoreServerEnvGetPost();
         $this->resetStaticProperties([System::class, Input::class]);
 

diff --git a/core-bundle/tests/PhpunitExtension/GlobalStateWatcher.php b/core-bundle/tests/PhpunitExtension/GlobalStateWatcher.php
@@ -181,6 +181,10 @@ private function buildStaticMembers(): string
                     continue;
                 }
 
+                if ($value instanceof \WeakMap && $value->count() === 0 && $property->hasType() && !$property->getType()->allowsNull()) {
+                    continue;
+                }
+
                 if (\is_array($value)) {
                     $value = 'array('.\count($value).')';
                 }

diff --git a/test-case/src/ContaoTestCase.php b/test-case/src/ContaoTestCase.php
@@ -275,7 +275,6 @@ protected function backupServerEnvGetPost(): void
             '_ENV' => $_ENV,
             '_GET' => $_GET,
             '_POST' => $_POST,
-            '_COOKIE' => $_COOKIE,
         ];
     }
 
@@ -285,7 +284,6 @@ protected function restoreServerEnvGetPost(): void
         $_ENV = $this->backupServerEnvGetPost['_ENV'] ?? $_ENV;
         $_GET = $this->backupServerEnvGetPost['_GET'] ?? [];
         $_POST = $this->backupServerEnvGetPost['_POST'] ?? [];
-        $_COOKIE = $this->backupServerEnvGetPost['_COOKIE'] ?? [];
     }
 
     /**
@@ -312,7 +310,7 @@ protected function resetStaticProperties(array $classNames): void
                 && \is_callable([$class, 'reset'])
                 && method_exists($class, 'reset')
                 && $reflectionClass->getMethod('reset')->isStatic()
-                && $reflectionClass->getMethod('reset')->getDeclaringClass() === $class
+                && $reflectionClass->getMethod('reset')->getDeclaringClass()->getName() === $class
                 && 0 === \count($reflectionClass->getMethod('reset')->getParameters())
             ) {
                 $class::reset();