AliceMajere / wonderland-container

src/ServiceContainer.php

Indentation +147 added lines, -147 removed lines

@@ -14,152 +14,152 @@
  */
 class ServiceContainer implements ContainerInterface
 {
-	/** @var ServiceDefinitionInterface[] */
-	private $services;
-
-	/** @var array */
-	private $serviceInstances;
-
-	/**
-	 * ServiceContainer constructor.
-	 */
-	public function __construct()
-	{
-		$this->serviceInstances = [];
-	}
-
-	/**
-	 * @param ServiceDefinitionInterface $serviceDefinition
-	 */
-	public function addService(ServiceDefinitionInterface $serviceDefinition)
-	{
-		$this->services[$serviceDefinition->getServiceName()] = $serviceDefinition;
-	}
-
-	/**
-	 * @param ServiceInstanceInterface $definition
-	 * @throws DuplicatedServiceException
-	 */
-	public function addServiceInstance(ServiceInstanceInterface $definition)
-	{
-		if (true === array_key_exists($definition->getServiceName(), $this->serviceInstances)) {
-			throw new DuplicatedServiceException(
-				'The service' . $definition->getServiceName() . ' is already registered in the container'
-			);
-		}
-
-		$this->serviceInstances[$definition->getServiceName()] = $definition->getInstance();
-	}
-
-	/**
-	 * @param string $index
-	 * @param bool $new
-	 * @return mixed|null
-	 */
-	public function get($index, $new = false)
-	{
-		// 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)
-	{
-		// 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 (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 $callArgs) {
-			foreach ($callArgs as $k => $arg) {
-				if (true === $this->has($arg)) {
-					$args[$k] = $this->get($arg);
-				}
-			}
-		}
-
-		return $calls;
-	}
+    /** @var ServiceDefinitionInterface[] */
+    private $services;
+
+    /** @var array */
+    private $serviceInstances;
+
+    /**
+     * ServiceContainer constructor.
+     */
+    public function __construct()
+    {
+        $this->serviceInstances = [];
+    }
+
+    /**
+     * @param ServiceDefinitionInterface $serviceDefinition
+     */
+    public function addService(ServiceDefinitionInterface $serviceDefinition)
+    {
+        $this->services[$serviceDefinition->getServiceName()] = $serviceDefinition;
+    }
+
+    /**
+     * @param ServiceInstanceInterface $definition
+     * @throws DuplicatedServiceException
+     */
+    public function addServiceInstance(ServiceInstanceInterface $definition)
+    {
+        if (true === array_key_exists($definition->getServiceName(), $this->serviceInstances)) {
+            throw new DuplicatedServiceException(
+                'The service' . $definition->getServiceName() . ' is already registered in the container'
+            );
+        }
+
+        $this->serviceInstances[$definition->getServiceName()] = $definition->getInstance();
+    }
+
+    /**
+     * @param string $index
+     * @param bool $new
+     * @return mixed|null
+     */
+    public function get($index, $new = false)
+    {
+        // 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)
+    {
+        // 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 (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 $callArgs) {
+            foreach ($callArgs as $k => $arg) {
+                if (true === $this->has($arg)) {
+                    $args[$k] = $this->get($arg);
+                }
+            }
+        }
+
+        return $calls;
+    }
 
 }

src/Service/ServiceDefinition.php

Indentation +49 added lines, -49 removed lines

@@ -9,62 +9,62 @@
  */
 class ServiceDefinition implements ServiceDefinitionInterface
 {
-	/** @var string */
-	private $serviceName;
+    /** @var string */
+    private $serviceName;
 
-	/** @var string */
-	private $class;
+    /** @var string */
+    private $class;
 
-	/** @var array */
-	private $constructArgs;
+    /** @var array */
+    private $constructArgs;
 
-	/** @var array */
-	private $calls;
+    /** @var array */
+    private $calls;
 
-	/**
-	 * RepositoryFactory constructor.
-	 *
-	 * @param string $serviceName
-	 * @param string $class
-	 * @param array $args
-	 * @param array $calls
-	 */
-	public function __construct(string $serviceName, string $class, array $args = [], array $calls = [])
-	{
-		$this->serviceName = $serviceName;
-		$this->class = $class;
-		$this->constructArgs = $args;
-		$this->calls = $calls;
-	}
+    /**
+     * RepositoryFactory constructor.
+     *
+     * @param string $serviceName
+     * @param string $class
+     * @param array $args
+     * @param array $calls
+     */
+    public function __construct(string $serviceName, string $class, array $args = [], array $calls = [])
+    {
+        $this->serviceName = $serviceName;
+        $this->class = $class;
+        $this->constructArgs = $args;
+        $this->calls = $calls;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getClass()
-	{
-		return $this->class;
-	}
+    /**
+     * @return string
+     */
+    public function getClass()
+    {
+        return $this->class;
+    }
 
-	/** @return string */
-	public function getServiceName()
-	{
-		return $this->serviceName;
-	}
+    /** @return string */
+    public function getServiceName()
+    {
+        return $this->serviceName;
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getConstructArgs()
-	{
-		return $this->constructArgs;
-	}
+    /**
+     * @return array
+     */
+    public function getConstructArgs()
+    {
+        return $this->constructArgs;
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getCalls()
-	{
-		return $this->calls;
-	}
+    /**
+     * @return array
+     */
+    public function getCalls()
+    {
+        return $this->calls;
+    }
 
 }

tests/unit/ServiceContainerTest.php

Indentation +27 added lines, -27 removed lines

@@ -15,41 +15,41 @@
  */
 class ServiceContainerTest extends TestCase
 {
-	public function test_addService()
-	{
-		$definition = $this->getMockBuilder(ServiceDefinitionInterface::class)->getMock();
+    public function test_addService()
+    {
+        $definition = $this->getMockBuilder(ServiceDefinitionInterface::class)->getMock();
 
-		$definition->expects($this->once())
-			->method('getServiceName')
-			->willReturn('service.name');
+        $definition->expects($this->once())
+            ->method('getServiceName')
+            ->willReturn('service.name');
 
-		$this->assertSame('service.name', $definition->getServiceName());
-	}
+        $this->assertSame('service.name', $definition->getServiceName());
+    }
 
 //	 * @expectedException DuplicatedServiceException
-	/**
-	 */
-	public function test_addServiceInstance()
-	{
-		$instance = $this->getMockBuilder(ServiceInstanceInterface::class)->getMock();
+    /**
+     */
+    public function test_addServiceInstance()
+    {
+        $instance = $this->getMockBuilder(ServiceInstanceInterface::class)->getMock();
 
-		$instance->expects($this->once())
-			->method('getServiceName')
-			->willReturn('service.name');
+        $instance->expects($this->once())
+            ->method('getServiceName')
+            ->willReturn('service.name');
 
 
-		$this->assertSame('service.name', $instance->getServiceName());
-	}
+        $this->assertSame('service.name', $instance->getServiceName());
+    }
 
-	public function test_addServiceInstance2()
-	{
-		$instance = $this->getMockBuilder(ServiceInstanceInterface::class)->getMock();
+    public function test_addServiceInstance2()
+    {
+        $instance = $this->getMockBuilder(ServiceInstanceInterface::class)->getMock();
 
-		$object = new \DateTime();
-		$instance->expects($this->once())
-			->method('getInstance')
-			->willReturn($object);
+        $object = new \DateTime();
+        $instance->expects($this->once())
+            ->method('getInstance')
+            ->willReturn($object);
 
-		$this->assertSame($object, $instance->getInstance());
-	}
+        $this->assertSame($object, $instance->getInstance());
+    }
 }