Merge branch 'release/1.0.3'

README.md

@@ -0,0 +1,10 @@
+Installation
+============
+TODO
+
+CHANGELOG
+=========
+* 1.0.3
+  * Fixed issue with Singleton class.
+    * Description: When using the library in multiple plugins the Singleton class was only returning the class firstly ever
+    used by it. Obviously this was not intended behavior. It now returns the only the first used instance of each class type

composer.json

@@ -2,6 +2,7 @@
     "name": "objectivco/booster-seat",
     "description": "Classes for the faster creation of wordpress plugins",
     "keywords": ["template", "composer", "package"],
+    "version": "1.0.3",
     "license": "GPL-3.0-only",
     "authors": [
         {

src/Base/Singleton.php

@@ -19,7 +19,7 @@ abstract class Singleton
 	 * @access private
 	 * @var null
 	 */
-	private static $instance = null;
+	protected static $instance = array();
 
 	/**
 	 * Singleton constructor. Just a stub. Do not fill with logic
@@ -54,10 +54,12 @@ private function __wakeup() {}
 	 */
 	final public static function instance()
 	{
-		if (self::$instance === null) {
-			self::$instance = new static;
+		$class = (string)get_called_class();
+
+		if (!array_key_exists($class, self::$instance)) {
+			self::$instance[$class] = new static;
 		}
 
-		return self::$instance;
+		return self::$instance[$class];
 	}
 }

tests/Base/SingletonTest.php

@@ -0,0 +1,80 @@
+<?php
+
+use Objectiv\BoosterSeat\Base\Singleton;
+
+// Middle class so we can test more inheritance
+class Middle extends Singleton {
+	public $name = "";
+}
+
+// Test class 1
+class Test1 extends Middle {}
+
+// Test class 2
+class Test2 extends Middle {}
+
+// Test class 3
+class Test3 extends Middle {}
+
+/**
+ * Sample test case.
+ *
+ * @since 1.0.3
+ */
+class SingletonTest extends WP_UnitTestCase {
+
+	/**
+	 * @var Test1
+	 */
+	public $test1;
+
+	/**
+	 * @var Test2
+	 */
+	public $test2;
+
+	/**
+	 * @var Test3
+	 */
+	public $test3;
+
+	/**
+	 * Test setup function where we grab each classes initial instance
+	 */
+	function setUp() {
+		parent::setUp();
+
+		$this->test1 = Test1::instance();
+		$this->test1->name = "Murphy";
+
+		$this->test2 = Test2::instance();
+		$this->test2->name = "John";
+
+		$this->test3 = Test3::instance();
+		$this->test3->name = "Brandon";
+	}
+
+	/**
+	 * Test that when multiple classes extend from this base class it correctly retrieves the right class
+	 */
+	function test_class_extended_can_allow_for_other_classes() {
+
+		$this->assertTrue($this->test1 instanceof Test1);
+		$this->assertTrue($this->test2 instanceof Test2);
+		$this->assertTrue($this->test3 instanceof Test3);
+	}
+
+	/**
+	 * T
+	 */
+	function test_class_extended_can_be_the_only_class_created() {
+
+		$previous_test1 = $this->test1;
+		$test1 = Test1::instance();
+
+		$this->assertEquals($previous_test1, $test1);
+		$this->assertEquals("Murphy", $test1->name);
+		$this->assertEquals("John", Test2::instance()->name);
+		$this->assertEquals("Brandon", Test3::instance()->name);
+	}
+}

tests/Managers/PathManagerTest.php

@@ -9,6 +9,8 @@
 
 /**
  * Sample test case.
+ *
+ * @since 1.0.0
  */
 class PathManagerTest extends WP_UnitTestCase {
 

tests/Utilities/ActivatorTest.php

@@ -7,6 +7,8 @@
 
 /**
  * Sample test case.
+ *
+ * @since 1.0.0
  */
 class ActivatorTest extends WP_UnitTestCase {
 

tests/Utilities/DeactivatorTest.php

@@ -7,6 +7,8 @@
 
 /**
  * Sample test case.
+ *
+ * @since 1.0.0
  */
 class DeactivatorTest extends WP_UnitTestCase {