Added unit tests

contao · Dec 5, 2020 · 826748d · 826748d
1 parent a5c2326
commit 826748d
Show file tree

Hide file tree

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

diff --git a/core-bundle/tests/HttpKernel/ModelArgumentResolverTest.php b/core-bundle/tests/HttpKernel/ModelArgumentResolverTest.php
@@ -19,9 +19,17 @@
 use Contao\System;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
+use Contao\CoreBundle\Framework\ContaoFramework;
 
 class ModelArgumentResolverTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        unset($GLOBALS);
+    }
+
     /**
      * @dataProvider getArguments
      */
@@ -159,4 +167,34 @@ public function testChecksIfTheModelExistsIfTheArgumentIsNotNullable(): void
 
         $this->assertFalse($resolver->supports($request, $argument));
     }
+
+    public function testReturnsTheGlobalPageModel(): void
+    {
+        $framework = $this->createMock(ContaoFramework::class);
+        $framework
+            ->expects($this->once())
+            ->method('initialize')
+        ;
+        $framework
+            ->expects($this->never())
+            ->method('getAdapter')
+        ;
+
+        $pageModel = $this->mockClassWithProperties(PageModel::class, ['id' => 42]);
+        $GLOBALS['objPage'] = $pageModel;
+
+        $request = Request::create('/foobar');
+        $request->attributes->set('pageModel', 42);
+        $request->attributes->set('_scope', ContaoCoreBundle::SCOPE_FRONTEND);
+
+        $argument = new ArgumentMetadata('pageModel', PageModel::class, false, false, '', true);
+        $resolver = new ModelArgumentResolver($framework, $this->mockScopeMatcher());
+
+        $this->assertTrue($resolver->supports($request, $argument));
+
+        foreach ($resolver->resolve($request, $argument) as $model) {
+            $this->assertSame($pageModel, $model);
+        }
+    }
+
 }