Merge pull request #9 from wollanup/steve

EntityFactory : handles plural names of parameter (fetch collections)

Author: wollanup

src/Propel/Generator/Behavior/Api/Request/RequestBaseBuilder.php

@@ -94,6 +94,7 @@ protected function addClassBody(&$script)
         $script .= $this->renderTemplate('classBody',
             [
                 'object'          => $this->getObjectName(),
+                'objectPlural'    => $this->getPluralizer()->getPluralForm(lcfirst($this->getObjectName())),
                 'actionClassName' => $this->actionClassName,
                 'mapClassName'    => $this->mapClassName,
                 'entityClassName' => $this->entityClassName,
@@ -127,7 +128,7 @@ protected function addClassOpen(&$script)
  */
 abstract class " . $this->getUnprefixedClassName() . " extends {$this->shortParentName}
 {
-    
+
 ";
     }
 

src/Propel/Generator/Behavior/Api/Request/templates/classBody.template

@@ -8,11 +8,13 @@
     private $exposedRelations;
 
 	/**
+	 * @param bool $plural
+	 *
 	 * @return string
 	 */
-	public function buildNameOfParameterToAdd()
+	public function getNameOfParameterToAdd($plural = false)
 	{
-		return '<?php echo lcfirst($object) ?>';
+		return $plural ? '<?php echo lcfirst($objectPlural) ?>' : '<?php echo lcfirst($object) ?>';
 	}
 
     /**

tests/Propel/Generator/Behavior/Api/Request/RequestTest.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: steve
+ * Date: 21/04/17
+ * Time: 11:41
+ */
+
+namespace Propel\Generator\Behavior\Api\Request;
+
+use Eukles\Container\ContainerMock;
+use Eukles\Entity\EntityRequestInterface;
+use PHPUnit\Framework\TestCase;
+use Propel\Generator\Util\QuickBuilder;
+use Util\SetUp;
+
+class RequestTest extends TestCase
+{
+    
+    /**
+     * @var QuickBuilder
+     */
+    protected $builder;
+    
+    public function setUp()
+    {
+        $this->builder = SetUp::load('schema-full', true);
+    }
+    
+    public function testAction()
+    {
+        $r = $this->createMock('\\ApiTest1Request');
+        $this->assertInstanceOf(EntityRequestInterface::class, $r);
+        $this->assertInstanceOf('Base\\ApiTest1Request', $r);
+    }
+    
+    public function testGetActionClassName()
+    {
+        /** @var EntityRequestInterface $r */
+        $r = new \ApiTest1Request(new ContainerMock());
+        
+        $this->assertSame('ApiTest1Action', $r->getActionClassName());
+    }
+    
+    public function testGetNameOfParameterToAddPlural()
+    {
+        /** @var EntityRequestInterface $r */
+        $r = new \ApiTest1Request(new ContainerMock());
+        
+        $this->assertSame('apiTest1s', $r->getNameOfParameterToAdd(true));
+    }
+    
+    public function testGetNameOfParameterToAddSingular()
+    {
+        /** @var EntityRequestInterface $r */
+        $r = new \ApiTest1Request(new ContainerMock());
+        
+        $this->assertSame('apiTest1', $r->getNameOfParameterToAdd());
+    }
+}

tests/util/ContainerMock.php

@@ -1,7 +1,16 @@
 <?php
 namespace Eukles\Container {
 
-    use Psr\Container\ContainerInterface;
+    use Eukles\Entity\EntityFactoryInterface;
+    use Eukles\Service\Pagination\RequestPaginationInterface;
+    use Eukles\Service\QueryModifier\RequestQueryModifierInterface;
+    use Eukles\Service\ResponseBuilder\ResponseBuilderInterface;
+    use Eukles\Service\ResponseFormatter\ResponseFormatterInterface;
+    use Eukles\Service\RoutesClasses\RoutesClassesInterface;
+    use Eukles\Slim\Handlers\ActionErrorInterface;
+    use Eukles\Slim\Handlers\EntityRequestErrorInterface;
+    use Slim\Http\Request;
+    use Slim\Interfaces\RouterInterface;
 
     class ContainerMock implements ContainerInterface
     {
@@ -10,6 +19,86 @@ class ContainerMock implements ContainerInterface
          * @inheritdoc
          */
         public function get($id) { }
+    
+        /**
+         * @return ActionErrorInterface
+         */
+        public function getActionErrorHandler()
+        {
+            // TODO: Implement getActionErrorHandler() method.
+        }
+    
+        /**
+         * @return EntityFactoryInterface
+         */
+        public function getEntityFactory()
+        {
+            // TODO: Implement getEntityFactory() method.
+        }
+    
+        /**
+         * @return EntityRequestErrorInterface
+         */
+        public function getEntityRequestErrorHandler()
+        {
+            // TODO: Implement getEntityRequestErrorHandler() method.
+        }
+    
+        /**
+         * @return Request
+         */
+        public function getRequest()
+        {
+            // TODO: Implement getRequest() method.
+        }
+    
+        /**
+         * @return RequestPaginationInterface
+         */
+        public function getRequestPagination()
+        {
+            // TODO: Implement getRequestPagination() method.
+        }
+    
+        /**
+         * @return RequestQueryModifierInterface
+         */
+        public function getRequestQueryModifier()
+        {
+            // TODO: Implement getRequestQueryModifier() method.
+        }
+    
+        /**
+         * @return ResponseBuilderInterface
+         */
+        public function getResponseBuilder()
+        {
+            // TODO: Implement getResponseBuilder() method.
+        }
+    
+        /**
+         * @return ResponseFormatterInterface
+         */
+        public function getResponseFormatter()
+        {
+            // TODO: Implement getResponseFormatter() method.
+        }
+    
+        /**
+         * @return RouterInterface
+         */
+        public function getRouter()
+        {
+            // TODO: Implement getRouter() method.
+        }
+    
+        /**
+         * @return RoutesClassesInterface
+         */
+        public function getRoutesClasses()
+        {
+            // TODO: Implement getRoutesClasses() method.
+        }
 
         /**
          * @inheritdoc

tests/util/EntityRequestMock.php

@@ -2,10 +2,10 @@
 namespace Eukles\Entity {
 
     use Eukles\Action\ActionInterface;
+    use Eukles\Container\ContainerInterface;
     use Propel\Runtime\ActiveQuery\ModelCriteria;
     use Propel\Runtime\ActiveRecord\ActiveRecordInterface;
     use Propel\Runtime\Map\TableMap;
-    use Psr\Container\ContainerInterface;
 
     class EntityRequestMock implements EntityRequestInterface
     {
@@ -50,13 +50,7 @@ public function beforeCreate(ActiveRecordInterface $obj) { }
          *
          */
         public function beforeFetch(ModelCriteria $query) { }
-        
-        /**
-         *
-         * @return string
-         */
-        public function buildNameOfParameterToAdd() { }
-        
+    
         /**
          *
          * @return string|ActionInterface
@@ -105,6 +99,14 @@ public function getHiddenProperties() { }
          * @return array List of modifiable properties
          */
         public function getModifiableProperties() { }
+    
+        /**
+         *
+         * @param bool $plural
+         *
+         * @return string
+         */
+        public function getNameOfParameterToAdd($plural = false) { }
 
         /**
          * @return mixed