Revert "Merge remote-tracking branch 'origin/5.0-dev' into 6_com_sche…

…duler" This reverts commit 3bb1df2.
brianteeman · Sep 26, 2023 · df98bc9 · df98bc9
1 parent 3bb1df2
commit df98bc9
Show file tree

Hide file tree

Showing 142 changed files with 858 additions and 2,462 deletions.
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
@@ -2116,84 +2116,20 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/language/en-GB/lib_simplepie.sys.ini',
             '/libraries/src/Cache/Storage/WincacheStorage.php',
             // From 5.0.0-beta2 to 5.0.0-beta3
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/AbstractString.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/AbstractTime.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/ASNObject.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Base128.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Composite/AttributeTypeAndValue.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Composite/RDNString.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Composite/RelativeDistinguishedName.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Construct.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Exception/NotImplementedException.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Exception/ParserException.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/ExplicitlyTaggedObject.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Identifier.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/OID.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Parsable.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/TemplateParser.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/BitString.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/BMPString.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/Boolean.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/CharacterString.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/Enumerated.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/GeneralizedTime.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/GeneralString.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/GraphicString.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/IA5String.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/Integer.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/NullObject.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/NumericString.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/ObjectDescriptor.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/ObjectIdentifier.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/OctetString.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/PrintableString.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/RelativeObjectIdentifier.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/Sequence.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/Set.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/T61String.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/UniversalString.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/UTCTime.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/UTF8String.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/VisibleString.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/UnknownConstructedObject.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/UnknownObject.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/Utility/BigInteger.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/Utility/BigIntegerBcmath.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/Utility/BigIntegerGmp.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/X509/AlgorithmIdentifier.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/X509/CertificateExtensions.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/X509/CertificateSubject.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/X509/CSR/Attributes.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/X509/CSR/CSR.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/X509/PrivateKey.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/X509/PublicKey.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/X509/SAN/DNSName.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/X509/SAN/IPAddress.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/X509/SAN/SubjectAlternativeNames.php',
-            '/libraries/vendor/fgrosse/phpasn1/LICENSE',
-            '/libraries/vendor/stella-maris/clock/LICENSE.md',
-            '/libraries/vendor/stella-maris/clock/src/ClockInterface.php',
             '/media/com_scheduler/css/admin-view-select-task.css',
             '/media/com_scheduler/css/admin-view-select-task.min.css',
-            '/media/com_scheduler/css/admin-view-select-task.min.css.gz',
             '/media/system/css/calendar-jos.css',
             '/media/system/css/calendar-jos.min.css',
-            '/media/system/css/calendar-jos.min.css.gz',
             '/media/system/css/debug.css',
             '/media/system/css/debug.min.css',
-            '/media/system/css/debug.min.css.gz',
             '/media/system/css/frontediting.css',
             '/media/system/css/frontediting.min.css',
-            '/media/system/css/frontediting.min.css.gz',
             '/media/system/css/mootree.css',
             '/media/system/css/mootree.min.css',
-            '/media/system/css/mootree.min.css.gz',
             '/media/system/css/mootree_rtl.css',
-            '/media/system/css/mootree_rtl.min.css',
-            '/media/system/css/mootree_rtl.min.css.gz',
+            '/media/system/css/mootree_rtl,min.css',
             '/media/system/css/sortablelist.css',
             '/media/system/css/sortablelist.min.css',
-            '/media/system/css/sortablelist.min.css.gz',
         ];
 
         $folders = [
@@ -2413,21 +2349,6 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/templates/system/incompatible.html,',
             '/media/plg_system_compat',
             '/media/plg_editors_tinymce/js/plugins/highlighter',
-            // From 5.0.0-beta2 to 5.0.0-beta3
-            '/libraries/vendor/stella-maris/clock/src',
-            '/libraries/vendor/stella-maris/clock',
-            '/libraries/vendor/stella-maris',
-            '/libraries/vendor/fgrosse/phpasn1/lib/X509/SAN',
-            '/libraries/vendor/fgrosse/phpasn1/lib/X509/CSR',
-            '/libraries/vendor/fgrosse/phpasn1/lib/X509',
-            '/libraries/vendor/fgrosse/phpasn1/lib/Utility',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Exception',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Composite',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1',
-            '/libraries/vendor/fgrosse/phpasn1/lib',
-            '/libraries/vendor/fgrosse/phpasn1',
-            '/libraries/vendor/fgrosse',
         ];
 
         $status['files_checked']   = $files;

diff --git a/administrator/components/com_banners/src/Model/ClientsModel.php b/administrator/components/com_banners/src/Model/ClientsModel.php
@@ -281,10 +281,10 @@ public function getItems()
 
         // Inject the values back into the array.
         foreach ($items as $item) {
-            $item->count_published   = $countPublished[$item->id] ?? 0;
-            $item->count_unpublished = $countUnpublished[$item->id] ?? 0;
-            $item->count_trashed     = $countTrashed[$item->id] ?? 0;
-            $item->count_archived    = $countArchived[$item->id] ?? 0;
+            $item->count_published   = isset($countPublished[$item->id]) ? $countPublished[$item->id] : 0;
+            $item->count_unpublished = isset($countUnpublished[$item->id]) ? $countUnpublished[$item->id] : 0;
+            $item->count_trashed     = isset($countTrashed[$item->id]) ? $countTrashed[$item->id] : 0;
+            $item->count_archived    = isset($countArchived[$item->id]) ? $countArchived[$item->id] : 0;
         }
 
         // Add the items to the internal cache.

diff --git a/administrator/components/com_content/src/Model/ArticleModel.php b/administrator/components/com_content/src/Model/ArticleModel.php
@@ -32,7 +32,6 @@
 use Joomla\CMS\Versioning\VersionableModelTrait;
 use Joomla\CMS\Workflow\Workflow;
 use Joomla\Component\Categories\Administrator\Helper\CategoriesHelper;
-use Joomla\Component\Content\Administrator\Event\Model\FeatureEvent;
 use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
 use Joomla\Database\ParameterType;
 use Joomla\Filter\OutputFilter;
@@ -846,7 +845,7 @@ public function featured($pks, $value = 0, $featuredUp = null, $featuredDown = n
             AbstractEvent::create(
                 $this->event_before_change_featured,
                 [
-                    'eventClass' => FeatureEvent::class,
+                    'eventClass' => 'Joomla\Component\Content\Administrator\Event\Model\FeatureEvent',
                     'subject'    => $this,
                     'extension'  => $context,
                     'pks'        => $pks,
@@ -951,7 +950,7 @@ public function featured($pks, $value = 0, $featuredUp = null, $featuredDown = n
             AbstractEvent::create(
                 $this->event_after_change_featured,
                 [
-                    'eventClass' => FeatureEvent::class,
+                    'eventClass' => 'Joomla\Component\Content\Administrator\Event\Model\FeatureEvent',
                     'subject'    => $this,
                     'extension'  => $context,
                     'pks'        => $pks,

diff --git a/administrator/components/com_content/tmpl/articles/modal.php b/administrator/components/com_content/tmpl/articles/modal.php
@@ -32,7 +32,7 @@
     ->useScript('modal-content-select')
     ->useScript('com_content.admin-articles-modal');
 
-// @todo: Use of Function and Editor is deprecated and should be removed in 6.0. It stays only for backward compatibility.
+// TODO: Use of Function and Editor is deprecated and should be removed in 6.0. It stays only for backward compatibility.
 $function  = $app->getInput()->getCmd('function', 'jSelectArticle');
 $editor    = $app->getInput()->getCmd('editor', '');
 $listOrder = $this->escape($this->state->get('list.ordering'));

diff --git a/administrator/components/com_fields/src/Helper/FieldsHelper.php b/administrator/components/com_fields/src/Helper/FieldsHelper.php
@@ -238,7 +238,7 @@ function ($f) {
                         'context' => $context,
                         'item'    => $item,
                         'subject' => $field,
-                        'value'   => &$value, // @todo: Remove reference in Joomla 6, see AfterPrepareFieldEvent::__constructor()
+                        'value'   => &$value, // TODO: Remove reference in Joomla 6, see AfterPrepareFieldEvent::__constructor()
                     ]);
                     $dispatcher->dispatch('onCustomFieldsAfterPrepareField', $eventAfter);
                     $value = $eventAfter->getValue();

diff --git a/administrator/components/com_guidedtours/src/Model/StepModel.php b/administrator/components/com_guidedtours/src/Model/StepModel.php
@@ -88,7 +88,7 @@ public function save($data)
 
         // Make sure we use the correct extension when editing an existing tour
         $key = $table->getKeyName();
-        $pk  = $data[$key] ?? (int) $this->getState($this->getName() . '.id');
+        $pk  = isset($data[$key]) ? $data[$key] : (int) $this->getState($this->getName() . '.id');
 
         if ($pk > 0) {
             $table->load($pk);

diff --git a/administrator/components/com_installer/src/Model/DatabaseModel.php b/administrator/components/com_installer/src/Model/DatabaseModel.php
@@ -559,9 +559,9 @@ private function getErrorsMessage($errors)
             $key             = 'COM_INSTALLER_MSG_DATABASE_' . $error->queryType;
             $messages        = $error->msgElements;
             $file            = basename($error->file);
-            $message0        = $messages[0] ?? ' ';
-            $message1        = $messages[1] ?? ' ';
-            $message2        = $messages[2] ?? ' ';
+            $message0        = isset($messages[0]) ? $messages[0] : ' ';
+            $message1        = isset($messages[1]) ? $messages[1] : ' ';
+            $message2        = isset($messages[2]) ? $messages[2] : ' ';
             $errorMessages[] = Text::sprintf($key, $file, $message0, $message1, $message2);
         }
 

diff --git a/administrator/components/com_installer/src/Model/InstallModel.php b/administrator/components/com_installer/src/Model/InstallModel.php
@@ -97,7 +97,7 @@ public function install()
         // (e.g. from a \JSON description).
         $eventBefore = new BeforeInstallationEvent('onInstallerBeforeInstallation', [
             'subject' => $this,
-            'package' => &$package, // @todo: Remove reference in Joomla 6, see InstallerEvent::__constructor()
+            'package' => &$package, // TODO: Remove reference in Joomla 6, see InstallerEvent::__constructor()
         ]);
         $results = $dispatcher->dispatch('onInstallerBeforeInstallation', $eventBefore)->getArgument('result', []);
         $package = $eventBefore->getPackage();
@@ -136,15 +136,10 @@ public function install()
             }
         }
 
-        // No one of installType was able to resolve $package. Nothing to Install.
-        if (!$package) {
-            return false;
-        }
-
         // This event allows a custom installation of the package or a customization of the package:
         $eventBeforeInst = new BeforeInstallerEvent('onInstallerBeforeInstaller', [
             'subject' => $this,
-            'package' => &$package, // @todo: Remove reference in Joomla 6, see InstallerEvent::__constructor()
+            'package' => &$package, // TODO: Remove reference in Joomla 6, see InstallerEvent::__constructor()
         ]);
         $results = $dispatcher->dispatch('onInstallerBeforeInstaller', $eventBeforeInst)->getArgument('result', []);
         $package = $eventBeforeInst->getPackage();
@@ -226,10 +221,10 @@ public function install()
         // This event allows a custom a post-flight:
         $eventAfterInst = new AfterInstallerEvent('onInstallerAfterInstaller', [
             'subject'         => $this,
-            'package'         => &$package, // @todo: Remove reference in Joomla 6, see InstallerEvent::__constructor()
+            'package'         => &$package, // TODO: Remove reference in Joomla 6, see InstallerEvent::__constructor()
             'installer'       => $installer,
-            'installerResult' => &$result, // @todo: Remove reference in Joomla 6, see AfterInstallerEvent::__constructor()
-            'message'         => &$msg, // @todo: Remove reference in Joomla 6, see AfterInstallerEvent::__constructor()
+            'installerResult' => &$result, // TODO: Remove reference in Joomla 6, see AfterInstallerEvent::__constructor()
+            'message'         => &$msg, // TODO: Remove reference in Joomla 6, see AfterInstallerEvent::__constructor()
         ]);
         $dispatcher->dispatch('onInstallerAfterInstaller', $eventAfterInst);
         $package = $eventAfterInst->getPackage();