CS

AlexejKossmann · Dec 7, 2020 · 29ea202 · 29ea202
1 parent 00eeb72
commit 29ea202
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/core-bundle/src/HttpKernel/ModelArgumentResolver.php b/core-bundle/src/HttpKernel/ModelArgumentResolver.php
@@ -82,10 +82,10 @@ private function fetchModel(Request $request, ArgumentMetadata $argument): ?Mode
 
         // Special handling for pageModel that could be globally registered
         if (
-            is_a($type, PageModel::class, true)
-            && isset($GLOBALS['objPage'])
+            isset($GLOBALS['objPage'])
             && $GLOBALS['objPage'] instanceof PageModel
             && (int) $GLOBALS['objPage']->id === (int) $value
+            && is_a($type, PageModel::class, true)
         ) {
             return $GLOBALS['objPage'];
         }

diff --git a/core-bundle/tests/HttpKernel/ModelArgumentResolverTest.php b/core-bundle/tests/HttpKernel/ModelArgumentResolverTest.php
@@ -23,18 +23,13 @@
 
 class ModelArgumentResolverTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        unset($GLOBALS);
-    }
-
     /**
      * @dataProvider getArguments
      */
     public function testResolvesTheModel(string $name, string $class): void
     {
+        unset($GLOBALS['objPage']);
+
         System::setContainer($this->getContainerWithContaoConfiguration());
 
         $pageModel = $this->createMock(PageModel::class);
@@ -175,6 +170,7 @@ public function testReturnsTheGlobalPageModel(): void
             ->expects($this->once())
             ->method('initialize')
         ;
+
         $framework
             ->expects($this->never())
             ->method('getAdapter')