diff --git a/modules/backend/classes/WidgetBase.php b/modules/backend/classes/WidgetBase.php index 66367f477..1f098e8f3 100644 --- a/modules/backend/classes/WidgetBase.php +++ b/modules/backend/classes/WidgetBase.php @@ -29,16 +29,16 @@ abstract class WidgetBase */ protected $controller; - /** - * @var string A unique alias to identify this widget. - */ - public $defaultAlias = 'widget'; - /** * @var string Defined alias used for this widget. */ public $alias; + /** + * @var string A unique alias to identify this widget. + */ + protected $defaultAlias = 'widget'; + /** * Constructor * @param Backend\Classes\Controller $controller @@ -80,26 +80,6 @@ abstract class WidgetBase } } - /** - * Transfers config values stored inside the $config property directly - * on to the root object properties. If no properties are defined - * all config will be transferred if finds a match. - * @param array $properties - * @return void - */ - protected function fillFromConfig($properties = null) - { - if ($properties === null) { - $properties = array_keys((array) $this->config); - } - - foreach ($properties as $property) { - if (property_exists($this, $property)) { - $this->{$property} = $this->getConfig($property, $this->{$property}); - } - } - } - /** * Initialize the widget, called by the constructor and free from its parameters. * @return void @@ -138,6 +118,26 @@ abstract class WidgetBase $this->controller->widget->{$this->alias} = $this; } + /** + * Transfers config values stored inside the $config property directly + * on to the root object properties. If no properties are defined + * all config will be transferred if it finds a matching property. + * @param array $properties + * @return void + */ + protected function fillFromConfig($properties = null) + { + if ($properties === null) { + $properties = array_keys((array) $this->config); + } + + foreach ($properties as $property) { + if (property_exists($this, $property)) { + $this->{$property} = $this->getConfig($property, $this->{$property}); + } + } + } + /** * Returns a unique ID for this widget. Useful in creating HTML markup. * @param string $suffix An extra string to append to the ID. diff --git a/modules/backend/formwidgets/CodeEditor.php b/modules/backend/formwidgets/CodeEditor.php index ded2567c0..7dd83d759 100644 --- a/modules/backend/formwidgets/CodeEditor.php +++ b/modules/backend/formwidgets/CodeEditor.php @@ -15,7 +15,7 @@ class CodeEditor extends FormWidgetBase /** * {@inheritDoc} */ - public $defaultAlias = 'codeeditor'; + protected $defaultAlias = 'codeeditor'; /** * @var string Code language to display (php, twig) diff --git a/modules/backend/formwidgets/ColorPicker.php b/modules/backend/formwidgets/ColorPicker.php index 6aeef0682..67c33c7e5 100644 --- a/modules/backend/formwidgets/ColorPicker.php +++ b/modules/backend/formwidgets/ColorPicker.php @@ -14,7 +14,7 @@ class ColorPicker extends FormWidgetBase /** * {@inheritDoc} */ - public $defaultAlias = 'colorpicker'; + protected $defaultAlias = 'colorpicker'; /** * @var array Default available colors diff --git a/modules/backend/formwidgets/DataGrid.php b/modules/backend/formwidgets/DataGrid.php index 17ff471f8..c04a09a70 100644 --- a/modules/backend/formwidgets/DataGrid.php +++ b/modules/backend/formwidgets/DataGrid.php @@ -16,7 +16,7 @@ class DataGrid extends FormWidgetBase /** * {@inheritDoc} */ - public $defaultAlias = 'datagrid'; + protected $defaultAlias = 'datagrid'; /** * @var string Grid size diff --git a/modules/backend/formwidgets/DataTable.php b/modules/backend/formwidgets/DataTable.php index 3f1d52d19..b401d9a05 100644 --- a/modules/backend/formwidgets/DataTable.php +++ b/modules/backend/formwidgets/DataTable.php @@ -17,7 +17,7 @@ class DataTable extends FormWidgetBase /** * {@inheritDoc} */ - public $defaultAlias = 'datatable'; + protected $defaultAlias = 'datatable'; /** * @var string Table size diff --git a/modules/backend/formwidgets/DatePicker.php b/modules/backend/formwidgets/DatePicker.php index 0c1fabf42..18a4705ee 100644 --- a/modules/backend/formwidgets/DatePicker.php +++ b/modules/backend/formwidgets/DatePicker.php @@ -16,7 +16,7 @@ class DatePicker extends FormWidgetBase /** * {@inheritDoc} */ - public $defaultAlias = 'datepicker'; + protected $defaultAlias = 'datepicker'; /** * @var bool Display mode: datetime, date, time. diff --git a/modules/backend/formwidgets/FileUpload.php b/modules/backend/formwidgets/FileUpload.php index e1f56fa13..16ee7eddf 100644 --- a/modules/backend/formwidgets/FileUpload.php +++ b/modules/backend/formwidgets/FileUpload.php @@ -27,7 +27,7 @@ class FileUpload extends FormWidgetBase /** * {@inheritDoc} */ - public $defaultAlias = 'fileupload'; + protected $defaultAlias = 'fileupload'; /** * @var int Preview image width diff --git a/modules/backend/formwidgets/RecordFinder.php b/modules/backend/formwidgets/RecordFinder.php index 1f347a8d3..b91bd419b 100644 --- a/modules/backend/formwidgets/RecordFinder.php +++ b/modules/backend/formwidgets/RecordFinder.php @@ -24,7 +24,7 @@ class RecordFinder extends FormWidgetBase /** * {@inheritDoc} */ - public $defaultAlias = 'recordfinder'; + protected $defaultAlias = 'recordfinder'; /** * @var string Relationship type diff --git a/modules/backend/formwidgets/Relation.php b/modules/backend/formwidgets/Relation.php index 9eadcce68..a48785734 100644 --- a/modules/backend/formwidgets/Relation.php +++ b/modules/backend/formwidgets/Relation.php @@ -17,7 +17,7 @@ class Relation extends FormWidgetBase /** * {@inheritDoc} */ - public $defaultAlias = 'relation'; + protected $defaultAlias = 'relation'; /** * @var string Relationship type diff --git a/modules/backend/formwidgets/RichEditor.php b/modules/backend/formwidgets/RichEditor.php index c2c2dab9a..07d8de7e6 100644 --- a/modules/backend/formwidgets/RichEditor.php +++ b/modules/backend/formwidgets/RichEditor.php @@ -14,7 +14,7 @@ class RichEditor extends FormWidgetBase /** * {@inheritDoc} */ - public $defaultAlias = 'richeditor'; + protected $defaultAlias = 'richeditor'; /** * @var boolean Determines whether content has HEAD and HTML tags. diff --git a/modules/backend/widgets/Filter.php b/modules/backend/widgets/Filter.php index 5b3d55ca6..c33dea08d 100644 --- a/modules/backend/widgets/Filter.php +++ b/modules/backend/widgets/Filter.php @@ -18,7 +18,7 @@ class Filter extends WidgetBase /** * {@inheritDoc} */ - public $defaultAlias = 'filter'; + protected $defaultAlias = 'filter'; /** * @var boolean Determines if scope definitions have been created. diff --git a/modules/backend/widgets/Form.php b/modules/backend/widgets/Form.php index 613c25e55..62c144895 100644 --- a/modules/backend/widgets/Form.php +++ b/modules/backend/widgets/Form.php @@ -43,7 +43,7 @@ class Form extends WidgetBase /** * {@inheritDoc} */ - public $defaultAlias = 'form'; + protected $defaultAlias = 'form'; /** * @var Model Form model object. diff --git a/modules/backend/widgets/Grid.php b/modules/backend/widgets/Grid.php index 4e42fd664..cb0a1bb40 100644 --- a/modules/backend/widgets/Grid.php +++ b/modules/backend/widgets/Grid.php @@ -23,7 +23,7 @@ class Grid extends WidgetBase /** * {@inheritDoc} */ - public $defaultAlias = 'grid'; + protected $defaultAlias = 'grid'; /** * @var array Grid columns diff --git a/modules/backend/widgets/ReportContainer.php b/modules/backend/widgets/ReportContainer.php index 5010e45d8..01a63c0d0 100644 --- a/modules/backend/widgets/ReportContainer.php +++ b/modules/backend/widgets/ReportContainer.php @@ -55,6 +55,11 @@ class ReportContainer extends WidgetBase // Object properties // + /** + * {@inheritDoc} + */ + protected $defaultAlias = 'reportContainer'; + /** * @var array Collection of all report widgets used by this container. */ @@ -65,11 +70,6 @@ class ReportContainer extends WidgetBase */ protected $reportsDefined = false; - /** - * {@inheritDoc} - */ - public $defaultAlias = 'reportContainer'; - /** * Constructor. */ diff --git a/modules/backend/widgets/Search.php b/modules/backend/widgets/Search.php index df0f65a5b..c8b11b231 100644 --- a/modules/backend/widgets/Search.php +++ b/modules/backend/widgets/Search.php @@ -15,7 +15,7 @@ class Search extends WidgetBase /** * {@inheritDoc} */ - public $defaultAlias = 'search'; + protected $defaultAlias = 'search'; /** * @var string Search placeholder text. diff --git a/modules/backend/widgets/Table.php b/modules/backend/widgets/Table.php index f203c52c0..5688fb40f 100644 --- a/modules/backend/widgets/Table.php +++ b/modules/backend/widgets/Table.php @@ -18,7 +18,7 @@ class Table extends WidgetBase /** * {@inheritDoc} */ - public $defaultAlias = 'table'; + protected $defaultAlias = 'table'; /** * @var array Table columns diff --git a/modules/backend/widgets/Toolbar.php b/modules/backend/widgets/Toolbar.php index 5e235fa97..5ae3f5642 100644 --- a/modules/backend/widgets/Toolbar.php +++ b/modules/backend/widgets/Toolbar.php @@ -14,7 +14,7 @@ class Toolbar extends WidgetBase /** * {@inheritDoc} */ - public $defaultAlias = 'toolbar'; + protected $defaultAlias = 'toolbar'; /** * @var WidgetBase Reference to the search widget object.