Yoshi2889 / container

src/ComponentContainer.php

Indentation +44 added lines, -44 removed lines

@@ -12,49 +12,49 @@
 
 class ComponentContainer implements ContainerInterface
 {
-	/**
-	 * @var object[]
-	 */
-	protected $storedComponents = [];
-
-	/**
-	 * @param ComponentInterface $object $object
-	 *
-	 * @throws ContainerException
-	 */
-	public function add(ComponentInterface $object)
-	{
-	    $id = get_class($object);
-
-	    if ($this->has($id))
-	        throw new ContainerException('A class with ID ' . $id . ' already exists in this container.');
-
-		$this->storedComponents[$id] = $object;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function get($id)
-	{
-		if (!is_string($id))
-			throw new ContainerException('Given ID must be a string');
-
-		if (!$this->has($id))
-			throw new NotFoundException();
-
-		return $this->storedComponents[$id];
-	}
-
-	/**
-	 * @inheritdoc
+    /**
+     * @var object[]
+     */
+    protected $storedComponents = [];
+
+    /**
+     * @param ComponentInterface $object $object
+     *
      * @throws ContainerException
-	 */
-	public function has($id)
-	{
-		if (!is_string($id))
-			throw new ContainerException('Given ID must be a string');
-
-		return array_key_exists($id, $this->storedComponents);
-	}
+     */
+    public function add(ComponentInterface $object)
+    {
+        $id = get_class($object);
+
+        if ($this->has($id))
+            throw new ContainerException('A class with ID ' . $id . ' already exists in this container.');
+
+        $this->storedComponents[$id] = $object;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function get($id)
+    {
+        if (!is_string($id))
+            throw new ContainerException('Given ID must be a string');
+
+        if (!$this->has($id))
+            throw new NotFoundException();
+
+        return $this->storedComponents[$id];
+    }
+
+    /**
+     * @inheritdoc
+     * @throws ContainerException
+     */
+    public function has($id)
+    {
+        if (!is_string($id))
+            throw new ContainerException('Given ID must be a string');
+
+        return array_key_exists($id, $this->storedComponents);
+    }
 }
\ No newline at end of file

Braces +12 added lines, -8 removed lines

@@ -26,8 +26,9 @@ 
 	{
 	    $id = get_class($object);
 
-	    if ($this->has($id))
-	        throw new ContainerException('A class with ID ' . $id . ' already exists in this container.');
+	    if ($this->has($id)) {
+	    	        throw new ContainerException('A class with ID ' . $id . ' already exists in this container.');
+	    }
 
 		$this->storedComponents[$id] = $object;
 	}
@@ -37,11 +38,13 @@ 
 	 */
 	public function get($id)
 	{
-		if (!is_string($id))
-			throw new ContainerException('Given ID must be a string');
+		if (!is_string($id)) {
+					throw new ContainerException('Given ID must be a string');
+		}
 
-		if (!$this->has($id))
-			throw new NotFoundException();
+		if (!$this->has($id)) {
+					throw new NotFoundException();
+		}
 
 		return $this->storedComponents[$id];
 	}
@@ -52,8 +55,9 @@ 
 	 */
 	public function has($id)
 	{
-		if (!is_string($id))
-			throw new ContainerException('Given ID must be a string');
+		if (!is_string($id)) {
+					throw new ContainerException('Given ID must be a string');
+		}
 
 		return array_key_exists($id, $this->storedComponents);
 	}

src/ComponentInterface.php

Indentation +6 added lines, -6 removed lines

@@ -13,10 +13,10 @@
 
 interface ComponentInterface
 {
-	/**
-	 * @param ContainerInterface $container
-	 *
-	 * @return null|object
-	 */
-	public static function fromContainer(ContainerInterface $container);
+    /**
+     * @param ContainerInterface $container
+     *
+     * @return null|object
+     */
+    public static function fromContainer(ContainerInterface $container);
 }
\ No newline at end of file

src/ContainerTrait.php

Indentation +18 added lines, -18 removed lines

@@ -13,24 +13,24 @@
 
 trait ContainerTrait
 {
-	/**
-	 * @var ContainerInterface
-	 */
-	protected $container;
+    /**
+     * @var ContainerInterface
+     */
+    protected $container;
 
-	/**
-	 * @return ContainerInterface
-	 */
-	public function getContainer(): ContainerInterface
-	{
-		return $this->container;
-	}
+    /**
+     * @return ContainerInterface
+     */
+    public function getContainer(): ContainerInterface
+    {
+        return $this->container;
+    }
 
-	/**
-	 * @param ContainerInterface $container
-	 */
-	public function setContainer(ContainerInterface $container)
-	{
-		$this->container = $container;
-	}
+    /**
+     * @param ContainerInterface $container
+     */
+    public function setContainer(ContainerInterface $container)
+    {
+        $this->container = $container;
+    }
 }
\ No newline at end of file

src/ComponentTrait.php

Indentation +13 added lines, -13 removed lines

@@ -12,19 +12,19 @@
 
 trait ComponentTrait
 {
-	/**
-	 * @param ContainerInterface $container
-	 *
-	 * @return static
-	 * @throws NotFoundException
-	 */
-	public static function fromContainer(ContainerInterface $container)
-	{
-		$obj = $container->get(__CLASS__);
+    /**
+     * @param ContainerInterface $container
+     *
+     * @return static
+     * @throws NotFoundException
+     */
+    public static function fromContainer(ContainerInterface $container)
+    {
+        $obj = $container->get(__CLASS__);
 
-		if ($obj && $obj instanceof static)
-			return $obj;
+        if ($obj && $obj instanceof static)
+            return $obj;
 
-		throw new NotFoundException();
-	}
+        throw new NotFoundException();
+    }
 }
\ No newline at end of file

Braces +3 added lines, -2 removed lines

@@ -22,8 +22,9 @@
 	{
 		$obj = $container->get(__CLASS__);
 
-		if ($obj && $obj instanceof static)
-			return $obj;
+		if ($obj && $obj instanceof static) {
+					return $obj;
+		}
 
 		throw new NotFoundException();
 	}

tests/ContainerTraitTest.php

Indentation +7 added lines, -7 removed lines

@@ -13,13 +13,13 @@
 
 class ContainerTraitTest extends TestCase
 {
-	public function testGetSetContainerWithTrait()
-	{
-		$container = new ComponentContainer();
+    public function testGetSetContainerWithTrait()
+    {
+        $container = new ComponentContainer();
 
-		$class = new SampleContainerTraitClass();
-		$class->setContainer($container);
+        $class = new SampleContainerTraitClass();
+        $class->setContainer($container);
 
-		self::assertSame($container, $class->getContainer());
-	}
+        self::assertSame($container, $class->getContainer());
+    }
 }

tests/SampleContainerTraitClass.php

Indentation +1 added lines, -1 removed lines

@@ -13,5 +13,5 @@
 
 class SampleContainerTraitClass
 {
-	use ContainerTrait;
+    use ContainerTrait;
 }
\ No newline at end of file

tests/SampleComponent.php

Indentation +1 added lines, -1 removed lines

@@ -13,5 +13,5 @@
 
 class SampleComponent implements ComponentInterface
 {
-	use ComponentTrait;
+    use ComponentTrait;
 }
\ No newline at end of file

tests/ComponentContainerTest.php

Indentation +48 added lines, -48 removed lines

@@ -11,52 +11,52 @@
 
 class ComponentContainerTest extends TestCase
 {
-	public function testContainerGet()
-	{
-		$container = new ComponentContainer();
-
-		$sampleComponent = new \Yoshi2889\Container\Tests\SampleComponent();
-		$container->add($sampleComponent);
-
-		$sampleComponentFromContainer = \Yoshi2889\Container\Tests\SampleComponent::fromContainer($container);
-
-		self::assertInstanceOf(\Yoshi2889\Container\Tests\SampleComponent::class, $sampleComponentFromContainer);
-		self::assertEquals($sampleComponent, $sampleComponentFromContainer);
-	}
-
-	public function testGetInvalidComponent()
-	{
-		$container = new ComponentContainer();
-		$this->expectException(\Yoshi2889\Container\NotFoundException::class);
-		$container->get(\Yoshi2889\Container\Tests\SampleInvalidComponent::class);
-	}
-
-	public function testGetInvalidType()
-	{
-		$container = new ComponentContainer();
-		$this->expectException(\Yoshi2889\Container\ContainerException::class);
-		$container->get(10);
-	}
-
-	public function testGetNotFound()
-	{
-		$emptyContainer = new ComponentContainer();
-		$this->expectException(\Yoshi2889\Container\NotFoundException::class);
-		\Yoshi2889\Container\Tests\SampleComponent::fromContainer($emptyContainer);
-	}
-
-	public function testContainerHas()
-	{
-		$container = new ComponentContainer();
-
-		self::assertFalse($container->has(\Yoshi2889\Container\Tests\SampleComponent::class));
-
-		$sampleComponent = new \Yoshi2889\Container\Tests\SampleComponent();
-		$container->add($sampleComponent);
-
-		self::assertTrue($container->has(\Yoshi2889\Container\Tests\SampleComponent::class));
-
-		$this->expectException(\Yoshi2889\Container\ContainerException::class);
-		$container->has(10);
-	}
+    public function testContainerGet()
+    {
+        $container = new ComponentContainer();
+
+        $sampleComponent = new \Yoshi2889\Container\Tests\SampleComponent();
+        $container->add($sampleComponent);
+
+        $sampleComponentFromContainer = \Yoshi2889\Container\Tests\SampleComponent::fromContainer($container);
+
+        self::assertInstanceOf(\Yoshi2889\Container\Tests\SampleComponent::class, $sampleComponentFromContainer);
+        self::assertEquals($sampleComponent, $sampleComponentFromContainer);
+    }
+
+    public function testGetInvalidComponent()
+    {
+        $container = new ComponentContainer();
+        $this->expectException(\Yoshi2889\Container\NotFoundException::class);
+        $container->get(\Yoshi2889\Container\Tests\SampleInvalidComponent::class);
+    }
+
+    public function testGetInvalidType()
+    {
+        $container = new ComponentContainer();
+        $this->expectException(\Yoshi2889\Container\ContainerException::class);
+        $container->get(10);
+    }
+
+    public function testGetNotFound()
+    {
+        $emptyContainer = new ComponentContainer();
+        $this->expectException(\Yoshi2889\Container\NotFoundException::class);
+        \Yoshi2889\Container\Tests\SampleComponent::fromContainer($emptyContainer);
+    }
+
+    public function testContainerHas()
+    {
+        $container = new ComponentContainer();
+
+        self::assertFalse($container->has(\Yoshi2889\Container\Tests\SampleComponent::class));
+
+        $sampleComponent = new \Yoshi2889\Container\Tests\SampleComponent();
+        $container->add($sampleComponent);
+
+        self::assertTrue($container->has(\Yoshi2889\Container\Tests\SampleComponent::class));
+
+        $this->expectException(\Yoshi2889\Container\ContainerException::class);
+        $container->has(10);
+    }
 }