AliceMajere / wonderland-container

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;
+    }
 }

examples/Object/object.php

Indentation +10 added lines, -10 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';
@@ -10,23 +10,23 @@ 
 
 // Create a new definition with another service as an argument
 $definition = new \Wonderland\Container\Service\ServiceDefinition(
-	'service.name',
-	\Wonderland\Container\Example\Object\SampleClass::class,
-	['param1', '@service.name2']
+    'service.name',
+    \Wonderland\Container\Example\Object\SampleClass::class,
+    ['param1', '@service.name2']
 );
 
 // Create a new definition with a method call taking two other services as arguments
 $definition2 = new \Wonderland\Container\Service\ServiceDefinition(
-	'service.name2',
-	\Wonderland\Container\Example\Object\SampleClass::class,
-	['param2', 'param3'],
-	['callMethod' => ['test', '@instance.name']]
+    'service.name2',
+    \Wonderland\Container\Example\Object\SampleClass::class,
+    ['param2', 'param3'],
+    ['callMethod' => ['test', '@instance.name']]
 );
 
 // Create a new instance definition
 $instance = new \Wonderland\Container\Service\InstanceDefinition(
-	'instance.name',
-	new \DateTime()
+    'instance.name',
+    new \DateTime()
 );
 
 // Registering them all

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';

tests/unit/Configuration/Parser/YamlParserTest.php

Indentation +64 added lines, -64 removed lines

@@ -14,76 +14,76 @@
  */
 class YamlParserTest extends TestCase
 {
-	/** @var YamlParser */
-	private $parser;
+    /** @var YamlParser */
+    private $parser;
 
-	public function setUp()
-	{
-		$this->parser = new YamlParser();
-	}
+    public function setUp()
+    {
+        $this->parser = new YamlParser();
+    }
 
-	/**
-	 * @throws \Wonderland\Container\Exception\InvalidResourceException
-	 * @throws \Wonderland\Container\Exception\ResourceNotFoundException
-	 */
-	public function test_load()
-	{
-		$this->assertInternalType('array', $this->parser->loadFile(__DIR__ . '/../data/yml/test-full.yml'));
-		$this->assertInternalType('array', $this->parser->loadDirectory(__DIR__ . '/../data/yml/'));
-	}
+    /**
+     * @throws \Wonderland\Container\Exception\InvalidResourceException
+     * @throws \Wonderland\Container\Exception\ResourceNotFoundException
+     */
+    public function test_load()
+    {
+        $this->assertInternalType('array', $this->parser->loadFile(__DIR__ . '/../data/yml/test-full.yml'));
+        $this->assertInternalType('array', $this->parser->loadDirectory(__DIR__ . '/../data/yml/'));
+    }
 
-	/**
-	 * @return array
-	 */
-	public function loadErrorNotFoundProvider()
-	{
-		return [
-			['dontexists']
-		];
-	}
+    /**
+     * @return array
+     */
+    public function loadErrorNotFoundProvider()
+    {
+        return [
+            ['dontexists']
+        ];
+    }
 
-	/**
-	 * @dataProvider loadErrorNotFoundProvider
-	 * @param string $filePath
-	 * @throws \Wonderland\Container\Exception\InvalidResourceException
-	 * @throws \Wonderland\Container\Exception\ResourceNotFoundException
-	 */
-	public function test_loadFileErrorNotFound($filePath)
-	{
-		$this->expectException(ResourceNotFoundException::class);
-		$this->parser->loadFile($filePath);
-	}
+    /**
+     * @dataProvider loadErrorNotFoundProvider
+     * @param string $filePath
+     * @throws \Wonderland\Container\Exception\InvalidResourceException
+     * @throws \Wonderland\Container\Exception\ResourceNotFoundException
+     */
+    public function test_loadFileErrorNotFound($filePath)
+    {
+        $this->expectException(ResourceNotFoundException::class);
+        $this->parser->loadFile($filePath);
+    }
 
-	/**
-	 * @dataProvider loadErrorNotFoundProvider
-	 * @param string $filePath
-	 * @throws \Wonderland\Container\Exception\InvalidResourceException
-	 * @throws \Wonderland\Container\Exception\ResourceNotFoundException
-	 */
-	public function test_loadDirErrorNotFound($filePath)
-	{
-		$this->expectException(ResourceNotFoundException::class);
-		$this->parser->loadDirectory($filePath);
-	}
+    /**
+     * @dataProvider loadErrorNotFoundProvider
+     * @param string $filePath
+     * @throws \Wonderland\Container\Exception\InvalidResourceException
+     * @throws \Wonderland\Container\Exception\ResourceNotFoundException
+     */
+    public function test_loadDirErrorNotFound($filePath)
+    {
+        $this->expectException(ResourceNotFoundException::class);
+        $this->parser->loadDirectory($filePath);
+    }
 
-	/**
-	 * @throws \Wonderland\Container\Exception\InvalidResourceException
-	 * @throws \Wonderland\Container\Exception\ResourceNotFoundException
-	 */
-	public function test_loadFileErrorInvalid()
-	{
-		$this->expectException(InvalidResourceException::class);
-		$this->parser->loadFile(__DIR__ . '/../data/yml');
-	}
+    /**
+     * @throws \Wonderland\Container\Exception\InvalidResourceException
+     * @throws \Wonderland\Container\Exception\ResourceNotFoundException
+     */
+    public function test_loadFileErrorInvalid()
+    {
+        $this->expectException(InvalidResourceException::class);
+        $this->parser->loadFile(__DIR__ . '/../data/yml');
+    }
 
-	/**
-	 * @throws \Wonderland\Container\Exception\InvalidResourceException
-	 * @throws \Wonderland\Container\Exception\ResourceNotFoundException
-	 */
-	public function test_loadDirErrorInvalid()
-	{
-		$this->expectException(InvalidResourceException::class);
-		$this->parser->loadDirectory(__DIR__ . '/../data/yml/test-full.yml');
-	}
+    /**
+     * @throws \Wonderland\Container\Exception\InvalidResourceException
+     * @throws \Wonderland\Container\Exception\ResourceNotFoundException
+     */
+    public function test_loadDirErrorInvalid()
+    {
+        $this->expectException(InvalidResourceException::class);
+        $this->parser->loadDirectory(__DIR__ . '/../data/yml/test-full.yml');
+    }
 
 }

tests/unit/Configuration/ServiceLoaderTest.php

Indentation +67 added lines, -67 removed lines

@@ -15,78 +15,78 @@
  */
 class ServiceLoaderTest extends TestCase
 {
-	/** @var ServiceLoader */
-	private $loaderYml;
+    /** @var ServiceLoader */
+    private $loaderYml;
 
-	public function setUp()
-	{
-		$this->loaderYml = new ServiceLoader(new YamlParser());
-	}
+    public function setUp()
+    {
+        $this->loaderYml = new ServiceLoader(new YamlParser());
+    }
 
-	/**
-	 * @return array
-	 */
-	public function ymlProvider()
-	{
-		return [
-			[__DIR__ . '/data/yml/test-empty.yml'],
-			[__DIR__ . '/data/yml/test-full.yml']
-		];
-	}
+    /**
+     * @return array
+     */
+    public function ymlProvider()
+    {
+        return [
+            [__DIR__ . '/data/yml/test-empty.yml'],
+            [__DIR__ . '/data/yml/test-full.yml']
+        ];
+    }
 
-	/**
-	 * @dataProvider ymlProvider
-	 * @param string $testFile
-	 * @throws \Wonderland\Container\Exception\InvalidConfigFormatException
-	 */
-	public function test_loadFile($testFile)
-	{
-		$services = $this->loaderYml->loadFile($testFile);
-		$this->assertInternalType('array', $services);
-		foreach ($services as $service) {
-			$this->assertInstanceOf(ServiceDefinition::class, $service);
-		}
-	}
+    /**
+     * @dataProvider ymlProvider
+     * @param string $testFile
+     * @throws \Wonderland\Container\Exception\InvalidConfigFormatException
+     */
+    public function test_loadFile($testFile)
+    {
+        $services = $this->loaderYml->loadFile($testFile);
+        $this->assertInternalType('array', $services);
+        foreach ($services as $service) {
+            $this->assertInstanceOf(ServiceDefinition::class, $service);
+        }
+    }
 
-	/**
-	 * @return array
-	 */
-	public function ymlErrorProvider()
-	{
-		return [
-			[__DIR__ . '/data/yml-error/empty.yml'],
-			[__DIR__ . '/data/yml-error/err1.yml'],
-			[__DIR__ . '/data/yml-error/err2.yml'],
-			[__DIR__ . '/data/yml-error/err3.yml'],
-			[__DIR__ . '/data/yml-error/err4.yml'],
-			[__DIR__ . '/data/yml-error/err5.yml'],
-			[__DIR__ . '/data/yml-error/err6.yml'],
-			[__DIR__ . '/data/yml-error/err7.yml'],
-			[__DIR__ . '/data/yml-error/err8.yml']
-		];
-	}
+    /**
+     * @return array
+     */
+    public function ymlErrorProvider()
+    {
+        return [
+            [__DIR__ . '/data/yml-error/empty.yml'],
+            [__DIR__ . '/data/yml-error/err1.yml'],
+            [__DIR__ . '/data/yml-error/err2.yml'],
+            [__DIR__ . '/data/yml-error/err3.yml'],
+            [__DIR__ . '/data/yml-error/err4.yml'],
+            [__DIR__ . '/data/yml-error/err5.yml'],
+            [__DIR__ . '/data/yml-error/err6.yml'],
+            [__DIR__ . '/data/yml-error/err7.yml'],
+            [__DIR__ . '/data/yml-error/err8.yml']
+        ];
+    }
 
-	/**
-	 * @dataProvider ymlErrorProvider
-	 * @param string $testFile
-	 * @throws \Wonderland\Container\Exception\InvalidConfigFormatException
-	 */
-	public function test_loadFileError($testFile)
-	{
-		$this->expectException(InvalidConfigFormatException::class);
-		$this->loaderYml->loadFile($testFile);
-	}
+    /**
+     * @dataProvider ymlErrorProvider
+     * @param string $testFile
+     * @throws \Wonderland\Container\Exception\InvalidConfigFormatException
+     */
+    public function test_loadFileError($testFile)
+    {
+        $this->expectException(InvalidConfigFormatException::class);
+        $this->loaderYml->loadFile($testFile);
+    }
 
-	/**
-	 * @throws InvalidConfigFormatException
-	 */
-	public function test_loadDirectory()
-	{
-		$services = $this->loaderYml->loadDirectory(__DIR__ . '/data/yml');
-		$this->assertInternalType('array', $services);
-		foreach ($services as $service) {
-			$this->assertInstanceOf(ServiceDefinition::class, $service);
-		}
-	}
+    /**
+     * @throws InvalidConfigFormatException
+     */
+    public function test_loadDirectory()
+    {
+        $services = $this->loaderYml->loadDirectory(__DIR__ . '/data/yml');
+        $this->assertInternalType('array', $services);
+        foreach ($services as $service) {
+            $this->assertInstanceOf(ServiceDefinition::class, $service);
+        }
+    }
 
 }

examples/Object/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;
+    }
 }

src/Configuration/Parser/YamlParser.php

Indentation +43 added lines, -43 removed lines

@@ -14,57 +14,57 @@
 class YamlParser implements ParserInterface
 {
 
-	/**
-	 * @param string $filePath
-	 * @return array
-	 * @throws ResourceNotFoundException
-	 * @throws InvalidResourceException
-	 */
-	public function loadFile(string $filePath): array
-	{
-		if (false === file_exists($filePath)) {
-			throw new ResourceNotFoundException('The file "' . $filePath . '" does not exists');
-		}
+    /**
+     * @param string $filePath
+     * @return array
+     * @throws ResourceNotFoundException
+     * @throws InvalidResourceException
+     */
+    public function loadFile(string $filePath): array
+    {
+        if (false === file_exists($filePath)) {
+            throw new ResourceNotFoundException('The file "' . $filePath . '" does not exists');
+        }
 
-		if (false === is_file($filePath)) {
-			throw new InvalidResourceException('The resource "' . $filePath . '" is not a file');
-		}
+        if (false === is_file($filePath)) {
+            throw new InvalidResourceException('The resource "' . $filePath . '" is not a file');
+        }
 
-		$parse = Yaml::parseFile($filePath);
+        $parse = Yaml::parseFile($filePath);
 
-		if (false === is_array($parse)) {
-			$parse = [];
-		}
+        if (false === is_array($parse)) {
+            $parse = [];
+        }
 
-		return $parse;
-	}
+        return $parse;
+    }
 
-	/**
-	 * @param string $directorPath
-	 * @return array
-	 * @throws InvalidResourceException
-	 * @throws ResourceNotFoundException
-	 */
-	public function loadDirectory(string $directorPath): array
-	{
-		if (false === file_exists($directorPath)) {
-			throw new ResourceNotFoundException('The directory "' . $directorPath . '" does not exists');
-		}
+    /**
+     * @param string $directorPath
+     * @return array
+     * @throws InvalidResourceException
+     * @throws ResourceNotFoundException
+     */
+    public function loadDirectory(string $directorPath): array
+    {
+        if (false === file_exists($directorPath)) {
+            throw new ResourceNotFoundException('The directory "' . $directorPath . '" does not exists');
+        }
 
-		if (false === is_dir($directorPath)) {
-			throw new InvalidResourceException('The resource "' . $directorPath . '" is not a directory');
-		}
+        if (false === is_dir($directorPath)) {
+            throw new InvalidResourceException('The resource "' . $directorPath . '" is not a directory');
+        }
 
-		$config = [];
+        $config = [];
 
-		$files = array_diff(scandir($directorPath), array('.', '..'));
-		foreach ($files as $file) {
-			if (false !== preg_match('/^.+(yml|yaml)$/i', $file)) {
-				$config[$file] = Yaml::parseFile(realpath($directorPath) . DIRECTORY_SEPARATOR . $file);
-			}
-		}
+        $files = array_diff(scandir($directorPath), array('.', '..'));
+        foreach ($files as $file) {
+            if (false !== preg_match('/^.+(yml|yaml)$/i', $file)) {
+                $config[$file] = Yaml::parseFile(realpath($directorPath) . DIRECTORY_SEPARATOR . $file);
+            }
+        }
 
-		return $config;
-	}
+        return $config;
+    }
 
 }

tests/unit/ServiceContainerTest.php

Indentation +177 added lines, -177 removed lines

@@ -18,182 +18,182 @@
  */
 class ServiceContainerTest extends TestCase
 {
-	private const SERVICE_NAME = 'service.name';
-	private const DEFAULT_SERVICE_NANE = 'default.service.name';
-
-	/** @var ServiceContainer|MockObject */
-	private $container;
-
-	/** @var ServiceContainer */
-	private $realContainer;
-
-	/**
-	 * @throws DuplicatedServiceException
-	 */
-	protected function setUp()
-	{
-		$this->container = $this->getMockBuilder(ServiceContainer::class)->getMock();
-		$this->realContainer = new ServiceContainer();
-		$this->realContainer->addService(new ServiceDefinition(self::DEFAULT_SERVICE_NANE, \DateTime::class));
-	}
-
-	public function testConstructor()
-	{
-		$this->assertAttributeEquals([], 'serviceInstances', $this->container);
-	}
-
-	/**
-	 * @covers \Wonderland\Container\ServiceContainer::addService
-	 * @throws DuplicatedServiceException
-	 */
-	public function test_AddService()
-	{
-		$definition = $this->getMockBuilder(ServiceDefinition::class)
-			->setConstructorArgs([self::SERVICE_NAME, \DateTime::class])
-			->getMock();
-		;
-
-		$definition->expects($this->exactly(2))
-			->method('getServiceName')
-			->willReturn(self::SERVICE_NAME);
-
-		$this->assertSame($this->realContainer, $this->realContainer->addService($definition));
-	}
-
-	/**
-	 * @throws DuplicatedServiceException
-	 */
-	public function test_AddServiceException()
-	{
-		$this->expectException(DuplicatedServiceException::class);
-
-		$definition = $this->getMockBuilder(ServiceDefinition::class)
-			->setConstructorArgs([self::SERVICE_NAME, \DateTime::class])
-			->getMock();
-		;
-
-		$definition->expects($this->exactly(4))
-			->method('getServiceName')
-			->willReturn(self::SERVICE_NAME);
-
-		$this->realContainer->addService($definition);
-		$this->realContainer->addService($definition);
-	}
-
-	public function test_loadServices()
-	{
-		$definition = $this->getMockBuilder(ServiceDefinition::class)
-			->setConstructorArgs([self::SERVICE_NAME . '10', \DateTime::class])
-			->getMock();
-		;
-		$definition2 = $this->getMockBuilder(ServiceDefinition::class)
-			->setConstructorArgs([self::SERVICE_NAME . '20', \DateTime::class])
-			->getMock();
-		;
-
-		$list = [
-			$definition,
-			$definition2
-		];
-
-		$definition->expects($this->exactly(2))
-			->method('getServiceName')
-			->willReturn(self::SERVICE_NAME . '10');
-		$definition2->expects($this->exactly(2))
-			->method('getServiceName')
-			->willReturn(self::SERVICE_NAME . '20');
-
-		$this->realContainer->loadServices($list);
-	}
-
-	/**
-	 * @throws DuplicatedServiceException
-	 */
-	public function test_AddServiceInstance()
-	{
-		$definition = $this->getMockBuilder(InstanceDefinition::class)
-			->setConstructorArgs([self::SERVICE_NAME, new \DateTime()])
-			->getMock();
-
-		$definition->expects($this->atLeast(2))
-			->method('getServiceName')
-			->willReturn(self::SERVICE_NAME);
-
-		$this->container->expects($this->once())
-			->method('addServiceInstance')
-			->willReturn($this->container);
-
-		$this->assertSame($this->container, $this->container->addServiceInstance($definition));
-		$this->assertSame($this->realContainer, $this->realContainer->addServiceInstance($definition));
-	}
-
-	/**
-	 * @throws DuplicatedServiceException
-	 */
-	public function test_AddServiceInstanceException()
-	{
-		$this->expectException(DuplicatedServiceException::class);
-
-		$definition = $this->getMockBuilder(InstanceDefinition::class)
-			->setConstructorArgs([self::SERVICE_NAME, new \DateTime()])
-			->getMock();
-
-		$definition->expects($this->exactly(2))
-			->method('getServiceName')
-			->willReturn(self::DEFAULT_SERVICE_NANE);
-
-		$this->realContainer->addServiceInstance($definition);
-	}
-
-	/**
-	 * @throws DuplicatedServiceException
-	 */
-	public function test_get()
-	{
-		$this->assertSame(null, $this->realContainer->get('test'));
-		$this->assertSame(\DateTime::class, get_class($this->realContainer->get(self::DEFAULT_SERVICE_NANE)));
-		$instance = $this->realContainer->get(self::DEFAULT_SERVICE_NANE);
-		$this->assertSame(\DateTime::class, get_class($instance));
-		$this->assertSame($instance, $this->realContainer->get(self::DEFAULT_SERVICE_NANE));
-
-		$this->realContainer->addServiceInstance(
-			new InstanceDefinition('call.format', 'd-m-Y')
-		);
-		$this->realContainer->addServiceInstance(
-			new InstanceDefinition('call.date', '1970-01-01')
-		);
-
-		$this->realContainer->addService(
-			new ServiceDefinition(
-				'service.call',
-				\DateTime::class,
-				['@call.date'],
-				['format' => ['@call.format']]
-			)
-		);
-
-		$this->realContainer->addService(
-			new ServiceDefinition(
-				'service.call2',
-				\DateTime::class,
-				['1970-01-01'],
-				['format' => ['Y-m-d']]
-			)
-		);
-
-		$date = new \DateTime('1970-01-01');
-		$this->assertSame($date->format('m-d-Y'), $this->realContainer->get('service.call')->format('m-d-Y'));
-		$this->assertSame($date->format('m-d-Y'), $this->realContainer->get('service.call2')->format('m-d-Y'));
-	}
-
-	public function test_has()
-	{
-		$this->assertSame(false, $this->realContainer->has('fake'));
-		$this->assertSame(true, $this->realContainer->has(self::DEFAULT_SERVICE_NANE));
-		$this->assertSame(true, $this->realContainer->has(self::DEFAULT_SERVICE_NANE));
-
-		$this->realContainer->addServiceInstance(new InstanceDefinition('instance.name', \DateTime::class));
-		$this->assertSame(true, $this->realContainer->has('instance.name'));
-	}
+    private const SERVICE_NAME = 'service.name';
+    private const DEFAULT_SERVICE_NANE = 'default.service.name';
+
+    /** @var ServiceContainer|MockObject */
+    private $container;
+
+    /** @var ServiceContainer */
+    private $realContainer;
+
+    /**
+     * @throws DuplicatedServiceException
+     */
+    protected function setUp()
+    {
+        $this->container = $this->getMockBuilder(ServiceContainer::class)->getMock();
+        $this->realContainer = new ServiceContainer();
+        $this->realContainer->addService(new ServiceDefinition(self::DEFAULT_SERVICE_NANE, \DateTime::class));
+    }
+
+    public function testConstructor()
+    {
+        $this->assertAttributeEquals([], 'serviceInstances', $this->container);
+    }
+
+    /**
+     * @covers \Wonderland\Container\ServiceContainer::addService
+     * @throws DuplicatedServiceException
+     */
+    public function test_AddService()
+    {
+        $definition = $this->getMockBuilder(ServiceDefinition::class)
+            ->setConstructorArgs([self::SERVICE_NAME, \DateTime::class])
+            ->getMock();
+        ;
+
+        $definition->expects($this->exactly(2))
+            ->method('getServiceName')
+            ->willReturn(self::SERVICE_NAME);
+
+        $this->assertSame($this->realContainer, $this->realContainer->addService($definition));
+    }
+
+    /**
+     * @throws DuplicatedServiceException
+     */
+    public function test_AddServiceException()
+    {
+        $this->expectException(DuplicatedServiceException::class);
+
+        $definition = $this->getMockBuilder(ServiceDefinition::class)
+            ->setConstructorArgs([self::SERVICE_NAME, \DateTime::class])
+            ->getMock();
+        ;
+
+        $definition->expects($this->exactly(4))
+            ->method('getServiceName')
+            ->willReturn(self::SERVICE_NAME);
+
+        $this->realContainer->addService($definition);
+        $this->realContainer->addService($definition);
+    }
+
+    public function test_loadServices()
+    {
+        $definition = $this->getMockBuilder(ServiceDefinition::class)
+            ->setConstructorArgs([self::SERVICE_NAME . '10', \DateTime::class])
+            ->getMock();
+        ;
+        $definition2 = $this->getMockBuilder(ServiceDefinition::class)
+            ->setConstructorArgs([self::SERVICE_NAME . '20', \DateTime::class])
+            ->getMock();
+        ;
+
+        $list = [
+            $definition,
+            $definition2
+        ];
+
+        $definition->expects($this->exactly(2))
+            ->method('getServiceName')
+            ->willReturn(self::SERVICE_NAME . '10');
+        $definition2->expects($this->exactly(2))
+            ->method('getServiceName')
+            ->willReturn(self::SERVICE_NAME . '20');
+
+        $this->realContainer->loadServices($list);
+    }
+
+    /**
+     * @throws DuplicatedServiceException
+     */
+    public function test_AddServiceInstance()
+    {
+        $definition = $this->getMockBuilder(InstanceDefinition::class)
+            ->setConstructorArgs([self::SERVICE_NAME, new \DateTime()])
+            ->getMock();
+
+        $definition->expects($this->atLeast(2))
+            ->method('getServiceName')
+            ->willReturn(self::SERVICE_NAME);
+
+        $this->container->expects($this->once())
+            ->method('addServiceInstance')
+            ->willReturn($this->container);
+
+        $this->assertSame($this->container, $this->container->addServiceInstance($definition));
+        $this->assertSame($this->realContainer, $this->realContainer->addServiceInstance($definition));
+    }
+
+    /**
+     * @throws DuplicatedServiceException
+     */
+    public function test_AddServiceInstanceException()
+    {
+        $this->expectException(DuplicatedServiceException::class);
+
+        $definition = $this->getMockBuilder(InstanceDefinition::class)
+            ->setConstructorArgs([self::SERVICE_NAME, new \DateTime()])
+            ->getMock();
+
+        $definition->expects($this->exactly(2))
+            ->method('getServiceName')
+            ->willReturn(self::DEFAULT_SERVICE_NANE);
+
+        $this->realContainer->addServiceInstance($definition);
+    }
+
+    /**
+     * @throws DuplicatedServiceException
+     */
+    public function test_get()
+    {
+        $this->assertSame(null, $this->realContainer->get('test'));
+        $this->assertSame(\DateTime::class, get_class($this->realContainer->get(self::DEFAULT_SERVICE_NANE)));
+        $instance = $this->realContainer->get(self::DEFAULT_SERVICE_NANE);
+        $this->assertSame(\DateTime::class, get_class($instance));
+        $this->assertSame($instance, $this->realContainer->get(self::DEFAULT_SERVICE_NANE));
+
+        $this->realContainer->addServiceInstance(
+            new InstanceDefinition('call.format', 'd-m-Y')
+        );
+        $this->realContainer->addServiceInstance(
+            new InstanceDefinition('call.date', '1970-01-01')
+        );
+
+        $this->realContainer->addService(
+            new ServiceDefinition(
+                'service.call',
+                \DateTime::class,
+                ['@call.date'],
+                ['format' => ['@call.format']]
+            )
+        );
+
+        $this->realContainer->addService(
+            new ServiceDefinition(
+                'service.call2',
+                \DateTime::class,
+                ['1970-01-01'],
+                ['format' => ['Y-m-d']]
+            )
+        );
+
+        $date = new \DateTime('1970-01-01');
+        $this->assertSame($date->format('m-d-Y'), $this->realContainer->get('service.call')->format('m-d-Y'));
+        $this->assertSame($date->format('m-d-Y'), $this->realContainer->get('service.call2')->format('m-d-Y'));
+    }
+
+    public function test_has()
+    {
+        $this->assertSame(false, $this->realContainer->has('fake'));
+        $this->assertSame(true, $this->realContainer->has(self::DEFAULT_SERVICE_NANE));
+        $this->assertSame(true, $this->realContainer->has(self::DEFAULT_SERVICE_NANE));
+
+        $this->realContainer->addServiceInstance(new InstanceDefinition('instance.name', \DateTime::class));
+        $this->assertSame(true, $this->realContainer->has('instance.name'));
+    }
 
 }

src/Configuration/Validator/ConfigurationValidator.php

Indentation +129 added lines, -129 removed lines

@@ -13,134 +13,134 @@
  */
 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'
-			);
-		}
-
-		$this->validateClass($service);
-		$this->validateArguments($service);
-		$this->validateMethods($service);
-	}
-
-	/**
-	 * @param $service
-	 * @throws InvalidConfigFormatException
-	 */
-	private function validateClass($service)
-	{
-		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'
-			);
-		}
-	}
-
-	/**
-	 * @param $service
-	 * @throws InvalidConfigFormatException
-	 */
-	private function validateArguments($service)
-	{
-		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'
-			);
-		}
-	}
-
-	/**
-	 * @param $service
-	 * @throws InvalidConfigFormatException
-	 */
-	private function validateMethods($service)
-	{
-		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'
+            );
+        }
+
+        $this->validateClass($service);
+        $this->validateArguments($service);
+        $this->validateMethods($service);
+    }
+
+    /**
+     * @param $service
+     * @throws InvalidConfigFormatException
+     */
+    private function validateClass($service)
+    {
+        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'
+            );
+        }
+    }
+
+    /**
+     * @param $service
+     * @throws InvalidConfigFormatException
+     */
+    private function validateArguments($service)
+    {
+        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'
+            );
+        }
+    }
+
+    /**
+     * @param $service
+     * @throws InvalidConfigFormatException
+     */
+    private function validateMethods($service)
+    {
+        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'
+            );
+        }
+    }
 
 }