diff --git a/Creational/SimpleFactory/README.rst b/Creational/SimpleFactory/README.rst index 0525667..8f6ce81 100644 --- a/Creational/SimpleFactory/README.rst +++ b/Creational/SimpleFactory/README.rst @@ -4,7 +4,7 @@ Simple Factory Purpose ------- -ConcreteFactory is a simple factory pattern. +SimpleFactory is a simple factory pattern. It differs from the static factory because it is NOT static and as you know: static => global => evil! @@ -24,9 +24,9 @@ Code You can also find these code on `GitHub`_ -ConcreteFactory.php +SimpleFactory.php -.. literalinclude:: ConcreteFactory.php +.. literalinclude:: SimpleFactory.php :language: php :linenos: @@ -53,7 +53,7 @@ Usage .. code:: php - $factory = new ConcreteFactory(); + $factory = new SimpleFactory(); $bicycle = $factory->createVehicle('bicycle'); $bicycle->driveTo('Paris'); diff --git a/Creational/SimpleFactory/ConcreteFactory.php b/Creational/SimpleFactory/SimpleFactory.php similarity index 95% rename from Creational/SimpleFactory/ConcreteFactory.php rename to Creational/SimpleFactory/SimpleFactory.php index 5f4cd2d..7de17a1 100644 --- a/Creational/SimpleFactory/ConcreteFactory.php +++ b/Creational/SimpleFactory/SimpleFactory.php @@ -3,9 +3,9 @@ namespace DesignPatterns\Creational\SimpleFactory; /** - * class ConcreteFactory. + * class SimpleFactory. */ -class ConcreteFactory +class SimpleFactory { /** * @var array diff --git a/Creational/SimpleFactory/Tests/SimpleFactoryTest.php b/Creational/SimpleFactory/Tests/SimpleFactoryTest.php index c913d96..c2f5379 100644 --- a/Creational/SimpleFactory/Tests/SimpleFactoryTest.php +++ b/Creational/SimpleFactory/Tests/SimpleFactoryTest.php @@ -2,7 +2,7 @@ namespace DesignPatterns\Creational\SimpleFactory\Tests; -use DesignPatterns\Creational\SimpleFactory\ConcreteFactory; +use DesignPatterns\Creational\SimpleFactory\SimpleFactory; /** * SimpleFactoryTest tests the Simple Factory pattern. @@ -13,7 +13,7 @@ class SimpleFactoryTest extends \PHPUnit_Framework_TestCase protected function setUp() { - $this->factory = new ConcreteFactory(); + $this->factory = new SimpleFactory(); } public function getType() diff --git a/Creational/SimpleFactory/uml/SimpleFactory.uml b/Creational/SimpleFactory/uml/SimpleFactory.uml index f51ce6c..5a586a5 100644 --- a/Creational/SimpleFactory/uml/SimpleFactory.uml +++ b/Creational/SimpleFactory/uml/SimpleFactory.uml @@ -1,10 +1,10 @@ PHP - \DesignPatterns\Creational\SimpleFactory\ConcreteFactory + \DesignPatterns\Creational\SimpleFactory\SimpleFactory \DesignPatterns\Creational\SimpleFactory\Scooter - \DesignPatterns\Creational\SimpleFactory\ConcreteFactory + \DesignPatterns\Creational\SimpleFactory\SimpleFactory \DesignPatterns\Creational\SimpleFactory\VehicleInterface \DesignPatterns\Creational\SimpleFactory\Bicycle diff --git a/Creational/SimpleFactory/uml/uml.svg b/Creational/SimpleFactory/uml/uml.svg index 7c966c2..7da8077 100644 --- a/Creational/SimpleFactory/uml/uml.svg +++ b/Creational/SimpleFactory/uml/uml.svg @@ -201,10 +201,10 @@ - ConcreteFactory + SimpleFactory - ConcreteFactory + SimpleFactory diff --git a/locale/ca/LC_MESSAGES/Creational/SimpleFactory/README.po b/locale/ca/LC_MESSAGES/Creational/SimpleFactory/README.po index d011ad6..74e85d4 100644 --- a/locale/ca/LC_MESSAGES/Creational/SimpleFactory/README.po +++ b/locale/ca/LC_MESSAGES/Creational/SimpleFactory/README.po @@ -20,7 +20,7 @@ msgid "Purpose" msgstr "" #: ../../Creational/SimpleFactory/README.rst:7 -msgid "ConcreteFactory is a simple factory pattern." +msgid "SimpleFactory is a simple factory pattern." msgstr "" #: ../../Creational/SimpleFactory/README.rst:9 @@ -48,7 +48,7 @@ msgid "You can also find these code on `GitHub`_" msgstr "" #: ../../Creational/SimpleFactory/README.rst:27 -msgid "ConcreteFactory.php" +msgid "SimpleFactory.php" msgstr "" #: ../../Creational/SimpleFactory/README.rst:33 diff --git a/locale/es/LC_MESSAGES/Creational/SimpleFactory/README.po b/locale/es/LC_MESSAGES/Creational/SimpleFactory/README.po index a56e3b4..0b517cd 100644 --- a/locale/es/LC_MESSAGES/Creational/SimpleFactory/README.po +++ b/locale/es/LC_MESSAGES/Creational/SimpleFactory/README.po @@ -20,7 +20,7 @@ msgid "Purpose" msgstr "" #: ../../Creational/SimpleFactory/README.rst:7 -msgid "ConcreteFactory is a simple factory pattern." +msgid "SimpleFactory is a simple factory pattern." msgstr "" #: ../../Creational/SimpleFactory/README.rst:9 @@ -48,7 +48,7 @@ msgid "You can also find these code on `GitHub`_" msgstr "" #: ../../Creational/SimpleFactory/README.rst:27 -msgid "ConcreteFactory.php" +msgid "SimpleFactory.php" msgstr "" #: ../../Creational/SimpleFactory/README.rst:33 diff --git a/locale/pt_BR/LC_MESSAGES/Creational/SimpleFactory/README.po b/locale/pt_BR/LC_MESSAGES/Creational/SimpleFactory/README.po index d011ad6..74e85d4 100644 --- a/locale/pt_BR/LC_MESSAGES/Creational/SimpleFactory/README.po +++ b/locale/pt_BR/LC_MESSAGES/Creational/SimpleFactory/README.po @@ -20,7 +20,7 @@ msgid "Purpose" msgstr "" #: ../../Creational/SimpleFactory/README.rst:7 -msgid "ConcreteFactory is a simple factory pattern." +msgid "SimpleFactory is a simple factory pattern." msgstr "" #: ../../Creational/SimpleFactory/README.rst:9 @@ -48,7 +48,7 @@ msgid "You can also find these code on `GitHub`_" msgstr "" #: ../../Creational/SimpleFactory/README.rst:27 -msgid "ConcreteFactory.php" +msgid "SimpleFactory.php" msgstr "" #: ../../Creational/SimpleFactory/README.rst:33 diff --git a/locale/ru/LC_MESSAGES/Creational/SimpleFactory/README.po b/locale/ru/LC_MESSAGES/Creational/SimpleFactory/README.po index fdec3c4..4d50b56 100644 --- a/locale/ru/LC_MESSAGES/Creational/SimpleFactory/README.po +++ b/locale/ru/LC_MESSAGES/Creational/SimpleFactory/README.po @@ -20,8 +20,8 @@ msgid "Purpose" msgstr "Назначение" #: ../../Creational/SimpleFactory/README.rst:7 -msgid "ConcreteFactory is a simple factory pattern." -msgstr "ConcreteFactory в примере ниже, это паттерн «Простая Фабрика»." +msgid "SimpleFactory is a simple factory pattern." +msgstr "SimpleFactory в примере ниже, это паттерн «Простая Фабрика»." #: ../../Creational/SimpleFactory/README.rst:9 msgid "" @@ -53,8 +53,8 @@ msgid "You can also find these code on `GitHub`_" msgstr "Вы можете найти этот код на `GitHub`_" #: ../../Creational/SimpleFactory/README.rst:27 -msgid "ConcreteFactory.php" -msgstr "ConcreteFactory.php" +msgid "SimpleFactory.php" +msgstr "SimpleFactory.php" #: ../../Creational/SimpleFactory/README.rst:33 msgid "VehicleInterface.php" diff --git a/locale/zh_CN/LC_MESSAGES/Creational/SimpleFactory/README.po b/locale/zh_CN/LC_MESSAGES/Creational/SimpleFactory/README.po index 56221d8..d8eb51c 100644 --- a/locale/zh_CN/LC_MESSAGES/Creational/SimpleFactory/README.po +++ b/locale/zh_CN/LC_MESSAGES/Creational/SimpleFactory/README.po @@ -20,7 +20,7 @@ msgid "Purpose" msgstr "目的" #: ../../Creational/SimpleFactory/README.rst:7 -msgid "ConcreteFactory is a simple factory pattern." +msgid "SimpleFactory is a simple factory pattern." msgstr "简单的创建对象型工厂模式" #: ../../Creational/SimpleFactory/README.rst:9 @@ -52,7 +52,7 @@ msgid "You can also find these code on `GitHub`_" msgstr "你可以在 `GitHub`_ 上找到这些代码" #: ../../Creational/SimpleFactory/README.rst:27 -msgid "ConcreteFactory.php" +msgid "SimpleFactory.php" msgstr "" #: ../../Creational/SimpleFactory/README.rst:33