[TASK] Allow Manager::destroy() even if not being initialized

TYPO3 · Aug 30, 2018 · a93126f · a93126f
1 parent ce3af19
commit a93126f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/src/Manager.php b/src/Manager.php
@@ -54,16 +54,16 @@ public static function instance(): self
         );
     }
 
-    public static function destroy()
+    /**
+     * @return bool
+     */
+    public static function destroy(): bool
     {
-        if (self::$instance !== null) {
-            self::$instance = null;
-            return;
+        if (self::$instance === null) {
+            return false;
         }
-        throw new \LogicException(
-            'Manager was never initialized',
-            1535189873
-        );
+        self::$instance = null;
+        return true;
     }
 
     /**

diff --git a/tests/Unit/ManagerTest.php b/tests/Unit/ManagerTest.php
@@ -80,6 +80,23 @@ public function instanceResolvesIfCalledTwice()
         static::assertSame($firstInstance, $secondInstance);
     }
 
+    /**
+     * @test
+     */
+    public function destroyReturnsTrueIfInitialized()
+    {
+        Manager::initialize($this->behaviorProphecy->reveal());
+        static::assertTrue(Manager::destroy());
+    }
+
+    /**
+     * @test
+     */
+    public function destroyReturnsFalseIfNotInitialized()
+    {
+        static::assertFalse(Manager::destroy());
+    }
+
     /**
      * @test
      */