[TASK] Remove dependency between SiteLanguage and Site

[Packages/TYPO3.CMS.git] / typo3 / sysext / frontend / Tests / Unit / Configuration / TypoScript / ConditionMatching / ConditionMatcherTest.php

diff --git a/typo3/sysext/frontend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php b/typo3/sysext/frontend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
index de3e45d..27e8a6e 100644 (file)
--- a/typo3/sysext/frontend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
@@ -793,7 +793,7 @@ class ConditionMatcherTest extends UnitTestCase
     {
         $site = new Site('angelo', 13, ['languages' => [], 'base' => 'https://typo3.org/']);
         $GLOBALS['TYPO3_REQUEST'] = new ServerRequest();
     {
         $site = new Site('angelo', 13, ['languages' => [], 'base' => 'https://typo3.org/']);
         $GLOBALS['TYPO3_REQUEST'] = new ServerRequest();

-        $GLOBALS['TYPO3_REQUEST'] = $GLOBALS['TYPO3_REQUEST']->withAttribute('language', $site->getLanguageById(0));
+        $GLOBALS['TYPO3_REQUEST'] = $GLOBALS['TYPO3_REQUEST']->withAttribute('site', $site);

         $subject = new ConditionMatcher(new Context());
         $this->assertTrue($subject->match('[site = identifier = angelo]'));
         $this->assertTrue($subject->match('[site = rootPageId = 13]'));
         $subject = new ConditionMatcher(new Context());
         $this->assertTrue($subject->match('[site = identifier = angelo]'));
         $this->assertTrue($subject->match('[site = rootPageId = 13]'));


@@ -822,7 +822,7 @@ class ConditionMatcherTest extends UnitTestCase
             ]
         ]);
         $GLOBALS['TYPO3_REQUEST'] = new ServerRequest();
             ]
         ]);
         $GLOBALS['TYPO3_REQUEST'] = new ServerRequest();

-        $GLOBALS['TYPO3_REQUEST'] = $GLOBALS['TYPO3_REQUEST']->withAttribute('language', $site->getLanguageById(0));
+        $GLOBALS['TYPO3_REQUEST'] = $GLOBALS['TYPO3_REQUEST']->withAttribute('site', $site);

         $subject = new ConditionMatcher(new Context());
         $this->assertFalse($subject->match('[site = identifier = berta]'));
         $this->assertFalse($subject->match('[site = rootPageId = 14, rootPageId=23]'));
         $subject = new ConditionMatcher(new Context());
         $this->assertFalse($subject->match('[site = identifier = berta]'));
         $this->assertFalse($subject->match('[site = rootPageId = 14, rootPageId=23]'));