From 235b4701bcdda4ccd4289096fec89340ff898d62 Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Mon, 20 Feb 2023 21:42:40 +0000 Subject: [PATCH] Set native types in PropertyItem Signed-off-by: Kamil Tekiela --- .../Options/Groups/OptionsPropertyMainGroup.php | 4 +--- .../Options/Groups/OptionsPropertyRootGroup.php | 4 +--- .../Options/Groups/OptionsPropertySubgroup.php | 4 +--- .../Properties/Options/Items/BoolPropertyItem.php | 4 +--- .../Properties/Options/Items/DocPropertyItem.php | 4 +--- .../Properties/Options/Items/HiddenPropertyItem.php | 4 +--- .../Options/Items/MessageOnlyPropertyItem.php | 4 +--- .../Properties/Options/Items/NumberPropertyItem.php | 4 +--- .../Properties/Options/Items/RadioPropertyItem.php | 4 +--- .../Properties/Options/Items/SelectPropertyItem.php | 4 +--- .../Properties/Options/Items/TextPropertyItem.php | 4 +--- .../Properties/Options/OptionsPropertyGroup.php | 4 +--- .../Properties/Options/OptionsPropertyItem.php | 4 +--- .../Properties/Plugins/ExportPluginProperties.php | 4 +--- .../Properties/Plugins/ImportPluginProperties.php | 4 +--- .../Properties/Plugins/PluginPropertyItem.php | 4 +--- .../Properties/Plugins/SchemaPluginProperties.php | 4 +--- libraries/classes/Properties/PropertyItem.php | 12 +++--------- 18 files changed, 20 insertions(+), 60 deletions(-) diff --git a/libraries/classes/Properties/Options/Groups/OptionsPropertyMainGroup.php b/libraries/classes/Properties/Options/Groups/OptionsPropertyMainGroup.php index ce2f172fce..b414ba027c 100644 --- a/libraries/classes/Properties/Options/Groups/OptionsPropertyMainGroup.php +++ b/libraries/classes/Properties/Options/Groups/OptionsPropertyMainGroup.php @@ -18,10 +18,8 @@ class OptionsPropertyMainGroup extends OptionsPropertyGroup * - PhpMyAdmin\Properties\Options\OptionsPropertyGroup ( "root", "main" * or "subgroup" ) * - PhpMyAdmin\Properties\Plugins\PluginPropertyItem ( "export", "import", "transformations" ) - * - * @return string */ - public function getItemType() + public function getItemType(): string { return 'main'; } diff --git a/libraries/classes/Properties/Options/Groups/OptionsPropertyRootGroup.php b/libraries/classes/Properties/Options/Groups/OptionsPropertyRootGroup.php index ea32224358..db84a69eb2 100644 --- a/libraries/classes/Properties/Options/Groups/OptionsPropertyRootGroup.php +++ b/libraries/classes/Properties/Options/Groups/OptionsPropertyRootGroup.php @@ -18,10 +18,8 @@ class OptionsPropertyRootGroup extends OptionsPropertyGroup * - PhpMyAdmin\Properties\Options\OptionsPropertyGroup ( "root", "main" * or "subgroup" ) * - PhpMyAdmin\Properties\Plugins\PluginPropertyItem ( "export", "import", "transformations" ) - * - * @return string */ - public function getItemType() + public function getItemType(): string { return 'root'; } diff --git a/libraries/classes/Properties/Options/Groups/OptionsPropertySubgroup.php b/libraries/classes/Properties/Options/Groups/OptionsPropertySubgroup.php index a4686cf7b5..ef9b3634fd 100644 --- a/libraries/classes/Properties/Options/Groups/OptionsPropertySubgroup.php +++ b/libraries/classes/Properties/Options/Groups/OptionsPropertySubgroup.php @@ -27,10 +27,8 @@ class OptionsPropertySubgroup extends OptionsPropertyGroup * - PhpMyAdmin\Properties\Options\OptionsPropertyGroup ( "root", "main" * or "subgroup" ) * - PhpMyAdmin\Properties\Plugins\PluginPropertyItem ( "export", "import", "transformations" ) - * - * @return string */ - public function getItemType() + public function getItemType(): string { return 'subgroup'; } diff --git a/libraries/classes/Properties/Options/Items/BoolPropertyItem.php b/libraries/classes/Properties/Options/Items/BoolPropertyItem.php index 8751b64578..aa37ea8077 100644 --- a/libraries/classes/Properties/Options/Items/BoolPropertyItem.php +++ b/libraries/classes/Properties/Options/Items/BoolPropertyItem.php @@ -18,10 +18,8 @@ class BoolPropertyItem extends OptionsPropertyOneItem * - PhpMyAdmin\Properties\Options\OptionsPropertyGroup ( "root", "main" * or "subgroup" ) * - PhpMyAdmin\Properties\Plugins\PluginPropertyItem ( "export", "import", "transformations" ) - * - * @return string */ - public function getItemType() + public function getItemType(): string { return 'bool'; } diff --git a/libraries/classes/Properties/Options/Items/DocPropertyItem.php b/libraries/classes/Properties/Options/Items/DocPropertyItem.php index 65481e3908..1c73b12829 100644 --- a/libraries/classes/Properties/Options/Items/DocPropertyItem.php +++ b/libraries/classes/Properties/Options/Items/DocPropertyItem.php @@ -18,10 +18,8 @@ class DocPropertyItem extends OptionsPropertyOneItem * - PhpMyAdmin\Properties\Options\OptionsPropertyGroup ( "root", "main" * or "subgroup" ) * - PhpMyAdmin\Properties\Plugins\PluginPropertyItem ( "export", "import", "transformations" ) - * - * @return string */ - public function getItemType() + public function getItemType(): string { return 'doc'; } diff --git a/libraries/classes/Properties/Options/Items/HiddenPropertyItem.php b/libraries/classes/Properties/Options/Items/HiddenPropertyItem.php index ac2c676980..10eb1aa79d 100644 --- a/libraries/classes/Properties/Options/Items/HiddenPropertyItem.php +++ b/libraries/classes/Properties/Options/Items/HiddenPropertyItem.php @@ -18,10 +18,8 @@ class HiddenPropertyItem extends OptionsPropertyOneItem * - PhpMyAdmin\Properties\Options\OptionsPropertyGroup ( "root", "main" * or "subgroup" ) * - PhpMyAdmin\Properties\Plugins\PluginPropertyItem ( "export", "import", "transformations" ) - * - * @return string */ - public function getItemType() + public function getItemType(): string { return 'hidden'; } diff --git a/libraries/classes/Properties/Options/Items/MessageOnlyPropertyItem.php b/libraries/classes/Properties/Options/Items/MessageOnlyPropertyItem.php index 249d582bc4..1af7f4c36f 100644 --- a/libraries/classes/Properties/Options/Items/MessageOnlyPropertyItem.php +++ b/libraries/classes/Properties/Options/Items/MessageOnlyPropertyItem.php @@ -18,10 +18,8 @@ class MessageOnlyPropertyItem extends OptionsPropertyOneItem * - PhpMyAdmin\Properties\Options\OptionsPropertyGroup ( "root", "main" * or "subgroup" ) * - PhpMyAdmin\Properties\Plugins\PluginPropertyItem ( "export", "import", "transformations" ) - * - * @return string */ - public function getItemType() + public function getItemType(): string { return 'messageOnly'; } diff --git a/libraries/classes/Properties/Options/Items/NumberPropertyItem.php b/libraries/classes/Properties/Options/Items/NumberPropertyItem.php index ee874a7f2e..0166ea41b7 100644 --- a/libraries/classes/Properties/Options/Items/NumberPropertyItem.php +++ b/libraries/classes/Properties/Options/Items/NumberPropertyItem.php @@ -18,10 +18,8 @@ class NumberPropertyItem extends OptionsPropertyOneItem * - PhpMyAdmin\Properties\Options\OptionsPropertyGroup ( "root", "main" * or "subgroup" ) * - PhpMyAdmin\Properties\Plugins\PluginPropertyItem ( "export", "import", "transformations" ) - * - * @return string */ - public function getItemType() + public function getItemType(): string { return 'number'; } diff --git a/libraries/classes/Properties/Options/Items/RadioPropertyItem.php b/libraries/classes/Properties/Options/Items/RadioPropertyItem.php index 9df42d2ce4..e2505741e8 100644 --- a/libraries/classes/Properties/Options/Items/RadioPropertyItem.php +++ b/libraries/classes/Properties/Options/Items/RadioPropertyItem.php @@ -18,10 +18,8 @@ class RadioPropertyItem extends OptionsPropertyOneItem * - PhpMyAdmin\Properties\Options\OptionsPropertyGroup ( "root", "main" * or "subgroup" ) * - PhpMyAdmin\Properties\Plugins\PluginPropertyItem ( "export", "import", "transformations" ) - * - * @return string */ - public function getItemType() + public function getItemType(): string { return 'radio'; } diff --git a/libraries/classes/Properties/Options/Items/SelectPropertyItem.php b/libraries/classes/Properties/Options/Items/SelectPropertyItem.php index d6fb50a242..4f9b866f3a 100644 --- a/libraries/classes/Properties/Options/Items/SelectPropertyItem.php +++ b/libraries/classes/Properties/Options/Items/SelectPropertyItem.php @@ -18,10 +18,8 @@ class SelectPropertyItem extends OptionsPropertyOneItem * - PhpMyAdmin\Properties\Options\OptionsPropertyGroup ( "root", "main" * or "subgroup" ) * - PhpMyAdmin\Properties\Plugins\PluginPropertyItem ( "export", "import", "transformations" ) - * - * @return string */ - public function getItemType() + public function getItemType(): string { return 'select'; } diff --git a/libraries/classes/Properties/Options/Items/TextPropertyItem.php b/libraries/classes/Properties/Options/Items/TextPropertyItem.php index b8920252c9..550e958729 100644 --- a/libraries/classes/Properties/Options/Items/TextPropertyItem.php +++ b/libraries/classes/Properties/Options/Items/TextPropertyItem.php @@ -18,10 +18,8 @@ class TextPropertyItem extends OptionsPropertyOneItem * - PhpMyAdmin\Properties\Options\OptionsPropertyGroup ( "root", "main" * or "subgroup" ) * - PhpMyAdmin\Properties\Plugins\PluginPropertyItem ( "export", "import", "transformations" ) - * - * @return string */ - public function getItemType() + public function getItemType(): string { return 'text'; } diff --git a/libraries/classes/Properties/Options/OptionsPropertyGroup.php b/libraries/classes/Properties/Options/OptionsPropertyGroup.php index 233b88d770..8e826dd715 100644 --- a/libraries/classes/Properties/Options/OptionsPropertyGroup.php +++ b/libraries/classes/Properties/Options/OptionsPropertyGroup.php @@ -61,10 +61,8 @@ abstract class OptionsPropertyGroup extends OptionsPropertyItem implements Count /** * Gets the instance of the class - * - * @return OptionsPropertyGroup */ - public function getGroup() + public function getGroup(): static { return $this; } diff --git a/libraries/classes/Properties/Options/OptionsPropertyItem.php b/libraries/classes/Properties/Options/OptionsPropertyItem.php index 834f043741..7b6146ec35 100644 --- a/libraries/classes/Properties/Options/OptionsPropertyItem.php +++ b/libraries/classes/Properties/Options/OptionsPropertyItem.php @@ -115,10 +115,8 @@ abstract class OptionsPropertyItem extends PropertyItem /** * Returns the property type ( either "options", or "plugin" ). - * - * @return string */ - public function getPropertyType() + public function getPropertyType(): string { return 'options'; } diff --git a/libraries/classes/Properties/Plugins/ExportPluginProperties.php b/libraries/classes/Properties/Plugins/ExportPluginProperties.php index f56ccc7ef7..20a76aff3f 100644 --- a/libraries/classes/Properties/Plugins/ExportPluginProperties.php +++ b/libraries/classes/Properties/Plugins/ExportPluginProperties.php @@ -26,10 +26,8 @@ class ExportPluginProperties extends PluginPropertyItem * - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem ( f.e. "bool", "text", "radio", etc ) or * - PhpMyAdmin\Properties\Options\OptionsPropertyGroup ( "root", "main" or "subgroup" ) * - PhpMyAdmin\Properties\Plugins\PluginPropertyItem ( "export", "import", "transformations" ) - * - * @return string */ - public function getItemType() + public function getItemType(): string { return 'export'; } diff --git a/libraries/classes/Properties/Plugins/ImportPluginProperties.php b/libraries/classes/Properties/Plugins/ImportPluginProperties.php index 453dcf4695..5124a74036 100644 --- a/libraries/classes/Properties/Plugins/ImportPluginProperties.php +++ b/libraries/classes/Properties/Plugins/ImportPluginProperties.php @@ -17,10 +17,8 @@ class ImportPluginProperties extends PluginPropertyItem * - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem ( f.e. "bool", "text", "radio", etc ) or * - PhpMyAdmin\Properties\Options\OptionsPropertyGroup ( "root", "main" or "subgroup" ) * - PhpMyAdmin\Properties\Plugins\PluginPropertyItem ( "export", "import", "transformations" ) - * - * @return string */ - public function getItemType() + public function getItemType(): string { return 'import'; } diff --git a/libraries/classes/Properties/Plugins/PluginPropertyItem.php b/libraries/classes/Properties/Plugins/PluginPropertyItem.php index 1f1c9d9d32..f9d45fe9af 100644 --- a/libraries/classes/Properties/Plugins/PluginPropertyItem.php +++ b/libraries/classes/Properties/Plugins/PluginPropertyItem.php @@ -152,10 +152,8 @@ abstract class PluginPropertyItem extends PropertyItem /** * Returns the property type ( either "options", or "plugin" ). - * - * @return string */ - public function getPropertyType() + public function getPropertyType(): string { return 'plugin'; } diff --git a/libraries/classes/Properties/Plugins/SchemaPluginProperties.php b/libraries/classes/Properties/Plugins/SchemaPluginProperties.php index e81e758daf..0bed062d4c 100644 --- a/libraries/classes/Properties/Plugins/SchemaPluginProperties.php +++ b/libraries/classes/Properties/Plugins/SchemaPluginProperties.php @@ -17,10 +17,8 @@ class SchemaPluginProperties extends PluginPropertyItem * - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem ( f.e. "bool", "text", "radio", etc ) or * - PhpMyAdmin\Properties\Options\OptionsPropertyGroup ( "root", "main" or "subgroup" ) * - PhpMyAdmin\Properties\Plugins\PluginPropertyItem ( "export", "import", "transformations" ) - * - * @return string */ - public function getItemType() + public function getItemType(): string { return 'schema'; } diff --git a/libraries/classes/Properties/PropertyItem.php b/libraries/classes/Properties/PropertyItem.php index eebbb8ddad..f181ea1596 100644 --- a/libraries/classes/Properties/PropertyItem.php +++ b/libraries/classes/Properties/PropertyItem.php @@ -14,30 +14,24 @@ abstract class PropertyItem { /** * Returns the property type ( either "Options", or "Plugin" ). - * - * @return string */ - abstract public function getPropertyType(); + abstract public function getPropertyType(): string; /** * Returns the property item type of either an instance of * - PhpMyAdmin\Properties\Options\OptionsPropertyOneItem ( f.e. "bool", "text", "radio", etc ) or * - PhpMyAdmin\Properties\Options\OptionsPropertyGroup ( "root", "main" or "subgroup" ) * - PhpMyAdmin\Properties\Plugins\PluginPropertyItem ( "export", "import", "transformations" ) - * - * @return string */ - abstract public function getItemType(); + abstract public function getItemType(): string; /** * Only overwritten in the PhpMyAdmin\Properties\Options\OptionsPropertyGroup class: * Used to tell whether we can use the current item as a group by calling * the addProperty() or removeProperty() methods, which are not available * for simple PhpMyAdmin\Properties\Options\OptionsPropertyOneItem subclasses. - * - * @return object|null */ - public function getGroup() + public function getGroup(): static|null { return null; }