Merge pull request #269 from Hyunk3l/feature/class-instead-of-namespace

Feature/class instead of namespace
This commit is contained in:
Dominik Liebler 2017-03-09 19:08:19 +01:00 committed by GitHub
commit 8c9b5377b9
11 changed files with 31 additions and 22 deletions

View File

@ -3,7 +3,9 @@
namespace DesignPatterns\Creational\AbstractFactory\Tests;
use DesignPatterns\Creational\AbstractFactory\HtmlFactory;
use DesignPatterns\Creational\AbstractFactory\HtmlText;
use DesignPatterns\Creational\AbstractFactory\JsonFactory;
use DesignPatterns\Creational\AbstractFactory\JsonText;
use PHPUnit\Framework\TestCase;
class AbstractFactoryTest extends TestCase
@ -13,7 +15,7 @@ class AbstractFactoryTest extends TestCase
$factory = new HtmlFactory();
$text = $factory->createText('foobar');
$this->assertInstanceOf('DesignPatterns\Creational\AbstractFactory\HtmlText', $text);
$this->assertInstanceOf(HtmlText::class, $text);
}
public function testCanCreateJsonText()
@ -21,6 +23,6 @@ class AbstractFactoryTest extends TestCase
$factory = new JsonFactory();
$text = $factory->createText('foobar');
$this->assertInstanceOf('DesignPatterns\Creational\AbstractFactory\JsonText', $text);
$this->assertInstanceOf(JsonText::class, $text);
}
}

View File

@ -2,6 +2,8 @@
namespace DesignPatterns\Creational\Builder\Tests;
use DesignPatterns\Creational\Builder\Parts\Car;
use DesignPatterns\Creational\Builder\Parts\Truck;
use DesignPatterns\Creational\Builder\TruckBuilder;
use DesignPatterns\Creational\Builder\CarBuilder;
use DesignPatterns\Creational\Builder\Director;
@ -14,7 +16,7 @@ class DirectorTest extends TestCase
$truckBuilder = new TruckBuilder();
$newVehicle = (new Director())->build($truckBuilder);
$this->assertInstanceOf('DesignPatterns\Creational\Builder\Parts\Truck', $newVehicle);
$this->assertInstanceOf(Truck::class, $newVehicle);
}
public function testCanBuildCar()
@ -22,6 +24,6 @@ class DirectorTest extends TestCase
$carBuilder = new CarBuilder();
$newVehicle = (new Director())->build($carBuilder);
$this->assertInstanceOf('DesignPatterns\Creational\Builder\Parts\Car', $newVehicle);
$this->assertInstanceOf(Car::class, $newVehicle);
}
}

View File

@ -2,6 +2,9 @@
namespace DesignPatterns\Creational\FactoryMethod\Tests;
use DesignPatterns\Creational\FactoryMethod\Bicycle;
use DesignPatterns\Creational\FactoryMethod\CarFerrari;
use DesignPatterns\Creational\FactoryMethod\CarMercedes;
use DesignPatterns\Creational\FactoryMethod\FactoryMethod;
use DesignPatterns\Creational\FactoryMethod\GermanFactory;
use DesignPatterns\Creational\FactoryMethod\ItalianFactory;
@ -14,7 +17,7 @@ class FactoryMethodTest extends TestCase
$factory = new GermanFactory();
$result = $factory->create(FactoryMethod::CHEAP);
$this->assertInstanceOf('DesignPatterns\Creational\FactoryMethod\Bicycle', $result);
$this->assertInstanceOf(Bicycle::class, $result);
}
public function testCanCreateFastVehicleInGermany()
@ -22,7 +25,7 @@ class FactoryMethodTest extends TestCase
$factory = new GermanFactory();
$result = $factory->create(FactoryMethod::FAST);
$this->assertInstanceOf('DesignPatterns\Creational\FactoryMethod\CarMercedes', $result);
$this->assertInstanceOf(CarMercedes::class, $result);
}
public function testCanCreateCheapVehicleInItaly()
@ -30,7 +33,7 @@ class FactoryMethodTest extends TestCase
$factory = new ItalianFactory();
$result = $factory->create(FactoryMethod::CHEAP);
$this->assertInstanceOf('DesignPatterns\Creational\FactoryMethod\Bicycle', $result);
$this->assertInstanceOf(Bicycle::class, $result);
}
public function testCanCreateFastVehicleInItaly()
@ -38,7 +41,7 @@ class FactoryMethodTest extends TestCase
$factory = new ItalianFactory();
$result = $factory->create(FactoryMethod::FAST);
$this->assertInstanceOf('DesignPatterns\Creational\FactoryMethod\CarFerrari', $result);
$this->assertInstanceOf(CarFerrari::class, $result);
}
/**

View File

@ -12,7 +12,7 @@ class MultitonTest extends TestCase
$firstCall = Multiton::getInstance(Multiton::INSTANCE_1);
$secondCall = Multiton::getInstance(Multiton::INSTANCE_1);
$this->assertInstanceOf('DesignPatterns\Creational\Multiton\Multiton', $firstCall);
$this->assertInstanceOf(Multiton::class, $firstCall);
$this->assertSame($firstCall, $secondCall);
}
@ -21,8 +21,8 @@ class MultitonTest extends TestCase
$firstCall = Multiton::getInstance(Multiton::INSTANCE_1);
$secondCall = Multiton::getInstance(Multiton::INSTANCE_2);
$this->assertInstanceOf('DesignPatterns\Creational\Multiton\Multiton', $firstCall);
$this->assertInstanceOf('DesignPatterns\Creational\Multiton\Multiton', $secondCall);
$this->assertInstanceOf(Multiton::class, $firstCall);
$this->assertInstanceOf(Multiton::class, $secondCall);
$this->assertNotSame($firstCall, $secondCall);
}
}

View File

@ -16,13 +16,13 @@ class PrototypeTest extends TestCase
for ($i = 0; $i < 10; $i++) {
$book = clone $fooPrototype;
$book->setTitle('Foo Book No ' . $i);
$this->assertInstanceOf('DesignPatterns\Creational\Prototype\FooBookPrototype', $book);
$this->assertInstanceOf(FooBookPrototype::class, $book);
}
for ($i = 0; $i < 5; $i++) {
$book = clone $barPrototype;
$book->setTitle('Bar Book No ' . $i);
$this->assertInstanceOf('DesignPatterns\Creational\Prototype\BarBookPrototype', $book);
$this->assertInstanceOf(BarBookPrototype::class, $book);
}
}
}

View File

@ -2,6 +2,7 @@
namespace DesignPatterns\Creational\SimpleFactory\Tests;
use DesignPatterns\Creational\SimpleFactory\Bicycle;
use DesignPatterns\Creational\SimpleFactory\SimpleFactory;
use PHPUnit\Framework\TestCase;
@ -10,6 +11,6 @@ class SimpleFactoryTest extends TestCase
public function testCanCreateBicycle()
{
$bicycle = (new SimpleFactory())->createBicycle();
$this->assertInstanceOf('DesignPatterns\Creational\SimpleFactory\Bicycle', $bicycle);
$this->assertInstanceOf(Bicycle::class, $bicycle);
}
}

View File

@ -12,7 +12,7 @@ class SingletonTest extends TestCase
$firstCall = Singleton::getInstance();
$secondCall = Singleton::getInstance();
$this->assertInstanceOf('DesignPatterns\Creational\Singleton\Singleton', $firstCall);
$this->assertInstanceOf(Singleton::class, $firstCall);
$this->assertSame($firstCall, $secondCall);
}
}

View File

@ -31,6 +31,6 @@ class ServiceLocatorTest extends TestCase
$this->serviceLocator->addClass(LogService::class, []);
$logger = $this->serviceLocator->get(LogService::class);
$this->assertInstanceOf('DesignPatterns\More\ServiceLocator\LogService', $logger);
$this->assertInstanceOf(LogService::class, $logger);
}
}

View File

@ -3,6 +3,7 @@
namespace DesignPatterns\Structural\DataMapper\Tests;
use DesignPatterns\Structural\DataMapper\StorageAdapter;
use DesignPatterns\Structural\DataMapper\User;
use DesignPatterns\Structural\DataMapper\UserMapper;
use PHPUnit\Framework\TestCase;
@ -15,7 +16,7 @@ class DataMapperTest extends TestCase
$user = $mapper->findById(1);
$this->assertInstanceOf('DesignPatterns\Structural\DataMapper\User', $user);
$this->assertInstanceOf(User::class, $user);
}
/**

View File

@ -2,7 +2,6 @@
namespace DesignPatterns\Structural\Proxy\Tests;
use DesignPatterns\Structural\Decorator;
use DesignPatterns\Structural\Proxy\RecordProxy;
use PHPUnit\Framework\TestCase;
@ -21,6 +20,6 @@ class ProxyTest extends TestCase
$recordProxy = new RecordProxy([]);
$recordProxy->username = 'baz';
$this->assertInstanceOf('DesignPatterns\Structural\Proxy\Record', $recordProxy);
$this->assertInstanceOf(RecordProxy::class, $recordProxy);
}
}

View File

@ -3,6 +3,7 @@
namespace DesignPatterns\Structural\Registry\Tests;
use DesignPatterns\Structural\Registry\Registry;
use stdClass;
use PHPUnit\Framework\TestCase;
class RegistryTest extends TestCase
@ -10,13 +11,13 @@ class RegistryTest extends TestCase
public function testSetAndGetLogger()
{
$key = Registry::LOGGER;
$logger = new \stdClass();
$logger = new stdClass();
Registry::set($key, $logger);
$storedLogger = Registry::get($key);
$this->assertSame($logger, $storedLogger);
$this->assertInstanceOf('stdClass', $storedLogger);
$this->assertInstanceOf(stdClass::class, $storedLogger);
}
/**
@ -24,7 +25,7 @@ class RegistryTest extends TestCase
*/
public function testThrowsExceptionWhenTryingToSetInvalidKey()
{
Registry::set('foobar', new \stdClass());
Registry::set('foobar', new stdClass());
}
/**