Merge pull request #1360 from phalcon/fix/#1320-scaffold-white-screen

#1320 - Fix Scaffold white screen

Author: Jeckerson

src/Builder/Component/Scaffold.php

@@ -181,6 +181,7 @@ public function build(): bool
         $attributes = $metaData->getAttributes($entity);
         $dataTypes = $metaData->getDataTypes($entity);
         $identityField = $metaData->getIdentityField($entity);
+        $identityField = $identityField ? $identityField : null;
         $primaryKeys = $metaData->getPrimaryKeyAttributes($entity);
 
         $setParams = [];
@@ -234,11 +235,11 @@ public function build(): bool
      *
      * @return string
      */
-    private function captureFilterInput(string $var, $fields, bool $useGetSetters, string $identityField): string
+    private function captureFilterInput(string $var, $fields, bool $useGetSetters, string $identityField = null): string
     {
         $code = '';
         foreach ($fields as $field => $dataType) {
-            if ($field == $identityField) {
+            if ($identityField !== null && $field == $identityField) {
                 continue;
             }
 
@@ -502,28 +503,28 @@ private function makeController(): void
         $code = str_replace('$assignInputFromRequestCreate$', $this->captureFilterInput(
             $this->options->get('singular'),
             $this->options->get('dataTypes'),
-            $this->options->get('genSettersGetters'),
+            (bool) $this->options->get('genSettersGetters'),
             $this->options->get('identityField')
         ), $code);
 
         $code = str_replace('$assignInputFromRequestUpdate$', $this->captureFilterInput(
             $this->options->get('singular'),
             $this->options->get('dataTypes'),
-            $this->options->get('genSettersGetters'),
+            (bool) $this->options->get('genSettersGetters'),
             $this->options->get('identityField')
         ), $code);
 
         $code = str_replace('$assignTagDefaults$', $this->assignTagDefaults(
             $this->options->get('singular'),
             $this->options->get('dataTypes'),
-            $this->options->get('genSettersGetters')
+            (bool) $this->options->get('genSettersGetters')
         ), $code);
 
         $attributes = $this->options->get('attributes');
 
         $code = str_replace('$pkVar$', '$' . $attributes[0], $code);
 
-        if ($this->options->get('genSettersGetters')) {
+        if ((bool) $this->options->get('genSettersGetters')) {
             $code = str_replace('$pkGet$', 'get' . Text::camelize($attributes[0]) . '()', $code);
         } else {
             $code = str_replace('$pkGet$', $attributes[0], $code);

src/Web/Tools/Controllers/ScaffoldController.php

@@ -51,7 +51,7 @@ public function generateAction()
             try {
                 $tableName = $this->request->getPost('tableName', 'string');
 
-                $scaffoldBuilder = new Scaffold([
+                $options = [
                     'name'              => $tableName,
                     'schema'            => $this->request->getPost('schema', 'string'),
                     'force'             => $this->request->getPost('force', 'int'),
@@ -60,8 +60,9 @@ public function generateAction()
                     'templatePath'      => $this->request->getPost('templatesPath', 'string'),
                     'templateEngine'    => $this->request->getPost('templateEngine', 'string'),
                     'modelsNamespace'   => $this->request->getPost('modelsNamespace', 'string'),
-                ]);
+                ];
 
+                $scaffoldBuilder = new Scaffold(array_merge($options, ['config' => $this->config->toArray()]));
                 $scaffoldBuilder->build();
 
                 $this->flashSession->success(