mirror of
https://github.com/DesignPatternsPHP/DesignPatternsPHP.git
synced 2025-06-21 16:52:49 +02:00
it was created the More namespace and append its patterns
This commit is contained in:
@ -1,8 +1,8 @@
|
||||
<?php
|
||||
|
||||
namespace DesignPatterns\Tests\Delegation;
|
||||
namespace DesignPatterns\More\Delegation;
|
||||
|
||||
use DesignPatterns\Delegation;
|
||||
use DesignPatterns\More\Delegation;
|
||||
|
||||
/**
|
||||
* DelegationTest tests the delegation pattern
|
@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace DesignPatterns\Delegation;
|
||||
namespace DesignPatterns\More\Delegation;
|
||||
|
||||
/**
|
||||
* Class JuniorDeveloper
|
||||
|
@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace DesignPatterns\Delegation;
|
||||
namespace DesignPatterns\More\Delegation;
|
||||
|
||||
/**
|
||||
* Class TeamLead
|
||||
|
@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace DesignPatterns\Delegation;
|
||||
namespace DesignPatterns\More\Delegation;
|
||||
|
||||
// instantiate TeamLead and appoint to assistants JuniorDeveloper
|
||||
$teamLead = new TeamLead(new JuniorDeveloper());
|
||||
|
@ -1,8 +1,7 @@
|
||||
<?php
|
||||
|
||||
namespace DesignPatterns\ServiceLocator;
|
||||
namespace DesignPatterns\More\ServiceLocator;
|
||||
|
||||
class DatabaseService implements DatabaseServiceInterface
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -1,8 +1,7 @@
|
||||
<?php
|
||||
|
||||
namespace DesignPatterns\ServiceLocator;
|
||||
namespace DesignPatterns\More\ServiceLocator;
|
||||
|
||||
interface DatabaseServiceInterface
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -1,8 +1,7 @@
|
||||
<?php
|
||||
|
||||
namespace DesignPatterns\ServiceLocator;
|
||||
namespace DesignPatterns\More\ServiceLocator;
|
||||
|
||||
class LogService implements LogServiceInterface
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -1,8 +1,7 @@
|
||||
<?php
|
||||
|
||||
namespace DesignPatterns\ServiceLocator;
|
||||
namespace DesignPatterns\More\ServiceLocator;
|
||||
|
||||
interface LogServiceInterface
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace DesignPatterns\ServiceLocator;
|
||||
namespace DesignPatterns\More\ServiceLocator;
|
||||
|
||||
class ServiceLocator implements ServiceLocatorInterface
|
||||
{
|
||||
@ -27,17 +27,17 @@ class ServiceLocator implements ServiceLocatorInterface
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->services = array();
|
||||
$this->services = array();
|
||||
$this->instantiated = array();
|
||||
$this->shared = array();
|
||||
$this->shared = array();
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers a service with specific interface.
|
||||
*
|
||||
* @param string $interface
|
||||
* @param string $interface
|
||||
* @param string|object $service
|
||||
* @param bool $share
|
||||
* @param bool $share
|
||||
*/
|
||||
public function add($interface, $service, $share = true)
|
||||
{
|
||||
@ -47,11 +47,11 @@ class ServiceLocator implements ServiceLocatorInterface
|
||||
* in the future even if you will change the service implementation.
|
||||
*/
|
||||
|
||||
if(is_object($service) && $share)
|
||||
if (is_object($service) && $share) {
|
||||
$this->instantiated[$interface] = $service;
|
||||
|
||||
}
|
||||
$this->services[$interface] = (is_object($service) ? get_class($service) : $service);
|
||||
$this->shared[$interface] = $share;
|
||||
$this->shared[$interface] = $share;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -76,8 +76,9 @@ class ServiceLocator implements ServiceLocatorInterface
|
||||
public function get($interface)
|
||||
{
|
||||
// Retrieves the instance if it exists and it is shared
|
||||
if(isset($this->instantiated[$interface]) && $this->shared[$interface])
|
||||
if (isset($this->instantiated[$interface]) && $this->shared[$interface]) {
|
||||
return $this->instantiated[$interface];
|
||||
}
|
||||
|
||||
// otherwise gets the service registered.
|
||||
$service = $this->services[$interface];
|
||||
@ -97,9 +98,9 @@ class ServiceLocator implements ServiceLocatorInterface
|
||||
$object = new $service();
|
||||
|
||||
// and saves it if the service must be shared.
|
||||
if($this->shared[$interface])
|
||||
if ($this->shared[$interface]) {
|
||||
$this->instantiated[$interface] = $object;
|
||||
|
||||
}
|
||||
return $object;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,8 +1,8 @@
|
||||
<?php
|
||||
|
||||
namespace DesignPatterns\ServiceLocator;
|
||||
namespace DesignPatterns\More\ServiceLocator;
|
||||
|
||||
interface ServiceLocatorInterface
|
||||
interface ServiceLocatorInterface
|
||||
{
|
||||
/**
|
||||
* Checks if a service is registered.
|
||||
@ -21,4 +21,4 @@ interface ServiceLocatorInterface
|
||||
* @return mixed
|
||||
*/
|
||||
public function get($interface);
|
||||
}
|
||||
}
|
||||
|
85
More/ServiceLocator/ServiceLocatorTest.php
Normal file
85
More/ServiceLocator/ServiceLocatorTest.php
Normal file
@ -0,0 +1,85 @@
|
||||
<?php
|
||||
|
||||
namespace DesignPatterns\More\ServiceLocator;
|
||||
|
||||
use DesignPatterns\More\ServiceLocator\DatabaseService;
|
||||
use DesignPatterns\More\ServiceLocator\LogService;
|
||||
use DesignPatterns\More\ServiceLocator\ServiceLocator;
|
||||
use \PHPUnit_Framework_TestCase as TestCase;
|
||||
|
||||
class ServiceLocatorTest extends TestCase
|
||||
{
|
||||
/**
|
||||
* @var LogService
|
||||
*/
|
||||
private $logService;
|
||||
|
||||
/**
|
||||
* @var DatabaseService
|
||||
*/
|
||||
private $databaseService;
|
||||
|
||||
/**
|
||||
* @var ServiceLocator
|
||||
*/
|
||||
private $serviceLocator;
|
||||
|
||||
public function setUp()
|
||||
{
|
||||
$this->serviceLocator = new ServiceLocator();
|
||||
|
||||
$this->logService = new LogService();
|
||||
$this->databaseService = new DatabaseService();
|
||||
}
|
||||
|
||||
public function testHasServices()
|
||||
{
|
||||
$this->serviceLocator->add(
|
||||
'DesignPatterns\More\ServiceLocator\LogServiceInterface',
|
||||
$this->logService
|
||||
);
|
||||
$this->serviceLocator->add(
|
||||
'DesignPatterns\More\ServiceLocator\DatabaseServiceInterface',
|
||||
$this->databaseService
|
||||
);
|
||||
|
||||
$this->assertTrue($this->serviceLocator->has('DesignPatterns\More\ServiceLocator\LogServiceInterface'));
|
||||
$this->assertTrue($this->serviceLocator->has('DesignPatterns\More\ServiceLocator\DatabaseServiceInterface'));
|
||||
|
||||
$this->assertFalse($this->serviceLocator->has('DesignPatterns\More\ServiceLocator\FakeServiceInterface'));
|
||||
}
|
||||
|
||||
public function testServicesWithObject()
|
||||
{
|
||||
$this->serviceLocator->add('DesignPatterns\More\ServiceLocator\LogServiceInterface', $this->logService);
|
||||
$this->serviceLocator->add('DesignPatterns\More\ServiceLocator\DatabaseServiceInterface', $this->databaseService);
|
||||
|
||||
$this->assertSame($this->logService, $this->serviceLocator->get('DesignPatterns\More\ServiceLocator\LogServiceInterface'));
|
||||
$this->assertSame($this->databaseService, $this->serviceLocator->get('DesignPatterns\More\ServiceLocator\DatabaseServiceInterface'));
|
||||
}
|
||||
|
||||
public function testServicesWithClass()
|
||||
{
|
||||
$this->serviceLocator
|
||||
->add('DesignPatterns\More\ServiceLocator\LogServiceInterface', get_class($this->logService));
|
||||
$this->serviceLocator->add('DesignPatterns\More\ServiceLocator\DatabaseServiceInterface', get_class($this->databaseService));
|
||||
|
||||
$this->assertNotSame($this->logService, $this->serviceLocator->get('DesignPatterns\More\ServiceLocator\LogServiceInterface'));
|
||||
$this->assertInstanceOf('DesignPatterns\More\ServiceLocator\LogServiceInterface', $this->serviceLocator->get('DesignPatterns\More\ServiceLocator\LogServiceInterface'));
|
||||
|
||||
$this->assertNotSame($this->databaseService, $this->serviceLocator->get('DesignPatterns\More\ServiceLocator\DatabaseServiceInterface'));
|
||||
$this->assertInstanceOf('DesignPatterns\More\ServiceLocator\DatabaseServiceInterface', $this->serviceLocator->get('DesignPatterns\More\ServiceLocator\DatabaseServiceInterface'));
|
||||
}
|
||||
|
||||
public function testServicesNotShared()
|
||||
{
|
||||
$this->serviceLocator->add('DesignPatterns\More\ServiceLocator\LogServiceInterface', $this->logService, false);
|
||||
$this->serviceLocator->add('DesignPatterns\More\ServiceLocator\DatabaseServiceInterface', $this->databaseService, false);
|
||||
|
||||
$this->assertNotSame($this->logService, $this->serviceLocator->get('DesignPatterns\More\ServiceLocator\LogServiceInterface'));
|
||||
$this->assertInstanceOf('DesignPatterns\More\ServiceLocator\LogServiceInterface', $this->serviceLocator->get('DesignPatterns\More\ServiceLocator\LogServiceInterface'));
|
||||
|
||||
$this->assertNotSame($this->databaseService, $this->serviceLocator->get('DesignPatterns\More\ServiceLocator\DatabaseServiceInterface'));
|
||||
$this->assertInstanceOf('DesignPatterns\More\ServiceLocator\DatabaseServiceInterface', $this->serviceLocator->get('DesignPatterns\More\ServiceLocator\DatabaseServiceInterface'));
|
||||
}
|
||||
}
|
@ -1,79 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace DesignPatterns\Tests\ServiceLocator;
|
||||
|
||||
use DesignPatterns\ServiceLocator\DatabaseService;
|
||||
use DesignPatterns\ServiceLocator\LogService;
|
||||
use DesignPatterns\ServiceLocator\ServiceLocator;
|
||||
use \PHPUnit_Framework_TestCase as TestCase;
|
||||
|
||||
class ServiceLocatorTest extends TestCase
|
||||
{
|
||||
/**
|
||||
* @var LogService
|
||||
*/
|
||||
private $logService;
|
||||
|
||||
/**
|
||||
* @var DatabaseService
|
||||
*/
|
||||
private $databaseService;
|
||||
|
||||
/**
|
||||
* @var ServiceLocator
|
||||
*/
|
||||
private $serviceLocator;
|
||||
|
||||
public function setUp()
|
||||
{
|
||||
$this->serviceLocator = new ServiceLocator();
|
||||
|
||||
$this->logService = new LogService();
|
||||
$this->databaseService = new DatabaseService();
|
||||
}
|
||||
|
||||
public function testHasServices()
|
||||
{
|
||||
$this->serviceLocator->add('DesignPatterns\ServiceLocator\LogServiceInterface', $this->logService);
|
||||
$this->serviceLocator->add('DesignPatterns\ServiceLocator\DatabaseServiceInterface', $this->databaseService);
|
||||
|
||||
$this->assertTrue($this->serviceLocator->has('DesignPatterns\ServiceLocator\LogServiceInterface'));
|
||||
$this->assertTrue($this->serviceLocator->has('DesignPatterns\ServiceLocator\DatabaseServiceInterface'));
|
||||
|
||||
$this->assertFalse($this->serviceLocator->has('DesignPatterns\ServiceLocator\FakeServiceInterface'));
|
||||
}
|
||||
|
||||
public function testServicesWithObject()
|
||||
{
|
||||
$this->serviceLocator->add('DesignPatterns\ServiceLocator\LogServiceInterface', $this->logService);
|
||||
$this->serviceLocator->add('DesignPatterns\ServiceLocator\DatabaseServiceInterface', $this->databaseService);
|
||||
|
||||
$this->assertSame($this->logService, $this->serviceLocator->get('DesignPatterns\ServiceLocator\LogServiceInterface'));
|
||||
$this->assertSame($this->databaseService, $this->serviceLocator->get('DesignPatterns\ServiceLocator\DatabaseServiceInterface'));
|
||||
}
|
||||
|
||||
public function testServicesWithClass()
|
||||
{
|
||||
$this->serviceLocator->add('DesignPatterns\ServiceLocator\LogServiceInterface', get_class($this->logService));
|
||||
$this->serviceLocator->add('DesignPatterns\ServiceLocator\DatabaseServiceInterface', get_class($this->databaseService));
|
||||
|
||||
$this->assertNotSame($this->logService, $this->serviceLocator->get('DesignPatterns\ServiceLocator\LogServiceInterface'));
|
||||
$this->assertInstanceOf('DesignPatterns\ServiceLocator\LogServiceInterface', $this->serviceLocator->get('DesignPatterns\ServiceLocator\LogServiceInterface'));
|
||||
|
||||
$this->assertNotSame($this->databaseService, $this->serviceLocator->get('DesignPatterns\ServiceLocator\DatabaseServiceInterface'));
|
||||
$this->assertInstanceOf('DesignPatterns\ServiceLocator\DatabaseServiceInterface', $this->serviceLocator->get('DesignPatterns\ServiceLocator\DatabaseServiceInterface'));
|
||||
}
|
||||
|
||||
public function testServicesNotShared()
|
||||
{
|
||||
$this->serviceLocator->add('DesignPatterns\ServiceLocator\LogServiceInterface', $this->logService, false);
|
||||
$this->serviceLocator->add('DesignPatterns\ServiceLocator\DatabaseServiceInterface', $this->databaseService, false);
|
||||
|
||||
$this->assertNotSame($this->logService, $this->serviceLocator->get('DesignPatterns\ServiceLocator\LogServiceInterface'));
|
||||
$this->assertInstanceOf('DesignPatterns\ServiceLocator\LogServiceInterface', $this->serviceLocator->get('DesignPatterns\ServiceLocator\LogServiceInterface'));
|
||||
|
||||
$this->assertNotSame($this->databaseService, $this->serviceLocator->get('DesignPatterns\ServiceLocator\DatabaseServiceInterface'));
|
||||
$this->assertInstanceOf('DesignPatterns\ServiceLocator\DatabaseServiceInterface', $this->serviceLocator->get('DesignPatterns\ServiceLocator\DatabaseServiceInterface'));
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user