Correções de bugs.

Author: 0x3175633435

src/Config/Enums/EntityConfigs.php

@@ -2,9 +2,25 @@
 
 namespace Zend\EntityMapper\Config\Enums;
 
+/**
+ * Interface EntityConfigs
+ *
+ * @package Zend\EntityMapper\Config\Enums
+ */
 interface EntityConfigs
 {
+    /**
+     * Schema where the table is located.
+     */
     const SCHEMA = 'schema';
+
+    /**
+     * Table corresponding to the entity.
+     */
     const TABLE  = 'table';
+
+    /**
+     * Entity fields definition.
+     */
     const FIELDS = 'fields';
 }

src/Config/Enums/PropertyConfigs.php

@@ -9,6 +9,23 @@
  */
 interface PropertyConfigs
 {
+    /**
+     * In-class property name
+     */
     const PROPERTY = 'property';
+
+    /**
+     * In-Database column name
+     */
     const ALIAS = 'alias';
+
+    /**
+     * Foreign key definition.
+     */
+    const FOREIGN_KEY = 'foreignKey';
+
+    /**
+     * Define if the field is a primaryKey (boolean)
+     */
+    const PRIMARY_KEY = 'primaryKey';
 }

src/Config/Factory/EntityConfigFactory.php

@@ -5,7 +5,6 @@
 use Zend\Config\Config;
 use Zend\Db\Sql\TableIdentifier;
 use Zend\EntityMapper\Config\Collection;
-use Zend\EntityMapper\Config\Container\Container;
 use Zend\EntityMapper\Config\Entity;
 use Zend\EntityMapper\Config\Exceptions\ConfigurationException;
 use Zend\EntityMapper\Config\Field;
@@ -30,10 +29,11 @@ class EntityConfigFactory
     private $config;
 
     /**
-     * ConfigFactory constructor.
+     * EntityConfigFactory constructor.
      *
      * @param array $configArray
      * @throws ConfigurationException
+     * @throws \Zend\Cache\Exception\ExceptionInterface
      */
     public function __construct(array $configArray)
     {
@@ -51,10 +51,8 @@ public function getConfig(): Entity
     }
 
     /**
-     * Merge $rawConfig into $config
-     *
-     * @return void
      * @throws ConfigurationException
+     * @throws \Zend\Cache\Exception\ExceptionInterface
      */
     public function mergeEntity(): void
     {
@@ -81,6 +79,7 @@ public function mergeEntity(): void
 
     /**
      * @param array $fieldConfig
+     * @throws \Zend\Cache\Exception\ExceptionInterface
      */
     public function mergeField(array $fieldConfig)
     {

src/Config/Field.php

@@ -2,8 +2,6 @@
 
 namespace Zend\EntityMapper\Config;
 
-use Zend\Filter\FilterInterface;
-
 /**
  * Field
  *
@@ -97,17 +95,17 @@ public function setAlias(string $alias)
     }
 
     /**
-     * @return string
+     * @return string|object
      */
-    public function getInputFilter(): string
+    public function getInputFilter()
     {
         return $this->inputFilter;
     }
 
     /**
-     * @param string $inputFilter
+     * @param string|object $inputFilter
      */
-    public function setInputFilter(string $inputFilter)
+    public function setInputFilter($inputFilter)
     {
         $this->inputFilter = $inputFilter;
     }
@@ -117,21 +115,21 @@ public function setInputFilter(string $inputFilter)
      */
     public function hasInputFilter(): bool
     {
-        return (!empty($this->inputFilter)) && class_exists($this->inputFilter);
+        return (!empty($this->inputFilter)) || class_exists($this->inputFilter);
     }
 
     /**
-     * @return string
+     * @return string|object
      */
-    public function getOutputFilter(): string
+    public function getOutputFilter()
     {
         return $this->outputFilter;
     }
 
     /**
-     * @param string $outputFilter
+     * @param string|object $outputFilter
      */
-    public function setOutputFilter(string $outputFilter)
+    public function setOutputFilter($outputFilter)
     {
         $this->outputFilter = $outputFilter;
     }
@@ -141,7 +139,7 @@ public function setOutputFilter(string $outputFilter)
      */
     public function hasOutputFilter(): bool
     {
-        return (!empty($this->outputFilter)) && class_exists($this->outputFilter);
+        return (!empty($this->outputFilter)) || class_exists($this->outputFilter);
     }
 
     /**

src/Db/Gateway/Factory/DynamicTableGatewayFactory.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Zend\EntityMapper\Db\Gateway\Factory;
+
+use Interop\Container\ContainerInterface;
+use Zend\EntityMapper\Db\Gateway\DynamicTableGateway;
+use Zend\ServiceManager\Factory\FactoryInterface;
+
+/**
+ * DynamicTableGatewayFactory
+ *
+ * @package Zend\EntityMapper\Db\Gateway\Factory
+ */
+class DynamicTableGatewayFactory implements FactoryInterface
+{
+    /**
+     * @param ContainerInterface $container
+     * @param string $requestedName
+     * @param array|null $options
+     * @return object|DynamicTableGateway
+     * @throws \Psr\Container\ContainerExceptionInterface
+     * @throws \Psr\Container\NotFoundExceptionInterface
+     * @throws \Zend\Cache\Exception\ExceptionInterface
+     */
+    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
+    {
+        $adapter = $container->get('Zend\Db\Adapter\Adapter');
+        $dynamicTableGateway = new DynamicTableGateway($adapter);
+
+        return $dynamicTableGateway;
+    }
+}