Adjust to Field::type not null

demos/collection/crud.php

@@ -23,7 +23,7 @@
 $crud = Crud::addTo($app, ['ipp' => 10]);
 
 // callback for model action add form.
-$crud->onFormAdd(function (Form $form, $t) use ($model) {
+$crud->onFormAdd(function (Form $form, ModalExecutor $ex) use ($model) {
     $form->js(true, $form->getControl($model->fieldName()->name)->jsInput()->val('Entering value via javascript'));
 });
 

demos/init-db.php

@@ -311,7 +311,7 @@ protected function init(): void
 
 class Percent extends Field
 {
-    public ?string $type = 'float';
+    public string $type = 'float';
 }
 
 /**

docs/crud.rst

@@ -89,17 +89,17 @@ Custom Form Behavior
 specify your own form behavior using a callback for action::
 
     // callback for model action add form.
-    $g->onFormAdd(function (Form $form, $ex) {
+    $g->onFormAdd(function (Form $form, ModalExecutor $ex) {
         $form->js(true, $form->getControl('name')->jsInput()->val('Entering value via javascript'));
     });
 
     // callback for model action edit form.
-    $g->onFormEdit(function (Form $form, $ex) {
+    $g->onFormEdit(function (Form $form, ModalExecutor $ex) {
         $form->js(true, $form->getControl('name')->jsInput()->attr('readonly', true));
     });
 
     // callback for both model action edit and add.
-    $g->onFormAddEdit(function (Form $form, $ex) {
+    $g->onFormAddEdit(function (Form $form, ModalExecutor $ex) {
         $form->onSubmit(function (Form $form) use ($ex) {
             return [$ex->hide(), new \Atk4\Ui\JsToast('Submit all right! This demo does not saved data.')];
         });

docs/form.rst

@@ -244,7 +244,7 @@ There are 3 ways to define Data form control using 'string', 'json' or 'object':
 
     class MyBoolean extends \Atk4\Data\Field
     {
-        public ?string $type = 'boolean';
+        public string $type = 'boolean';
         public ?array $enum = ['N', 'Y'];
     }
     $form->addControl('test2', [], new MyBoolean());

docs/js.rst

@@ -507,8 +507,8 @@ needed:
 
 The following will **not** work::
 
-    $app = new myApp;
-    $model = new myModel;
+    $app = new MyApp();
+    $model = new MyModel();
 
     // JsModal requires its contents to be put into a Virtual Page
     $vp = \Atk4\Ui\VirtualPage::addTo($app);
@@ -532,8 +532,8 @@ The following will **not** work::
 
 Table needs to be first! The following works::
 
-    $app = new myApp;
-    $model = new myModel;
+    $app = new MyApp();
+    $model = new MyModel();
 
     // This needs to be first
     $table = \Atk4\Ui\Table::addTo($app);

src/Crud.php

@@ -193,9 +193,9 @@ protected function getJsGridAction(Model\UserAction $action): ?JsExpressionable
                 break;
             case Model\UserAction::MODIFIER_DELETE:
                 // use deleted record id to remove row, fallback to closest tr if id is not available.
-                $js = $this->deletedId ?
-                    (new Jquery('tr[data-id="' . $this->deletedId . '"]'))->transition('fade left') :
-                    (new Jquery())->closest('tr')->transition('fade left');
+                $js = $this->deletedId
+                    ? (new Jquery('tr[data-id="' . $this->deletedId . '"]'))->transition('fade left')
+                    : (new Jquery())->closest('tr')->transition('fade left');
 
                 break;
             default:

src/Form.php

@@ -459,7 +459,6 @@ public function controlFactory(Field $field, $ControlSeed = []): Control
     protected array $typeToControl = [
         'boolean' => [Control\Checkbox::class],
         'text' => [Control\Textarea::class],
-        'string' => [Control\Line::class],
         'datetime' => [Control\Calendar::class, 'type' => 'datetime'],
         'date' => [Control\Calendar::class, 'type' => 'date'],
         'time' => [Control\Calendar::class, 'type' => 'time'],

src/Form/Control/ScopeBuilder.php

@@ -339,7 +339,7 @@ protected function addFieldRule(Field $field): self
         } elseif ($field->hasReference()) {
             $type = 'lookup';
         } else {
-            $type = $field->type ?? 'string';
+            $type = $field->type;
         }
 
         $rule = $this->getRule($type, array_merge([

src/Loader.php

@@ -116,7 +116,7 @@ public function jsLoad(array $args = [], array $apiConfig = [], $storeName = nul
             'url' => $this->cb->getUrl(),
             'urlOptions' => $args,
             'apiConfig' => $apiConfig !== [] ? $apiConfig : null,
-            'storeName' => $storeName ? $storeName : null,
+            'storeName' => $storeName,
         ]);
     }
 }

src/Table/Column/FilterModel.php

@@ -69,7 +69,7 @@ public static function factoryType(App $app, Field $field): self
             Types::OBJECT => FilterModel\TypeString::class,
 
             'TODO we do not support enum type, any type can be enum' => FilterModel\TypeEnum::class,
-        ][$field->type ?? 'string'];
+        ][$field->type];
 
         // You can set your own filter model class.
         if (isset($field->ui['filterModel'])) {

src/View.php

@@ -135,7 +135,7 @@ public function setSource(array $data, $fields = null)
         }
 
         $this->setModel(new Model(new Persistence\Static_($data)), $fields); // @phpstan-ignore-line
-        $this->model->getField($this->model->idField)->type = null; // TODO probably unwanted
+        $this->model->getField($this->model->idField)->type = 'string'; // TODO probably unwanted
 
         return $this->model;
     }

src/VueComponent/InlineEdit.php

@@ -167,7 +167,7 @@ protected function renderView(): void
     {
         parent::renderView();
 
-        $type = $this->model && $this->fieldName ? $this->model->getField($this->fieldName)->type : 'text';
+        $type = $this->model && $this->fieldName ? $this->model->getField($this->fieldName)->type : 'string';
         $type = $type === 'string' ? 'text' : $type;
 
         if ($type !== 'text' && $type !== 'integer') {