Moved PrimaryKey into Contract ns

Author: peldax

src/CoolBeans/Bean.php

@@ -4,19 +4,21 @@
 
 namespace Infinityloop\CoolBeans;
 
+use Infinityloop\CoolBeans\Contract\PrimaryKey;
+
 abstract class Bean implements \Infinityloop\CoolBeans\Contract\Row, \IteratorAggregate
 {
     use \Nette\SmartObject;
 
     protected \Nette\Database\Table\ActiveRow $row;
     protected \ReflectionClass $reflection;
-    protected ?\Infinityloop\CoolBeans\PrimaryKey\PrimaryKey $primaryKey;
+    protected ?PrimaryKey $primaryKey;
 
     final public function __construct(\Nette\Database\Table\ActiveRow $row)
     {
         $this->row = $row;
         $this->reflection = new \ReflectionClass(static::class);
-        $this->primaryKey = \Infinityloop\CoolBeans\PrimaryKey\PrimaryKey::create($this->row);
+        $this->primaryKey = PrimaryKey::create($this->row);
 
         if (\App\Bootstrap::isDebugMode()) {
             $this->validateTableName();
@@ -45,7 +47,7 @@ public function toArray() : array
     /**
      * Returns primary key object.
      */
-    public function getPrimaryKey() : ?\Infinityloop\CoolBeans\PrimaryKey\PrimaryKey
+    public function getPrimaryKey() : ?PrimaryKey
     {
         return $this->primaryKey;
     }

src/CoolBeans/Bridge/Nette/ActiveRow.php

@@ -6,17 +6,17 @@
 
 class ActiveRow extends \Nette\Database\Table\ActiveRow implements \Infinityloop\CoolBeans\Contract\Row
 {
-    protected ?\Infinityloop\CoolBeans\PrimaryKey\PrimaryKey $primaryKey = null;
+    protected ?\Infinityloop\CoolBeans\Contract\PrimaryKey $primaryKey = null;
 
     public function getTableName(): string
     {
         return $this->getTable()->getName();
     }
 
-    public function getPrimaryKey(): \Infinityloop\CoolBeans\PrimaryKey\PrimaryKey
+    public function getPrimaryKey(): \Infinityloop\CoolBeans\Contract\PrimaryKey
     {
-        if (!$this->primaryKey instanceof \Infinityloop\CoolBeans\PrimaryKey\PrimaryKey) {
-            $this->primaryKey = \Infinityloop\CoolBeans\PrimaryKey\PrimaryKey::create($this);
+        if (!$this->primaryKey instanceof \Infinityloop\CoolBeans\Contract\PrimaryKey) {
+            $this->primaryKey = \Infinityloop\CoolBeans\Contract\PrimaryKey::create($this);
         }
 
         return $this->primaryKey;

src/CoolBeans/Bridge/Nette/DataSource.php

@@ -4,7 +4,7 @@
 
 namespace Infinityloop\CoolBeans\Bridge\Nette;
 
-use Infinityloop\CoolBeans\PrimaryKey\PrimaryKey;
+use Infinityloop\CoolBeans\Contract\PrimaryKey;
 
 interface DataSource extends \Infinityloop\CoolBeans\Contract\DataSource
 {

src/CoolBeans/Bridge/Nette/TDecorator.php

@@ -4,7 +4,7 @@
 
 namespace Infinityloop\CoolBeans\Bridge\Nette;
 
-use Infinityloop\CoolBeans\PrimaryKey\PrimaryKey;
+use Infinityloop\CoolBeans\Contract\PrimaryKey;
 
 trait TDecorator
 {

src/CoolBeans/Contract/DataSource.php

@@ -4,7 +4,7 @@
 
 namespace Infinityloop\CoolBeans\Contract;
 
-use Infinityloop\CoolBeans\PrimaryKey\PrimaryKey;
+use Infinityloop\CoolBeans\Contract\PrimaryKey;
 
 interface DataSource
 {

src/CoolBeans/PrimaryKey/PrimaryKey.php src/CoolBeans/Contract/PrimaryKey.phpsrc/CoolBeans/PrimaryKey/PrimaryKey.php renamed to src/CoolBeans/Contract/PrimaryKey.php

@@ -2,7 +2,7 @@
 
 declare(strict_types = 1);
 
-namespace Infinityloop\CoolBeans\PrimaryKey;
+namespace Infinityloop\CoolBeans\Contract;
 
 abstract class PrimaryKey
 {
@@ -19,11 +19,11 @@ public static function create(\Nette\Database\Table\ActiveRow $activeRow) : ?sel
         $primary = $activeRow->getPrimary();
 
         if (\is_int($primary)) {
-            return new IntPrimaryKey($primary);
+            return new \Infinityloop\CoolBeans\PrimaryKey\IntPrimaryKey($primary);
         }
 
         if (\is_array($primary)) {
-            return new ArrayPrimaryKey($primary);
+            return new \Infinityloop\CoolBeans\PrimaryKey\ArrayPrimaryKey($primary);
         }
 
         throw new \Infinityloop\CoolBeans\Exception\MissingPrimaryKey('Table [' . $activeRow->getTable()->getName() . '] has no primary key.');

src/CoolBeans/Contract/Row.php

@@ -10,5 +10,5 @@ public function getTableName() : string;
 
     public function toArray() : array;
 
-    public function getPrimaryKey() : ?\Infinityloop\CoolBeans\PrimaryKey\PrimaryKey;
+    public function getPrimaryKey() : ?\Infinityloop\CoolBeans\Contract\PrimaryKey;
 }

src/CoolBeans/DataSource.php

@@ -4,7 +4,7 @@
 
 namespace Infinityloop\CoolBeans;
 
-use Infinityloop\CoolBeans\PrimaryKey\PrimaryKey;
+use Infinityloop\CoolBeans\Contract\PrimaryKey;
 
 interface DataSource extends \Infinityloop\CoolBeans\Contract\DataSource
 {

src/CoolBeans/Decorator/Active.php

@@ -4,7 +4,7 @@
 
 namespace Infinityloop\CoolBeans\Decorator;
 
-use Infinityloop\CoolBeans\PrimaryKey\PrimaryKey;
+use Infinityloop\CoolBeans\Contract\PrimaryKey;
 
 final class Active implements \Infinityloop\CoolBeans\Contract\DataSource
 {

src/CoolBeans/Decorator/Bean.php

@@ -4,7 +4,7 @@
 
 namespace Infinityloop\CoolBeans\Decorator;
 
-use Infinityloop\CoolBeans\PrimaryKey\PrimaryKey;
+use Infinityloop\CoolBeans\Contract\PrimaryKey;
 
 final class Bean implements \Infinityloop\CoolBeans\DataSource
 {