Tidy

onoi · Sep 8, 2015 · ef86b8b · ef86b8b
1 parent d9f8892
commit ef86b8b
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -76,7 +76,7 @@ The library provides unit tests that covers the core-functionality normally run
 [continues integration platform][travis]. Tests can also be executed manually using the
 `composer phpunit` command from the root directory.
 
-### Release notes
+## Release notes
 
 - 1.0.0 Initial release (2015-09-07)
  - Added the `CallbackContainer` and `CallbackLoader` interface

diff --git a/src/DeferredCallbackLoader.php b/src/DeferredCallbackLoader.php
@@ -128,7 +128,7 @@ public function singleton( $handlerName ) {
 
 		$instance = $this->getReturnValueFromSingletonFor( $handlerName, $fingerprint );
 
-		if ( !isset( $this->expectedReturnTypeByHandler[$handlerName] ) || is_a( $instance, $this->expectedReturnTypeByHandler[$handlerName] ) ) {
+		if ( $instance !== null && ( !isset( $this->expectedReturnTypeByHandler[$handlerName] ) || is_a( $instance, $this->expectedReturnTypeByHandler[$handlerName] ) ) ) {
 			return $instance;
 		}
 

diff --git a/tests/phpunit/Unit/DeferredCallbackLoaderTest.php b/tests/phpunit/Unit/DeferredCallbackLoaderTest.php
@@ -46,8 +46,6 @@ public function testRegisterCallback() {
 			return new \stdClass;
 		} );
 
-		$instance->registerExpectedReturnType( 'Foo', '\stdClass' );
-
 		$this->assertEquals(
 			new \stdClass,
 			$instance->load( 'Foo' )
@@ -57,11 +55,29 @@ public function testRegisterCallback() {
 			new \stdClass,
 			$instance->singleton( 'Foo' )
 		);
+	}
+
+	public function testDeregisterCallback() {
+
+		$instance = new DeferredCallbackLoader();
+
+		$instance->registerCallback( 'Foo', function() {
+			return 'abc';
+		} );
+
+		$this->assertEquals(
+			'abc',
+			$instance->load( 'Foo' )
+		);
 
 		$instance->deregister( 'Foo' );
+
+		$this->assertNull(
+			$instance->singleton( 'Foo' )
+		);
 	}
 
-	public function testLoadTypedReturn() {
+	public function testLoadCallbackHandlerWithExpectedReturnType() {
 
 		$instance = new DeferredCallbackLoader();
 
@@ -77,7 +93,7 @@ public function testLoadTypedReturn() {
 		);
 	}
 
-	public function testLoadUntypedHandler() {
+	public function testLoadCallbackHandlerWithoutExpectedReturnType() {
 
 		$instance = new DeferredCallbackLoader();
 
@@ -93,7 +109,8 @@ public function testLoadUntypedHandler() {
 
 	public function testRegisterCallbackContainer() {
 
-		$instance = new DeferredCallbackLoader( new FooCallbackContainer() );
+		$instance = new DeferredCallbackLoader();
+		$instance->registerCallbackContainer( new FooCallbackContainer() );
 
 		$this->assertEquals(
 			new \stdClass,
@@ -146,7 +163,7 @@ public function testInjectInstanceForExistingRegisteredCallbackHandler() {
 		);
 	}
 
-	public function testLoadParameterizedInstance() {
+	public function testLoadParameterizedCallbackHandler() {
 
 		$instance = new DeferredCallbackLoader();
 
@@ -183,7 +200,7 @@ public function testSingleton() {
 		);
 	}
 
-	public function testFingerprintedParameterizedSingleton() {
+	public function testFingerprintedParameterizedSingletonCallbackHandler() {
 
 		$instance = new DeferredCallbackLoader();
 
@@ -208,7 +225,7 @@ public function testFingerprintedParameterizedSingleton() {
 		);
 	}
 
-	public function testLoadUnregisteredCallbackHandlerToReturnNull() {
+	public function testUnregisteredCallbackHandlerIsToReturnNull() {
 
 		$instance = new DeferredCallbackLoader();
 
@@ -217,7 +234,7 @@ public function testLoadUnregisteredCallbackHandlerToReturnNull() {
 		);
 	}
 
-	public function testLoadUnregisteredCallbackHandlerAsSingletonToReturnNull() {
+	public function testUnregisteredCallbackHandlerForSingletonIsToReturnNull() {
 
 		$instance = new DeferredCallbackLoader();