Merge branch '4.3-dev' into fix-package-versions

administrator/components/com_actionlogs/src/Controller/ActionlogsController.php

@@ -25,6 +25,10 @@
 use Joomla\Component\Actionlogs\Administrator\Model\ActionlogsModel;
 use Joomla\Utilities\ArrayHelper;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Actionlogs list controller class.
  *

administrator/components/com_actionlogs/src/Controller/DisplayController.php

@@ -12,6 +12,10 @@
 
 use Joomla\CMS\MVC\Controller\BaseController;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Plugins master display controller.
  *

administrator/components/com_actionlogs/src/Field/ExtensionField.php

@@ -15,6 +15,10 @@
 use Joomla\CMS\Language\Text;
 use Joomla\Component\Actionlogs\Administrator\Helper\ActionlogsHelper;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Field to load a list of all extensions that have logged actions
  *

administrator/components/com_actionlogs/src/Field/LogcreatorField.php

@@ -12,6 +12,10 @@
 
 use Joomla\CMS\Form\Field\ListField;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Field to load a list of all users that have logged actions
  *

administrator/components/com_actionlogs/src/Field/LogsdaterangeField.php

@@ -14,6 +14,10 @@
 use Joomla\CMS\Form\Field\PredefinedlistField;
 use Joomla\CMS\Form\Form;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Field to show a list of range dates to sort with
  *

administrator/components/com_actionlogs/src/Field/LogtypeField.php

@@ -16,6 +16,10 @@
 use Joomla\CMS\Language\Text;
 use Joomla\Component\Actionlogs\Administrator\Helper\ActionlogsHelper;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Field to load a list of all users that have logged actions
  *

administrator/components/com_actionlogs/src/Field/PlugininfoField.php

@@ -15,6 +15,10 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Information field.
  *

administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php

@@ -19,6 +19,10 @@
 use Joomla\CMS\Router\Route;
 use Joomla\String\StringHelper;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Actionlogs component helper.
  *

administrator/components/com_actionlogs/src/Model/ActionlogConfigModel.php

@@ -13,6 +13,10 @@
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use stdClass;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Model to interact with the action log configuration.
  *

administrator/components/com_actionlogs/src/Model/ActionlogModel.php

@@ -21,6 +21,10 @@
 use Joomla\Utilities\IpHelper;
 use PHPMailer\PHPMailer\Exception as phpMailerException;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Methods supporting a list of Actionlog records.
  *

administrator/components/com_actionlogs/src/Model/ActionlogsModel.php

@@ -24,6 +24,10 @@
 use Joomla\Utilities\ArrayHelper;
 use RuntimeException;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Methods supporting a list of article records.
  *

administrator/components/com_actionlogs/src/Plugin/ActionLogPlugin.php

@@ -13,6 +13,10 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\CMSPlugin;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Abstract Action Log Plugin
  *

administrator/components/com_admin/postinstall/addnosniff.php

@@ -11,7 +11,9 @@
  * in the default .htaccess and web.config files.
  */
 
-
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
 
 /**
  * Notifies users of the add the nosniff headers by applying the changes from the default .htaccess or web.config file

administrator/components/com_admin/postinstall/behindproxy.php

@@ -15,6 +15,10 @@
 use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Notifies users of the new Behind Load Balancer option in Global Config, if we detect they might be behind a proxy
  *

administrator/components/com_admin/postinstall/htaccesssvg.php

@@ -11,7 +11,9 @@
  * in the default .htaccess file regarding hardening against XSS in SVG's
  */
 
-
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
 
 /**
  * Notifies users of a change in the default .htaccess file regarding hardening against XSS in SVG's

administrator/components/com_admin/postinstall/languageaccess340.php

@@ -13,6 +13,10 @@
 
 use Joomla\CMS\Factory;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Checks if the installation is affected by the issue with content languages access in 3.4.0
  *

administrator/components/com_admin/postinstall/statscollection.php

@@ -10,7 +10,9 @@
  * This file contains post-installation message handling for the checking minimum PHP version support
  */
 
-
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
 
 /**
  * Alerts the user we are collecting anonymous data as of Joomla 3.5.0.

administrator/components/com_admin/postinstall/textfilter3919.php

@@ -11,7 +11,9 @@
  * in the default textfilter settings
  */
 
-
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
 
 /**
  * Notifies users the changes from the default textfilter.

administrator/components/com_admin/script.php

@@ -21,6 +21,10 @@
 use Joomla\Component\Fields\Administrator\Model\FieldModel;
 use Joomla\Database\ParameterType;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Script file of Joomla CMS
  *
@@ -6435,6 +6439,12 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/plugins/system/webauthn/webauthn.php',
             '/plugins/task/checkfiles/checkfiles.php',
             '/plugins/task/demotasks/demotasks.php',
+            // From 4.2.0-rc1 to 4.2.0
+            '/administrator/language/en-GB/plg_fields_menuitem.ini',
+            '/administrator/language/en-GB/plg_fields_menuitem.sys.ini',
+            '/plugins/fields/menuitem/menuitem.php',
+            '/plugins/fields/menuitem/menuitem.xml',
+            '/plugins/fields/menuitem/tmpl/menuitem.php',
             // From 4.2.0 to 4.2.1
             '/media/vendor/hotkeys.js/js/hotkeys.js',
             '/media/vendor/hotkeys.js/js/hotkeys.min.js',
@@ -7807,6 +7817,9 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             // From 4.2.0-beta2 to 4.2.0-beta3
             '/plugins/system/webauthn/src/Helper',
             '/plugins/system/webauthn/src/Exception',
+            // From 4.2.0-rc1 to 4.2.0
+            '/plugins/fields/menuitem/tmpl',
+            '/plugins/fields/menuitem',
             // From 4.2.0 to 4.2.1
             '/media/vendor/hotkeys.js/js',
             '/media/vendor/hotkeys.js',

administrator/components/com_admin/sql/updates/mysql/4.2.0-2022-07-07.sql

@@ -0,0 +1,4 @@
+-- The following statement added with Joonmla version 4.2.0 RC 1 had to be removed with version 4.2.0 (stable).
+-- See https://github.com/joomla/joomla-cms/pull/38244
+-- INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`, `ordering`, `state`) VALUES
+-- (0, 'plg_fields_menuitem', 'plugin', 'menuitem', 'fields', 0, 1, 1, 0, 1, '', '', '', 0, 0);

administrator/components/com_admin/sql/updates/mysql/4.2.1-2022-08-23.sql

@@ -0,0 +1,3 @@
+-- Revert https://github.com/joomla/joomla-cms/pull/38244
+-- See also file 4.2.0-2022-07-07.sql
+DELETE FROM `#__extensions` WHERE `name` = 'plg_fields_menuitem' AND `type` = 'plugin' AND `element` = 'menuitem' AND `folder` = 'fields' AND `client_id` = 0;

administrator/components/com_admin/sql/updates/postgresql/4.2.0-2022-07-07.sql

@@ -0,0 +1,4 @@
+-- The following statement added with Joonmla version 4.2.0 RC 1 had to be removed with version 4.2.0 (stable).
+-- See https://github.com/joomla/joomla-cms/pull/38244
+-- INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "ordering", "state") VALUES
+--(0, 'plg_fields_menuitem', 'plugin', 'menuitem', 'fields', 0, 1, 1, 0, 1, '', '', '', 0, 0);

administrator/components/com_admin/sql/updates/postgresql/4.2.1-2022-08-23.sql

@@ -0,0 +1,3 @@
+-- Revert https://github.com/joomla/joomla-cms/pull/38244
+-- See also file 4.2.0-2022-07-07.sql
+DELETE FROM "#__extensions" WHERE "name" = 'plg_fields_menuitem' AND "type" = 'plugin' AND "element" = 'menuitem' AND "folder" = 'fields' AND "client_id" = 0;

administrator/components/com_admin/src/Controller/DisplayController.php

@@ -12,6 +12,10 @@
 
 use Joomla\CMS\MVC\Controller\BaseController;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Admin Controller
  *

administrator/components/com_admin/src/Dispatcher/Dispatcher.php

@@ -12,6 +12,10 @@
 
 use Joomla\CMS\Dispatcher\ComponentDispatcher;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * ComponentDispatcher class for com_admin
  *

administrator/components/com_admin/src/Extension/AdminComponent.php

@@ -19,6 +19,10 @@
 use Joomla\Component\Admin\Administrator\Service\HTML\System;
 use Psr\Container\ContainerInterface;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('JPATH_PLATFORM') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Component class for com_admin
  *

administrator/components/com_admin/src/Model/HelpModel.php

@@ -17,6 +17,10 @@
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use Joomla\String\StringHelper;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Admin Component Help Model
  *

administrator/components/com_admin/src/Model/SysinfoModel.php

@@ -18,6 +18,10 @@
 use Joomla\CMS\Version;
 use Joomla\Registry\Registry;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Model for the display of system information.
  *

administrator/components/com_admin/src/Service/HTML/Directory.php

@@ -12,6 +12,10 @@
 
 use Joomla\CMS\Language\Text;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Utility class working with directory
  *

administrator/components/com_admin/src/Service/HTML/PhpSetting.php

@@ -12,6 +12,10 @@
 
 use Joomla\CMS\Language\Text;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Utility class working with phpsetting
  *

administrator/components/com_admin/src/Service/HTML/System.php

@@ -12,6 +12,10 @@
 
 use Joomla\CMS\Language\Text;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Utility class working with system
  *

administrator/components/com_admin/src/View/Help/HtmlView.php

@@ -16,6 +16,10 @@
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\Component\Admin\Administrator\Model\HelpModel;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * HTML View class for the Admin component
  *

administrator/components/com_admin/src/View/Sysinfo/HtmlView.php

@@ -20,6 +20,10 @@
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\Component\Admin\Administrator\Model\SysinfoModel;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Sysinfo View class for the Admin component
  *

administrator/components/com_admin/src/View/Sysinfo/JsonView.php

@@ -17,6 +17,10 @@
 use Joomla\CMS\MVC\View\AbstractView;
 use Joomla\Component\Admin\Administrator\Model\SysinfoModel;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Sysinfo View class for the Admin component
  *

administrator/components/com_admin/src/View/Sysinfo/TextView.php

@@ -17,6 +17,10 @@
 use Joomla\CMS\MVC\View\AbstractView;
 use Joomla\Component\Admin\Administrator\Model\SysinfoModel;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Sysinfo View class for the Admin component
  *

administrator/components/com_associations/src/Controller/AssociationController.php

@@ -15,6 +15,10 @@
 use Joomla\CMS\Router\Route;
 use Joomla\Component\Associations\Administrator\Helper\AssociationsHelper;
 
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
 /**
  * Association edit controller class.
  *