Merge pull request #16 from maurobonfietti/0.15.0

Version 0.15.0
maurobonfietti · Nov 14, 2020 · a9b4854 · a9b4854
2 parents 62e81fe + 1510319
commit a9b4854
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 15 deletions.
diff --git a/src/Command/CrudGeneratorCommand.php b/src/Command/CrudGeneratorCommand.php
@@ -11,7 +11,7 @@
 
 class CrudGeneratorCommand extends Command
 {
-    const COMMAND_VERSION = '0.14.0';
+    const COMMAND_VERSION = '0.15.0';
 
     public function __construct($app)
     {

diff --git a/src/Command/CrudGeneratorService.php b/src/Command/CrudGeneratorService.php
@@ -56,7 +56,7 @@ private function getRepositoryFunctions()
         }
         $fields1 = substr_replace($this->list1, '', -2);
         $fields2 = substr_replace($this->list2, '', -2);
-        $fields3 = substr_replace($this->list3, '', -2);
+        $fields3 = substr_replace($this->list3, '', -8);
         $fields4 = substr_replace($this->list4, '', -2);
         $fields5 = substr_replace($this->list5, '', -9);
         $this->postParams = substr_replace($this->list6, '', -14);
@@ -69,10 +69,12 @@ private function getFieldsList($field)
         $this->list1.= sprintf("`%s`, ", $field['Field']);
         $this->list2.= sprintf(":%s, ", $field['Field']);
         $this->list3.= sprintf('$statement->bindParam(\'%s\', $%s->%s);%s', $field['Field'], $this->entity, $field['Field'], PHP_EOL);
-        $this->list3.= sprintf("%'\t1s", '');
+        $this->list3.= sprintf("        %s", '');
         if ($field['Field'] != 'id') {
             $this->list4.= sprintf("`%s` = :%s, ", $field['Field'], $field['Field']);
-            $this->list5.= sprintf("if (isset(\$data->%s)) { $%s->%s = \$data->%s; }%s", $field['Field'], $this->entity, $field['Field'], $field['Field'], PHP_EOL);
+            $this->list5.= sprintf("if (isset(\$data->%s)) {%s", $field['Field'], PHP_EOL);
+            $this->list5.= sprintf("            $%s->%s = \$data->%s;%s", $this->entity, $field['Field'], $field['Field'], PHP_EOL);
+            $this->list5.= sprintf("        }%s", PHP_EOL);
             $this->list5.= sprintf("        %s", '');
             if ($field['Null'] == "NO" && strpos($field['Type'], 'varchar') !== false) {
                 $this->list6.= sprintf("'%s' => '%s',%s", $field['Field'], 'aaa', PHP_EOL);

diff --git a/src/Command/TemplateBase/Objectbase/Delete.php b/src/Command/TemplateBase/Objectbase/Delete.php
@@ -10,8 +10,11 @@
 
 final class Delete extends Base
 {
-    public function __invoke(Request $request, Response $response, array $args): Response
-    {
+    public function __invoke(
+        Request $request,
+        Response $response,
+        array $args
+    ): Response {
         $this->getObjectbaseService()->delete((int) $args['id']);
 
         return JsonResponse::withJson($response, '', 204);

diff --git a/src/Command/TemplateBase/Objectbase/GetOne.php b/src/Command/TemplateBase/Objectbase/GetOne.php
@@ -10,8 +10,11 @@
 
 final class GetOne extends Base
 {
-    public function __invoke(Request $request, Response $response, array $args): Response
-    {
+    public function __invoke(
+        Request $request,
+        Response $response,
+        array $args
+    ): Response {
         $objectbase = $this->getObjectbaseService()->getOne((int) $args['id']);
 
         return JsonResponse::withJson($response, json_encode($objectbase));

diff --git a/src/Command/TemplateBase/Objectbase/Update.php b/src/Command/TemplateBase/Objectbase/Update.php
@@ -10,8 +10,11 @@
 
 final class Update extends Base
 {
-    public function __invoke(Request $request, Response $response, array $args): Response
-    {
+    public function __invoke(
+        Request $request,
+        Response $response,
+        array $args
+    ): Response {
         $input = $request->getParsedBody();
         $objectbase = $this->getObjectbaseService()->update($input, (int) $args['id']);
 

diff --git a/src/Command/TemplateBase/ObjectbaseRepository.php b/src/Command/TemplateBase/ObjectbaseRepository.php
@@ -10,14 +10,14 @@ final class ObjectbaseRepository
 {
     protected $database;
 
-    protected function getDb(): \PDO
+    public function __construct(\PDO $database)
     {
-        return $this->database;
+        $this->database = $database;
     }
 
-    public function __construct(\PDO $database)
+    public function getDb(): \PDO
     {
-        $this->database = $database;
+        return $this->database;
     }
 
     public function checkAndGet(int $objectbaseId)

diff --git a/src/Command/TemplateBase/ObjectbaseService.php b/src/Command/TemplateBase/ObjectbaseService.php
@@ -16,7 +16,7 @@ public function __construct(ObjectbaseRepository $objectbaseRepository)
         $this->objectbaseRepository = $objectbaseRepository;
     }
 
-    protected function checkAndGet(int $objectbaseId)
+    public function checkAndGet(int $objectbaseId)
     {
         return $this->objectbaseRepository->checkAndGet($objectbaseId);
     }