minor CS fixes

demos/_includes/Flyers.php

@@ -14,6 +14,6 @@ protected function init(): void
 
         $this->addField('first_name');
         $this->addField('last_name');
-        $this->addField('age', ['values' => ['1' => 'From months to 2 years old', '2' => 'From 3 to 17 years old', '3' => '18 years or more']]);
+        $this->addField('age', ['values' => [1 => 'From months to 2 years old', 2 => 'From 3 to 17 years old', 3 => '18 years or more']]);
     }
 }

demos/form/form.php

@@ -57,7 +57,7 @@
 $group->addControl('gender', [Form\Control\Dropdown::class, 'values' => ['Female', 'Male']]);
 
 // testing 0 value
-$values = [0 => 'noob', 1 => 'pro', 2 => 'dev'];
+$values = ['noob', 'pro', 'dev'];
 $form->addControl('description', [Form\Control\Textarea::class])->set(0);
 $form->addControl('no_description', [Form\Control\Textarea::class])->set(null);
 $form->addControl('status_optional', [Form\Control\Dropdown::class, 'values' => $values]);

demos/layout/layout-panel.php

@@ -89,7 +89,7 @@
 $panel2->onOpen(function (Panel\Content $p) {
     $form = Form::addTo($p);
     $form->addHeader('Settings');
-    $form->addControl('name', [Form\Control\Dropdown::class, 'values' => ['1' => 'Option 1', '2' => 'Option 2']])
+    $form->addControl('name', [Form\Control\Dropdown::class, 'values' => [1 => 'Option 1', 2 => 'Option 2']])
         ->set('1')
         ->onChange($p->getOwner()->jsDisplayWarning(true));
 

docs/form.rst

@@ -256,7 +256,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 $enum = ['N', 'Y'];
+        public ?array $enum = ['N', 'Y'];
     }
     $form->addControl('test2', [], new MyBoolean());
 

docs/js.rst

@@ -341,7 +341,7 @@ The template language for JsExpression is super-simple:
 So the following lines are identical::
 
     $sum = new JsExpression('[] + []', [$h1, $h2]);
-    $sum = new JsExpression('[0] + [1]', [0 => $h1, 1 => $h2]);
+    $sum = new JsExpression('[0] + [1]', [$h1, $h2]);
     $sum = new JsExpression('[a] + [b]', ['a' => $h1, 'b' => $h2]);
 
 .. important::

docs/template.rst

@@ -396,7 +396,7 @@ You can use the following code to manipulate the template above::
     $template->loadFromFile('envelope'); // templates/envelope.html
 
     // Split into multiple objects for processing
-    $sender    = $template->cloneRegion('Sender');
+    $sender = $template->cloneRegion('Sender');
     $recipient = $template->cloneRegion('Recipient');
 
     // Set data to each sub-template separately
@@ -414,7 +414,7 @@ Same thing using Agile Toolkit Views::
 
     $envelope = \Atk4\Ui\View::addTo($this, [], [null], null, ['envelope']);
 
-    $sender    = \Atk4\Ui\View::addTo($envelope, [], [null], 'Sender', 'Sender');
+    $sender = \Atk4\Ui\View::addTo($envelope, [], [null], 'Sender', 'Sender');
     $recipient = \Atk4\Ui\View::addTo($envelope, [], [null], 'Recipient', 'Recipient');
 
     $sender->template->set($sender_data);
@@ -644,9 +644,9 @@ under ``$template->template`::
 
     // template property:
     array (
-        0 => 'Hello ',
+        'Hello ',
         'subject#0' => array (
-            0 => 'world',
+            'world',
         ),
         1 => '!!',
     )

src/Behat/Context.php

@@ -191,7 +191,7 @@ protected function assertNoDuplicateId(): void
     }
 
     /**
-     * @return array{0: 'css'|'xpath', 1: string}
+     * @return array{'css'|'xpath', string}
      */
     protected function parseSelector(string $selector): array
     {

src/Form/Control/Dropdown.php

@@ -4,7 +4,6 @@
 
 namespace Atk4\Ui\Form\Control;
 
-use Atk4\Data\Model;
 use Atk4\Ui\JsExpression;
 use Atk4\Ui\JsExpressionable;
 use Atk4\Ui\JsFunction;

src/Label.php

@@ -19,8 +19,6 @@ class Label extends View
     /**
      * Icon to the right of the label.
      *
-     * @see $icon
-     *
      * @var View|array|string
      */
     public $iconRight;
@@ -39,8 +37,6 @@ class Label extends View
     /**
      * Image to the right of the label.
      *
-     * @see $image
-     *
      * @var View|array|string
      */
     public $imageRight;

src/Table/Column/KeyValue.php

@@ -26,10 +26,10 @@
  *    'caption' => __('Payment Status'),
  *    'default' => 0,
  *    'values' => [
- *        0 => __('not invoiceable'),
- *        1 => __('ready to invoice'),
- *        2 => __('invoiced'),
- *        3 => __('paid'),
+ *        __('not invoiceable'),
+ *        __('ready to invoice'),
+ *        __('invoiced'),
+ *        __('paid'),
  *    ],
  *    'ui' => [
  *        'form' => [Form\Control\Dropdown::class],

src/Table/Column/Labels.php

@@ -16,8 +16,8 @@
  */
 class Labels extends Table\Column
 {
-    /** @var array|null Allowed values, prioritized over ->values */
-    public $values;
+    /** @var array|null Allowed values, prioritized over Field::$values */
+    public ?array $values = null;
 
     public function getHtmlTags(Model $row, ?Field $field): array
     {

tests/FormTest.php

@@ -149,7 +149,7 @@ public function testSubmitError(): void
     {
         $m = new Model();
 
-        $options = ['0' => 'yes please', '1' => 'woot'];
+        $options = ['yes please', 'woot'];
 
         $m->addField('opt1', ['values' => $options]);
         $m->addField('opt2', ['values' => $options]);