Merge pull request DesignPatternsPHP#309 from k-gun/master

piotrgradzinski · web-flow · commit 94d055ca7c7a · 2017-12-11T10:17:36.000+01:00
The "protected" keyword should be used in order to subclasses to use …
diff --git a/Creational/AbstractFactory/Text.php b/Creational/AbstractFactory/Text.php
@@ -7,7 +7,7 @@ abstract class Text
     /**
      * @var string
      */
-    private $text;
+    protected $text;
 
     public function __construct(string $text)
     {
diff --git a/Creational/SimpleFactory/README.rst b/Creational/SimpleFactory/README.rst
@@ -7,7 +7,7 @@ Purpose
 SimpleFactory is a simple factory pattern.
 
 It differs from the static factory because it is not static.
-Therefore, you can have multiple factories, differently parametrized, you can subclass it and you can mock it.
+Therefore, you can have multiple factories, differently parameterized, you can subclass it and you can mock it.
 It always should be preferred over a static factory!
 
 UML Diagram
diff --git a/Structural/DependencyInjection/README.rst b/Structural/DependencyInjection/README.rst
@@ -10,7 +10,7 @@ testable, maintainable and extendable code.
 Usage
 -----
 
-DatabaseConfiguration gets injected and ``DatabaseConnection`` will get all that it
+``DatabaseConfiguration`` gets injected and ``DatabaseConnection`` will get all that it
 needs from ``$config``. Without DI, the configuration would be created
 directly in ``DatabaseConnection``, which is not very good for testing and
 extending it.
diff --git a/locale/ca/LC_MESSAGES/Creational/SimpleFactory/README.po b/locale/ca/LC_MESSAGES/Creational/SimpleFactory/README.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: DesignPatternsPHP 1.0\n"
@@ -31,7 +31,7 @@ msgstr ""
 
 #: ../../Creational/SimpleFactory/README.rst:12
 msgid ""
-"Therefore, you can have multiple factories, differently parametrized, you "
+"Therefore, you can have multiple factories, differently parameterized, you "
 "can subclass it and you can mock-up it."
 msgstr ""
 
diff --git a/locale/template/LC_MESSAGES/Creational/SimpleFactory/README.pot b/locale/template/LC_MESSAGES/Creational/SimpleFactory/README.pot
@@ -23,7 +23,7 @@ msgstr ""
 #: ../../Creational/SimpleFactory/README.rst:9
 msgid ""
 "It differs from the static factory because it is not static. "
-"Therefore, you can have multiple factories, differently parametrized, you can subclass it and you can mock it."
+"Therefore, you can have multiple factories, differently parameterized, you can subclass it and you can mock it."
 msgstr ""
 
 #: ../../Creational/SimpleFactory/README.rst:11
@@ -52,4 +52,4 @@ msgstr ""
 
 #: ../../Creational/SimpleFactory/README.rst:52
 msgid "Test"
-msgstr ""
+msgstr ""
diff --git a/locale/template/LC_MESSAGES/Structural/DependencyInjection/README.pot b/locale/template/LC_MESSAGES/Structural/DependencyInjection/README.pot
@@ -28,7 +28,7 @@ msgstr ""
 
 #: ../../Structural/DependencyInjection/README.rst:13
 msgid ""
-"DatabaseConfiguration gets injected and ``DatabaseConnection`` will get all that it "
+"``DatabaseConfiguration`` gets injected and ``DatabaseConnection`` will get all that it "
 "needs from ``$config``. Without DI, the configuration would be created "
 "directly in ``DatabaseConnection``, which is not very good for testing and "
 "extending it."
@@ -71,4 +71,4 @@ msgstr ""
 
 #: ../../Structural/DependencyInjection/README.rst:53
 msgid "Test"
-msgstr ""
+msgstr ""

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ abstract class Text`
`7`	`7`	`/**`
`8`	`8`	`* @var string`
`9`	`9`	`*/`
`10`		`- private $text;`
	`10`	`+ protected $text;`
`11`	`11`
`12`	`12`	`public function __construct(string $text)`
`13`	`13`	`{`