Aligned tests with the SiteAccess constructor arguments change

ezsystems · Nov 7, 2019 · 4bfc081 · 4bfc081
1 parent d2c804f
commit 4bfc081
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 32 deletions.
diff --git a/eZ/Bundle/EzPublishCoreBundle/Tests/EventListener/ConsoleCommandListenerTest.php b/eZ/Bundle/EzPublishCoreBundle/Tests/EventListener/ConsoleCommandListenerTest.php
@@ -40,7 +40,7 @@ class ConsoleCommandListenerTest extends TestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $this->siteAccess = new SiteAccess();
+        $this->siteAccess = new SiteAccess('test');
         $this->dispatcher = $this->createMock(EventDispatcherInterface::class);
         $this->listener = new ConsoleCommandListener('default', $this->getSiteAccessProviderMock(), $this->dispatcher);
         $this->listener->setSiteAccess($this->siteAccess);

diff --git a/eZ/Bundle/EzPublishCoreBundle/Tests/EventListener/RequestEventListenerTest.php b/eZ/Bundle/EzPublishCoreBundle/Tests/EventListener/RequestEventListenerTest.php
@@ -132,7 +132,7 @@ public function testOnKernelRequestRedirect()
         $semanticPathinfo = '/foo/something';
         $request->attributes->set('semanticPathinfo', $semanticPathinfo);
         $request->attributes->set('needsRedirect', true);
-        $request->attributes->set('siteaccess', new SiteAccess());
+        $request->attributes->set('siteaccess', new SiteAccess('test'));
 
         $event = new RequestEvent($this->httpKernel, $request, HttpKernelInterface::MASTER_REQUEST);
         $this->requestEventListener->onKernelRequestRedirect($event);
@@ -154,7 +154,7 @@ public function testOnKernelRequestRedirectWithLocationId()
         $request->attributes->set('semanticPathinfo', $semanticPathinfo);
         $request->attributes->set('needsRedirect', true);
         $request->attributes->set('locationId', 123);
-        $request->attributes->set('siteaccess', new SiteAccess());
+        $request->attributes->set('siteaccess', new SiteAccess('test'));
 
         $event = new RequestEvent($this->httpKernel, $request, HttpKernelInterface::MASTER_REQUEST);
         $this->requestEventListener->onKernelRequestRedirect($event);

diff --git a/eZ/Bundle/EzPublishCoreBundle/Tests/EventListener/RoutingListenerTest.php b/eZ/Bundle/EzPublishCoreBundle/Tests/EventListener/RoutingListenerTest.php
@@ -80,7 +80,7 @@ public function testOnSiteAccessMatch()
             ->method('setExcludedUriPrefixes')
             ->with($excludedUriPrefixes);
 
-        $event = new PostSiteAccessMatchEvent(new SiteAccess(), new Request(), HttpKernelInterface::MASTER_REQUEST);
+        $event = new PostSiteAccessMatchEvent(new SiteAccess('test'), new Request(), HttpKernelInterface::MASTER_REQUEST);
         $listener = new RoutingListener($this->configResolver, $this->urlAliasRouter, $this->urlAliasGenerator);
         $listener->onSiteAccessMatch($event);
     }

diff --git a/eZ/Bundle/EzPublishCoreBundle/Tests/EventListener/SessionInitByPostListenerTest.php b/eZ/Bundle/EzPublishCoreBundle/Tests/EventListener/SessionInitByPostListenerTest.php
@@ -44,14 +44,14 @@ public function testGetSubscribedEvents()
 
     public function testOnSiteAccessMatchNoSessionService()
     {
-        $event = new PostSiteAccessMatchEvent(new SiteAccess(), new Request(), HttpKernelInterface::MASTER_REQUEST);
+        $event = new PostSiteAccessMatchEvent(new SiteAccess('test'), new Request(), HttpKernelInterface::MASTER_REQUEST);
         $listener = new SessionInitByPostListener(null);
         $this->assertNull($listener->onSiteAccessMatch($event));
     }
 
     public function testOnSiteAccessMatchSubRequest()
     {
-        $event = new PostSiteAccessMatchEvent(new SiteAccess(), new Request(), HttpKernelInterface::SUB_REQUEST);
+        $event = new PostSiteAccessMatchEvent(new SiteAccess('test'), new Request(), HttpKernelInterface::SUB_REQUEST);
         $this->session
             ->expects($this->never())
             ->method('getName');
@@ -61,7 +61,7 @@ public function testOnSiteAccessMatchSubRequest()
     public function testOnSiteAccessMatchRequestNoSessionName()
     {
         $sessionName = 'eZSESSID';
-        $event = new PostSiteAccessMatchEvent(new SiteAccess(), new Request(), HttpKernelInterface::MASTER_REQUEST);
+        $event = new PostSiteAccessMatchEvent(new SiteAccess('test'), new Request(), HttpKernelInterface::MASTER_REQUEST);
 
         $this->session
             ->expects($this->once())
@@ -87,7 +87,7 @@ public function testOnSiteAccessMatchNewSessionName()
         $sessionId = 'foobar123';
         $request = new Request();
         $request->request->set($sessionName, $sessionId);
-        $event = new PostSiteAccessMatchEvent(new SiteAccess(), $request, HttpKernelInterface::MASTER_REQUEST);
+        $event = new PostSiteAccessMatchEvent(new SiteAccess('test'), $request, HttpKernelInterface::MASTER_REQUEST);
 
         $this->session
             ->expects($this->once())

diff --git a/eZ/Bundle/EzPublishCoreBundle/Tests/EventListener/SessionSetDynamicNameListenerTest.php b/eZ/Bundle/EzPublishCoreBundle/Tests/EventListener/SessionSetDynamicNameListenerTest.php
@@ -62,7 +62,7 @@ public function testOnSiteAccessMatchNoSession()
             ->expects($this->never())
             ->method('setOptions');
         $listener = new SessionSetDynamicNameListener($this->configResolver, null, $this->sessionStorage);
-        $listener->onSiteAccessMatch(new PostSiteAccessMatchEvent(new SiteAccess(), new Request(), HttpKernelInterface::MASTER_REQUEST));
+        $listener->onSiteAccessMatch(new PostSiteAccessMatchEvent(new SiteAccess('test'), new Request(), HttpKernelInterface::MASTER_REQUEST));
     }
 
     public function testOnSiteAccessMatchSubRequest()
@@ -71,7 +71,7 @@ public function testOnSiteAccessMatchSubRequest()
             ->expects($this->never())
             ->method('setOptions');
         $listener = new SessionSetDynamicNameListener($this->configResolver, $this->session, $this->sessionStorage);
-        $listener->onSiteAccessMatch(new PostSiteAccessMatchEvent(new SiteAccess(), new Request(), HttpKernelInterface::SUB_REQUEST));
+        $listener->onSiteAccessMatch(new PostSiteAccessMatchEvent(new SiteAccess('test'), new Request(), HttpKernelInterface::SUB_REQUEST));
     }
 
     public function testOnSiteAccessMatchNonNativeSessionStorage()
@@ -84,7 +84,7 @@ public function testOnSiteAccessMatchNonNativeSessionStorage()
             $this->session,
             $this->createMock(SessionStorageInterface::class)
         );
-        $listener->onSiteAccessMatch(new PostSiteAccessMatchEvent(new SiteAccess(), new Request(), HttpKernelInterface::SUB_REQUEST));
+        $listener->onSiteAccessMatch(new PostSiteAccessMatchEvent(new SiteAccess('test'), new Request(), HttpKernelInterface::SUB_REQUEST));
     }
 
     /**
@@ -165,6 +165,6 @@ public function testOnSiteAccessMatchNoConfiguredSessionName()
             ->will($this->returnValue($configuredSessionStorageOptions));
 
         $listener = new SessionSetDynamicNameListener($this->configResolver, $this->session, $this->sessionStorage);
-        $listener->onSiteAccessMatch(new PostSiteAccessMatchEvent(new SiteAccess(), new Request(), HttpKernelInterface::MASTER_REQUEST));
+        $listener->onSiteAccessMatch(new PostSiteAccessMatchEvent(new SiteAccess('test'), new Request(), HttpKernelInterface::MASTER_REQUEST));
     }
 }
diff --git a/eZ/Publish/API/Repository/Tests/Regression/EZP22840RoleLimitations.php b/eZ/Publish/API/Repository/Tests/Regression/EZP22840RoleLimitations.php
@@ -84,7 +84,7 @@ public function testSectionRoleAssignLimitation()
 
         // try to login
         $this->assertTrue(
-            $permissionResolver->canUser('user', 'login', new SiteAccess()),
+            $permissionResolver->canUser('user', 'login', new SiteAccess('test')),
             'Could not verify that user can login with section limitation'
         );
     }

diff --git a/eZ/Publish/Core/Limitation/Tests/SiteAccessLimitationTypeTest.php b/eZ/Publish/Core/Limitation/Tests/SiteAccessLimitationTypeTest.php
@@ -231,7 +231,7 @@ public function providerForTestEvaluateInvalidArgument()
             // invalid limitation
             [
                 'limitation' => new ObjectStateLimitation(),
-                'object' => new SiteAccess(),
+                'object' => new SiteAccess('test'),
             ],
             // invalid object
             [

diff --git a/eZ/Publish/Core/MVC/Symfony/EventListener/Tests/SiteAccessMatchListenerTest.php b/eZ/Publish/Core/MVC/Symfony/EventListener/Tests/SiteAccessMatchListenerTest.php
@@ -50,7 +50,7 @@ public function testGetSubscribedEvents()
 
     public function testOnKernelRequestSerializedSA()
     {
-        $siteAccess = new SiteAccess();
+        $siteAccess = new SiteAccess('test');
         $request = new Request();
         $request->attributes->set('serialized_siteaccess', serialize($siteAccess));
         $event = new RequestEvent(
@@ -76,7 +76,7 @@ public function testOnKernelRequestSerializedSA()
 
     public function testOnKernelRequestSiteAccessPresent()
     {
-        $siteAccess = new SiteAccess();
+        $siteAccess = new SiteAccess('test');
         $request = new Request();
         $request->attributes->set('siteaccess', $siteAccess);
         $event = new RequestEvent(
@@ -101,7 +101,7 @@ public function testOnKernelRequestSiteAccessPresent()
 
     public function testOnKernelRequest()
     {
-        $siteAccess = new SiteAccess();
+        $siteAccess = new SiteAccess('test');
         $scheme = 'https';
         $host = 'phoenix-rises.fm';
         $port = 1234;
@@ -143,7 +143,7 @@ public function testOnKernelRequest()
 
     public function testOnKernelRequestUserHashWithOriginalRequest()
     {
-        $siteAccess = new SiteAccess();
+        $siteAccess = new SiteAccess('test');
         $scheme = 'https';
         $host = 'phoenix-rises.fm';
         $port = 1234;

diff --git a/eZ/Publish/Core/MVC/Symfony/Security/Tests/EventListener/SecurityListenerTest.php b/eZ/Publish/Core/MVC/Symfony/Security/Tests/EventListener/SecurityListenerTest.php
@@ -184,7 +184,7 @@ public function testCheckSiteAccessPermissionDenied()
             ->will($this->returnValue($user));
 
         $request = new Request();
-        $siteAccess = new SiteAccess();
+        $siteAccess = new SiteAccess('test');
         $request->attributes->set('siteaccess', $siteAccess);
 
         $this->authChecker
@@ -206,7 +206,7 @@ public function testCheckSiteAccessPermissionGranted()
             ->will($this->returnValue($user));
 
         $request = new Request();
-        $siteAccess = new SiteAccess();
+        $siteAccess = new SiteAccess('test');
         $request->attributes->set('siteaccess', $siteAccess);
 
         $this->authChecker
@@ -229,7 +229,7 @@ public function testCheckSiteAccessNotEzUser()
             ->will($this->returnValue($user));
 
         $request = new Request();
-        $siteAccess = new SiteAccess();
+        $siteAccess = new SiteAccess('test');
         $request->attributes->set('siteaccess', $siteAccess);
 
         $this->authChecker
@@ -315,7 +315,7 @@ public function testOnKernelRequestNoSiteAccess()
     public function testOnKernelRequestNullToken()
     {
         $request = new Request();
-        $request->attributes->set('siteaccess', new SiteAccess());
+        $request->attributes->set('siteaccess', new SiteAccess('test'));
         $event = new RequestEvent(
             $this->createMock(HttpKernelInterface::class),
             $request,
@@ -336,7 +336,7 @@ public function testOnKernelRequestNullToken()
     public function testOnKernelRequestLoginRoute()
     {
         $request = new Request();
-        $request->attributes->set('siteaccess', new SiteAccess());
+        $request->attributes->set('siteaccess', new SiteAccess('test'));
         $request->attributes->set('_route', 'login');
         $event = new RequestEvent(
             $this->createMock(HttpKernelInterface::class),
@@ -360,7 +360,7 @@ public function testOnKernelRequestAccessDenied()
         $this->expectException(UnauthorizedSiteAccessException::class);
 
         $request = new Request();
-        $request->attributes->set('siteaccess', new SiteAccess());
+        $request->attributes->set('siteaccess', new SiteAccess('test'));
         $event = new RequestEvent(
             $this->createMock(HttpKernelInterface::class),
             $request,
@@ -388,7 +388,7 @@ public function testOnKernelRequestAccessDenied()
     public function testOnKernelRequestAccessGranted()
     {
         $request = new Request();
-        $request->attributes->set('siteaccess', new SiteAccess());
+        $request->attributes->set('siteaccess', new SiteAccess('test'));
         $event = new RequestEvent(
             $this->createMock(HttpKernelInterface::class),
             $request,

diff --git a/eZ/Publish/Core/MVC/Symfony/Security/Tests/HttpUtilsTest.php b/eZ/Publish/Core/MVC/Symfony/Security/Tests/HttpUtilsTest.php
@@ -23,7 +23,7 @@ public function testGenerateUriStandard($uri, $isUriRouteName, $expected)
     {
         $urlGenerator = $this->createMock(UrlGeneratorInterface::class);
         $httpUtils = new HttpUtils($urlGenerator);
-        $httpUtils->setSiteAccess(new SiteAccess());
+        $httpUtils->setSiteAccess(new SiteAccess('test'));
         $request = Request::create('http://ezpublish.dev/');
         $request->attributes->set('siteaccess', new SiteAccess('test'));
         $requestAttributes = ['foo' => 'bar', 'some' => 'thing'];
@@ -101,7 +101,7 @@ public function generateUriProvider()
     public function testCheckRequestPathStandard()
     {
         $httpUtils = new HttpUtils();
-        $httpUtils->setSiteAccess(new SiteAccess());
+        $httpUtils->setSiteAccess(new SiteAccess('test'));
         $request = Request::create('http://ezpublish.dev/foo/bar');
         $this->assertTrue($httpUtils->checkRequestPath($request, '/foo/bar'));
     }

diff --git a/eZ/Publish/Core/MVC/Symfony/SiteAccess/Tests/Provider/ChainSiteAccessProviderTest.php b/eZ/Publish/Core/MVC/Symfony/SiteAccess/Tests/Provider/ChainSiteAccessProviderTest.php
@@ -57,7 +57,7 @@ public function testGetSiteAccesses(): void
         foreach ($expectedSiteAccessNames as $key => $expectedSiteAccessName) {
             $expectedSiteAccess = new SiteAccess(
                 $expectedSiteAccessName,
-                null,
+                SiteAccess::DEFAULT_MATCHING_TYPE,
                 null,
                 StaticSiteAccessProvider::class
             );
@@ -67,7 +67,7 @@ public function testGetSiteAccesses(): void
         $this->assertNotContains(
             new SiteAccess(
                 self::UNDEFINED_SA_NAME,
-                null,
+                SiteAccess::DEFAULT_MATCHING_TYPE,
                 null,
                 StaticSiteAccessProvider::class
             ),
@@ -81,7 +81,7 @@ public function testGetExistingSiteAccess(): void
         $this->assertEquals(
             new SiteAccess(
                 self::EXISTING_SA_NAME,
-                null,
+                SiteAccess::DEFAULT_MATCHING_TYPE,
                 null,
                 StaticSiteAccessProvider::class
             ),

diff --git a/eZ/Publish/Core/MVC/Symfony/SiteAccess/Tests/SiteAccessSetting.php b/eZ/Publish/Core/MVC/Symfony/SiteAccess/Tests/SiteAccessSetting.php
@@ -8,7 +8,7 @@
 
 namespace eZ\Publish\Core\MVC\Symfony\SiteAccess\Tests;
 
-use eZ\Publish\Core\MVC\Symfony\SiteAccess\Router;
+use eZ\Publish\Core\MVC\Symfony\SiteAccess;
 
 /**
  * This class represents settings which will be used to construct SiteAccessProvider mock.
@@ -24,7 +24,7 @@ final class SiteAccessSetting
     public function __construct(
         string $name,
         bool $isDefined,
-        string $matchingType = Router::DEFAULT_SA_MATCHING_TYPE
+        string $matchingType = SiteAccess::DEFAULT_MATCHING_TYPE
     ) {
         $this->name = $name;
         $this->isDefined = $isDefined;