Skip to content

Commit

Permalink
Merge pull request #87 from DoclerLabs/develop
Browse files Browse the repository at this point in the history
prepare 0.33.0
  • Loading branch information
aliokan authored Nov 21, 2017
2 parents a49122e + 2e28cf9 commit c9ece9a
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 4 deletions.
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2017 Francis Bourre

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
2 changes: 1 addition & 1 deletion test/hex/MockDependencyInjector.hx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class MockDependencyInjector implements IDependencyInjector
return null;
}

public function getInstanceWithClassName<T>( className : String, name : String = '', targetType : Class<Dynamic> = null ) : T
public function getInstanceWithClassName<T>( className : String, name : String = '', targetType : Class<Dynamic> = null, shouldThrowAnError : Bool = true ) : T
{
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion test/hex/config/stateful/StatefulCommandConfigTest.hx
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ private class MockInjectorWithFrontController implements IDependencyInjector
return cast this._frontcontroller;
}

public function getInstanceWithClassName<T>( className : String, name : String = '', targetType : Class<Dynamic> = null ) : T
public function getInstanceWithClassName<T>( className : String, name : String = '', targetType : Class<Dynamic> = null, shouldThrowAnError : Bool = true ) : T
{
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion test/hex/control/FrontControllerTest.hx
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ private class MockDependencyInjector implements IDependencyInjector
return null;
}

public function getInstanceWithClassName<T>( className : String, name : String = '', targetType : Class<Dynamic> = null ) : T
public function getInstanceWithClassName<T>( className : String, name : String = '', targetType : Class<Dynamic> = null, shouldThrowAnError : Bool = true ) : T
{
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion test/hex/control/guard/GuardUtilTest.hx
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ private class MockDependencyInjector implements IDependencyInjector
return null;
}

public function getInstanceWithClassName<T>( className : String, name : String = '', targetType : Class<Dynamic> = null ) : T
public function getInstanceWithClassName<T>( className : String, name : String = '', targetType : Class<Dynamic> = null, shouldThrowAnError : Bool = true ) : T
{
return null;
}
Expand Down

0 comments on commit c9ece9a

Please sign in to comment.