From a325339501116eecf867f55dd7efb01cc7838fce Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Wed, 17 May 2023 00:20:41 +0200 Subject: [PATCH] Fix the sorting of fields and views for PHP 8 --- README.md | 6 +- admin/README.txt | 6 +- admin/helpers/compiler/c_Fields.php | 4 +- admin/helpers/compiler/e_Interpretation.php | 6 +- admin/sql/install.mysql.utf8.sql | 278 +++++++++--------- componentbuilder.xml | 2 +- .../Compiler/Model/Adminviews.php | 2 +- .../Compiler/Model/Fields.php | 4 +- .../Compiler/Power/Repos/Readme.php | 2 +- 9 files changed, 155 insertions(+), 155 deletions(-) diff --git a/README.md b/README.md index c39b78dae..eff52d48d 100644 --- a/README.md +++ b/README.md @@ -144,13 +144,13 @@ TODO + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 2nd May, 2023 ++ *Last Build*: 16th May, 2023 + *Version*: 3.1.24 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **557762** ++ *Line count*: **563855** + *Field count*: **2041** -+ *File count*: **3930** ++ *File count*: **3934** + *Folder count*: **432** > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com). diff --git a/admin/README.txt b/admin/README.txt index c39b78dae..eff52d48d 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -144,13 +144,13 @@ TODO + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 2nd May, 2023 ++ *Last Build*: 16th May, 2023 + *Version*: 3.1.24 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **557762** ++ *Line count*: **563855** + *Field count*: **2041** -+ *File count*: **3930** ++ *File count*: **3934** + *Folder count*: **432** > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com). diff --git a/admin/helpers/compiler/c_Fields.php b/admin/helpers/compiler/c_Fields.php index f45880893..8261e7e87 100644 --- a/admin/helpers/compiler/c_Fields.php +++ b/admin/helpers/compiler/c_Fields.php @@ -1325,7 +1325,7 @@ class Fields extends Structure } } // fix the permissions field "title" issue gh-629 - // check if the the title is not already set + // check if the title is not already set if (!CFactory::_('Registry')->isString('builder.field_names.' . $nameSingleCode . '.title') && $this->hasPermissionsSet($view, $nameSingleCode)) { @@ -3982,7 +3982,7 @@ class Fields extends Structure . $field['alignment'] . '.' . $field['order_edit'], $name); } - // check if default fields were over written + // check if default fields were overwritten if (in_array($name, $default_fields)) { // just to eliminate diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index ce7f040dd..b329313a4 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -4972,7 +4972,7 @@ class Interpretation extends Fields public function setAdminViewDisplayMethod($nameListCode) { $script = ''; - // add the the new filter methods for the search toolbar above the list view (2 = topbar) + // add the new filter methods for the search toolbar above the list view (2 = topbar) if (CFactory::_('Registry')-> get('builder.admin_filter_type.' . $nameListCode, 1) == 2) { @@ -11129,7 +11129,7 @@ class Interpretation extends Fields $body .= PHP_EOL . Indent::_(1) . "?>"; $body .= PHP_EOL . Indent::_(1) . ''; - // only load if not over written + // only load if not overwritten if (!CFactory::_('Registry')->isString('builder.field_names.' . $nameSingleCode . '.ordering')) { $body .= PHP_EOL . Indent::_(2) @@ -11236,7 +11236,7 @@ class Interpretation extends Fields $item, $nameSingleCode, $nameListCode, $itemClass, $doNotEscape, $coreLoad, $core ); - // check if buttons was aready added + // check if buttons was already added if ($firstTimeBeingAdded) // TODO we must improve this to allow more items to be targeted instead of just the first item :) { // get custom admin view buttons diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index 1c589d42e..d1d415bc8 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` ( `add_email_helper` TINYINT(1) NOT NULL DEFAULT 0, `add_javascript` TINYINT(1) NOT NULL DEFAULT 0, `add_license` TINYINT(1) NOT NULL DEFAULT 0, - `add_menu_prefix` CHAR(1) NOT NULL DEFAULT '', + `add_menu_prefix` CHAR(1) NOT NULL, `add_php_helper_admin` TINYINT(1) NOT NULL DEFAULT 0, `add_php_helper_both` TINYINT(1) NOT NULL DEFAULT 0, `add_php_helper_site` TINYINT(1) NOT NULL DEFAULT 0, @@ -28,40 +28,40 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` ( `addreadme` TINYINT(1) NOT NULL DEFAULT 0, `adduikit` TINYINT(1) NOT NULL DEFAULT 0, `assets_table_fix` TINYINT(1) NOT NULL DEFAULT 3, - `author` VARCHAR(255) NOT NULL DEFAULT '', - `bom` CHAR(64) NOT NULL DEFAULT '', + `author` VARCHAR(255) NOT NULL, + `bom` CHAR(64) NOT NULL, `buildcomp` TINYINT(1) NOT NULL DEFAULT 0, `buildcompsql` MEDIUMTEXT NOT NULL, - `companyname` CHAR(64) NOT NULL DEFAULT '', - `component_version` CHAR(64) NOT NULL DEFAULT '', - `copyright` VARCHAR(255) NOT NULL DEFAULT '', + `companyname` CHAR(64) NOT NULL, + `component_version` CHAR(64) NOT NULL, + `copyright` VARCHAR(255) NOT NULL, `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `creatuserhelper` TINYINT(1) NOT NULL DEFAULT 0, `crowdin_account_api_key` TEXT NOT NULL, `crowdin_project_api_key` TEXT NOT NULL, - `crowdin_project_identifier` VARCHAR(255) NOT NULL DEFAULT '', + `crowdin_project_identifier` VARCHAR(255) NOT NULL, `crowdin_username` TEXT NOT NULL, `css_admin` TEXT NOT NULL, `css_site` TEXT NOT NULL, - `dashboard` VARCHAR(64) NOT NULL DEFAULT '', + `dashboard` VARCHAR(64) NOT NULL, `dashboard_type` TINYINT(1) NOT NULL DEFAULT 1, `debug_linenr` TINYINT(1) NOT NULL DEFAULT 0, `description` TEXT NOT NULL, - `email` VARCHAR(255) NOT NULL DEFAULT '', + `email` VARCHAR(255) NOT NULL, `emptycontributors` TINYINT(1) NOT NULL DEFAULT 0, - `export_buy_link` VARCHAR(255) NOT NULL DEFAULT '', + `export_buy_link` VARCHAR(255) NOT NULL, `export_key` TEXT NOT NULL, - `guid` VARCHAR(36) NOT NULL DEFAULT '', - `image` CHAR(64) NOT NULL DEFAULT '', + `guid` VARCHAR(36) NOT NULL, + `image` CHAR(64) NOT NULL, `javascript` TEXT NOT NULL, - `joomla_source_link` VARCHAR(255) NOT NULL DEFAULT '', - `license` VARCHAR(255) NOT NULL DEFAULT '', + `joomla_source_link` VARCHAR(255) NOT NULL, + `license` VARCHAR(255) NOT NULL, `license_type` TINYINT(1) NOT NULL DEFAULT 0, - `menu_prefix` VARCHAR(100) NOT NULL DEFAULT '', + `menu_prefix` VARCHAR(100) NOT NULL, `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `mvc_versiondate` TINYINT(1) NOT NULL DEFAULT 0, - `name` CHAR(64) NOT NULL DEFAULT '', - `name_code` VARCHAR(255) NOT NULL DEFAULT '', + `name` CHAR(64) NOT NULL, + `name_code` VARCHAR(255) NOT NULL, `number` INT(11) NOT NULL DEFAULT 0, `php_admin_event` MEDIUMTEXT NOT NULL, `php_helper_admin` MEDIUMTEXT NOT NULL, @@ -76,19 +76,19 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` ( `readme` TEXT NOT NULL, `remove_line_breaks` TINYINT(1) NOT NULL DEFAULT 0, `sales_server` INT(11) NOT NULL DEFAULT 0, - `short_description` VARCHAR(255) NOT NULL DEFAULT '', + `short_description` VARCHAR(255) NOT NULL, `sql` MEDIUMTEXT NOT NULL, `sql_uninstall` MEDIUMTEXT NOT NULL, - `system_name` VARCHAR(255) NOT NULL DEFAULT '', + `system_name` VARCHAR(255) NOT NULL, `toignore` TEXT NOT NULL, `translation_tool` TINYINT(1) NOT NULL DEFAULT 0, `update_server` INT(11) NOT NULL DEFAULT 0, `update_server_target` TINYINT(1) NOT NULL DEFAULT 0, - `update_server_url` VARCHAR(255) NOT NULL DEFAULT '', - `website` CHAR(255) NOT NULL DEFAULT '', - `whmcs_buy_link` VARCHAR(255) NOT NULL DEFAULT '', - `whmcs_key` VARCHAR(255) NOT NULL DEFAULT '', - `whmcs_url` VARCHAR(255) NOT NULL DEFAULT '', + `update_server_url` VARCHAR(255) NOT NULL, + `website` CHAR(255) NOT NULL, + `whmcs_buy_link` VARCHAR(255) NOT NULL, + `whmcs_key` VARCHAR(255) NOT NULL, + `whmcs_url` VARCHAR(255) NOT NULL, `params` text NULL, `published` TINYINT(3) NOT NULL DEFAULT 1, `created_by` INT(10) unsigned NOT NULL DEFAULT 0, @@ -171,11 +171,11 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_module` ( `default` MEDIUMTEXT NOT NULL, `description` TEXT NOT NULL, `fields` TEXT NOT NULL, - `guid` VARCHAR(36) NOT NULL DEFAULT '', + `guid` VARCHAR(36) NOT NULL, `libraries` TEXT NOT NULL, `mod_code` TEXT NOT NULL, - `module_version` CHAR(64) NOT NULL DEFAULT '', - `name` VARCHAR(255) NOT NULL DEFAULT '', + `module_version` CHAR(64) NOT NULL, + `name` VARCHAR(255) NOT NULL, `php_method_uninstall` MEDIUMTEXT NOT NULL, `php_postflight_install` MEDIUMTEXT NOT NULL, `php_postflight_update` MEDIUMTEXT NOT NULL, @@ -188,11 +188,11 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_module` ( `snippet` INT(11) NOT NULL DEFAULT 0, `sql` MEDIUMTEXT NOT NULL, `sql_uninstall` MEDIUMTEXT NOT NULL, - `system_name` VARCHAR(255) NOT NULL DEFAULT '', + `system_name` VARCHAR(255) NOT NULL, `target` TINYINT(1) NOT NULL DEFAULT 0, `update_server` INT(11) NOT NULL DEFAULT 0, `update_server_target` TINYINT(1) NOT NULL DEFAULT 0, - `update_server_url` VARCHAR(255) NOT NULL DEFAULT '', + `update_server_url` VARCHAR(255) NOT NULL, `params` text NULL, `published` TINYINT(3) NOT NULL DEFAULT 1, `created_by` INT(10) unsigned NOT NULL DEFAULT 0, @@ -248,12 +248,12 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin` ( `class_extends` INT(11) NOT NULL DEFAULT 0, `description` TEXT NOT NULL, `fields` TEXT NOT NULL, - `guid` VARCHAR(36) NOT NULL DEFAULT '', + `guid` VARCHAR(36) NOT NULL, `head` TEXT NOT NULL, `joomla_plugin_group` INT(11) NOT NULL DEFAULT 0, `main_class_code` MEDIUMTEXT NOT NULL, `method_selection` TEXT NOT NULL, - `name` VARCHAR(255) NOT NULL DEFAULT '', + `name` VARCHAR(255) NOT NULL, `php_method_uninstall` MEDIUMTEXT NOT NULL, `php_postflight_install` MEDIUMTEXT NOT NULL, `php_postflight_update` MEDIUMTEXT NOT NULL, @@ -261,16 +261,16 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin` ( `php_preflight_uninstall` MEDIUMTEXT NOT NULL, `php_preflight_update` MEDIUMTEXT NOT NULL, `php_script_construct` MEDIUMTEXT NOT NULL, - `plugin_version` CHAR(64) NOT NULL DEFAULT '', + `plugin_version` CHAR(64) NOT NULL, `property_selection` TEXT NOT NULL, `readme` TEXT NOT NULL, `sales_server` INT(11) NOT NULL DEFAULT 0, `sql` MEDIUMTEXT NOT NULL, `sql_uninstall` MEDIUMTEXT NOT NULL, - `system_name` VARCHAR(255) NOT NULL DEFAULT '', + `system_name` VARCHAR(255) NOT NULL, `update_server` INT(11) NOT NULL DEFAULT 0, `update_server_target` TINYINT(1) NOT NULL DEFAULT 0, - `update_server_url` VARCHAR(255) NOT NULL DEFAULT '', + `update_server_url` VARCHAR(255) NOT NULL, `params` text NULL, `published` TINYINT(3) NOT NULL DEFAULT 1, `created_by` INT(10) unsigned NOT NULL DEFAULT 0, @@ -318,22 +318,22 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_power` ( `approved_paths` TEXT NOT NULL, `composer` TEXT NOT NULL, `description` TEXT NOT NULL, - `extends` VARCHAR(36) NOT NULL DEFAULT '', - `extends_custom` VARCHAR(64) NOT NULL DEFAULT '', - `guid` VARCHAR(36) NOT NULL DEFAULT '', + `extends` VARCHAR(36) NOT NULL, + `extends_custom` VARCHAR(64) NOT NULL, + `guid` VARCHAR(36) NOT NULL, `head` TEXT NOT NULL, `implements` TEXT NULL, - `implements_custom` VARCHAR(1024) NOT NULL DEFAULT '', + `implements_custom` VARCHAR(1024) NOT NULL, `licensing_template` TEXT NOT NULL, `load_selection` TEXT NOT NULL, `main_class_code` MEDIUMTEXT NOT NULL, `method_selection` TEXT NOT NULL, - `name` VARCHAR(255) NOT NULL DEFAULT '', - `namespace` VARCHAR(255) NOT NULL DEFAULT '', - `power_version` CHAR(64) NOT NULL DEFAULT '', + `name` VARCHAR(255) NOT NULL, + `namespace` VARCHAR(255) NOT NULL, + `power_version` CHAR(64) NOT NULL, `property_selection` TEXT NOT NULL, - `system_name` VARCHAR(255) NOT NULL DEFAULT '', - `type` VARCHAR(64) NOT NULL DEFAULT '', + `system_name` VARCHAR(255) NOT NULL, + `type` VARCHAR(64) NOT NULL, `use_selection` TEXT NOT NULL, `params` text NULL, `published` TINYINT(3) NOT NULL DEFAULT 1, @@ -402,17 +402,17 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` ( `addtables` TEXT NOT NULL, `addtabs` TEXT NOT NULL, `ajax_input` TEXT NOT NULL, - `alias_builder` VARCHAR(255) NOT NULL DEFAULT '', - `alias_builder_type` CHAR NOT NULL DEFAULT '', + `alias_builder` VARCHAR(255) NOT NULL, + `alias_builder_type` CHAR NOT NULL, `css_view` TEXT NOT NULL, `css_views` TEXT NOT NULL, `custom_button` TEXT NOT NULL, `description` TEXT NOT NULL, - `guid` VARCHAR(36) NOT NULL DEFAULT '', + `guid` VARCHAR(36) NOT NULL, `html_import_view` MEDIUMTEXT NOT NULL, - `icon` CHAR(64) NOT NULL DEFAULT '', - `icon_add` CHAR(64) NOT NULL DEFAULT '', - `icon_category` CHAR(64) NOT NULL DEFAULT '', + `icon` CHAR(64) NOT NULL, + `icon_add` CHAR(64) NOT NULL, + `icon_category` CHAR(64) NOT NULL, `javascript_view_file` TEXT NOT NULL, `javascript_view_footer` TEXT NOT NULL, `javascript_views_file` TEXT NOT NULL, @@ -421,8 +421,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` ( `mysql_table_collate` VARCHAR(64) NOT NULL DEFAULT 1, `mysql_table_engine` VARCHAR(64) NOT NULL DEFAULT 1, `mysql_table_row_format` VARCHAR(64) NOT NULL DEFAULT 0, - `name_list` CHAR(64) NOT NULL DEFAULT '', - `name_single` CHAR(64) NOT NULL DEFAULT '', + `name_list` CHAR(64) NOT NULL, + `name_single` CHAR(64) NOT NULL, `php_after_cancel` MEDIUMTEXT NOT NULL, `php_after_delete` MEDIUMTEXT NOT NULL, `php_after_publish` MEDIUMTEXT NOT NULL, @@ -453,10 +453,10 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` ( `php_model_list` MEDIUMTEXT NOT NULL, `php_postsavehook` MEDIUMTEXT NOT NULL, `php_save` MEDIUMTEXT NOT NULL, - `short_description` VARCHAR(255) NOT NULL DEFAULT '', + `short_description` VARCHAR(255) NOT NULL, `source` TINYINT(1) NOT NULL DEFAULT 0, `sql` MEDIUMTEXT NOT NULL, - `system_name` VARCHAR(255) NOT NULL DEFAULT '', + `system_name` VARCHAR(255) NOT NULL, `type` INT(11) NOT NULL DEFAULT 0, `params` text NULL, `published` TINYINT(3) NOT NULL DEFAULT 1, @@ -532,22 +532,22 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` ( `add_php_jview_display` TINYINT(1) NOT NULL DEFAULT 0, `add_php_view` TINYINT(1) NOT NULL DEFAULT 0, `ajax_input` TEXT NOT NULL, - `codename` VARCHAR(255) NOT NULL DEFAULT '', - `context` VARCHAR(255) NOT NULL DEFAULT '', + `codename` VARCHAR(255) NOT NULL, + `context` VARCHAR(255) NOT NULL, `css` TEXT NOT NULL, `css_document` TEXT NOT NULL, `custom_button` TEXT NOT NULL, `custom_get` TEXT NOT NULL, `default` MEDIUMTEXT NOT NULL, - `description` VARCHAR(255) NOT NULL DEFAULT '', + `description` VARCHAR(255) NOT NULL, `dynamic_get` INT(11) NOT NULL DEFAULT 0, - `guid` VARCHAR(36) NOT NULL DEFAULT '', - `icon` CHAR(64) NOT NULL DEFAULT '', + `guid` VARCHAR(36) NOT NULL, + `icon` CHAR(64) NOT NULL, `javascript_file` TEXT NOT NULL, `js_document` TEXT NOT NULL, `libraries` TEXT NOT NULL, `main_get` INT(11) NOT NULL DEFAULT 0, - `name` VARCHAR(255) NOT NULL DEFAULT '', + `name` VARCHAR(255) NOT NULL, `php_ajaxmethod` MEDIUMTEXT NOT NULL, `php_controller` MEDIUMTEXT NOT NULL, `php_document` MEDIUMTEXT NOT NULL, @@ -556,7 +556,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` ( `php_model` MEDIUMTEXT NOT NULL, `php_view` MEDIUMTEXT NOT NULL, `snippet` INT(11) NOT NULL DEFAULT 0, - `system_name` VARCHAR(255) NOT NULL DEFAULT '', + `system_name` VARCHAR(255) NOT NULL, `params` text NULL, `published` TINYINT(3) NOT NULL DEFAULT 1, `created_by` INT(10) unsigned NOT NULL DEFAULT 0, @@ -608,21 +608,21 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_site_view` ( `add_php_view` TINYINT(1) NOT NULL DEFAULT 0, `ajax_input` TEXT NOT NULL, `button_position` TINYINT(1) NOT NULL DEFAULT 1, - `codename` VARCHAR(255) NOT NULL DEFAULT '', - `context` VARCHAR(255) NOT NULL DEFAULT '', + `codename` VARCHAR(255) NOT NULL, + `context` VARCHAR(255) NOT NULL, `css` TEXT NOT NULL, `css_document` TEXT NOT NULL, `custom_button` TEXT NOT NULL, `custom_get` TEXT NOT NULL, `default` MEDIUMTEXT NOT NULL, - `description` VARCHAR(255) NOT NULL DEFAULT '', + `description` VARCHAR(255) NOT NULL, `dynamic_get` INT(11) NOT NULL DEFAULT 0, - `guid` VARCHAR(36) NOT NULL DEFAULT '', + `guid` VARCHAR(36) NOT NULL, `javascript_file` TEXT NOT NULL, `js_document` TEXT NOT NULL, `libraries` TEXT NOT NULL, `main_get` INT(11) NOT NULL DEFAULT 0, - `name` VARCHAR(255) NOT NULL DEFAULT '', + `name` VARCHAR(255) NOT NULL, `php_ajaxmethod` MEDIUMTEXT NOT NULL, `php_controller` MEDIUMTEXT NOT NULL, `php_document` MEDIUMTEXT NOT NULL, @@ -631,7 +631,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_site_view` ( `php_model` MEDIUMTEXT NOT NULL, `php_view` MEDIUMTEXT NOT NULL, `snippet` INT(11) NOT NULL DEFAULT 0, - `system_name` VARCHAR(255) NOT NULL DEFAULT '', + `system_name` VARCHAR(255) NOT NULL, `params` text NULL, `published` TINYINT(3) NOT NULL DEFAULT 1, `created_by` INT(10) unsigned NOT NULL DEFAULT 0, @@ -673,11 +673,11 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_template` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `add_php_view` TINYINT(1) NOT NULL DEFAULT 0, - `alias` VARCHAR(255) NOT NULL DEFAULT '', - `description` VARCHAR(255) NOT NULL DEFAULT '', + `alias` VARCHAR(255) NOT NULL, + `description` VARCHAR(255) NOT NULL, `dynamic_get` INT(11) NOT NULL DEFAULT 0, `libraries` TEXT NOT NULL, - `name` VARCHAR(255) NOT NULL DEFAULT '', + `name` VARCHAR(255) NOT NULL, `php_view` MEDIUMTEXT NOT NULL, `snippet` INT(11) NOT NULL DEFAULT 0, `template` TEXT NOT NULL, @@ -709,12 +709,12 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_layout` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `add_php_view` TINYINT(1) NOT NULL DEFAULT 0, - `alias` VARCHAR(255) NOT NULL DEFAULT '', - `description` VARCHAR(255) NOT NULL DEFAULT '', + `alias` VARCHAR(255) NOT NULL, + `description` VARCHAR(255) NOT NULL, `dynamic_get` INT(11) NOT NULL DEFAULT 0, `layout` TEXT NOT NULL, `libraries` TEXT NOT NULL, - `name` VARCHAR(255) NOT NULL DEFAULT '', + `name` VARCHAR(255) NOT NULL, `php_view` MEDIUMTEXT NOT NULL, `snippet` INT(11) NOT NULL DEFAULT 0, `params` text NULL, @@ -750,19 +750,19 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_dynamic_get` ( `add_php_before_getitems` TINYINT(1) NOT NULL DEFAULT 0, `add_php_getlistquery` TINYINT(1) NOT NULL DEFAULT 0, `add_php_router_parse` TINYINT(1) NOT NULL DEFAULT 0, - `addcalculation` CHAR NOT NULL DEFAULT '', + `addcalculation` CHAR NOT NULL, `db_selection` TEXT NOT NULL, - `db_table_main` VARCHAR(255) NOT NULL DEFAULT '', + `db_table_main` VARCHAR(255) NOT NULL, `filter` TEXT NOT NULL, - `getcustom` VARCHAR(255) NOT NULL DEFAULT '', + `getcustom` VARCHAR(255) NOT NULL, `gettype` TINYINT(1) NOT NULL DEFAULT 0, `global` TEXT NOT NULL, `group` TEXT NOT NULL, - `guid` VARCHAR(36) NOT NULL DEFAULT '', + `guid` VARCHAR(36) NOT NULL, `join_db_table` TEXT NOT NULL, `join_view_table` TEXT NOT NULL, `main_source` TINYINT(1) NOT NULL DEFAULT 0, - `name` VARCHAR(255) NOT NULL DEFAULT '', + `name` VARCHAR(255) NOT NULL, `order` TEXT NOT NULL, `pagination` TINYINT(1) NOT NULL DEFAULT 1, `php_after_getitem` MEDIUMTEXT NOT NULL, @@ -773,7 +773,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_dynamic_get` ( `php_custom_get` MEDIUMTEXT NOT NULL, `php_getlistquery` MEDIUMTEXT NOT NULL, `php_router_parse` MEDIUMTEXT NOT NULL, - `plugin_events` VARCHAR(255) NOT NULL DEFAULT '', + `plugin_events` VARCHAR(255) NOT NULL, `select_all` TINYINT(1) NOT NULL DEFAULT 0, `view_selection` TEXT NOT NULL, `view_table_main` INT(11) NOT NULL DEFAULT 0, @@ -817,14 +817,14 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_code` ( `code` MEDIUMTEXT NOT NULL, `comment_type` TINYINT(1) NOT NULL DEFAULT 1, `component` INT(11) NOT NULL DEFAULT 0, - `from_line` VARCHAR(100) NOT NULL DEFAULT '', - `function_name` VARCHAR(255) NOT NULL DEFAULT '', - `hashendtarget` VARCHAR(64) NOT NULL DEFAULT '', - `hashtarget` VARCHAR(64) NOT NULL DEFAULT '', + `from_line` VARCHAR(100) NOT NULL, + `function_name` VARCHAR(255) NOT NULL, + `hashendtarget` VARCHAR(64) NOT NULL, + `hashtarget` VARCHAR(64) NOT NULL, `path` TEXT NOT NULL, - `system_name` VARCHAR(255) NOT NULL DEFAULT '', + `system_name` VARCHAR(255) NOT NULL, `target` TINYINT(1) NOT NULL DEFAULT 0, - `to_line` VARCHAR(100) NOT NULL DEFAULT '', + `to_line` VARCHAR(100) NOT NULL, `type` TINYINT(1) NOT NULL DEFAULT 0, `params` text NULL, `published` TINYINT(3) NOT NULL DEFAULT 1, @@ -857,11 +857,11 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_class_property` ( `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `comment` TEXT NOT NULL, `default` TEXT NOT NULL, - `extension_type` VARCHAR(64) NOT NULL DEFAULT '', - `guid` VARCHAR(36) NOT NULL DEFAULT '', + `extension_type` VARCHAR(64) NOT NULL, + `guid` VARCHAR(36) NOT NULL, `joomla_plugin_group` INT(11) NOT NULL DEFAULT 0, - `name` VARCHAR(255) NOT NULL DEFAULT '', - `visibility` VARCHAR(255) NOT NULL DEFAULT '', + `name` VARCHAR(255) NOT NULL, + `visibility` VARCHAR(255) NOT NULL, `params` text NULL, `published` TINYINT(3) NOT NULL DEFAULT 1, `created_by` INT(10) unsigned NOT NULL DEFAULT 0, @@ -892,11 +892,11 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_class_method` ( `arguments` TEXT NOT NULL, `code` MEDIUMTEXT NOT NULL, `comment` TEXT NOT NULL, - `extension_type` VARCHAR(64) NOT NULL DEFAULT '', - `guid` VARCHAR(36) NOT NULL DEFAULT '', + `extension_type` VARCHAR(64) NOT NULL, + `guid` VARCHAR(36) NOT NULL, `joomla_plugin_group` INT(11) NOT NULL DEFAULT 0, - `name` VARCHAR(255) NOT NULL DEFAULT '', - `visibility` VARCHAR(255) NOT NULL DEFAULT '', + `name` VARCHAR(255) NOT NULL, + `visibility` VARCHAR(255) NOT NULL, `params` text NULL, `published` TINYINT(3) NOT NULL DEFAULT 1, `created_by` INT(10) unsigned NOT NULL DEFAULT 0, @@ -924,7 +924,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_class_method` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_placeholder` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `target` VARCHAR(255) NOT NULL DEFAULT '', + `target` VARCHAR(255) NOT NULL, `value` TEXT NOT NULL, `params` text NULL, `published` TINYINT(3) NOT NULL DEFAULT 1, @@ -951,11 +951,11 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_library` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `addconditions` MEDIUMTEXT NOT NULL, - `description` VARCHAR(255) NOT NULL DEFAULT '', - `guid` VARCHAR(36) NOT NULL DEFAULT '', + `description` VARCHAR(255) NOT NULL, + `guid` VARCHAR(36) NOT NULL, `how` TINYINT(1) NOT NULL DEFAULT 1, `libraries` TEXT NOT NULL, - `name` VARCHAR(255) NOT NULL DEFAULT '', + `name` VARCHAR(255) NOT NULL, `php_setdocument` MEDIUMTEXT NOT NULL, `target` TINYINT(1) NOT NULL DEFAULT 1, `type` TINYINT(1) NOT NULL DEFAULT 0, @@ -985,18 +985,18 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_library` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_snippet` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `contributor_company` VARCHAR(255) NOT NULL DEFAULT '', - `contributor_email` VARCHAR(255) NOT NULL DEFAULT '', - `contributor_name` VARCHAR(255) NOT NULL DEFAULT '', - `contributor_website` VARCHAR(255) NOT NULL DEFAULT '', + `contributor_company` VARCHAR(255) NOT NULL, + `contributor_email` VARCHAR(255) NOT NULL, + `contributor_name` VARCHAR(255) NOT NULL, + `contributor_website` VARCHAR(255) NOT NULL, `description` TEXT NOT NULL, - `guid` VARCHAR(36) NOT NULL DEFAULT '', - `heading` VARCHAR(255) NOT NULL DEFAULT '', + `guid` VARCHAR(36) NOT NULL, + `heading` VARCHAR(255) NOT NULL, `library` INT(11) NOT NULL DEFAULT 0, - `name` VARCHAR(255) NOT NULL DEFAULT '', + `name` VARCHAR(255) NOT NULL, `snippet` TEXT NOT NULL, `type` INT(11) NOT NULL DEFAULT 0, - `url` VARCHAR(255) NOT NULL DEFAULT '', + `url` VARCHAR(255) NOT NULL, `usage` TEXT NOT NULL, `params` text NULL, `published` TINYINT(3) NOT NULL DEFAULT 1, @@ -1025,10 +1025,10 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_snippet` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_validation_rule` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `inherit` CHAR NOT NULL DEFAULT '', - `name` VARCHAR(255) NOT NULL DEFAULT '', + `inherit` CHAR NOT NULL, + `name` VARCHAR(255) NOT NULL, `php` MEDIUMTEXT NOT NULL, - `short_description` VARCHAR(255) NOT NULL DEFAULT '', + `short_description` VARCHAR(255) NOT NULL, `params` text NULL, `published` TINYINT(3) NOT NULL DEFAULT 1, `created_by` INT(10) unsigned NOT NULL DEFAULT 0, @@ -1060,20 +1060,20 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_field` ( `catid` INT(11) NOT NULL DEFAULT 0, `css_view` TEXT NOT NULL, `css_views` TEXT NOT NULL, - `datadefault` CHAR(64) NOT NULL DEFAULT '', - `datadefault_other` CHAR(64) NOT NULL DEFAULT '', - `datalenght` CHAR(64) NOT NULL DEFAULT '', - `datalenght_other` CHAR(64) NOT NULL DEFAULT '', - `datatype` CHAR(64) NOT NULL DEFAULT '', + `datadefault` CHAR(64) NOT NULL, + `datadefault_other` CHAR(64) NOT NULL, + `datalenght` CHAR(64) NOT NULL, + `datalenght_other` CHAR(64) NOT NULL, + `datatype` CHAR(64) NOT NULL, `fieldtype` INT(11) NOT NULL DEFAULT 0, - `guid` VARCHAR(36) NOT NULL DEFAULT '', - `indexes` CHAR(64) NOT NULL DEFAULT '', + `guid` VARCHAR(36) NOT NULL, + `indexes` CHAR(64) NOT NULL, `initiator_on_get_model` TEXT NOT NULL, `initiator_on_save_model` TEXT NOT NULL, `javascript_view_footer` TEXT NOT NULL, `javascript_views_footer` TEXT NOT NULL, - `name` VARCHAR(255) NOT NULL DEFAULT '', - `null_switch` CHAR(64) NOT NULL DEFAULT '', + `name` VARCHAR(255) NOT NULL, + `null_switch` CHAR(64) NOT NULL, `on_get_model_field` TEXT NOT NULL, `on_save_model_field` TEXT NOT NULL, `store` INT(11) NOT NULL DEFAULT 0, @@ -1117,19 +1117,19 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_fieldtype` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `catid` INT(11) NOT NULL DEFAULT 0, - `datadefault` CHAR(64) NOT NULL DEFAULT '', - `datadefault_other` CHAR(64) NOT NULL DEFAULT '', - `datalenght` CHAR(64) NOT NULL DEFAULT '', - `datalenght_other` CHAR(64) NOT NULL DEFAULT '', - `datatype` CHAR(64) NOT NULL DEFAULT '', + `datadefault` CHAR(64) NOT NULL, + `datadefault_other` CHAR(64) NOT NULL, + `datalenght` CHAR(64) NOT NULL, + `datalenght_other` CHAR(64) NOT NULL, + `datatype` CHAR(64) NOT NULL, `description` TEXT NOT NULL, - `guid` VARCHAR(36) NOT NULL DEFAULT '', + `guid` VARCHAR(36) NOT NULL, `has_defaults` TINYINT(1) NOT NULL DEFAULT 0, - `indexes` CHAR(64) NOT NULL DEFAULT '', - `name` VARCHAR(255) NOT NULL DEFAULT '', - `null_switch` CHAR(64) NOT NULL DEFAULT '', + `indexes` CHAR(64) NOT NULL, + `name` VARCHAR(255) NOT NULL, + `null_switch` CHAR(64) NOT NULL, `properties` TEXT NOT NULL, - `short_description` VARCHAR(255) NOT NULL DEFAULT '', + `short_description` VARCHAR(255) NOT NULL, `store` INT(11) NOT NULL DEFAULT 0, `params` text NULL, `published` TINYINT(3) NOT NULL DEFAULT 1, @@ -1193,8 +1193,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_language_translation` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_language` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `langtag` VARCHAR(64) NOT NULL DEFAULT '', - `name` VARCHAR(255) NOT NULL DEFAULT '', + `langtag` VARCHAR(64) NOT NULL, + `name` VARCHAR(255) NOT NULL, `params` text NULL, `published` TINYINT(3) NOT NULL DEFAULT 1, `created_by` INT(10) unsigned NOT NULL DEFAULT 0, @@ -1221,7 +1221,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_server` ( `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `authentication` TINYINT(1) NOT NULL DEFAULT 0, `host` TEXT NOT NULL, - `name` VARCHAR(255) NOT NULL DEFAULT '', + `name` VARCHAR(255) NOT NULL, `password` TEXT NOT NULL, `path` TEXT NOT NULL, `port` TEXT NOT NULL, @@ -1256,18 +1256,18 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_server` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_help_document` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `admin_view` CHAR(255) NOT NULL DEFAULT '', - `alias` CHAR(64) NOT NULL DEFAULT '', + `admin_view` CHAR(255) NOT NULL, + `alias` CHAR(64) NOT NULL, `article` TINYINT(1) NOT NULL DEFAULT 0, `content` TEXT NOT NULL, `groups` TEXT NOT NULL, `location` TINYINT(1) NOT NULL DEFAULT 0, `not_required` INT(1) NOT NULL DEFAULT 0, - `site_view` CHAR(255) NOT NULL DEFAULT '', + `site_view` CHAR(255) NOT NULL, `target` TINYINT(1) NOT NULL DEFAULT 0, - `title` CHAR(64) NOT NULL DEFAULT '', + `title` CHAR(64) NOT NULL, `type` TINYINT(1) NOT NULL DEFAULT 0, - `url` VARCHAR(255) NOT NULL DEFAULT '', + `url` VARCHAR(255) NOT NULL, `params` text NULL, `published` TINYINT(3) NOT NULL DEFAULT 1, `created_by` INT(10) unsigned NOT NULL DEFAULT 0, @@ -1715,8 +1715,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_modules` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_snippet_type` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `description` VARCHAR(255) NOT NULL DEFAULT '', - `name` VARCHAR(255) NOT NULL DEFAULT '', + `description` VARCHAR(255) NOT NULL, + `name` VARCHAR(255) NOT NULL, `params` text NULL, `published` TINYINT(3) NOT NULL DEFAULT 1, `created_by` INT(10) unsigned NOT NULL DEFAULT 0, @@ -1798,9 +1798,9 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_class_extends` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `comment` TEXT NOT NULL, - `extension_type` VARCHAR(64) NOT NULL DEFAULT '', + `extension_type` VARCHAR(64) NOT NULL, `head` TEXT NOT NULL, - `name` VARCHAR(255) NOT NULL DEFAULT '', + `name` VARCHAR(255) NOT NULL, `params` text NULL, `published` TINYINT(3) NOT NULL DEFAULT 1, `created_by` INT(10) unsigned NOT NULL DEFAULT 0, @@ -1882,7 +1882,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin_group` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `class_extends` INT(11) NOT NULL DEFAULT 0, - `name` VARCHAR(255) NOT NULL DEFAULT '', + `name` VARCHAR(255) NOT NULL, `params` text NULL, `published` TINYINT(3) NOT NULL DEFAULT 1, `created_by` INT(10) unsigned NOT NULL DEFAULT 0, diff --git a/componentbuilder.xml b/componentbuilder.xml index f0348ef73..4b6e2b5f9 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,7 +1,7 @@ COM_COMPONENTBUILDER - 2nd May, 2023 + 16th May, 2023 Llewellyn van der Merwe joomla@vdm.io https://dev.vdm.io diff --git a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Model/Adminviews.php b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Model/Adminviews.php index edb322b22..38201e9bd 100644 --- a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Model/Adminviews.php +++ b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Model/Adminviews.php @@ -92,7 +92,7 @@ class Adminviews $item->addadmin_views, function ($a, $b) { if ($a['order'] != 0 && $b['order'] != 0) { - return $a['order'] - $b['order']; + return $a['order'] <=> $b['order']; } elseif ($b['order'] != 0 && $a['order'] == 0) { diff --git a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Model/Fields.php b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Model/Fields.php index d7fe61d64..0e6b03c24 100644 --- a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Model/Fields.php +++ b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Model/Fields.php @@ -204,7 +204,7 @@ class Fields { if ($a['order_list'] != 0 && $b['order_list'] != 0) { - return $a['order_list'] - $b['order_list']; + return $a['order_list'] <=> $b['order_list']; } elseif ($b['order_list'] != 0 && $a['order_list'] == 0) { @@ -212,7 +212,7 @@ class Fields } elseif ($a['order_list'] != 0 && $b['order_list'] == 0) { - return 0; + return -1; } return 1; diff --git a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Power/Repos/Readme.php b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Power/Repos/Readme.php index 4b4ec0fc9..d47ca4d41 100644 --- a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Power/Repos/Readme.php +++ b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Power/Repos/Readme.php @@ -301,7 +301,7 @@ class Readme */ private function compareType(array $a, array $b, array $typeOrder): int { - return $typeOrder[$a['type']] - $typeOrder[$b['type']]; + return $typeOrder[$a['type']] <=> $typeOrder[$b['type']]; } /**