Fix issue with is archived behavior

activecollab · Mar 12, 2022 · de2974b · de2974b
1 parent 5085b84
commit de2974b
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 29 deletions.
diff --git a/src/Behaviour/IsArchivedInterface.php b/src/Behaviour/IsArchivedInterface.php
@@ -12,10 +12,8 @@ interface IsArchivedInterface
 {
     /**
      * Return true if parent object is archived.
-     *
-     * @return bool
      */
-    public function getIsArchived();
+    public function getIsArchived(): bool;
 
     /**
      * Move to archive.

diff --git a/src/Behaviour/IsArchivedInterface/Implementation.php b/src/Behaviour/IsArchivedInterface/Implementation.php
@@ -20,9 +20,12 @@ trait Implementation
      */
     public function ActiveCollabDatabaseStructureBehaviourIsArchivedInterfaceImplementation()
     {
-        $this->registerEventHandler('on_json_serialize', function (array &$result) {
-            $result['is_archived'] = $this->getIsArchived();
-        });
+        $this->registerEventHandler(
+            'on_json_serialize',
+            function (array &$result) {
+                $result['is_archived'] = $this->getIsArchived();
+            }
+        );
     }
 
     /**
@@ -32,18 +35,20 @@ public function ActiveCollabDatabaseStructureBehaviourIsArchivedInterfaceImpleme
      */
     public function moveToArchive($bulk = false)
     {
-        $this->connection->transact(function () use ($bulk) {
-            $this->triggerEvent('on_before_move_to_archive', [$bulk]);
+        $this->connection->transact(
+            function () use ($bulk) {
+                $this->triggerEvent('on_before_move_to_archive', [$bulk]);
 
-            if ($bulk && method_exists($this, 'setOriginalIsArchived')) {
-                $this->setOriginalIsArchived($this->getIsArchived());
-            }
+                if ($bulk && method_exists($this, 'setOriginalIsArchived')) {
+                    $this->setOriginalIsArchived($this->getIsArchived());
+                }
 
-            $this->setIsArchived(true);
-            $this->save();
+                $this->setIsArchived(true);
+                $this->save();
 
-            $this->triggerEvent('on_after_move_to_archive', [$bulk]);
-        });
+                $this->triggerEvent('on_after_move_to_archive', [$bulk]);
+            }
+        );
     }
 
     /**
@@ -53,8 +58,12 @@ public function moveToArchive($bulk = false)
      */
     public function restoreFromArchive($bulk = false)
     {
-        if ($this->getIsArchived()) {
-            $this->connection->transact(function () use ($bulk) {
+        if (!$this->getIsArchived()) {
+            return;
+        }
+
+        $this->connection->transact(
+            function () use ($bulk) {
                 $this->triggerEvent('on_before_restore_from_archive', [$bulk]);
 
                 if ($bulk && method_exists($this, 'getOriginalIsArchived') && method_exists($this, 'setOriginalIsArchived')) {
@@ -67,28 +76,22 @@ public function restoreFromArchive($bulk = false)
                 $this->save();
 
                 $this->triggerEvent('on_after_restore_from_archive', [$bulk]);
-            });
-        }
+            }
+        );
     }
 
     // ---------------------------------------------------
     //  Expectations
     // ---------------------------------------------------
 
-    /**
-     * Return true if parent object is archived.
-     *
-     * @return bool
-     */
-    abstract public function getIsArchived();
+    abstract public function getIsArchived(): bool;
 
     /**
      * Set value of is_archived field.
      *
-     * @param  bool $value
      * @return bool
      */
-    abstract public function &setIsArchived(bool $value);
+    abstract public function setIsArchived(bool $value);
 
     /**
      * Save to database.

diff --git a/test/src/ScalarFields/JsonSerializationTest.php b/test/src/ScalarFields/JsonSerializationTest.php
@@ -143,7 +143,7 @@ public function testArrayValueSerialization()
 
         $this->assertIsArray($row);
         $this->assertEquals('xyz', $row['name']);
-        $this->assertSame('[1, 2, 3]', $row['value']);
+        $this->assertSame('[1,2,3]', $row['value']);
     }
 
     /**
@@ -163,6 +163,6 @@ public function testAssocArrayValueSerialization()
 
         $this->assertIsArray($row);
         $this->assertEquals('xyz', $row['name']);
-        $this->assertSame('{"one": "two"}', $row['value']);
+        $this->assertSame('{"one":"two"}', $row['value']);
     }
 }