Merge pull request DesignPatternsPHP#445 from mariosimao/444-adopt-psr12

style: Adopt PSR12
Codelutions · Oct 2, 2021 · c03a2f9 · c03a2f9
2 parents 9401af5 + 56970cc
commit c03a2f9
Show file tree

Hide file tree

Showing 167 changed files with 511 additions and 226 deletions.
diff --git a/Behavioral/ChainOfResponsibilities/Handler.php b/Behavioral/ChainOfResponsibilities/Handler.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\ChainOfResponsibilities;
 

diff --git a/Behavioral/ChainOfResponsibilities/Responsible/HttpInMemoryCacheHandler.php b/Behavioral/ChainOfResponsibilities/Responsible/HttpInMemoryCacheHandler.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible;
 

diff --git a/Behavioral/ChainOfResponsibilities/Responsible/SlowDatabaseHandler.php b/Behavioral/ChainOfResponsibilities/Responsible/SlowDatabaseHandler.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible;
 

diff --git a/Behavioral/ChainOfResponsibilities/Tests/ChainTest.php b/Behavioral/ChainOfResponsibilities/Tests/ChainTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\ChainOfResponsibilities\Tests;
 

diff --git a/Behavioral/Command/AddMessageDateCommand.php b/Behavioral/Command/AddMessageDateCommand.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Command;
 

diff --git a/Behavioral/Command/Command.php b/Behavioral/Command/Command.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Command;
 

diff --git a/Behavioral/Command/HelloCommand.php b/Behavioral/Command/HelloCommand.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Command;
 

diff --git a/Behavioral/Command/Invoker.php b/Behavioral/Command/Invoker.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Command;
 

diff --git a/Behavioral/Command/Receiver.php b/Behavioral/Command/Receiver.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Command;
 
@@ -17,7 +19,7 @@ class Receiver
     public function write(string $str)
     {
         if ($this->enableDate) {
-            $str .= ' ['.date('Y-m-d').']';
+            $str .= ' [' . date('Y-m-d') . ']';
         }
 
         $this->output[] = $str;

diff --git a/Behavioral/Command/Tests/CommandTest.php b/Behavioral/Command/Tests/CommandTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Command\Tests;
 

diff --git a/Behavioral/Command/Tests/UndoableCommandTest.php b/Behavioral/Command/Tests/UndoableCommandTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Command\Tests;
 
@@ -23,11 +25,11 @@ public function testInvocation()
         $messageDateCommand->execute();
 
         $invoker->run();
-        $this->assertSame("Hello World\nHello World [".date('Y-m-d').']', $receiver->getOutput());
+        $this->assertSame("Hello World\nHello World [" . date('Y-m-d') . ']', $receiver->getOutput());
 
         $messageDateCommand->undo();
 
         $invoker->run();
-        $this->assertSame("Hello World\nHello World [".date('Y-m-d')."]\nHello World", $receiver->getOutput());
+        $this->assertSame("Hello World\nHello World [" . date('Y-m-d') . "]\nHello World", $receiver->getOutput());
     }
 }
diff --git a/Behavioral/Command/UndoableCommand.php b/Behavioral/Command/UndoableCommand.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Command;
 

diff --git a/Behavioral/Interpreter/AbstractExp.php b/Behavioral/Interpreter/AbstractExp.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Interpreter;
 

diff --git a/Behavioral/Interpreter/AndExp.php b/Behavioral/Interpreter/AndExp.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Interpreter;
 

diff --git a/Behavioral/Interpreter/Context.php b/Behavioral/Interpreter/Context.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Interpreter;
 

diff --git a/Behavioral/Interpreter/OrExp.php b/Behavioral/Interpreter/OrExp.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Interpreter;
 

diff --git a/Behavioral/Interpreter/Tests/InterpreterTest.php b/Behavioral/Interpreter/Tests/InterpreterTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Interpreter\Tests;
 

diff --git a/Behavioral/Interpreter/VariableExp.php b/Behavioral/Interpreter/VariableExp.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Interpreter;
 

diff --git a/Behavioral/Iterator/Book.php b/Behavioral/Iterator/Book.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Iterator;
 
@@ -20,6 +22,6 @@ public function getTitle(): string
 
     public function getAuthorAndTitle(): string
     {
-        return $this->getTitle().' by '.$this->getAuthor();
+        return $this->getTitle() . ' by ' . $this->getAuthor();
     }
 }
diff --git a/Behavioral/Iterator/BookList.php b/Behavioral/Iterator/BookList.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Iterator;
 

diff --git a/Behavioral/Iterator/Tests/IteratorTest.php b/Behavioral/Iterator/Tests/IteratorTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Iterator\Tests;
 

diff --git a/Behavioral/Mediator/Colleague.php b/Behavioral/Mediator/Colleague.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Mediator;
 

diff --git a/Behavioral/Mediator/Mediator.php b/Behavioral/Mediator/Mediator.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Mediator;
 

diff --git a/Behavioral/Mediator/Tests/MediatorTest.php b/Behavioral/Mediator/Tests/MediatorTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Tests\Mediator\Tests;
 

diff --git a/Behavioral/Mediator/Ui.php b/Behavioral/Mediator/Ui.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Mediator;
 

diff --git a/Behavioral/Mediator/UserRepository.php b/Behavioral/Mediator/UserRepository.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Mediator;
 

diff --git a/Behavioral/Mediator/UserRepositoryUiMediator.php b/Behavioral/Mediator/UserRepositoryUiMediator.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Mediator;
 

diff --git a/Behavioral/Memento/Memento.php b/Behavioral/Memento/Memento.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Memento;
 

diff --git a/Behavioral/Memento/State.php b/Behavioral/Memento/State.php
@@ -1,15 +1,17 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Memento;
 
 use InvalidArgumentException;
 
 class State implements \Stringable
 {
-    const STATE_CREATED = 'created';
-    const STATE_OPENED = 'opened';
-    const STATE_ASSIGNED = 'assigned';
-    const STATE_CLOSED = 'closed';
+    public const STATE_CREATED = 'created';
+    public const STATE_OPENED = 'opened';
+    public const STATE_ASSIGNED = 'assigned';
+    public const STATE_CLOSED = 'closed';
 
     private string $state;
 

diff --git a/Behavioral/Memento/Tests/MementoTest.php b/Behavioral/Memento/Tests/MementoTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Memento\Tests;
 

diff --git a/Behavioral/Memento/Ticket.php b/Behavioral/Memento/Ticket.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Memento;
 

diff --git a/Behavioral/NullObject/Logger.php b/Behavioral/NullObject/Logger.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\NullObject;
 

diff --git a/Behavioral/NullObject/NullLogger.php b/Behavioral/NullObject/NullLogger.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\NullObject;
 

diff --git a/Behavioral/NullObject/PrintLogger.php b/Behavioral/NullObject/PrintLogger.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\NullObject;
 

diff --git a/Behavioral/NullObject/Service.php b/Behavioral/NullObject/Service.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\NullObject;
 
@@ -14,6 +16,6 @@ public function __construct(private Logger $logger)
     public function doSomething()
     {
         // notice here that you don't have to check if the logger is set with eg. is_null(), instead just use it
-        $this->logger->log('We are in '.__METHOD__);
+        $this->logger->log('We are in ' . __METHOD__);
     }
 }
diff --git a/Behavioral/NullObject/Tests/LoggerTest.php b/Behavioral/NullObject/Tests/LoggerTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\NullObject\Tests;
 

diff --git a/Behavioral/Observer/Tests/ObserverTest.php b/Behavioral/Observer/Tests/ObserverTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Observer\Tests;
 

diff --git a/Behavioral/Observer/User.php b/Behavioral/Observer/User.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Observer;
 

diff --git a/Behavioral/Observer/UserObserver.php b/Behavioral/Observer/UserObserver.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Observer;
 

diff --git a/Behavioral/Specification/AndSpecification.php b/Behavioral/Specification/AndSpecification.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Specification;
 

diff --git a/Behavioral/Specification/Item.php b/Behavioral/Specification/Item.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Specification;
 

diff --git a/Behavioral/Specification/NotSpecification.php b/Behavioral/Specification/NotSpecification.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Specification;
 

diff --git a/Behavioral/Specification/OrSpecification.php b/Behavioral/Specification/OrSpecification.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Specification;