Conform to PSR-12

kocsismate · kocsismate · commit c11c191f1c6e · 2019-10-04T15:05:46.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,13 @@ REMOVED:
 
 FIXED:
 
+## 0.7.1 - 2019-10-04
+
+CHANGED:
+
+- Improved PSR-12 conformance
+- Added more type hints
+
 ## 0.7.0 - 2019-08-21
 
 CHANGED:
diff --git a/composer.json b/composer.json
@@ -23,9 +23,9 @@
         "phpstan/phpstan-phpunit": "^0.11.0",
         "phpstan/phpstan-strict-rules": "^0.11.0",
         "phpunit/phpunit": "^8.3.4",
-        "squizlabs/php_codesniffer": "^3.4.0",
-        "woohoolabs/coding-standard": "^2.0.1",
-        "woohoolabs/releaser": "^1.1.0"
+        "squizlabs/php_codesniffer": "^3.5.0",
+        "woohoolabs/coding-standard": "^2.1.1",
+        "woohoolabs/releaser": "^1.2.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/composer.lock b/composer.lock
diff --git a/examples/Domain/Course.php b/examples/Domain/Course.php
@@ -5,35 +5,13 @@
 
 class Course
 {
-    /**
-     * @var int
-     */
-    private $id;
-
-    /**
-     * @var
-     */
-    private $name;
-
-    /**
-     * @var string
-     */
-    private $description;
-
-    /**
-     * @var int
-     */
-    private $credit;
-
-    /**
-     * @var string
-     */
-    private $language;
-
-    /**
-     * @var SchoolClass[]
-     */
-    private $classes;
+    private int $id;
+    private string $name;
+    private string $description;
+    private int $credit;
+    private string $language;
+    /** @var SchoolClass[] */
+    private array $classes;
 
     /**
      * @param SchoolClass[] $classes
diff --git a/examples/Domain/Name.php b/examples/Domain/Name.php
@@ -5,15 +5,8 @@
 
 class Name
 {
-    /**
-     * @var string
-     */
-    private $firstName;
-
-    /**
-     * @var string
-     */
-    private $lastName;
+    private string $firstName;
+    private string $lastName;
 
     public function __construct(string $firstName, string $lastName)
     {
diff --git a/examples/Domain/SchoolClass.php b/examples/Domain/SchoolClass.php
@@ -7,29 +7,12 @@
 
 class SchoolClass
 {
-    /**
-     * @var int
-     */
-    private $id;
-
-    /**
-     * @var int
-     */
-    private $roomId;
-
-    /**
-     * @var int
-     */
-    private $teacherId;
-
-    /**
-     * @var Student[]
-     */
-    private $students;
-
-    /**
-     * @var DateTimeImmutable
-     */
+    private int $id;
+    private int $roomId;
+    private int $teacherId;
+    /** @var Student[] */
+    private array $students;
+    /** @var DateTimeImmutable */
     private $datetime;
 
     /**
diff --git a/examples/Domain/Student.php b/examples/Domain/Student.php
@@ -5,30 +5,11 @@
 
 class Student
 {
-    /**
-     * @var int
-     */
-    private $id;
-
-    /**
-     * @var Name
-     */
-    private $name;
-
-    /**
-     * @var string|null
-     */
-    private $birthday;
-
-    /**
-     * @var string|null
-     */
-    private $gender;
-
-    /**
-     * @var string
-     */
-    private $introduction;
+    private int $id;
+    private Name $name;
+    private ?string $birthday;
+    private ?string $gender;
+    private string $introduction;
 
     public function __construct(int $id, Name $name, string $introduction, string $birthday = null, string $gender = null)
     {
diff --git a/examples/Infrastructure/Factory/AbstractFactory.php b/examples/Infrastructure/Factory/AbstractFactory.php
@@ -9,10 +9,7 @@
 
 abstract class AbstractFactory
 {
-    /**
-     * @var IdentityMap
-     */
-    private $identityMap;
+    private IdentityMap $identityMap;
 
     public function __construct(IdentityMap $identityMap)
     {
diff --git a/examples/Infrastructure/Factory/ClassFactory.php b/examples/Infrastructure/Factory/ClassFactory.php
@@ -10,15 +10,8 @@
 
 class ClassFactory extends AbstractFactory
 {
-    /**
-     * @var ClassModel
-     */
-    private $model;
-
-    /**
-     * @var StudentFactory
-     */
-    private $studentFactory;
+    private ClassModel $model;
+    private StudentFactory $studentFactory;
 
     public function __construct(IdentityMap $identityMap, ClassModel $model, StudentFactory $studentFactory)
     {
diff --git a/examples/Infrastructure/Factory/CourseFactory.php b/examples/Infrastructure/Factory/CourseFactory.php
@@ -9,15 +9,8 @@
 
 class CourseFactory extends AbstractFactory
 {
-    /**
-     * @var CourseModel
-     */
-    private $model;
-
-    /**
-     * @var ClassFactory
-     */
-    private $classFactory;
+    private CourseModel $model;
+    private ClassFactory $classFactory;
 
     public function __construct(IdentityMap $identityMap, CourseModel $model, ClassFactory $classFactory)
     {
diff --git a/examples/Infrastructure/Factory/StudentFactory.php b/examples/Infrastructure/Factory/StudentFactory.php
@@ -10,10 +10,7 @@
 
 class StudentFactory extends AbstractFactory
 {
-    /**
-     * @var StudentModel
-     */
-    private $model;
+    private StudentModel $model;
 
     public function __construct(IdentityMap $identityMap, StudentModel $model)
     {
diff --git a/examples/Infrastructure/Model/ClassModel.php b/examples/Infrastructure/Model/ClassModel.php
@@ -16,15 +16,8 @@ class ClassModel extends AbstractModel
     public $students;
     public $datetime;
 
-    /**
-     * @var ClassStudentModel
-     */
-    private $classStudentModel;
-
-    /**
-     * @var StudentModel
-     */
-    private $studentModel;
+    private ClassStudentModel $classStudentModel;
+    private StudentModel $studentModel;
 
     public function __construct(ClassStudentModel $classStudentModel, StudentModel $studentModel)
     {
diff --git a/examples/Infrastructure/Model/CourseModel.php b/examples/Infrastructure/Model/CourseModel.php
@@ -14,11 +14,7 @@ class CourseModel extends AbstractModel
     public $credit;
     public $language;
     public $classes;
-
-    /**
-     * @var ClassModel
-     */
-    public $classModel;
+    public ClassModel $classModel;
 
     public function __construct(ClassModel $classModel)
     {
diff --git a/examples/Infrastructure/Repository/AbstractRepository.php b/examples/Infrastructure/Repository/AbstractRepository.php
@@ -7,10 +7,7 @@
 
 abstract class AbstractRepository
 {
-    /**
-     * @var Worm
-     */
-    protected $worm;
+    protected Worm $worm;
 
     public function __construct(Worm $worm)
     {
diff --git a/examples/Infrastructure/Repository/CourseRepository.php b/examples/Infrastructure/Repository/CourseRepository.php
@@ -11,15 +11,9 @@
 
 class CourseRepository extends AbstractRepository
 {
-    /**
-     * @var CourseModel
-     */
-    private $model;
+    private CourseModel $model;
 
-    /**
-     * @var CourseFactory
-     */
-    private $courseFactory;
+    private CourseFactory $courseFactory;
 
     public function __construct(Worm $worm, CourseModel $model, CourseFactory $factory)
     {
diff --git a/src/Execution/IdentityMap.php b/src/Execution/IdentityMap.php
@@ -1,9 +1,11 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Worm\Execution;
 
 use WoohooLabs\Worm\Model\ModelInterface;
+
 use function array_key_exists;
 use function count;
 
diff --git a/src/Execution/Persister.php b/src/Execution/Persister.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Worm\Execution;
@@ -8,6 +9,7 @@
 use WoohooLabs\Larva\Query\Insert\InsertQueryBuilder;
 use WoohooLabs\Larva\Query\Update\UpdateQueryBuilder;
 use WoohooLabs\Worm\Model\ModelInterface;
+
 use function array_diff_key;
 use function array_keys;
 use function array_values;
diff --git a/src/Execution/QueryExecutor.php b/src/Execution/QueryExecutor.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Worm\Execution;
@@ -12,6 +13,7 @@
 use WoohooLabs\Larva\Query\Update\UpdateQueryBuilderInterface;
 use WoohooLabs\Worm\Model\ModelInterface;
 use WoohooLabs\Worm\Model\Relationship\RelationshipInterface;
+
 use function array_intersect;
 use function is_array;
 
diff --git a/src/Model/AbstractModel.php b/src/Model/AbstractModel.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Worm\Model;
@@ -15,6 +16,7 @@
 use WoohooLabs\Worm\Model\Relationship\HasOneRelationship;
 use WoohooLabs\Worm\Model\Relationship\RelationshipBuilderInterface;
 use WoohooLabs\Worm\Model\Relationship\RelationshipInterface;
+
 use function array_key_exists;
 use function array_keys;
 use function count;
diff --git a/src/Model/ModelInterface.php b/src/Model/ModelInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Worm\Model;
diff --git a/src/Model/Relationship/AbstractRelationship.php b/src/Model/Relationship/AbstractRelationship.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Worm\Model\Relationship;
@@ -9,6 +10,7 @@
 use WoohooLabs\Worm\Execution\IdentityMap;
 use WoohooLabs\Worm\Execution\Persister;
 use WoohooLabs\Worm\Model\ModelInterface;
+
 use function array_key_exists;
 
 abstract class AbstractRelationship implements RelationshipInterface, RelationshipBuilderInterface
diff --git a/src/Model/Relationship/BelongsToManyRelationship.php b/src/Model/Relationship/BelongsToManyRelationship.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Worm\Model\Relationship;
diff --git a/src/Model/Relationship/BelongsToOneRelationship.php b/src/Model/Relationship/BelongsToOneRelationship.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Worm\Model\Relationship;
diff --git a/src/Model/Relationship/HasManyRelationship.php b/src/Model/Relationship/HasManyRelationship.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Worm\Model\Relationship;
diff --git a/src/Model/Relationship/HasManyThroughRelationship.php b/src/Model/Relationship/HasManyThroughRelationship.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Worm\Model\Relationship;
diff --git a/src/Model/Relationship/HasOneRelationship.php b/src/Model/Relationship/HasOneRelationship.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Worm\Model\Relationship;
diff --git a/src/Model/Relationship/RelationshipBuilderInterface.php b/src/Model/Relationship/RelationshipBuilderInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Worm\Model\Relationship;
diff --git a/src/Model/Relationship/RelationshipInterface.php b/src/Model/Relationship/RelationshipInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Worm\Model\Relationship;
diff --git a/src/Query/ConditionBuilder.php b/src/Query/ConditionBuilder.php
diff --git a/src/Query/DeleteQueryBuilder.php b/src/Query/DeleteQueryBuilder.php
diff --git a/src/Query/InsertQueryBuilder.php b/src/Query/InsertQueryBuilder.php
diff --git a/src/Query/SelectQueryBuilder.php b/src/Query/SelectQueryBuilder.php
diff --git a/src/Query/TruncateQueryBuilder.php b/src/Query/TruncateQueryBuilder.php
diff --git a/src/Query/UpdateQueryBuilder.php b/src/Query/UpdateQueryBuilder.php
diff --git a/src/Worm.php b/src/Worm.php
diff --git a/tests/Execution/IdentityMapTest.php b/tests/Execution/IdentityMapTest.php
diff --git a/tests/TestDouble/DummyConnection.php b/tests/TestDouble/DummyConnection.php
diff --git a/tests/TestDouble/DummyModel.php b/tests/TestDouble/DummyModel.php
diff --git a/tests/WormTest.php b/tests/WormTest.php

Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,7 @@`
`9`	`9`
`10`	`10`	`abstract class AbstractFactory`
`11`	`11`	`{`
`12`		`- /**`
`13`		`- * @var IdentityMap`
`14`		`- */`
`15`		`- private $identityMap;`
	`12`	`+ private IdentityMap $identityMap;`
`16`	`13`
`17`	`14`	`public function __construct(IdentityMap $identityMap)`
`18`	`15`	`{`