EZP-32173: Changed return data when $access is bool

ezsystems · Dec 14, 2020 · 54ceb42 · 54ceb42
1 parent 8798016
commit 54ceb42
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/lib/Tests/UniversalDiscovery/Event/Subscriber/RichTextEmbedAllowedContentTypesTest.php b/src/lib/Tests/UniversalDiscovery/Event/Subscriber/RichTextEmbedAllowedContentTypesTest.php
@@ -64,12 +64,9 @@ public function testUdwConfigResolveOnUnsupportedConfigName(): void
         $this->assertEquals([], $event->getConfig());
     }
 
-    /**
-     * @dataProvider dataProviderForUdwConfigResolveWhenThereIsNoContentReadLimitations
-     */
-    public function testUdwConfigResolveWhenThereIsNoContentReadLimitations(bool $hasAccess): void
+    public function testUdwConfigResolveWhenThereIsNoContentReadLimitations(): void
     {
-        $this->permissionResolver->method('hasAccess')->with('content', 'read')->willReturn($hasAccess);
+        $this->permissionResolver->method('hasAccess')->with('content', 'read')->willReturn(true);
         $this->permissionChecker->expects($this->never())->method('getRestrictions');
         $this->contentTypeService->expects($this->never())->method('loadContentTypeList');
 
@@ -78,12 +75,15 @@ public function testUdwConfigResolveWhenThereIsNoContentReadLimitations(bool $ha
         ]);
     }
 
-    public function dataProviderForUdwConfigResolveWhenThereIsNoContentReadLimitations(): iterable
+    public function testUdwConfigResolveWhenThereIsNoContentReadLimitationsAndNoAccess(): void
     {
-        return [
-            ['hasAccess' => false],
-            ['hasAccess' => true],
-        ];
+        $this->permissionResolver->method('hasAccess')->with('content', 'read')->willReturn(false);
+        $this->permissionChecker->expects($this->never())->method('getRestrictions');
+        $this->contentTypeService->expects($this->never())->method('loadContentTypeList');
+
+        $this->assertConfigurationResolvingResult([
+            'allowed_content_types' => [null],
+        ]);
     }
 
     public function testUdwConfigResolveWhenThereAreContentReadLimitations(): void

diff --git a/src/lib/UniversalDiscovery/Event/Subscriber/RichTextEmbedAllowedContentTypes.php b/src/lib/UniversalDiscovery/Event/Subscriber/RichTextEmbedAllowedContentTypes.php
@@ -45,8 +45,8 @@ public function __construct(
     private function getAllowedContentTypesIdentifiers(array $contentTypesAllowedViaConfig): ?array
     {
         $access = $this->permissionResolver->hasAccess('content', 'read');
-        if (!\is_array($access) && $access) {
-            return $contentTypesAllowedViaConfig ?: null;
+        if (!\is_array($access)) {
+            return $access ? ($contentTypesAllowedViaConfig ?: null) : [null];
         }
 
         $restrictedContentTypesIds = $this->permissionChecker->getRestrictions($access, ContentTypeLimitation::class);
@@ -87,7 +87,7 @@ public function onUdwConfigResolve(ConfigResolveEvent $event): void
             $this->allowedContentTypesIdentifiers = $this->getAllowedContentTypesIdentifiers($config['allowed_content_types'] ?? []);
         }
 
-        $config['allowed_content_types'] = $this->allowedContentTypesIdentifiers ?: null;
+        $config['allowed_content_types'] = $this->allowedContentTypesIdentifiers;
 
         $event->setConfig($config);
     }