AliceMajere / wonderland-container

src/Configuration/Config/Fields.php

Indentation +4 added lines, -4 removed lines

@@ -9,8 +9,8 @@
  */
 final class Fields
 {
-	const ROOT_CONFIG_NAME = 'services';
-	const CLASS_CONFIG_NAME = 'class';
-	const CONSTRUCTOR_PARAMS_CONFIG_NAME = 'arguments';
-	const METHOD_CALLS_CONFIG_NAME = 'calls';
+    const ROOT_CONFIG_NAME = 'services';
+    const CLASS_CONFIG_NAME = 'class';
+    const CONSTRUCTOR_PARAMS_CONFIG_NAME = 'arguments';
+    const METHOD_CALLS_CONFIG_NAME = 'calls';
 }

src/Configuration/Parser/ParserInterface.php

Indentation +10 added lines, -10 removed lines

@@ -10,16 +10,16 @@
 interface ParserInterface
 {
 
-	/**
-	 * @param string $filePath
-	 * @return array
-	 */
-	public function loadFile(string $filePath): array;
+    /**
+     * @param string $filePath
+     * @return array
+     */
+    public function loadFile(string $filePath): array;
 
-	/**
-	 * @param string $directorPath
-	 * @return array
-	 */
-	public function loadDirectory(string $directorPath): array;
+    /**
+     * @param string $directorPath
+     * @return array
+     */
+    public function loadDirectory(string $directorPath): array;
 
 }

src/Configuration/ServiceLoader.php

Indentation +117 added lines, -117 removed lines

@@ -15,122 +15,122 @@
  */
 class ServiceLoader
 {
-	/** @var ParserInterface  */
-	private $parser;
-
-	/** @var ConfigurationValidator  */
-	private $validator;
-
-	/**
-	 * ServiceLoader constructor.
-	 * @param ParserInterface $parser
-	 */
-	public function __construct(ParserInterface $parser)
-	{
-		$this->parser = $parser;
-		$this->validator = new ConfigurationValidator();
-	}
-
-	/**
-	 * @param string $filePath
-	 * @return ServiceDefinition[]
-	 * @throws InvalidConfigFormatException
-	 */
-	public function loadFile(string $filePath)
-	{
-		$definitionList = $this->parser->loadFile($filePath);
-
-		return $this->loadDefinitions($definitionList);
-	}
-
-	/**
-	 * @param string $directoryPath
-	 * @return ServiceDefinition[]
-	 * @throws InvalidConfigFormatException
-	 */
-	public function loadDirectory(string $directoryPath)
-	{
-		$definitionList = $this->parser->loadDirectory($directoryPath);
-
-		$list = [];
-		foreach ($definitionList as $item) {
-			$list = array_merge($list, $this->loadDefinitions($item));
-		}
-
-		return $list;
-	}
-
-	/**
-	 * @param array $definitionList
-	 * @return ServiceDefinition[]
-	 * @throws InvalidConfigFormatException
-	 */
-	private function loadDefinitions(array $definitionList)
-	{
-		$this->validator->validateDefinitions($definitionList);
-
-		if (null === $definitionList[Fields::ROOT_CONFIG_NAME]) {
-			return [];
-		}
-
-		$list = [];
-		foreach ($definitionList[Fields::ROOT_CONFIG_NAME] as $serviceName => $serviceConfig) {
-			$list[] = $this->initServiceDefinition($serviceName, $serviceConfig);
-		}
-
-		return $list;
-	}
-
-	/**
-	 * @param string $serviceName
-	 * @param array $serviceConfig
-	 * @return ServiceDefinition
-	 */
-	private function initServiceDefinition(string $serviceName, array $serviceConfig)
-	{
-		$definition = new ServiceDefinition(
-			$serviceName,
-			$this->getClass($serviceConfig),
-			$this->getConstructorParams($serviceConfig),
-			$this->getMethodCalls($serviceConfig)
-		);
-
-		return $definition;
-	}
-
-	/**
-	 * @param $serviceConfig
-	 * @return string
-	 */
-	private function getClass($serviceConfig)
-	{
-		return $serviceConfig[Fields::CLASS_CONFIG_NAME];
-	}
-
-	/**
-	 * @param $serviceConfig
-	 * @return array
-	 */
-	private function getConstructorParams($serviceConfig)
-	{
-		if (false === array_key_exists(Fields::CONSTRUCTOR_PARAMS_CONFIG_NAME, $serviceConfig)) {
-			return [];
-		}
-
-		return $serviceConfig[Fields::CONSTRUCTOR_PARAMS_CONFIG_NAME];
-	}
-
-	/**
-	 * @param $serviceConfig
-	 * @return array
-	 */
-	private function getMethodCalls($serviceConfig)
-	{
-		if (false === array_key_exists(Fields::METHOD_CALLS_CONFIG_NAME, $serviceConfig)) {
-			return [];
-		}
-
-		return $serviceConfig[Fields::METHOD_CALLS_CONFIG_NAME];
-	}
+    /** @var ParserInterface  */
+    private $parser;
+
+    /** @var ConfigurationValidator  */
+    private $validator;
+
+    /**
+     * ServiceLoader constructor.
+     * @param ParserInterface $parser
+     */
+    public function __construct(ParserInterface $parser)
+    {
+        $this->parser = $parser;
+        $this->validator = new ConfigurationValidator();
+    }
+
+    /**
+     * @param string $filePath
+     * @return ServiceDefinition[]
+     * @throws InvalidConfigFormatException
+     */
+    public function loadFile(string $filePath)
+    {
+        $definitionList = $this->parser->loadFile($filePath);
+
+        return $this->loadDefinitions($definitionList);
+    }
+
+    /**
+     * @param string $directoryPath
+     * @return ServiceDefinition[]
+     * @throws InvalidConfigFormatException
+     */
+    public function loadDirectory(string $directoryPath)
+    {
+        $definitionList = $this->parser->loadDirectory($directoryPath);
+
+        $list = [];
+        foreach ($definitionList as $item) {
+            $list = array_merge($list, $this->loadDefinitions($item));
+        }
+
+        return $list;
+    }
+
+    /**
+     * @param array $definitionList
+     * @return ServiceDefinition[]
+     * @throws InvalidConfigFormatException
+     */
+    private function loadDefinitions(array $definitionList)
+    {
+        $this->validator->validateDefinitions($definitionList);
+
+        if (null === $definitionList[Fields::ROOT_CONFIG_NAME]) {
+            return [];
+        }
+
+        $list = [];
+        foreach ($definitionList[Fields::ROOT_CONFIG_NAME] as $serviceName => $serviceConfig) {
+            $list[] = $this->initServiceDefinition($serviceName, $serviceConfig);
+        }
+
+        return $list;
+    }
+
+    /**
+     * @param string $serviceName
+     * @param array $serviceConfig
+     * @return ServiceDefinition
+     */
+    private function initServiceDefinition(string $serviceName, array $serviceConfig)
+    {
+        $definition = new ServiceDefinition(
+            $serviceName,
+            $this->getClass($serviceConfig),
+            $this->getConstructorParams($serviceConfig),
+            $this->getMethodCalls($serviceConfig)
+        );
+
+        return $definition;
+    }
+
+    /**
+     * @param $serviceConfig
+     * @return string
+     */
+    private function getClass($serviceConfig)
+    {
+        return $serviceConfig[Fields::CLASS_CONFIG_NAME];
+    }
+
+    /**
+     * @param $serviceConfig
+     * @return array
+     */
+    private function getConstructorParams($serviceConfig)
+    {
+        if (false === array_key_exists(Fields::CONSTRUCTOR_PARAMS_CONFIG_NAME, $serviceConfig)) {
+            return [];
+        }
+
+        return $serviceConfig[Fields::CONSTRUCTOR_PARAMS_CONFIG_NAME];
+    }
+
+    /**
+     * @param $serviceConfig
+     * @return array
+     */
+    private function getMethodCalls($serviceConfig)
+    {
+        if (false === array_key_exists(Fields::METHOD_CALLS_CONFIG_NAME, $serviceConfig)) {
+            return [];
+        }
+
+        return $serviceConfig[Fields::METHOD_CALLS_CONFIG_NAME];
+    }
 
 }

src/Configuration/Validator/ConfigurationValidator.php

Indentation +104 added lines, -104 removed lines

@@ -13,109 +13,109 @@
  */
 class ConfigurationValidator
 {
-	private const ERROR_PREFIX = 'The service configuration';
-
-	/**
-	 * @param array $definitionList
-	 * @throws InvalidConfigFormatException
-	 */
-	public function validateDefinitions(array $definitionList)
-	{
-		$this->validateRoot($definitionList);
-
-		if (null === $definitionList[Fields::ROOT_CONFIG_NAME]) {
-			return;
-		}
-
-		foreach ($definitionList[Fields::ROOT_CONFIG_NAME] as $serviceName => $service) {
-			$this->validateService($serviceName, $service);
-		}
-	}
-
-	/**
-	 * @param array $definitionList
-	 * @throws InvalidConfigFormatException
-	 */
-	private function validateRoot(array $definitionList)
-	{
-		if (false === array_key_exists(Fields::ROOT_CONFIG_NAME, $definitionList)) {
-			throw new InvalidConfigFormatException(
-				self::ERROR_PREFIX . ' need the root config key "' . Fields::ROOT_CONFIG_NAME . '"'
-			);
-		}
-
-		$field = $definitionList[Fields::ROOT_CONFIG_NAME];
-		if (false === is_array($field) && false === is_null($field)) {
-			throw new InvalidConfigFormatException(
-				self::ERROR_PREFIX . ' key "' . Fields::ROOT_CONFIG_NAME . '" must be an associative array'
-			);
-		}
-	}
-
-	/**
-	 * @param $serviceName
-	 * @param $service
-	 * @throws InvalidConfigFormatException
-	 */
-	private function validateService($serviceName, $service)
-	{
-		if (false === is_array($service)) {
-			throw new InvalidConfigFormatException(
-				self::ERROR_PREFIX . ' key "' . $serviceName . '" must be an associative array'
-			);
-		}
-
-		if (false === array_key_exists(Fields::CLASS_CONFIG_NAME, $service)) {
-			throw new InvalidConfigFormatException(
-				self::ERROR_PREFIX . ' key "' . Fields::CLASS_CONFIG_NAME . '" is required'
-			);
-		}
-
-		if (false === is_string($service[Fields::CLASS_CONFIG_NAME])) {
-			throw new InvalidConfigFormatException(
-				self::ERROR_PREFIX . ' key "' . Fields::CLASS_CONFIG_NAME . '" must be a string'
-			);
-		}
-
-		if (true === array_key_exists(Fields::CONSTRUCTOR_PARAMS_CONFIG_NAME, $service) &&
-			false === is_array($service[Fields::CONSTRUCTOR_PARAMS_CONFIG_NAME])
-		) {
-			throw new InvalidConfigFormatException(
-				self::ERROR_PREFIX . ' key "' . Fields::CONSTRUCTOR_PARAMS_CONFIG_NAME .
-				'" must be an array or null'
-			);
-		}
-
-		if (true === array_key_exists(Fields::METHOD_CALLS_CONFIG_NAME, $service) &&
-			false === is_array($service[Fields::METHOD_CALLS_CONFIG_NAME])
-		) {
-			throw new InvalidConfigFormatException(
-				self::ERROR_PREFIX . ' key "' . Fields::METHOD_CALLS_CONFIG_NAME .
-				'" must be an array or null'
-			);
-		}
-
-		if (false === array_key_exists(Fields::METHOD_CALLS_CONFIG_NAME, $service)) {
-			return;
-		}
-
-		foreach ($service[Fields::METHOD_CALLS_CONFIG_NAME] as $methodName => $call) {
-			$this->validateCalls($methodName, $call);
-		}
-	}
-
-	/**
-	 * @param $methodName
-	 * @param $call
-	 * @throws InvalidConfigFormatException
-	 */
-	private function validateCalls($methodName, $call)
-	{
-		if (false === is_array($call)) {
-			throw new InvalidConfigFormatException(
-				self::ERROR_PREFIX . ' key "' . $methodName . '" must be be an array'
-			);
-		}
-	}
+    private const ERROR_PREFIX = 'The service configuration';
+
+    /**
+     * @param array $definitionList
+     * @throws InvalidConfigFormatException
+     */
+    public function validateDefinitions(array $definitionList)
+    {
+        $this->validateRoot($definitionList);
+
+        if (null === $definitionList[Fields::ROOT_CONFIG_NAME]) {
+            return;
+        }
+
+        foreach ($definitionList[Fields::ROOT_CONFIG_NAME] as $serviceName => $service) {
+            $this->validateService($serviceName, $service);
+        }
+    }
+
+    /**
+     * @param array $definitionList
+     * @throws InvalidConfigFormatException
+     */
+    private function validateRoot(array $definitionList)
+    {
+        if (false === array_key_exists(Fields::ROOT_CONFIG_NAME, $definitionList)) {
+            throw new InvalidConfigFormatException(
+                self::ERROR_PREFIX . ' need the root config key "' . Fields::ROOT_CONFIG_NAME . '"'
+            );
+        }
+
+        $field = $definitionList[Fields::ROOT_CONFIG_NAME];
+        if (false === is_array($field) && false === is_null($field)) {
+            throw new InvalidConfigFormatException(
+                self::ERROR_PREFIX . ' key "' . Fields::ROOT_CONFIG_NAME . '" must be an associative array'
+            );
+        }
+    }
+
+    /**
+     * @param $serviceName
+     * @param $service
+     * @throws InvalidConfigFormatException
+     */
+    private function validateService($serviceName, $service)
+    {
+        if (false === is_array($service)) {
+            throw new InvalidConfigFormatException(
+                self::ERROR_PREFIX . ' key "' . $serviceName . '" must be an associative array'
+            );
+        }
+
+        if (false === array_key_exists(Fields::CLASS_CONFIG_NAME, $service)) {
+            throw new InvalidConfigFormatException(
+                self::ERROR_PREFIX . ' key "' . Fields::CLASS_CONFIG_NAME . '" is required'
+            );
+        }
+
+        if (false === is_string($service[Fields::CLASS_CONFIG_NAME])) {
+            throw new InvalidConfigFormatException(
+                self::ERROR_PREFIX . ' key "' . Fields::CLASS_CONFIG_NAME . '" must be a string'
+            );
+        }
+
+        if (true === array_key_exists(Fields::CONSTRUCTOR_PARAMS_CONFIG_NAME, $service) &&
+            false === is_array($service[Fields::CONSTRUCTOR_PARAMS_CONFIG_NAME])
+        ) {
+            throw new InvalidConfigFormatException(
+                self::ERROR_PREFIX . ' key "' . Fields::CONSTRUCTOR_PARAMS_CONFIG_NAME .
+                '" must be an array or null'
+            );
+        }
+
+        if (true === array_key_exists(Fields::METHOD_CALLS_CONFIG_NAME, $service) &&
+            false === is_array($service[Fields::METHOD_CALLS_CONFIG_NAME])
+        ) {
+            throw new InvalidConfigFormatException(
+                self::ERROR_PREFIX . ' key "' . Fields::METHOD_CALLS_CONFIG_NAME .
+                '" must be an array or null'
+            );
+        }
+
+        if (false === array_key_exists(Fields::METHOD_CALLS_CONFIG_NAME, $service)) {
+            return;
+        }
+
+        foreach ($service[Fields::METHOD_CALLS_CONFIG_NAME] as $methodName => $call) {
+            $this->validateCalls($methodName, $call);
+        }
+    }
+
+    /**
+     * @param $methodName
+     * @param $call
+     * @throws InvalidConfigFormatException
+     */
+    private function validateCalls($methodName, $call)
+    {
+        if (false === is_array($call)) {
+            throw new InvalidConfigFormatException(
+                self::ERROR_PREFIX . ' key "' . $methodName . '" must be be an array'
+            );
+        }
+    }
 
 }

src/ServiceContainer.php

Indentation +207 added lines, -207 removed lines

@@ -14,212 +14,212 @@
  */
 class ServiceContainer implements ContainerInterface
 {
-	private const SERVICE_PREFIX = '@';
-
-	/** @var ServiceDefinitionInterface[] */
-	private $services;
-
-	/** @var array */
-	private $serviceInstances;
-
-	/**
-	 * ServiceContainer constructor.
-	 */
-	public function __construct()
-	{
-		$this->services = [];
-		$this->serviceInstances = [];
-	}
-
-	/**
-	 * @param ServiceDefinitionInterface $serviceDefinition
-	 * @return ServiceContainer
-	 * @throws DuplicatedServiceException
-	 */
-	public function addService(ServiceDefinitionInterface $serviceDefinition)
-	{
-		if (true === $this->has($serviceDefinition->getServiceName())) {
-			throw new DuplicatedServiceException(
-				'The service "' . $serviceDefinition->getServiceName() . '" is already registered in the container'
-			);
-		}
-
-		$this->services[$serviceDefinition->getServiceName()] = $serviceDefinition;
-
-		return $this;
-	}
-
-	/**
-	 * @param ServiceDefinitionInterface[] $definitionList
-	 * @return ServiceContainer
-	 * @throws DuplicatedServiceException
-	 */
-	public function loadServices(array $definitionList)
-	{
-		foreach ($definitionList as $definition) {
-			$this->addService($definition);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * @param InstanceDefinitionInterface $definition
-	 * @return ServiceContainer
-	 * @throws DuplicatedServiceException
-	 */
-	public function addServiceInstance(InstanceDefinitionInterface $definition)
-	{
-		if (true === $this->has($definition->getServiceName())) {
-			throw new DuplicatedServiceException(
-				'The service "' . $definition->getServiceName() . '" is already registered in the container'
-			);
-		}
-
-		$this->serviceInstances[$definition->getServiceName()] = $definition->getInstance();
-
-		return $this;
-	}
-
-	/**
-	 * @param string $index
-	 * @param bool $new
-	 * @return mixed|null
-	 */
-	public function get($index, $new = false)
-	{
-		$index = $this->cleanServiceName($index);
-
-		// if service is shared true and already exists we return it
-		if (isset($this->serviceInstances[$index]) && false === $new) {
-			return $this->serviceInstances[$index];
-		}
-
-		// is service not defined return null
-		if (!isset($this->services[$index])) {
-			return null;
-		}
-
-		// we create a new instance
-		$instance = $this->create($this->services[$index]);
-
-		// if shared true we set it in the current instances
-		if (false === $new) {
-			$this->serviceInstances[$index] = $instance;
-		}
-
-		return $instance;
-	}
-
-	/**
-	 * Returns true if the container can return an entry for the given identifier.
-	 * Returns false otherwise.
-	 *
-	 * `has($id)` returning true does not mean that `get($id)` will not throw an exception.
-	 * It does however mean that `get($id)` will not throw a `NotFoundExceptionInterface`.
-	 *
-	 * @param string $index Identifier of the entry to look for.
-	 *
-	 * @return bool
-	 */
-	public function has($index)
-	{
-		$index = $this->cleanServiceName($index);
-
-		// if service is shared true and already exists we return it
-		if (isset($this->serviceInstances[$index])) {
-			return true;
-		}
-
-		// is service not defined return null
-		if (isset($this->services[$index])) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @param ServiceDefinitionInterface $serviceDefinition
-	 * @return mixed
-	 */
-	private function create(ServiceDefinitionInterface $serviceDefinition)
-	{
-		// we get the class name in a var for the new later
-		$newClass = $serviceDefinition->getClass();
-
-		// we get the construct args
-		$args = $this->checkArgsServices($serviceDefinition->getConstructArgs());
-		$instance = new $newClass(...$args);
-
-		// we call the injection methods after we instance the object
-		$calls = $this->checkCallsServices($serviceDefinition->getCalls());
-		foreach ($calls as $call => $params) {
-			call_user_func_array([$instance, $call], $params);
-		}
-
-		// we create the new instance
-		return $instance;
-	}
-
-	/**
-	 * @param array $args
-	 * @return array
-	 */
-	private function checkArgsServices(array $args)
-	{
-		// we check if any of the construct args are services themself and we create them
-		foreach ($args as $k => $arg) {
-			if (false === $this->isServiceName($arg)) {
-				continue;
-			}
-
-			if (true === $this->has($arg)) {
-				$args[$k] = $this->get($arg);
-			}
-		}
-
-		return $args;
-	}
-
-	/**
-	 * @param array $calls
-	 * @return array
-	 */
-	private function checkCallsServices(array $calls)
-	{
-		// we check if any of the calls args are services themself and we create them
-		foreach ($calls as $i => $callArgs) {
-			foreach ($callArgs as $k => $arg) {
-				if (false === $this->isServiceName($arg)) {
-					continue;
-				}
-
-				if (true === $this->has($arg)) {
-					$calls[$i][$k] = $this->get($arg);
-				}
-			}
-		}
-
-		return $calls;
-	}
-
-	/**
-	 * @param string $str
-	 * @return bool
-	 */
-	private function isServiceName(string $str)
-	{
-		return self::SERVICE_PREFIX === substr($str, 0, 1);
-	}
-
-	/**
-	 * @param string $str
-	 * @return string
-	 */
-	private function cleanServiceName(string $str)
-	{
-		return trim($str, self::SERVICE_PREFIX);
-	}
+    private const SERVICE_PREFIX = '@';
+
+    /** @var ServiceDefinitionInterface[] */
+    private $services;
+
+    /** @var array */
+    private $serviceInstances;
+
+    /**
+     * ServiceContainer constructor.
+     */
+    public function __construct()
+    {
+        $this->services = [];
+        $this->serviceInstances = [];
+    }
+
+    /**
+     * @param ServiceDefinitionInterface $serviceDefinition
+     * @return ServiceContainer
+     * @throws DuplicatedServiceException
+     */
+    public function addService(ServiceDefinitionInterface $serviceDefinition)
+    {
+        if (true === $this->has($serviceDefinition->getServiceName())) {
+            throw new DuplicatedServiceException(
+                'The service "' . $serviceDefinition->getServiceName() . '" is already registered in the container'
+            );
+        }
+
+        $this->services[$serviceDefinition->getServiceName()] = $serviceDefinition;
+
+        return $this;
+    }
+
+    /**
+     * @param ServiceDefinitionInterface[] $definitionList
+     * @return ServiceContainer
+     * @throws DuplicatedServiceException
+     */
+    public function loadServices(array $definitionList)
+    {
+        foreach ($definitionList as $definition) {
+            $this->addService($definition);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param InstanceDefinitionInterface $definition
+     * @return ServiceContainer
+     * @throws DuplicatedServiceException
+     */
+    public function addServiceInstance(InstanceDefinitionInterface $definition)
+    {
+        if (true === $this->has($definition->getServiceName())) {
+            throw new DuplicatedServiceException(
+                'The service "' . $definition->getServiceName() . '" is already registered in the container'
+            );
+        }
+
+        $this->serviceInstances[$definition->getServiceName()] = $definition->getInstance();
+
+        return $this;
+    }
+
+    /**
+     * @param string $index
+     * @param bool $new
+     * @return mixed|null
+     */
+    public function get($index, $new = false)
+    {
+        $index = $this->cleanServiceName($index);
+
+        // if service is shared true and already exists we return it
+        if (isset($this->serviceInstances[$index]) && false === $new) {
+            return $this->serviceInstances[$index];
+        }
+
+        // is service not defined return null
+        if (!isset($this->services[$index])) {
+            return null;
+        }
+
+        // we create a new instance
+        $instance = $this->create($this->services[$index]);
+
+        // if shared true we set it in the current instances
+        if (false === $new) {
+            $this->serviceInstances[$index] = $instance;
+        }
+
+        return $instance;
+    }
+
+    /**
+     * Returns true if the container can return an entry for the given identifier.
+     * Returns false otherwise.
+     *
+     * `has($id)` returning true does not mean that `get($id)` will not throw an exception.
+     * It does however mean that `get($id)` will not throw a `NotFoundExceptionInterface`.
+     *
+     * @param string $index Identifier of the entry to look for.
+     *
+     * @return bool
+     */
+    public function has($index)
+    {
+        $index = $this->cleanServiceName($index);
+
+        // if service is shared true and already exists we return it
+        if (isset($this->serviceInstances[$index])) {
+            return true;
+        }
+
+        // is service not defined return null
+        if (isset($this->services[$index])) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param ServiceDefinitionInterface $serviceDefinition
+     * @return mixed
+     */
+    private function create(ServiceDefinitionInterface $serviceDefinition)
+    {
+        // we get the class name in a var for the new later
+        $newClass = $serviceDefinition->getClass();
+
+        // we get the construct args
+        $args = $this->checkArgsServices($serviceDefinition->getConstructArgs());
+        $instance = new $newClass(...$args);
+
+        // we call the injection methods after we instance the object
+        $calls = $this->checkCallsServices($serviceDefinition->getCalls());
+        foreach ($calls as $call => $params) {
+            call_user_func_array([$instance, $call], $params);
+        }
+
+        // we create the new instance
+        return $instance;
+    }
+
+    /**
+     * @param array $args
+     * @return array
+     */
+    private function checkArgsServices(array $args)
+    {
+        // we check if any of the construct args are services themself and we create them
+        foreach ($args as $k => $arg) {
+            if (false === $this->isServiceName($arg)) {
+                continue;
+            }
+
+            if (true === $this->has($arg)) {
+                $args[$k] = $this->get($arg);
+            }
+        }
+
+        return $args;
+    }
+
+    /**
+     * @param array $calls
+     * @return array
+     */
+    private function checkCallsServices(array $calls)
+    {
+        // we check if any of the calls args are services themself and we create them
+        foreach ($calls as $i => $callArgs) {
+            foreach ($callArgs as $k => $arg) {
+                if (false === $this->isServiceName($arg)) {
+                    continue;
+                }
+
+                if (true === $this->has($arg)) {
+                    $calls[$i][$k] = $this->get($arg);
+                }
+            }
+        }
+
+        return $calls;
+    }
+
+    /**
+     * @param string $str
+     * @return bool
+     */
+    private function isServiceName(string $str)
+    {
+        return self::SERVICE_PREFIX === substr($str, 0, 1);
+    }
+
+    /**
+     * @param string $str
+     * @return string
+     */
+    private function cleanServiceName(string $str)
+    {
+        return trim($str, self::SERVICE_PREFIX);
+    }
 
 }

src/Service/InstanceDefinition.php

Indentation +19 added lines, -19 removed lines

@@ -9,28 +9,28 @@
  */
 class InstanceDefinition implements InstanceDefinitionInterface
 {
-	/** @var string */
-	private $serviceName;
+    /** @var string */
+    private $serviceName;
 
-	/** @var mixed */
-	private $instance;
+    /** @var mixed */
+    private $instance;
 
-	public function __construct(string $serviceName, $instance)
-	{
-		$this->serviceName = $serviceName;
-		$this->instance = $instance;
-	}
+    public function __construct(string $serviceName, $instance)
+    {
+        $this->serviceName = $serviceName;
+        $this->instance = $instance;
+    }
 
-	/** @return string */
-	public function getServiceName()
-	{
-		return $this->serviceName;
-	}
+    /** @return string */
+    public function getServiceName()
+    {
+        return $this->serviceName;
+    }
 
-	/** @return mixed */
-	public function getInstance()
-	{
-		return $this->instance;
-	}
+    /** @return mixed */
+    public function getInstance()
+    {
+        return $this->instance;
+    }
 
 }

src/Service/InstanceDefinitionInterface.php

Indentation +4 added lines, -4 removed lines

@@ -10,10 +10,10 @@
 interface InstanceDefinitionInterface
 {
 
-	/** @return string */
-	public function getServiceName();
+    /** @return string */
+    public function getServiceName();
 
-	/** @return mixed */
-	public function getInstance();
+    /** @return mixed */
+    public function getInstance();
 
 }

examples/Yml/yml.php

Indentation +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 if ( !is_readable( __DIR__ . '/../../vendor/autoload.php' ) ) {
-	die( 'You need to install this package with Composer before you can run the examples' );
+    die( 'You need to install this package with Composer before you can run the examples' );
 }
 
 require_once __DIR__ . '/../../vendor/autoload.php';

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 
-if ( !is_readable( __DIR__ . '/../../vendor/autoload.php' ) ) {
-	die( 'You need to install this package with Composer before you can run the examples' );
+if (!is_readable(__DIR__ . '/../../vendor/autoload.php')) {
+	die('You need to install this package with Composer before you can run the examples');
 }
 
 require_once __DIR__ . '/../../vendor/autoload.php';

examples/Yml/SampleClass.php

Indentation +12 added lines, -12 removed lines

@@ -9,18 +9,18 @@
  */
 class SampleClass
 {
-	private $first;
-	private $second;
+    private $first;
+    private $second;
 
-	public function __construct($param1, $param2)
-	{
-		$this->first = $param1;
-		$this->second = $param2;
-	}
+    public function __construct($param1, $param2)
+    {
+        $this->first = $param1;
+        $this->second = $param2;
+    }
 
-	public function callMethod($param1, $param2)
-	{
-		$this->first = $param1;
-		$this->second = $param2;
-	}
+    public function callMethod($param1, $param2)
+    {
+        $this->first = $param1;
+        $this->second = $param2;
+    }
 }