Merge pull request #22 from vossik/codestyle

Codestyle
infinityloop-dev · Jun 1, 2021 · 0dd385b · 0dd385b
2 parents 329ac2e + 90c7006
commit 0dd385b
Show file tree

Hide file tree

Showing 31 changed files with 103 additions and 135 deletions.
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     "php": ">=8.0",
     "infinityloop-dev/utils": "^2.1",
     "nette/utils": "^3.0",
-    "nette/database": "^3.0",
+    "nette/database": "^3.1",
     "nette/robot-loader": "^3.3",
     "symfony/console": "^5.2"
   },
@@ -32,7 +32,7 @@
     "mockery/mockery": "^1.4",
     "infection/infection": "^0.20",
     "phpstan/phpstan": "^0.12",
-    "infinityloop-dev/coding-standard": "^0.1"
+    "infinityloop-dev/coding-standard": "^0.2"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/Attribute/ClassUniqueConstraint.php b/src/Attribute/ClassUniqueConstraint.php
@@ -4,11 +4,11 @@
 
 namespace CoolBeans\Attribute;
 
-#[\Attribute(\Attribute::TARGET_CLASS|\Attribute::IS_REPEATABLE)]
+#[\Attribute(\Attribute::TARGET_CLASS | \Attribute::IS_REPEATABLE)]
 final class ClassUniqueConstraint
 {
     public function __construct(
-        public array $columns
+        public array $columns,
     )
     {
         if (\count($columns) < 2) {

diff --git a/src/Attribute/DefaultValue.php b/src/Attribute/DefaultValue.php
@@ -8,6 +8,8 @@
 final class DefaultValue
 {
     public function __construct(
-        public string $defaultValue
-    ) {}
+        public string $defaultValue,
+    )
+    {
+    }
 }
diff --git a/src/Attribute/TypeOverride.php b/src/Attribute/TypeOverride.php
@@ -11,7 +11,7 @@ final class TypeOverride
 
     public function __construct(
         public string $type,
-        int ...$lengthArgs
+        int ...$lengthArgs,
     )
     {
         $this->lengthArgs = $lengthArgs;

diff --git a/src/Bean.php b/src/Bean.php
@@ -4,21 +4,19 @@
 
 namespace CoolBeans;
 
-use \CoolBeans\Contract\PrimaryKey;
-
 abstract class Bean implements \CoolBeans\Contract\Row, \IteratorAggregate
 {
     use \Nette\SmartObject;
 
-    protected \Nette\Database\Table\ActiveRow $row;
     protected \ReflectionClass $reflection;
-    protected PrimaryKey $primaryKey;
+    protected \CoolBeans\Contract\PrimaryKey $primaryKey;
 
-    public function __construct(\Nette\Database\Table\ActiveRow $row)
+    public function __construct(
+        protected \Nette\Database\Table\ActiveRow $row,
+    )
     {
-        $this->row = $row;
         $this->reflection = new \ReflectionClass(static::class);
-        $this->primaryKey = PrimaryKey::create($this->row);
+        $this->primaryKey = \CoolBeans\Contract\PrimaryKey::create($this->row);
 
         if (\CoolBeans\Config::$validateColumns) {
             $this->validateMissingColumns();
@@ -50,7 +48,7 @@ public function toArray() : array
     /**
      * Returns primary key object.
      */
-    public function getPrimaryKey() : PrimaryKey
+    public function getPrimaryKey() : \CoolBeans\Contract\PrimaryKey
     {
         return $this->primaryKey;
     }
@@ -84,7 +82,7 @@ public function offsetExists($offset) : bool
             $property = $this->reflection->getProperty($offset);
 
             return $property->isPublic();
-        } catch (\ReflectionException $e) {
+        } catch (\ReflectionException) {
             return false;
         }
     }

diff --git a/src/Bridge/Nette/DataSource.php b/src/Bridge/Nette/DataSource.php
@@ -4,11 +4,9 @@
 
 namespace CoolBeans\Bridge\Nette;
 
-use \CoolBeans\Contract\PrimaryKey;
-
 interface DataSource extends \CoolBeans\Contract\DataSource
 {
-    public function getRow(PrimaryKey $key) : \CoolBeans\Bridge\Nette\ActiveRow;
+    public function getRow(\CoolBeans\Contract\PrimaryKey $key) : \CoolBeans\Bridge\Nette\ActiveRow;
 
     public function findAll() : \CoolBeans\Bridge\Nette\Selection;
 

diff --git a/src/Bridge/Nette/Selection.php b/src/Bridge/Nette/Selection.php
@@ -6,16 +6,30 @@
 
 class Selection extends \Nette\Database\Table\Selection implements \CoolBeans\Contract\Selection
 {
+    public function where($condition, ...$params) : static
+    {
+        return parent::where($condition, ...$params);
+    }
+
+    public function fetch() : ?\CoolBeans\Bridge\Nette\ActiveRow
+    {
+        return parent::fetch();
+    }
+
+    public function key() : string|int
+    {
+        return parent::key();
+    }
+
     public function getTableName() : string
     {
         return $this->getName();
     }
 
     public function current() : ?\CoolBeans\Bridge\Nette\ActiveRow
     {
-        return ($key = \current($this->keys)) !== false
-            ? $this->data[$key]
-            : null;
+        return parent::current()
+            ?: null;
     }
 
     protected function createRow(array $row) : \CoolBeans\Bridge\Nette\ActiveRow

diff --git a/src/Bridge/Nette/TDecorator.php b/src/Bridge/Nette/TDecorator.php
@@ -4,15 +4,13 @@
 
 namespace CoolBeans\Bridge\Nette;
 
-use \CoolBeans\Contract\PrimaryKey;
-
 trait TDecorator
 {
     use \CoolBeans\Decorator\TCommon;
 
     protected \CoolBeans\Bridge\Nette\DataSource $dataSource;
 
-    public function getRow(PrimaryKey $key) : \CoolBeans\Bridge\Nette\ActiveRow
+    public function getRow(\CoolBeans\Contract\PrimaryKey $key) : \CoolBeans\Bridge\Nette\ActiveRow
     {
         return $this->dataSource->getRow($key);
     }

diff --git a/src/Command/SqlGeneratorCommand.php b/src/Command/SqlGeneratorCommand.php
@@ -24,7 +24,7 @@ protected function configure() : void
 
     protected function execute(
         \Symfony\Component\Console\Input\InputInterface $input,
-        \Symfony\Component\Console\Output\OutputInterface $output
+        \Symfony\Component\Console\Output\OutputInterface $output,
     ) : int
     {
         $converted = '';
@@ -113,8 +113,7 @@ private function buildTable(array $data) : string
                 . $row['name'] . \str_repeat(' ', $longestNameLength - $nameLength + 1)
                 . $row['dataType'] . \str_repeat(' ', $longestDataTypeLength - $dataTypeLength + 1)
                 . $row['notNull']
-                . $row['default']
-            );
+                . $row['default']);
         }
 
         return \implode(',' . \PHP_EOL, $toReturn);
@@ -315,7 +314,6 @@ private function getBeans(string $destination) : array
                 throw new \CoolBeans\Exception\BeanWithoutPublicProperty('Bean ' . $bean->getShortName() . ' has no public property.');
             }
 
-
             $beans[] = $class;
         }
 

diff --git a/src/Contract/ContextFactory.php b/src/Contract/ContextFactory.php
@@ -6,5 +6,5 @@
 
 interface ContextFactory
 {
-    public function create() : \Nette\Database\Context;
+    public function create() : \Nette\Database\Explorer;
 }
diff --git a/src/Contract/DataSource.php b/src/Contract/DataSource.php
@@ -67,5 +67,5 @@ public function upsert(?\CoolBeans\Contract\PrimaryKey $key, array $values) : \C
     /**
      * Executes function enclosed in PDO transaction.
      */
-    public function transaction(callable $function);
+    public function transaction(callable $function) : mixed;
 }
diff --git a/src/Contract/Selection.php b/src/Contract/Selection.php
@@ -8,17 +8,17 @@ interface Selection extends \Iterator, \Countable
 {
     public function getTableName() : string;
 
-    public function fetch(); // : ?\CoolBeans\Contract\Row
+    public function fetch() : ?\CoolBeans\Contract\Row;
 
-    public function where(string $column, string|int|array ...$val); // : static
+    public function where(string $column, string|int|array ...$val) : static;
 
     public function count() : int;
 
     public function rewind() : void;
 
     public function valid() : bool;
 
-    public function key(); // : string|int
+    public function key() : string|int;
 
     public function current() : ?\CoolBeans\Contract\Row;
 

diff --git a/src/DataSource.php b/src/DataSource.php
@@ -4,11 +4,9 @@
 
 namespace CoolBeans;
 
-use \CoolBeans\Contract\PrimaryKey;
-
 interface DataSource extends \CoolBeans\Contract\DataSource
 {
-    public function getRow(PrimaryKey $key) : \CoolBeans\Bean;
+    public function getRow(\CoolBeans\Contract\PrimaryKey $key) : \CoolBeans\Bean;
 
     public function findAll() : \CoolBeans\Selection;
 

diff --git a/src/Decorator/Active.php b/src/Decorator/Active.php
@@ -4,8 +4,6 @@
 
 namespace CoolBeans\Decorator;
 
-use \CoolBeans\Contract\PrimaryKey;
-
 final class Active implements \CoolBeans\Contract\DataSource
 {
     use \Nette\SmartObject;
@@ -16,7 +14,7 @@ public function __construct(\CoolBeans\Contract\DataSource $dataSource)
         $this->dataSource = $dataSource;
     }
 
-    public function getRow(PrimaryKey $key) : \CoolBeans\Contract\Row
+    public function getRow(\CoolBeans\Contract\PrimaryKey $key) : \CoolBeans\Contract\Row
     {
         $row = $this->dataSource->getRow($key);
 
@@ -39,7 +37,7 @@ public function findByArray(array $filter) : \CoolBeans\Contract\Selection
             ->where($this->getName() . '.active >= ?', 0);
     }
 
-    public function delete(PrimaryKey $key) : \CoolBeans\Result\Delete
+    public function delete(\CoolBeans\Contract\PrimaryKey $key) : \CoolBeans\Result\Delete
     {
         $this->dataSource->update($key, ['active' => -1]);
 

diff --git a/src/Decorator/Bean.php b/src/Decorator/Bean.php
@@ -4,30 +4,24 @@
 
 namespace CoolBeans\Decorator;
 
-use \CoolBeans\Contract\PrimaryKey;
-
 final class Bean implements \CoolBeans\DataSource
 {
     use \Nette\SmartObject;
     use \CoolBeans\Decorator\TCommon;
 
-    private \CoolBeans\Contract\DataSource $dataSource;
-    private string $rowClass;
-    private string $selectionClass;
-
-    public function __construct(\CoolBeans\Contract\DataSource $dataSource, string $rowClass, string $selectionClass)
+    public function __construct(
+        private \CoolBeans\Contract\DataSource $dataSource,
+        private string $rowClass,
+        private string $selectionClass,
+    )
     {
         if (!\is_subclass_of($rowClass, \CoolBeans\Bean::class) ||
             !\is_subclass_of($selectionClass, \CoolBeans\Selection::class)) {
             throw new \CoolBeans\Exception\InvalidFunctionParameters('Bean decorator can transform only to Bean instance.');
         }
-
-        $this->dataSource = $dataSource;
-        $this->rowClass = $rowClass;
-        $this->selectionClass = $selectionClass;
     }
 
-    public function getRow(PrimaryKey $entryId) : \CoolBeans\Bean
+    public function getRow(\CoolBeans\Contract\PrimaryKey $entryId) : \CoolBeans\Bean
     {
         return $this->createRow($this->dataSource->getRow($entryId));
     }

diff --git a/src/Decorator/History.php b/src/Decorator/History.php
@@ -4,33 +4,24 @@
 
 namespace CoolBeans\Decorator;
 
-use \CoolBeans\Contract\PrimaryKey;
-
 final class History implements \CoolBeans\Contract\DataSource
 {
     use \Nette\SmartObject;
     use \CoolBeans\Decorator\TDecorator;
 
     public const METADATA = ['id', 'active'];
 
-    private \CoolBeans\Contract\DataSource $historyDataSource;
-    private array $additionalData;
-    private array $metadata;
-
     public function __construct(
         \CoolBeans\Contract\DataSource $dataSource,
-        \CoolBeans\Contract\DataSource $historyDataSource,
-        array $additionalData = [],
-        array $metadata = self::METADATA
+        private \CoolBeans\Contract\DataSource $historyDataSource,
+        private array $additionalData = [],
+        private array $metadata = self::METADATA,
     )
     {
         $this->dataSource = $dataSource;
-        $this->historyDataSource = $historyDataSource;
-        $this->additionalData = $additionalData;
-        $this->metadata = $metadata;
     }
 
-    public function update(PrimaryKey $key, array $data) : \CoolBeans\Result\Update
+    public function update(\CoolBeans\Contract\PrimaryKey $key, array $data) : \CoolBeans\Result\Update
     {
         if ($this->isMetadataChange($data)) {
             return $this->dataSource->update($key, $data);
@@ -87,7 +78,7 @@ private function isMetadataChange(array $data) : bool
         return true;
     }
 
-    private function insertHistory(PrimaryKey $currentKey, array $oldData) : PrimaryKey
+    private function insertHistory(\CoolBeans\Contract\PrimaryKey $currentKey, array $oldData) : \CoolBeans\Contract\PrimaryKey
     {
         $oldData[$this->getName() . '_id'] = $currentKey->getValue();
 

diff --git a/src/Decorator/TDecorator.php b/src/Decorator/TDecorator.php
@@ -4,15 +4,13 @@
 
 namespace CoolBeans\Decorator;
 
-use \CoolBeans\Contract\PrimaryKey;
-
 trait TDecorator
 {
     use \CoolBeans\Decorator\TCommon;
 
     protected \CoolBeans\Contract\DataSource $dataSource;
 
-    public function getRow(PrimaryKey $key) : \CoolBeans\Contract\Row
+    public function getRow(\CoolBeans\Contract\PrimaryKey $key) : \CoolBeans\Contract\Row
     {
         return $this->dataSource->getRow($key);
     }

diff --git a/src/PrimaryKey/IntPrimaryKey.php b/src/PrimaryKey/IntPrimaryKey.php
@@ -7,16 +7,17 @@
 final class IntPrimaryKey extends \CoolBeans\Contract\PrimaryKey
 {
     private int $value;
-    private string $name;
 
-    public function __construct(int $key, string $name = 'id')
+    public function __construct(
+        int $key,
+        private string $name = 'id',
+    )
     {
         if ($key <= 0) {
             throw new \CoolBeans\Exception\InvalidFunctionParameters('Primary key must be positive integer.');
         }
 
         $this->value = $key;
-        $this->name = $name;
     }
 
     public function getValue() : int
@@ -36,8 +37,8 @@ public function getName() : string
 
     public function equals(\CoolBeans\Contract\PrimaryKey $compare) : bool
     {
-        return $compare instanceof self 
-            && $this->getValue() === $compare->getValue() 
+        return $compare instanceof self
+            && $this->getValue() === $compare->getValue()
             && $this->getName() === $compare->getName();
     }
 }