Merge branch '1.2' into 1.x

pimcore · Nov 5, 2024 · dafe781 · dafe781
2 parents 6bc77a1 + 5224888
commit dafe781
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 19 deletions.
diff --git a/src/Command/Update/IndexUpdateCommand.php b/src/Command/Update/IndexUpdateCommand.php
@@ -75,7 +75,7 @@ protected function configure(): void
             ->setName('generic-data-index:update:index')
             ->addOption(
                 self::OPTION_CLASS_DEFINITION_ID,
-                'cid',
+                'c',
                 InputOption::VALUE_OPTIONAL,
                 'Update mapping and data for specific data object classDefinition',
                 null

diff --git a/src/Permission/BasePermissions.php b/src/Permission/BasePermissions.php
@@ -21,8 +21,7 @@
  */
 abstract class BasePermissions
 {
-    // TODO: Change default value once development of API is finished
-    protected const DEFAULT_VALUE = true;
+    protected const DEFAULT_VALUE = false;
 
     private bool $list = self::DEFAULT_VALUE;
 

diff --git a/tests/Unit/Service/EventServiceTest.php b/tests/Unit/Service/EventServiceTest.php
@@ -36,8 +36,8 @@ final class EventServiceTest extends Unit
     public function testDispatchAssetSearchEvent(): void
     {
         $permissions = new AssetPermissions();
-        $permissions->setView(false);
-        $permissions->setRename(false);
+        $permissions->setView(true);
+        $permissions->setRename(true);
 
         $event = new Event\Asset\PermissionEvent(
             new AssetSearchResultItem(),
@@ -51,16 +51,16 @@ public function testDispatchAssetSearchEvent(): void
         );
 
         $this->assertSame($event->getPermissions(), $returnedEvent->getPermissions());
-        $this->assertFalse($returnedEvent->getPermissions()->isView());
-        $this->assertFalse($returnedEvent->getPermissions()->isRename());
-        $this->assertTrue($returnedEvent->getPermissions()->isList());
+        $this->assertTrue($returnedEvent->getPermissions()->isView());
+        $this->assertTrue($returnedEvent->getPermissions()->isRename());
+        $this->assertFalse($returnedEvent->getPermissions()->isList());
     }
 
     public function testDispatchDataObjectSearchEvent(): void
     {
         $permissions = new DataObjectPermissions();
-        $permissions->setView(false);
-        $permissions->setRename(false);
+        $permissions->setView(true);
+        $permissions->setRename(true);
 
         $event = new Event\DataObject\PermissionEvent(
             new DataObjectSearchResultItem(),
@@ -74,16 +74,16 @@ public function testDispatchDataObjectSearchEvent(): void
         );
 
         $this->assertSame($event->getPermissions(), $returnedEvent->getPermissions());
-        $this->assertFalse($returnedEvent->getPermissions()->isView());
-        $this->assertFalse($returnedEvent->getPermissions()->isRename());
-        $this->assertTrue($returnedEvent->getPermissions()->isList());
+        $this->assertTrue($returnedEvent->getPermissions()->isView());
+        $this->assertTrue($returnedEvent->getPermissions()->isRename());
+        $this->assertFalse($returnedEvent->getPermissions()->isList());
     }
 
     public function testDispatchDocumentSearchEvent(): void
     {
         $permissions = new DocumentPermissions();
-        $permissions->setView(false);
-        $permissions->setList(false);
+        $permissions->setView(true);
+        $permissions->setList(true);
 
         $event = new Event\Document\PermissionEvent(
             new DocumentSearchResultItem(),
@@ -97,9 +97,9 @@ public function testDispatchDocumentSearchEvent(): void
         );
 
         $this->assertSame($event->getPermissions(), $returnedEvent->getPermissions());
-        $this->assertFalse($returnedEvent->getPermissions()->isView());
-        $this->assertFalse($returnedEvent->getPermissions()->isList());
-        $this->assertTrue($returnedEvent->getPermissions()->isPublish());
+        $this->assertTrue($returnedEvent->getPermissions()->isView());
+        $this->asserttrue($returnedEvent->getPermissions()->isList());
+        $this->assertFalse($returnedEvent->getPermissions()->isPublish());
     }
 
     public function testEventDispatcherCall(): void

diff --git a/tests/Unit/Service/Permission/PermissionServiceTest.php b/tests/Unit/Service/Permission/PermissionServiceTest.php
@@ -39,7 +39,7 @@
  */
 final class PermissionServiceTest extends Unit
 {
-    private const DEFAULT_VALUE = true;
+    private const DEFAULT_VALUE = false;
 
     private User $user;