cleanup

atk4 · May 5, 2021 · 337427a · 337427a
1 parent d7a8680
commit 337427a
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 12 deletions.
diff --git a/demos/_includes/DemoActionsUtil.php b/demos/_includes/DemoActionsUtil.php
@@ -4,6 +4,8 @@
 
 namespace Atk4\Ui\Demos;
 
+use Atk4\Data\Model\UserAction;
+
 class DemoActionsUtil
 {
     public static function setupDemoActions(CountryLock $country): void
@@ -82,8 +84,8 @@ public static function setupDemoActions(CountryLock $country): void
             'edit_iso',
             [
                 'caption' => 'Edit ISO3',
-                'description' => function () {
-                    return 'Edit ISO3 for country:';
+                'description' => function (UserAction $action) {
+                    return 'Edit ISO3 for country: ' . $action->getEntity()->getTitle();
                 },
                 'fields' => [$country->fieldName()->iso3],
                 'callback' => function () {

diff --git a/demos/data-action/actions.php b/demos/data-action/actions.php
@@ -14,7 +14,6 @@
 require_once __DIR__ . '/../init-app.php';
 
 $files = new FileLock($app->db);
-//$files = $files->createEntity(); // TODO remove before #1623 merge, it is wrong
 
 // Actions can be added easily to the model via the Model::addUserAction($name, $properties) method.
 $action = $files->addUserAction(

diff --git a/demos/data-action/jsactions.php b/demos/data-action/jsactions.php
@@ -5,7 +5,6 @@
 namespace Atk4\Ui\Demos;
 
 use Atk4\Data\Model\UserAction;
-use Atk4\Ui\Button;
 use Atk4\Ui\Form\Control\Line;
 use Atk4\Ui\UserAction\JsCallbackExecutor;
 
@@ -78,4 +77,4 @@
 $s->addFields($entity = $country->loadAny(), [$country->fieldName()->name, $country->fieldName()->iso]);
 
 // Pass the model action to the Card::addClickAction() method.
-$card->addClickAction($sendEmailAction,null, ['id' => $entity->getId()]);
+$card->addClickAction($sendEmailAction, null, ['id' => $entity->getId()]);
diff --git a/demos/init-db.php b/demos/init-db.php
@@ -128,8 +128,7 @@ public function validate($intent = null): array
         }
 
         // look if name is unique
-        $c = $this->getModel();
-        $c = $c->tryLoadBy($this->fieldName()->name, $this->name);
+        $c = $this->getModel()->tryLoadBy($this->fieldName()->name, $this->name);
         if ($c->loaded() && $c->getId() !== $this->getId()) {
             $errors[$this->fieldName()->name] = 'Country name must be unique';
         }
@@ -264,7 +263,6 @@ protected function init(): void
         $this->addField($this->fieldName()->type, ['caption' => 'MIME Type']);
         $this->addField($this->fieldName()->is_folder, ['type' => 'boolean']);
 
-        $t = $this->fieldName()->SubFolder;
         $this->hasMany($this->fieldName()->SubFolder, [
             'model' => [self::class],
             'their_field' => self::hinting()->fieldName()->parent_folder_id,

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -104,7 +104,6 @@ parameters:
         - '~^Call to an undefined method Atk4\\Ui\\Panel\\Loadable::onOpen\(\)\.$~'
         - '~^Call to an undefined method Atk4\\Ui\\Panel\\Loadable::addConfirmation\(\)\.$~'
         # for src/Card.php
-        - '~^Call to an undefined method Atk4\\Ui\\AbstractView::addFields\(\)\.$~'
         - '~^Call to an undefined method Atk4\\Ui\\View::addDescription\(\)\.$~'
         # for src/CardDeck.php
         - '~^Access to an undefined property Atk4\\Ui\\AbstractView::\$reload\.$~'
@@ -187,7 +186,6 @@ parameters:
         - '~^Property Atk4\\Ui\\Card::\$section \(Atk4\\Ui\\CardSection\|null\) does not accept Atk4\\Ui\\AbstractView\.$~'
         - '~^Method Atk4\\Ui\\Card::getSection\(\) should return Atk4\\Ui\\View\|null but returns Atk4\\Ui\\AbstractView\.$~'
         - '~^Method Atk4\\Ui\\Card::addContent\(\) should return Atk4\\Ui\\View\|null but returns Atk4\\Ui\\AbstractView\.$~'
-        - '~^Method Atk4\\Ui\\Card::addSection\(\) should return Atk4\\Ui\\View but returns Atk4\\Ui\\AbstractView\.$~'
         - '~^Method Atk4\\Ui\\Card::addExtraContent\(\) should return Atk4\\Ui\\View but returns Atk4\\Ui\\AbstractView\.$~'
         - '~^Method Atk4\\Ui\\Card::addImage\(\) should return Atk4\\Ui\\View\|null but returns Atk4\\Ui\\AbstractView\.$~'
         - '~^Method Atk4\\Ui\\Card::addButton\(\) should return Atk4\\Ui\\View\|null but returns Atk4\\Ui\\AbstractView\.$~'

diff --git a/src/Card.php b/src/Card.php
@@ -252,7 +252,7 @@ public function addModelActions(Model $model)
      */
     public function addSection(string $title = null, Model $model = null, array $fields = null, bool $useTable = false, bool $useLabel = false)
     {
-        $section = CardSection::addTo($this, ['card' => $this], ['Section']);
+        $section = CardSection::addToWithCl($this, [$this->cardSection, 'card' => $this], ['Section']);
         if ($title) {
             View::addTo($section, [$title, ['class' => 'header']]);
         }

diff --git a/src/UserAction/FormExecutor.php b/src/UserAction/FormExecutor.php
@@ -5,7 +5,6 @@
 namespace Atk4\Ui\UserAction;
 
 use Atk4\Data\Model;
-use Atk4\Ui\Exception;
 use Atk4\Ui\Form;
 
 class FormExecutor extends BasicExecutor