wip

demos/form-control/checkbox.php

@@ -18,12 +18,12 @@
 Form\Control\Checkbox::addTo($app, ['Make my profile visible ticked'])->set(true);
 
 View::addTo($app, ['ui' => 'divider']);
-Form\Control\Checkbox::addTo($app, ['Accept terms and conditions', 'slider']);
+Form\Control\Checkbox::addTo($app, ['Accept terms and conditions', 'class.slider' => true]);
 
 View::addTo($app, ['ui' => 'divider']);
-Form\Control\Checkbox::addTo($app, ['Subscribe to weekly newsletter', 'toggle']);
+Form\Control\Checkbox::addTo($app, ['Subscribe to weekly newsletter', 'class.toggle' => true]);
 View::addTo($app, ['ui' => 'divider']);
-Form\Control\Checkbox::addTo($app, ['Look for the clues', 'disabled toggle'])->set(true);
+Form\Control\Checkbox::addTo($app, ['Look for the clues', 'class.disabled toggle' => true])->set(true);
 
 View::addTo($app, ['ui' => 'divider']);
 Form\Control\Checkbox::addTo($app, ['Custom setting?'])->js(true)->checkbox('set indeterminate');

demos/form/form-section-accordion.php

@@ -58,7 +58,7 @@
 $section2->addControl('delivery_address', []);
 
 // Terms field
-$form->addControl('term', [Form\Control\Checkbox::class, 'caption' => 'Accept terms and conditions', null, 'slider']);
+$form->addControl('term', [Form\Control\Checkbox::class, 'caption' => 'Accept terms and conditions', 'class.slider' => true]);
 
 $accordionLayout->activate($contactSection);
 

demos/form/jscondform.php

@@ -14,7 +14,7 @@
 \Atk4\Ui\Header::addTo($app, ['Phone', 'size' => 2]);
 
 $formPhone = Form::addTo($app, ['class.segment' => true]);
-\Atk4\Ui\Label::addTo($formPhone, ['Add other phone field input. Note: phone1 required a number of at least 5 char.', 'top attached'], ['AboveControls']);
+\Atk4\Ui\Label::addTo($formPhone, ['Add other phone field input. Note: phone1 required a number of at least 5 char.', 'class.top attached' => true], ['AboveControls']);
 
 $formPhone->addControl('phone1');
 $formPhone->addControl('phone2');
@@ -36,7 +36,7 @@
 \Atk4\Ui\Label::addTo($formSubscribe, ['Click on subscribe and add email to receive your gift.', 'top attached'], ['AboveControls']);
 
 $formSubscribe->addControl('name');
-$formSubscribe->addControl('subscribe', [Form\Control\Checkbox::class, 'Subscribe to weekly newsletter', 'toggle']);
+$formSubscribe->addControl('subscribe', [Form\Control\Checkbox::class, 'Subscribe to weekly newsletter', 'class.toggle' => true]);
 $formSubscribe->addControl('email');
 $formSubscribe->addControl('gender', [Form\Control\Radio::class], ['enum' => ['Female', 'Male']])->set('Female');
 $formSubscribe->addControl('m_gift', [Form\Control\Dropdown::class, 'caption' => 'Gift for Men', 'values' => ['Beer Glass', 'Swiss Knife']]);

demos/interactive/popup.php

@@ -272,4 +272,4 @@ public function linkCart($cart, $jsAction = null)
 $button = \Atk4\Ui\Button::addTo($app, [null, 'icon' => 'volume down']);
 $buttonPopup = Popup::addTo($app, [$button, 'triggerOn' => 'hover'])->setHoverable();
 
-Form\Control\Checkbox::addTo($buttonPopup, ['Just On/Off', 'slider'])->on('change', $button->js()->find('.icon')->toggleClass('up down'));
+Form\Control\Checkbox::addTo($buttonPopup, ['Just On/Off', 'class.slider' => true])->on('change', $button->js()->find('.icon')->toggleClass('up down'));

demos/obsolete/notify2.php

@@ -32,7 +32,7 @@ protected function init(): void
 // Unit test only.
 $form->cb->setUrlTrigger('test_notify');
 
-\Atk4\Ui\Label::addTo($form, ['Some of notification options that can be set.', 'top attached'], ['AboveControls']);
+\Atk4\Ui\Label::addTo($form, ['Some of notification options that can be set.', 'class.top attached' => true], ['AboveControls']);
 $form->buttonSave->set('Show');
 $form->setModel((new $notifierClass($app->db))->createEntity(), []);
 

docs/app.rst

@@ -92,8 +92,8 @@ active. (See :ref:`system_pattern`)::
             // Make sure user is valid
             if (!$this->user->isLoaded()) {
                 $this->initLayout([\Atk4\Ui\Layout\Centered::class]);
-                Message::addTo($this, ['Login Required', 'error']);
-                Button::addTo($this, ['Login', 'primary'])->link('index.php');
+                Message::addTo($this, ['Login Required', 'type' => 'error']);
+                Button::addTo($this, ['Login', 'class.primary' => true])->link('index.php');
                 exit;
             }
 

docs/autocomplete.rst

@@ -68,7 +68,7 @@ use of Filters::
 
 
     $form = \Atk4\Ui\Form::addTo($app, ['class.segment' => true]);
-    \Atk4\Ui\Label::addTo($form, ['Add city', 'top attached'], ['AboveControls']);
+    \Atk4\Ui\Label::addTo($form, ['Add city', 'class.top attached' => true], ['AboveControls']);
 
     $l = $form->addControl('city',[\Atk4\Ui\Form\Control\Lookup::class]);
 

docs/button.rst

@@ -37,11 +37,11 @@ Button Icon
 
 Property $icon will place icon on your button and can be specified in one of the following two ways::
 
-    $button = Button::addTo($app, ['Like', 'blue', 'icon' => 'thumbs up']);
+    $button = Button::addTo($app, ['Like', 'class.blue' => true, 'icon' => 'thumbs up']);
 
     // or
 
-    $button = Button::addTo($app, ['Like', 'blue', 'icon' => new Icon('thumbs up')]);
+    $button = Button::addTo($app, ['Like', 'class.blue' => true, 'icon' => new Icon('thumbs up')]);
 
 or if you prefer initializing objects::
 
@@ -120,7 +120,7 @@ Knowledge of the Fomantic UI button (https://fomantic-ui.com/elements/button.htm
 in creating more complex buttons::
 
     $forks = new Button(['labeled' => true]); // Button, not Buttons!
-    Icon::addTo(Button::addTo($forks, ['Forks', 'blue']), ['fork']);
-    Label::addTo($forks, ['1,048', 'basic blue left pointing']);
+    Icon::addTo(Button::addTo($forks, ['Forks', 'class.blue' => true]), ['fork']);
+    Label::addTo($forks, ['1,048', 'class.basic blue left pointing' => true]);
     $app->add($forks);
 

docs/dataexecutor.rst

@@ -233,8 +233,8 @@ Example of changing button for Card, Crud and Modal executor globally within you
     {
         protected static $actionTriggerSeed = [
             self::MODAL_BUTTON => [
-                'edit' => [Button::class, 'Save', 'green'],
-                'add' => [Button::class, 'Save', 'green'],
+                'edit' => [Button::class, 'Save', 'class.green' => true],
+                'add' => [Button::class, 'Save', 'class.green' => true],
             ],
             self::TABLE_BUTTON => [
                 'edit' => [Button::class, null, 'icon' => 'pencil'],

docs/form-control.rst

@@ -228,7 +228,7 @@ Here are few ways to specify `icon` to an Input::
 
     // Type-hinting friendly
     $line = new \Atk4\Ui\Form\Control\Line();
-    $line->icon='search';
+    $line->icon = 'search';
     $page->add($line);
 
     // using class factory
@@ -239,7 +239,7 @@ be automatically substituted with `new Icon($icon)`. If you wish to be more spec
 and pass some arguments to the icon, there are two options::
 
     // compact
-    $line->icon=['search', 'big'];
+    $line->icon = ['search', 'big'];
 
     // Type-hinting friendly
     $line->icon = new Icon('search');

docs/form.rst

@@ -771,7 +771,7 @@ Here is a more advanced example::
 
     $f_sub = Form::addTo($app);
     $f_sub->addControl('name');
-    $f_sub->addControl('subscribe', [\Atk4\Ui\Form\Control\Checkbox::class, 'Subscribe to weekly newsletter', 'toggle']);
+    $f_sub->addControl('subscribe', [\Atk4\Ui\Form\Control\Checkbox::class, 'Subscribe to weekly newsletter', 'class.toggle' => true]);
     $f_sub->addControl('email');
     $f_sub->addControl('gender', [\Atk4\Ui\Form\Control\Radio::class], ['enum' => ['Female', 'Male']])->set('Female');
     $f_sub->addControl('m_gift', [\Atk4\Ui\Form\Control\Dropdown::class, 'caption' => 'Gift for Men', 'values' => ['Beer Glass', 'Swiss Knife']]);

src/Accordion.php

@@ -16,7 +16,7 @@ class Accordion extends View
 
     public $ui = 'accordion';
 
-    /** @var array|string|null The css class for Fomantic-ui accordion type. */
+    /** @var array|string|null The CSS class for Fomantic-ui accordion type. */
     public $type;
 
     /** @var array Settings as per Fomantic-ui accordion settings. */

src/Form.php

@@ -77,7 +77,7 @@ class Form extends View
      *
      * @var Button|array|false Button object, seed or false to not show button at all
      */
-    public $buttonSave = [Button::class, 'Save', 'primary'];
+    public $buttonSave = [Button::class, 'Save', 'class.primary' => true];
 
     /**
      * When form is submitted successfully, this template is used by method
@@ -135,6 +135,10 @@ class Form extends View
 
     public function __construct(array $defaults = [])
     {
+        if (func_num_args() > 1) { // prevent bad usage
+            throw new \Error('Too many method arguments');
+        }
+
         parent::__construct($defaults); // TODO remove once parent::__construct() accepts only array
     }
 

src/Form/Control/Checkbox.php

@@ -24,13 +24,13 @@ class Checkbox extends Form\Control
      */
     public $label;
 
-    /**
-     * @param string|array $label
-     * @param string|array $class
-     */
-    public function __construct($label = null, $class = null)
+    public function __construct($label = [])
     {
-        parent::__construct($label, $class);
+        if (func_num_args() > 1) { // prevent bad usage
+            throw new \Error('Too many method arguments');
+        }
+
+        parent::__construct($label);
 
         $this->label = $this->content;
         $this->content = null;

src/Message.php

@@ -17,7 +17,7 @@
  */
 class Message extends View
 {
-    /** @var string Set to info | warning | error | success | positie | negative. */
+    /** @var string Set to info | warning | error | success | positive | negative. */
     public $type;
 
     /** @var Text|false Contains a text to be included below. */

src/Table.php

@@ -107,6 +107,10 @@ class Table extends Lister
 
     public function __construct(array $defaults = [])
     {
+        if (func_num_args() > 1) { // prevent bad usage
+            throw new \Error('Too many method arguments');
+        }
+
         parent::__construct($defaults); // TODO remove once parent::__construct() accepts only array
     }
 

src/Table/Column.php

@@ -52,6 +52,10 @@ class Column
 
     public function __construct(array $defaults = [])
     {
+        if (func_num_args() > 1) { // prevent bad usage
+            throw new \Error('Too many method arguments');
+        }
+
         $this->setDefaults($defaults);
     }
 

src/Wizard.php

@@ -64,8 +64,8 @@ protected function init(): void
             $this->buttonPrev->link($this->getUrl($this->currentStep - 1));
         }
 
-        $this->buttonNext = Button::addTo($this, ['Next', 'primary'], ['Right']);
-        $this->buttonFinish = Button::addTo($this, ['Finish', 'primary'], ['Right']);
+        $this->buttonNext = Button::addTo($this, ['Next', 'class.primary' => true], ['Right']);
+        $this->buttonFinish = Button::addTo($this, ['Finish', 'class.primary' => true], ['Right']);
 
         $this->buttonNext->link($this->getUrl($this->currentStep + 1));
     }