- PSR-12 codestyle fix

- always force default values
cycle · Dec 26, 2019 · 0a9124f · 0a9124f
1 parent 5dd8145
commit 0a9124f
Show file tree

Hide file tree

Showing 129 changed files with 788 additions and 458 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     "mockery/mockery": "^1.1",
     "spiral/tokenizer": "^2.1",
     "spiral/debug": "^1.3",
-    "squizlabs/php_codesniffer": "^3.4"
+    "spiral/code-style": "^1.0"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/Compiler.php b/src/Compiler.php
@@ -1,10 +1,12 @@
 <?php
+
 /**
  * Cycle ORM Schema Builder.
  *
  * @license   MIT
  * @author    Anton Titov (Wolfy-J)
  */
+
 declare(strict_types=1);
 
 namespace Cycle\Schema;
@@ -33,7 +35,7 @@ public function compile(Registry $registry, array $generators = []): array
         foreach ($generators as $generator) {
             if (!$generator instanceof GeneratorInterface) {
                 throw new CompilerException(sprintf(
-                    "Invalid generator `%s`",
+                    'Invalid generator `%s`',
                     is_object($generator) ? get_class($generator) : gettype($generator)
                 ));
             }
@@ -69,7 +71,7 @@ public function getSchema(): array
      * @param Registry $registry
      * @param Entity   $entity
      */
-    protected function compute(Registry $registry, Entity $entity)
+    protected function compute(Registry $registry, Entity $entity): void
     {
         $schema = [
             Schema::ENTITY       => $entity->getClass(),

diff --git a/src/Definition/Entity.php b/src/Definition/Entity.php
@@ -1,10 +1,12 @@
 <?php
+
 /**
  * Cycle ORM Schema Builder.
  *
  * @license   MIT
  * @author    Anton Titov (Wolfy-J)
  */
+
 declare(strict_types=1);
 
 namespace Cycle\Schema\Definition;
@@ -61,6 +63,16 @@ public function __construct()
         $this->relations = new RelationMap();
     }
 
+    /**
+     * Full entity copy.
+     */
+    public function __clone()
+    {
+        $this->options = clone $this->options;
+        $this->fields = clone $this->fields;
+        $this->relations = clone $this->relations;
+    }
+
     /**
      * @return OptionMap
      */
@@ -223,7 +235,7 @@ public function getSchema(): array
      *
      * @param Entity $entity
      */
-    public function merge(Entity $entity)
+    public function merge(Entity $entity): void
     {
         foreach ($entity->getRelations() as $name => $relation) {
             if (!$this->relations->has($name)) {
@@ -237,14 +249,4 @@ public function merge(Entity $entity)
             }
         }
     }
-
-    /**
-     * Full entity copy.
-     */
-    public function __clone()
-    {
-        $this->options = clone $this->options;
-        $this->fields = clone $this->fields;
-        $this->relations = clone $this->relations;
-    }
 }
diff --git a/src/Definition/Field.php b/src/Definition/Field.php
@@ -1,10 +1,12 @@
 <?php
+
 /**
  * Cycle ORM Schema Builder.
  *
  * @license   MIT
  * @author    Anton Titov (Wolfy-J)
  */
+
 declare(strict_types=1);
 
 namespace Cycle\Schema\Definition;
@@ -43,6 +45,14 @@ public function __construct()
         $this->options = new OptionMap();
     }
 
+    /**
+     * Cloning.
+     */
+    public function __clone()
+    {
+        $this->options = clone $this->options;
+    }
+
     /**
      * @return OptionMap
      */
@@ -57,7 +67,7 @@ public function getOptions(): OptionMap
     public function getType(): string
     {
         if (empty($this->column)) {
-            throw new FieldException("Field type must be set");
+            throw new FieldException('Field type must be set');
         }
 
         return $this->type;
@@ -112,7 +122,7 @@ public function setColumn(string $column): Field
     public function getColumn(): string
     {
         if (empty($this->column)) {
-            throw new FieldException("Column mapping must be set");
+            throw new FieldException('Column mapping must be set');
         }
 
         return $this->column;
@@ -163,12 +173,4 @@ public function isReferenced(): bool
     {
         return $this->referenced;
     }
-
-    /**
-     * Cloning.
-     */
-    public function __clone()
-    {
-        $this->options = clone $this->options;
-    }
 }
diff --git a/src/Definition/Map/FieldMap.php b/src/Definition/Map/FieldMap.php
@@ -1,10 +1,12 @@
 <?php
+
 /**
  * Cycle ORM Schema Builder.
  *
  * @license   MIT
  * @author    Anton Titov (Wolfy-J)
  */
+
 declare(strict_types=1);
 
 namespace Cycle\Schema\Definition\Map;
@@ -20,6 +22,16 @@ final class FieldMap implements \IteratorAggregate, \Countable
     /** @var Field[] */
     private $fields = [];
 
+    /**
+     * Cloning.
+     */
+    public function __clone()
+    {
+        foreach ($this->fields as $name => $field) {
+            $this->fields[$name] = clone $field;
+        }
+    }
+
     /**
      * @return int
      */
@@ -83,14 +95,4 @@ public function getIterator()
     {
         return new \ArrayIterator($this->fields);
     }
-
-    /**
-     * Cloning.
-     */
-    public function __clone()
-    {
-        foreach ($this->fields as $name => $field) {
-            $this->fields[$name] = clone $field;
-        }
-    }
 }
diff --git a/src/Definition/Map/OptionMap.php b/src/Definition/Map/OptionMap.php
@@ -1,10 +1,12 @@
 <?php
+
 /**
  * Cycle ORM Schema Builder.
  *
  * @license   MIT
  * @author    Anton Titov (Wolfy-J)
  */
+
 declare(strict_types=1);
 
 namespace Cycle\Schema\Definition\Map;

diff --git a/src/Definition/Map/RelationMap.php b/src/Definition/Map/RelationMap.php
@@ -1,10 +1,12 @@
 <?php
+
 /**
  * Cycle ORM Schema Builder.
  *
  * @license   MIT
  * @author    Anton Titov (Wolfy-J)
  */
+
 declare(strict_types=1);
 
 namespace Cycle\Schema\Definition\Map;
@@ -17,6 +19,16 @@ final class RelationMap implements \IteratorAggregate
     /** @var Relation[] */
     private $relations = [];
 
+    /**
+     * Cloning.
+     */
+    public function __clone()
+    {
+        foreach ($this->relations as $name => $relation) {
+            $this->relations[$name] = clone $relation;
+        }
+    }
+
     /**
      * @param string $name
      * @return bool
@@ -72,14 +84,4 @@ public function getIterator()
     {
         return new \ArrayIterator($this->relations);
     }
-
-    /**
-     * Cloning.
-     */
-    public function __clone()
-    {
-        foreach ($this->relations as $name => $relation) {
-            $this->relations[$name] = clone $relation;
-        }
-    }
 }
diff --git a/src/Definition/Relation.php b/src/Definition/Relation.php
@@ -1,10 +1,12 @@
 <?php
+
 /**
  * Cycle ORM Schema Builder.
  *
  * @license   MIT
  * @author    Anton Titov (Wolfy-J)
  */
+
 declare(strict_types=1);
 
 namespace Cycle\Schema\Definition;
@@ -40,6 +42,14 @@ public function __construct()
         $this->options = new OptionMap();
     }
 
+    /**
+     * Cloning.
+     */
+    public function __clone()
+    {
+        $this->options = clone $this->options;
+    }
+
     /**
      * @return OptionMap
      */
@@ -65,7 +75,7 @@ public function setType(string $type): Relation
     public function getType(): string
     {
         if ($this->type === null) {
-            throw new RelationException("Relation type must be set");
+            throw new RelationException('Relation type must be set');
         }
 
         return $this->type;
@@ -88,7 +98,7 @@ public function setTarget(string $target): Relation
     public function getTarget(): string
     {
         if ($this->target === null) {
-            throw new RelationException("Relation target must be set");
+            throw new RelationException('Relation target must be set');
         }
 
         return $this->target;
@@ -140,12 +150,4 @@ public function getInverseLoad(): ?int
     {
         return $this->inverseLoad;
     }
-
-    /**
-     * Cloning.
-     */
-    public function __clone()
-    {
-        $this->options = clone $this->options;
-    }
 }
diff --git a/src/Exception/ColumnException.php b/src/Exception/ColumnException.php
@@ -1,10 +1,12 @@
 <?php
+
 /**
  * Cycle ORM Schema Builder.
  *
  * @license   MIT
  * @author    Anton Titov (Wolfy-J)
  */
+
 declare(strict_types=1);
 
 namespace Cycle\Schema\Exception;

diff --git a/src/Exception/CompilerException.php b/src/Exception/CompilerException.php
@@ -1,10 +1,12 @@
 <?php
+
 /**
  * Cycle ORM Schema Builder.
  *
  * @license   MIT
  * @author    Anton Titov (Wolfy-J)
  */
+
 declare(strict_types=1);
 
 namespace Cycle\Schema\Exception;

diff --git a/src/Exception/EntityException.php b/src/Exception/EntityException.php
@@ -1,10 +1,12 @@
 <?php
+
 /**
  * Cycle ORM Schema Builder.
  *
  * @license   MIT
  * @author    Anton Titov (Wolfy-J)
  */
+
 declare(strict_types=1);
 
 namespace Cycle\Schema\Exception;

diff --git a/src/Exception/FieldException.php b/src/Exception/FieldException.php
@@ -1,10 +1,12 @@
 <?php
+
 /**
  * Cycle ORM Schema Builder.
  *
  * @license   MIT
  * @author    Anton Titov (Wolfy-J)
  */
+
 declare(strict_types=1);
 
 namespace Cycle\Schema\Exception;

diff --git a/src/Exception/OptionException.php b/src/Exception/OptionException.php
@@ -1,10 +1,12 @@
 <?php
+
 /**
  * Cycle ORM Schema Builder.
  *
  * @license   MIT
  * @author    Anton Titov (Wolfy-J)
  */
+
 declare(strict_types=1);
 
 namespace Cycle\Schema\Exception;

diff --git a/src/Exception/RegistryException.php b/src/Exception/RegistryException.php
@@ -1,10 +1,12 @@
 <?php
+
 /**
  * Cycle ORM Schema Builder.
  *
  * @license   MIT
  * @author    Anton Titov (Wolfy-J)
  */
+
 declare(strict_types=1);
 
 namespace Cycle\Schema\Exception;