Merge pull request #72 from DoclerLabs/develop

prepare 0.34.0
DoclerLabs · Jan 15, 2018 · 72f72db · 72f72db
2 parents 07983e6 + 0bad1be
commit 72f72db
Show file tree

Hide file tree

Showing 50 changed files with 292 additions and 2,715 deletions.
diff --git a/src/hex/di/Injector.hx b/src/hex/di/Injector.hx
@@ -132,11 +132,6 @@ class Injector
 			return null;
 		}
 	}
-
-	inline function _getClassDescription( type : Class<Dynamic> )
-	{
-		return Reflect.getProperty( type, "__INJECTION" );
-	}
 
     public function instantiateUnmapped<T>( type : Class<T> ) : T
 	{
@@ -149,6 +144,10 @@ class Injector
 		{
 			instance = ( cast type ).__ac( this.getInstanceWithClassName );
 		}
+		catch ( e : MissingMappingException )
+		{
+			throw( e );
+		}
 		catch( e : Dynamic )
 		{
 			instance = Type.createInstance( type, [] );
@@ -161,9 +160,13 @@ class Injector
 				this._applyInjection( instance, type );
 			}
 		}
+		catch ( e : MissingMappingException )
+		{
+			throw( e );
+		}
 		catch ( e : Dynamic )
 		{
-
+			//Do nothing
 		}
 
 		return instance;
@@ -250,23 +253,11 @@ class Injector
 
     public function destroyInstance( instance : Dynamic ) : Void
 	{
-		//#if php
 		if ( this._managedObjects.containsKey( instance ) )
 		{
 			this._managedObjects.remove( instance );
 			instance.__ap();
 		}
-		/*#else
-		try
-		{
-			this._managedObjects.remove( instance );
-			instance.__ap();
-		}
-		catch ( e : Dynamic )
-		{
-			
-		}
-		#end*/
 	}
 
 	public function map<T>( type : Class<T>, name : String = '' ) : InjectionMapping<T>