Merge branch 'master' of github.com:RefactoringGuru/design-patterns-php

Author: lex111

ruleset.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<ruleset name="RefactoringGuruExamplesCodingStandard">
+    <description>
+        The RefactoringGuru coding standard.
+    </description>
+
+    <rule ref="PSR2">
+        <exclude name="PSR1.Files.SideEffects.FoundWithSymbols" />
+        <exclude name="PSR1.Classes.ClassDeclaration.MultipleClasses" />
+        
+        <exclude name="PSR2.Methods.FunctionCallSignature.MultipleArguments" />
+        <exclude name="PSR2.Classes.PropertyDeclaration" />
+        <exclude name="PSR2.Methods.FunctionCallSignature.CloseBracketLine" />
+        <exclude name="PSR2.Methods.FunctionCallSignature.Indent" />
+        <exclude name="PSR2.Methods.FunctionCallSignature.ContentAfterOpenBracket" />
+        
+        <exclude name="Squiz.WhiteSpace.ScopeClosingBrace.ContentBefore" />
+        <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.BraceOnNewLine" />
+		<exclude name="Squiz.Functions.MultiLineFunctionDeclaration.BraceOnSameLine" />
+        <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.ContentAfterBrace" />
+        <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.OneParamPerLine" />
+        <exclude name="Squiz.ControlStructures.ControlSignature.SpaceAfterCloseBrace" />
+    </rule>
+</ruleset>

src/RefactoringGuru/AbstractFactory/Structural/AbstractFactoryStructural.php

@@ -206,11 +206,11 @@ public function anotherUsefulFunctionB(AbstractProductA $collaborator): string
  */
 function clientCode(AbstractFactory $factory)
 {
-    $product_a = $factory->createProductA();
-    $product_b = $factory->createProductB();
+    $productA = $factory->createProductA();
+    $productB = $factory->createProductB();
 
-    echo $product_b->usefulFunctionB() . "\n";
-    echo $product_b->anotherUsefulFunctionB($product_a) . "\n";
+    echo $productB->usefulFunctionB() . "\n";
+    echo $productB->anotherUsefulFunctionB($productA) . "\n";
 }
 
 /**

src/RefactoringGuru/Bridge/RealWorld/BridgeRealWorld.php

@@ -144,8 +144,7 @@ public function __construct(
         string $description,
         string $image,
         float $price
-    )
-    {
+    ) {
         $this->id = $id;
         $this->title = $title;
         $this->description = $description;

src/RefactoringGuru/Composite/RealWorld/CompositeRealWorld.php

@@ -99,7 +99,7 @@ public function getData(): array
      * рендеринга, но мы можем с уверенностью предположить, что все они будут
      * возвращать строки.
      */
-    public abstract function render(): string;
+    abstract public function render(): string;
 }
 
 /**

src/RefactoringGuru/Composite/Structural/CompositeStructural.php

@@ -88,7 +88,7 @@ public function isComposite(): bool
      * умолчанию или поручить это конкретным классам, объявив метод, содержащий
      * поведение абстрактным.
      */
-    public abstract function operation(): string;
+    abstract public function operation(): string;
 }
 
 /**

src/RefactoringGuru/Composite/Structural/Output.txt

@@ -4,5 +4,5 @@ RESULT: Leaf
 Client: Now I get a composite tree:
 RESULT: Branch(Branch(Leaf+Leaf)+Branch(Leaf))
 
-Client: I can merge two components without checking their classes:
-RESULT: Branch(Branch(Leaf+Leaf)+Branch(Leaf)+Leaf)
+Client: I don't need to check the components classes even when managing the tree::
+RESULT: Branch(Branch(Leaf+Leaf)+Branch(Leaf)+Leaf)

src/RefactoringGuru/Decorator/RealWorld/DecoratorRealWorld.php

@@ -303,4 +303,3 @@ function displayCommentAsAWebsite(InputFormat $format, string $text)
     "and filtering some dangerous HTML tags and attributes (safe, pretty):\n";
 displayCommentAsAWebsite($filteredInput, $dangerousForumPost);
 echo "\n\n\n";
-

src/RefactoringGuru/Facade/RealWorld/FacadeRealWorld.php

@@ -118,7 +118,7 @@ public function saveAs(string $path): void { /* ... */ }
  */
 class FFMpeg
 {
-    static public function create(): FFMpeg { /* ... */ }
+    public static function create(): FFMpeg { /* ... */ }
 
     public function open(string $video): void { /* ... */ }
 

src/RefactoringGuru/FactoryMethod/RealWorld/FactoryMethodRealWorld.php

@@ -58,7 +58,7 @@ abstract class SocialNetworkPoster
      * абстрактный коннектор. Это позволяет подклассам возвращать любые
      * конкретные коннекторы без нарушения контракта суперкласса.
      */
-    public abstract function getSocialNetwork(): SocialNetworkConnector;
+    abstract public function getSocialNetwork(): SocialNetworkConnector;
 
     /**
      * EN: When the factory method is used inside the Creator's business logic,

src/RefactoringGuru/FactoryMethod/Structural/FactoryMethodStructural.php

@@ -34,7 +34,7 @@ abstract class Creator
      * RU: Обратите внимание, что Создатель может также обеспечить реализацию
      * фабричного метода по умолчанию.
      */
-    public abstract function factoryMethod(): Product;
+    abstract public function factoryMethod(): Product;
 
     /**
      * EN: Also note that, despite its name, the Creator's primary

src/RefactoringGuru/Flyweight/RealWorld/FlyweightRealWorld.php

@@ -316,8 +316,7 @@ public function getVariation(
         string $texture,
         string $fur,
         string $size
-    ): CatVariation 
-    {
+    ): CatVariation {
         $key = $this->getKey(get_defined_vars());
 
         if (! isset($this->variations[$key])) {

src/RefactoringGuru/State/Structural/StateStructural.php

@@ -95,9 +95,9 @@ public function setContext(Context $context)
         $this->context = $context;
     }
 
-    public abstract function handle1(): void;
+    abstract public function handle1(): void;
 
-    public abstract function handle2(): void;
+    abstract public function handle2(): void;
 }
 
 /**

src/RefactoringGuru/TemplateMethod/RealWorld/TemplateMethodRealWorld.php

@@ -82,11 +82,11 @@ public function post(string $message): bool
      * RU: Шаги объявлены абстрактными, чтобы заставить подклассы реализовать их
      * полностью.
      */
-    public abstract function logIn(string $userName, string $password): bool;
+    abstract public function logIn(string $userName, string $password): bool;
 
-    public abstract function sendData(string $message): bool;
+    abstract public function sendData(string $message): bool;
 
-    public abstract function logOut(): void;
+    abstract public function logOut(): void;
 }
 
 /**

src/RefactoringGuru/TemplateMethod/Structural/TemplateMethodStructural.php

@@ -73,9 +73,9 @@ protected function baseOperation3(): void
      *
      * RU: А эти операции должны быть реализованы в подклассах.
      */
-    protected abstract function requiredOperations1(): void;
+    abstract protected function requiredOperations1(): void;
 
-    protected abstract function requiredOperation2(): void;
+    abstract protected function requiredOperation2(): void;
 
     /**
      * EN: These are "hooks." Subclasses may override them, but it's not

src/RefactoringGuru/Visitor/RealWorld/VisitorRealWorld.php

@@ -278,4 +278,3 @@ public function visitEmployee(Employee $employee): string
 
 // $export = new JSONExport; 
 // echo $company->accept($export);
-