From 2b652bd50d18b8d73fb5de96d15b83470e519eac Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Thu, 7 Jul 2016 11:38:04 +0200 Subject: [PATCH 1/4] Minor fixes from #66 --- src/ClassDiscovery.php | 4 ++-- src/Exception/ClassinstantiationFailedException.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ClassDiscovery.php b/src/ClassDiscovery.php index 5ae7dee..c48f221 100644 --- a/src/ClassDiscovery.php +++ b/src/ClassDiscovery.php @@ -182,7 +182,7 @@ protected static function evaluateCondition($condition) /** * Get an instance of the $class. * - * @param string|\Closure $class A FQN of a class or a closure that instantiate the class. + * @param string|\Closure $class A FQCN of a class or a closure that instantiate the class. * * @return object */ @@ -200,6 +200,6 @@ protected static function instantiateClass($class) throw new ClassinstantiationFailedException('Unexcepced exception when instantiating class.', 0, $e); } - throw new ClassinstantiationFailedException('Could not instantiate class becuase parameter is neitehr a callable or a string'); + throw new ClassinstantiationFailedException('Could not instantiate class becuase parameter is neither a callable nor a string'); } } diff --git a/src/Exception/ClassinstantiationFailedException.php b/src/Exception/ClassinstantiationFailedException.php index 5bb880a..53a8d70 100644 --- a/src/Exception/ClassinstantiationFailedException.php +++ b/src/Exception/ClassinstantiationFailedException.php @@ -9,6 +9,6 @@ * * @author Tobias Nyholm */ -class ClassinstantiationFailedException extends \RuntimeException implements Exception +final class ClassinstantiationFailedException extends \RuntimeException implements Exception { } From 41fb8418f4bbf51a5b9cfdb3bae9a5d9913ad4c9 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Thu, 7 Jul 2016 11:41:19 +0200 Subject: [PATCH 2/4] Using capital I --- src/ClassDiscovery.php | 7 ++++--- ...xception.php => ClassInstantiationFailedExceptionx.php} | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) rename src/Exception/{ClassinstantiationFailedException.php => ClassInstantiationFailedExceptionx.php} (77%) diff --git a/src/ClassDiscovery.php b/src/ClassDiscovery.php index c48f221..72eb24f 100644 --- a/src/ClassDiscovery.php +++ b/src/ClassDiscovery.php @@ -2,7 +2,7 @@ namespace Http\Discovery; -use Http\Discovery\Exception\ClassinstantiationFailedException; +use Http\Discovery\Exception\ClassInstantiationFailedException; use Http\Discovery\Exception\DiscoveryFailedException; use Http\Discovery\Exception\StrategyUnavailableException; @@ -185,6 +185,7 @@ protected static function evaluateCondition($condition) * @param string|\Closure $class A FQCN of a class or a closure that instantiate the class. * * @return object + * @throws ClassInstantiationFailedException */ protected static function instantiateClass($class) { @@ -197,9 +198,9 @@ protected static function instantiateClass($class) return $class(); } } catch (\Exception $e) { - throw new ClassinstantiationFailedException('Unexcepced exception when instantiating class.', 0, $e); + throw new ClassInstantiationFailedException('Unexcepced exception when instantiating class.', 0, $e); } - throw new ClassinstantiationFailedException('Could not instantiate class becuase parameter is neither a callable nor a string'); + throw new ClassInstantiationFailedException('Could not instantiate class becuase parameter is neither a callable nor a string'); } } diff --git a/src/Exception/ClassinstantiationFailedException.php b/src/Exception/ClassInstantiationFailedExceptionx.php similarity index 77% rename from src/Exception/ClassinstantiationFailedException.php rename to src/Exception/ClassInstantiationFailedExceptionx.php index 53a8d70..e95bf5d 100644 --- a/src/Exception/ClassinstantiationFailedException.php +++ b/src/Exception/ClassInstantiationFailedExceptionx.php @@ -9,6 +9,6 @@ * * @author Tobias Nyholm */ -final class ClassinstantiationFailedException extends \RuntimeException implements Exception +final class ClassInstantiationFailedException extends \RuntimeException implements Exception { } From bacc84929d1b85c7fbe6125dff77f260b4ae7818 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Thu, 7 Jul 2016 11:41:38 +0200 Subject: [PATCH 3/4] Using capital I --- ...FailedExceptionx.php => ClassInstantiationFailedException.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/Exception/{ClassInstantiationFailedExceptionx.php => ClassInstantiationFailedException.php} (100%) diff --git a/src/Exception/ClassInstantiationFailedExceptionx.php b/src/Exception/ClassInstantiationFailedException.php similarity index 100% rename from src/Exception/ClassInstantiationFailedExceptionx.php rename to src/Exception/ClassInstantiationFailedException.php From ed425da921e931918bf4ef07a802c19472872464 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Thu, 7 Jul 2016 11:43:49 +0200 Subject: [PATCH 4/4] style --- src/ClassDiscovery.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ClassDiscovery.php b/src/ClassDiscovery.php index 72eb24f..359a7dc 100644 --- a/src/ClassDiscovery.php +++ b/src/ClassDiscovery.php @@ -185,6 +185,7 @@ protected static function evaluateCondition($condition) * @param string|\Closure $class A FQCN of a class or a closure that instantiate the class. * * @return object + * * @throws ClassInstantiationFailedException */ protected static function instantiateClass($class)