diff --git a/PHPCI/Plugin/Util/Factory.php b/PHPCI/Plugin/Util/Factory.php index 097f8bf5..971b3e23 100644 --- a/PHPCI/Plugin/Util/Factory.php +++ b/PHPCI/Plugin/Util/Factory.php @@ -4,7 +4,8 @@ namespace PHPCI\Plugin\Util; -class Factory { +class Factory +{ const TYPE_ARRAY = "array"; const TYPE_CALLABLE = "callable"; @@ -18,18 +19,17 @@ class Factory { */ private $container; - function __construct(\Pimple $container = null) + public function __construct(\Pimple $container = null) { if ($container) { $this->container = $container; - } - else { + } else { $this->container = new \Pimple(); } $self = $this; $this->registerResource( - function() use ($self) { + function () use ($self) { return $self->getLastOptions(); }, 'options', @@ -89,7 +89,7 @@ class Factory { if ($constructor) { $argsToUse = array(); - foreach($constructor->getParameters() as $param) { + foreach ($constructor->getParameters() as $param) { $argsToUse = $this->addArgFromParam($argsToUse, $param); } $plugin = $reflectedPlugin->newInstanceArgs($argsToUse); @@ -107,11 +107,11 @@ class Factory { * @throws \InvalidArgumentException * @internal param mixed $resource */ - public function registerResource($loader, - $name = null, - $type = null - ) - { + public function registerResource( + $loader, + $name = null, + $type = null + ) { if ($name === null && $type === null) { throw new \InvalidArgumentException( "Type or Name must be specified" @@ -161,9 +161,9 @@ class Factory { $class = $param->getClass(); if ($class) { return $class->getName(); - } elseif($param->isArray()) { + } elseif ($param->isArray()) { return self::TYPE_ARRAY; - } elseif($param->isCallable()) { + } elseif ($param->isCallable()) { return self::TYPE_CALLABLE; } else { return null; @@ -188,4 +188,4 @@ class Factory { return $existingArgs; } -} \ No newline at end of file +}