Merge branch 'develop' into release

src/Alias/Model.php

@@ -78,7 +78,7 @@ abstract class Model implements ModelInterface
             if ($method->getName() === 'getRepository') {
                 continue;
             }
-            $p = strtolower(str_replace('get', '', $method->getName()));
+            $p = strtolower(preg_replace('/(?<!^)[A-Z]/', '_$0', str_replace('get', '', $method->getName())));
             if (!isset($this->{$p})) {
                 continue;
             }

src/Alias/Model/Repository.php

@@ -5,6 +5,7 @@ use ProVM\Concept\Database\Connection;
 use ProVM\Concept\Database\QueryBuilder;
 use ProVM\Concept\Model;
 use ProVM\Concept\Model\Factory;
+use ProVM\Concept\Model\Mapping;
 use ProVM\Concept\Model\Repository as RepositoryInterface;
 
 abstract class Repository implements RepositoryInterface
@@ -88,7 +89,24 @@ abstract class Repository implements RepositoryInterface
     }
     public function getColumns(): array
     {
-        return $this->columns;
+        return $this->columns ?? array_merge($this->getRequired(), $this->getOptional());
+    }
+    protected array $properties;
+    public function getProperties(): array
+    {
+        return $this->properties;
+    }
+    public function addProperty(string $property): RepositoryInterface
+    {
+        $this->properties []= $property;
+        return $this;
+    }
+    public function setProperties(array $properties): RepositoryInterface
+    {
+        foreach ($properties as $property) {
+            $this->addProperty($property);
+        }
+        return $this;
     }
     protected array $required;
     public function setRequired(array $columns): RepositoryInterface
@@ -131,9 +149,9 @@ abstract class Repository implements RepositoryInterface
         return $this->optional ?? [];
     }
 
-    public function getMethod(string $column, bool $get = true): string
+    public function getMethod(string $property, bool $get = true): string
     {
-        $m = str_replace(' ', '', ucwords(str_replace('_', ' ', $column)));
+        $m = str_replace(' ', '', ucwords(str_replace('_', ' ', $property)));
         if ($get) {
             return "get{$m}";
         }
@@ -149,37 +167,37 @@ abstract class Repository implements RepositoryInterface
     }
     public function fillData(Model $model, array $data): Model
     {
-        foreach ($this->getRequired() as $column) {
-            $m = $this->getMethod($column, false);
-            if (!method_exists($model, $m)) {
+        foreach ($this->getProperties() as $property) {
+            $m = $this->getMethod($property, false);
+            if (in_array($property, $this->getRequired())) {
+                $model->{$m}($data[$property]);
                 continue;
             }
-            $model->{$m}($data[$column]);
-        }
-        foreach ($this->getOptional() as $column) {
-            if (!isset($data[$column])) {
+            if (in_array("{$property}_id", $this->getRequired())) {
+                $model->{$m}($data["{$property}_id"]);
                 continue;
             }
-            $m = $this->getMethod($column, false);
-            if (!method_exists($model, $m)) {
+            if (in_array($property, $this->getOptional()) and isset($data[$property])) {
+                $model->{$m}($data[$property]);
                 continue;
             }
-            $model->{$m}($data[$column]);
+            if (in_array("{$property}_id", $this->getOptional()) and isset($data["{$property}_id"])) {
+                $model->{$m}($data["{$property}_id"]);
+                continue;
+            }
+            error_log("Missing {$property} in data for " . get_called_class() . "::fillData");
         }
         return $model;
     }
     public function mapArray(Model $model, array $data): array
     {
         foreach ($this->getColumns() as $column) {
-            if (isset($data[$column])) {
-                continue;
-            }
             $m = $this->getMethod($column);
             if (!method_exists($model, $m)) {
+                error_log("Missing getter for {$column} in " . get_called_class() . "::mapArray");
                 continue;
             }
-            $val = $model->{$m}();
-            $data[$column] = $val;
+            $data[$column] = $model->{$m}();
         }
         return $data;
     }
@@ -197,10 +215,10 @@ abstract class Repository implements RepositoryInterface
             $this->update($model);
             return;
         }
-        $values = $this->mapArray($model, []);
+        $values = array_replace(array_flip($this->getColumns()), $this->mapArray($model, []));
         $cols = array_fill(0, count($values), '?');
         $query = $this->getQueryBuilder()->insert($this->getTable())->columns($this->getColumns())->values($cols);
-        $this->getConnection()->execute($query, $values);
+        $this->getConnection()->execute($query, array_values($values));
     }
     public function update(Model $model): void
     {
@@ -247,7 +265,7 @@ abstract class Repository implements RepositoryInterface
             ->from($this->getTable())
             ->where(['id = ?'])
             ->limit(1);
-        return $this->load($this->getConnection()->execute($query, [$id])->getAsArray()[0]);
+        return $this->load($this->getConnection()->execute($query, [$id])->getFirstAsArray());
     }
     public function fetchAll(): array
     {

src/Concept/Model/Factory.php

@@ -1,11 +1,48 @@
 <?php
 namespace ProVM\Concept\Model;
 
+use ProVM\Concept\Model;
 use Psr\Container\ContainerInterface;
 
 interface Factory
 {
+    /**
+     * @param ContainerInterface $container
+     * @return Factory
+     */
     public function setContainer(ContainerInterface $container): Factory;
+
+    /**
+     * @return ContainerInterface
+     */
     public function getContainer(): ContainerInterface;
+
+    /**
+     * Get Repository by class
+     * @param string $repository_class
+     * @return Repository
+     */
     public function get(string $repository_class): Repository;
+
+    /**
+     * Get Repository by Model class
+     * @param string $model_class
+     * @return Repository
+     */
+    public function getByModel(string $model_class): Repository;
+
+    /**
+     * Fetch Model by Id
+     * @param string $model_class
+     * @param int $id
+     * @return Model
+     */
+    public function fetchById(string $model_class, int $id): Model;
+
+    /**
+     * Fetch all Models
+     * @param string $model_class
+     * @return array
+     */
+    public function fetchAll(string $model_class): array;
 }

src/Concept/Model/Repository.php

@@ -7,37 +7,240 @@ use ProVM\Concept\Model;
 
 interface Repository
 {
+    /**
+     * @param Connection $connection
+     * @return Repository
+     */
     public function setConnection(Connection $connection): Repository;
+
+    /**
+     * @return Connection
+     */
     public function getConnection(): Connection;
+
+    /**
+     * @param QueryBuilder $builder
+     * @return Repository
+     */
     public function setQueryBuilder(QueryBuilder $builder): Repository;
+
+    /**
+     * @return QueryBuilder
+     */
     public function getQueryBuilder(): QueryBuilder;
+
+    /**
+     * @param Factory $factory
+     * @return Repository
+     */
     public function setFactory(Factory $factory): Repository;
+
+    /**
+     * @return Factory
+     */
     public function getFactory(): Factory;
+
+    /**
+     * @param string $model_class
+     * @return Repository
+     */
     public function setModel(string $model_class): Repository;
+
+    /**
+     * @return string
+     */
     public function getModel(): string;
+
+    /**
+     * Get clean empty Model
+     * @return Model
+     */
     public function getNewModel(): Model;
+
+    /**
+     * Set up the Repository
+     * SHOULD CALL
+     *      setTable
+     *      setColumns [setRequired, setOptional]
+     *      setProperties
+     *      setMapping
+     *      setModel
+     * @return Repository
+     */
     public function setup(): Repository;
-    public function setTable(string $table): Repository;
+
+    /**
+     * @return string
+     */
     public function getTable(): string;
+
+    /**
+     * @param string $table
+     * @return Repository
+     */
+    public function setTable(string $table): Repository;
+
+    /**
+     * Set columns in table
+     * @param array $columns
+     * @return Repository
+     */
     public function setColumns(array $columns): Repository;
+
+    /**
+     * @param string $column
+     * @return Repository
+     */
     public function addColumn(string $column): Repository;
+
+    /**
+     * Get table columns
+     * @return array
+     */
     public function getColumns(): array;
+
+    /**
+     * Get Model properties
+     * @return array
+     */
+    public function getProperties(): array;
+
+    /**
+     * @param string $property
+     * @param $value
+     * @return Repository
+     */
+    public function addProperty(string $property): Repository;
+
+    /**
+     * Set Model properties
+     * @param array $properties
+     * @return Repository
+     */
+    public function setProperties(array $properties): Repository;
+
+    /**
+     * Set required columns
+     * Optional
+     * @param array $columns
+     * @return Repository
+     */
     public function setRequired(array $columns): Repository;
+
+    /**
+     * @param string $column
+     * @return Repository
+     */
     public function addRequired(string $column): Repository;
+
+    /**
+     * Get required columns
+     * @return array
+     */
     public function getRequired(): array;
+
+    /**
+     * Set optional columns
+     * @param array $columns
+     * @return Repository
+     */
     public function setOptional(array $columns): Repository;
+
+    /**
+     * @param string $column
+     * @return Repository
+     */
     public function addOptional(string $column): Repository;
+
+    /**
+     * Get optional columns
+     * @return array
+     */
     public function getOptional(): array;
-    public function getMethod(string $column, bool $get = true): string;
+
+    /**
+     * Get Model method
+     * @param string $property
+     * @param bool $get
+     * @return string
+     */
+    public function getMethod(string $property, bool $get = true): string;
+
+    /**
+     * @param string $method
+     * @return string
+     */
     public function getProperty(string $method): string;
+
+    /**
+     * Fill empty Model with data
+     * @param Model $model
+     * @param array $data
+     * @return Model
+     */
     public function fillData(Model $model, array $data): Model;
+
+    /**
+     * Fill data array with Model values. Accepts a preset data array
+     * @param Model $model
+     * @param array $data
+     * @return array
+     */
     public function mapArray(Model $model, array $data): array;
+
+    /**
+     * Transform result array to Model
+     * @param array $data
+     * @return Model
+     */
     public function load(array $data): Model;
+
+    /**
+     * Save Model to table
+     * @param Model $model
+     * @return void
+     */
     public function save(Model $model): void;
+
+    /**
+     * Update table value with Model
+     * @param Model $model
+     * @return void
+     */
     public function update(Model $model): void;
+
+    /**
+     * Create new Model with data
+     * @param array $data
+     * @return Model
+     */
     public function create(array $data): Model;
+
+    /**
+     * Edit Model with data
+     * @param Model $model
+     * @param array $data
+     * @return Model
+     */
     public function edit(Model $model, array $data): Model;
+
+    /**
+     * Delete Model from table
+     * @param Model $model
+     * @return void
+     */
     public function delete(Model $model): void;
+
+    /**
+     * Fetch Model by Id
+     * @param int $id
+     * @return Model
+     */
     public function fetchById(int $id): Model;
+
+    /**
+     * Fetch all Models
+     * @return array
+     */
     public function fetchAll(): array;
 }

src/Implement/Model/Factory.php

@@ -1,6 +1,7 @@
 <?php
 namespace ProVM\Implement\Model;
 
+use ProVM\Concept\Model;
 use Psr\Container\ContainerInterface;
 use ProVM\Concept\Model\Factory as FactoryInterface;
 use ProVM\Concept\Model\Repository;
@@ -26,4 +27,18 @@ class Factory implements FactoryInterface
     {
         return $this->getContainer()->get($repository_class);
     }
+    public function getByModel(string $model_class): Repository
+    {
+        $class = str_replace('Model', 'Repository', $model_class);
+        return $this->get($class);
+    }
+
+    public function fetchById(string $model_class, int $id): Model
+    {
+        return $this->getByModel($model_class)->fetchById($id);
+    }
+    public function fetchAll(string $model_class): array
+    {
+        return $this->getByModel($model_class)->fetchAll();
+    }
 }