joomla · HLeithner · Apr 2, 2023 · Mar 23, 2023 · Mar 23, 2023 · Mar 23, 2023
diff --git a/.drone.yml b/.drone.yml
@@ -104,6 +104,8 @@ steps:
     volumes:
       - name: cypress-cache
         path: /root/.cache/Cypress
+    environment:
+      CYPRESS_VERIFY_TIMEOUT: 100000
     commands:
       - mv cypress.config.dist.js cypress.config.js
       - npx cypress install
@@ -363,6 +365,6 @@ trigger:
 
 ---
 kind: signature
-hmac: 8cf1bf21cd6ed0fb836683510df6a44fe8b096704593aa2f30478b3d41bb0fdf
+hmac: 7d729d1bdab99cbf37d96324d129a7f3c7eca72a271c70af8755d99c0ae91142
 
 ...
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -25,12 +25,12 @@ libraries/src/Installer/*  @rdeutz @zero-24
 libraries/src/Updater/*  @rdeutz @zero-24
 
 # Automated Testing
-tests/*  @hackwar
-tests/Unit/*  @rdeutz
-.appveyor.yml  @rdeutz @hackwar
-.drone.yml  @rdeutz @hackwar
-phpunit.xml.dist  @rdeutz @hackwar
-phpunit-pgsql.xml.dist  @rdeutz @hackwar
+tests/*  @hackwar @fancyFranci
+tests/Unit/*  @rdeutz @fancyFranci
+.appveyor.yml  @rdeutz @hackwar @fancyFranci
+.drone.yml  @rdeutz @hackwar @fancyFranci
+phpunit.xml.dist  @rdeutz @hackwar @fancyFranci
+phpunit-pgsql.xml.dist  @rdeutz @hackwar @fancyFranci
 
 # HttpHeaders Plugin
 plugins/system/httpheaders/*  @zero-24

diff --git a/administrator/components/com_contenthistory/src/Helper/ContenthistoryHelper.php b/administrator/components/com_contenthistory/src/Helper/ContenthistoryHelper.php
@@ -76,7 +76,7 @@ public static function decodeFields($jsonString)
 
         if (is_object($object)) {
             foreach ($object as $name => $value) {
-                if ($subObject = json_decode($value)) {
+                if (!is_null($value) && $subObject = json_decode($value)) {
                     $object->$name = $subObject;
                 }
             }

diff --git a/administrator/components/com_guidedtours/src/View/Step/HtmlView.php b/administrator/components/com_guidedtours/src/View/Step/HtmlView.php
@@ -99,7 +99,7 @@ protected function addToolbar()
 
         $canDo = ContentHelper::getActions('com_guidedtours');
 
-        ToolbarHelper::title(Text::_('COM_GUIDEDTOURS') . ' - ' . ($isNew ? Text::_('COM_GUIDEDTOURS_MANAGER_STEP_NEW') : Text::_('COM_GUIDEDTOURS_MANAGER_STEP_EDIT')), 'map-signs');
+        ToolbarHelper::title(Text::_($isNew ? 'COM_GUIDEDTOURS_MANAGER_STEP_NEW' : 'COM_GUIDEDTOURS_MANAGER_STEP_EDIT'), 'map-signs');
 
         $toolbarButtons = [];
 

diff --git a/administrator/components/com_guidedtours/src/View/Tour/HtmlView.php b/administrator/components/com_guidedtours/src/View/Tour/HtmlView.php
@@ -102,7 +102,7 @@ protected function addToolbar()
 
         $toolbar = Toolbar::getInstance();
 
-        ToolbarHelper::title(Text::_('COM_GUIDEDTOURS') . ' - ' . ($isNew ? Text::_('COM_GUIDEDTOURS_MANAGER_TOUR_NEW') : Text::_('COM_GUIDEDTOURS_MANAGER_TOUR_EDIT')), 'map-signs');
+        ToolbarHelper::title(Text::_($isNew ? 'COM_GUIDEDTOURS_MANAGER_TOUR_NEW' : 'COM_GUIDEDTOURS_MANAGER_TOUR_EDIT'), 'map-signs');
 
         $toolbarButtons = [];
 

diff --git a/administrator/components/com_guidedtours/tmpl/steps/default.php b/administrator/components/com_guidedtours/tmpl/steps/default.php
@@ -69,7 +69,7 @@
             <table class="table" id="stepsList">
 
                 <caption class="visually-hidden">
-                    <?php echo Text::_('COM_GUIDEDTOURS_TABLE_CAPTION'); ?>,
+                    <?php echo Text::_('COM_GUIDEDTOURS_STEPS_TABLE_CAPTION'); ?>,
                     <span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?></span>,
                     <span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
                 </caption>

diff --git a/administrator/components/com_privacy/src/Plugin/PrivacyPlugin.php b/administrator/components/com_privacy/src/Plugin/PrivacyPlugin.php
@@ -16,6 +16,7 @@
 use Joomla\Component\Privacy\Administrator\Export\Domain;
 use Joomla\Component\Privacy\Administrator\Export\Field;
 use Joomla\Component\Privacy\Administrator\Export\Item;
+use Joomla\Database\DatabaseAwareTrait;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -28,11 +29,14 @@
  */
 abstract class PrivacyPlugin extends CMSPlugin
 {
+    use DatabaseAwareTrait;
+
     /**
      * Database object
      *
      * @var    \Joomla\Database\DatabaseDriver
      * @since  3.9.0
+     * @deprecated  __DEPLOY_VERSION__ will be removed in 6.0 use $this->getDatabase() instead
      */
     protected $db;
 

diff --git a/administrator/language/en-GB/com_guidedtours.ini b/administrator/language/en-GB/com_guidedtours.ini
@@ -10,7 +10,6 @@ COM_GUIDEDTOURS_DESCRIPTION="Description"
 COM_GUIDEDTOURS_DESCRIPTION_TRANSLATION="Description (%s)"
 COM_GUIDEDTOURS_EDIT_TOUR="Edit Tour"
 COM_GUIDEDTOURS_ERROR_NO_GUIDEDTOURS_SELECTED="No tour selected."
-COM_GUIDEDTOURS_ERROR_TOUR_NOT_FOUND="Tour not found!"
 COM_GUIDEDTOURS_EXTENSIONS_DESC="Restrict the tour to be displayed only when the selected component is active."
 COM_GUIDEDTOURS_EXTENSIONS_LABEL="Component Selector"
 COM_GUIDEDTOURS_FIELD_NOTE_LABEL="Note"
@@ -23,14 +22,11 @@ COM_GUIDEDTOURS_FIELD_VALUE_STEP_TYPE_NEXT="Next"
 COM_GUIDEDTOURS_FIELD_VALUE_STEP_TYPE_REDIRECT="Redirect"
 COM_GUIDEDTOURS_FILTER_SEARCH_DESC="Search in id, title and description. Prefix with ID: to search for tour ID or DESCRIPTION: to search only description text."
 COM_GUIDEDTOURS_FILTER_SEARCH_LABEL="Search"
-COM_GUIDEDTOURS_GUIDEDTOUR_STEPS_PAGE_TITLE="Guided Tour - List of Steps"
-COM_GUIDEDTOURS_GUIDEDTOURS_LABEL_DESCRIPTION="Description"
-COM_GUIDEDTOURS_GUIDEDTOURS_PAGE_TITLE="Guided Tours - List of Tours"
 COM_GUIDEDTOURS_GUIDEDTOURS_TABLE_CAPTION="List of Tours"
-COM_GUIDEDTOURS_MANAGER_STEP_EDIT="Edit Step"
-COM_GUIDEDTOURS_MANAGER_STEP_NEW="New Step"
-COM_GUIDEDTOURS_MANAGER_TOUR_EDIT="Edit Tour"
-COM_GUIDEDTOURS_MANAGER_TOUR_NEW="New Tour"
+COM_GUIDEDTOURS_MANAGER_STEP_EDIT="Guided Tours: Edit Step"
+COM_GUIDEDTOURS_MANAGER_STEP_NEW="Guided Tours: New Step"
+COM_GUIDEDTOURS_MANAGER_TOUR_EDIT="Guided Tours: Edit Tour"
+COM_GUIDEDTOURS_MANAGER_TOUR_NEW="Guided Tours: New Tour"
 COM_GUIDEDTOURS_N_ITEMS_ARCHIVED_1="Item archived."
 COM_GUIDEDTOURS_N_ITEMS_ARCHIVED="%s items archived."
 COM_GUIDEDTOURS_N_ITEMS_CHECKED_IN_1="Item checked in."
@@ -47,8 +43,6 @@ COM_GUIDEDTOURS_NEW_TOUR="New Tour"
 COM_GUIDEDTOURS_ORDER_TYPE_ASC="Type ascending"
 COM_GUIDEDTOURS_ORDER_TYPE_DESC="Type descending"
 COM_GUIDEDTOURS_STATUS="Status"
-COM_GUIDEDTOURS_STEP_ASC="Step ascending"
-COM_GUIDEDTOURS_STEP_DESC="Step descending"
 COM_GUIDEDTOURS_STEP_DESCRIPTION_TRANSLATION="Description (%s)"
 COM_GUIDEDTOURS_STEP_EDIT_STEP="Edit Step"
 COM_GUIDEDTOURS_STEP_FILTER_SEARCH_DESC="Search in id, title and description. Prefix with ID: to search for step ID or DESCRIPTION: to search only description text."
@@ -69,6 +63,7 @@ COM_GUIDEDTOURS_STEPS_EMPTYSTATE_CONTENT="A tour can only be functional if steps
 COM_GUIDEDTOURS_STEPS_EMPTYSTATE_TITLE="No steps for this tour have been created yet."
 COM_GUIDEDTOURS_STEPS_EMPTYSTATE_BUTTON_ADD="Add your first step"
 COM_GUIDEDTOURS_STEPS_LIST="Guided Tour: %s"
+COM_GUIDEDTOURS_STEPS_TABLE_CAPTION="List of Steps"
 COM_GUIDEDTOURS_TITLE="Title"
 COM_GUIDEDTOURS_TITLE_TRANSLATION="Title (%s)"
 COM_GUIDEDTOURS_TOUR_ID="ID"

diff --git a/administrator/language/en-GB/com_guidedtours.sys.ini b/administrator/language/en-GB/com_guidedtours.sys.ini
@@ -1,12 +1,9 @@
 ; Joomla! Project
 ; (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
-; GNU General Public License version 2 or later; see LICENSE.txt
+; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
 COM_GUIDEDTOURS="Guided Tours"
-COM_GUIDEDTOURS_ERROR_TOUR_NOT_FOUND="Tour not found!"
-COM_GUIDEDTOURS_GUIDEDTOUR_STEPS_PAGE_TITLE="Guided Tours - List of Steps"
-COM_GUIDEDTOURS_GUIDEDTOURS_PAGE_TITLE="Guided Tours - List of Tours"
 COM_GUIDEDTOURS_GUIDEDTOURS_TABLE_CAPTION="List of Tours"
 COM_GUIDEDTOURS_TOURS_VIEW_DEFAULT_TITLE="List All Guided Tours"
 COM_GUIDEDTOURS_TOURS_VIEW_DEFAULT_DESC="Shows a list of all guided tours."

diff --git a/administrator/language/en-GB/plg_system_guidedtours.ini b/administrator/language/en-GB/plg_system_guidedtours.ini
@@ -1,6 +1,6 @@
 ; Joomla! Project
 ; (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
-; GNU General Public License version 2 or later; see LICENSE.txt
+; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_SYSTEM_GUIDEDTOURS="System - Guided Tours Plugin"

diff --git a/administrator/language/en-GB/plg_system_guidedtours.sys.ini b/administrator/language/en-GB/plg_system_guidedtours.sys.ini
@@ -1,6 +1,6 @@
 ; Joomla! Project
 ; (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
-; GNU General Public License version 2 or later; see LICENSE.txt
+; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_SYSTEM_GUIDEDTOURS="System - Guided Tours Plugin"

diff --git a/administrator/templates/atum/html/layouts/status.php b/administrator/templates/atum/html/layouts/status.php
@@ -32,7 +32,11 @@
             $dom->loadHTML('<?xml encoding="utf-8" ?>' . $out);
             $els = $dom->getElementsByTagName('a');
 
-            $moduleCollapsedHtml[] = $dom->saveHTML($els[0]); //$els[0]->nodeValue;
+            if ($els[0]) {
+                $moduleCollapsedHtml[] = $dom->saveHTML($els[0]);
+            } else {
+                $moduleCollapsedHtml[] = $out;
+            }
         } else {
             $moduleCollapsedHtml[] = $out;
         }

diff --git a/build/media_source/plg_system_guidedtours/js/guidedtours.es6.js b/build/media_source/plg_system_guidedtours/js/guidedtours.es6.js
@@ -97,9 +97,8 @@ function addStepToTourButton(tour, stepObj, buttons) {
         } else {
           resolve();
         }
-      }).catch((error) => {
-        // eslint-disable-next-line no-console
-        console.log(`Exception error - ${error.message} - Bypass Shepherd target`);
+      }).catch(() => {
+        // Ignore
       });
     },
     when: {

diff --git a/libraries/namespacemap.php b/libraries/namespacemap.php
@@ -249,7 +249,7 @@ private function getNamespaces(string $type): array
     }
 
     /**
-     * Returns an array of with extension paths as keys and manifest paths as values.
+     * Returns an array of extensions with their respective paths as keys and manifest paths as values.
      *
      * @param   string  $type  The extension type
      *

diff --git a/libraries/src/Component/Router/Rules/NomenuRules.php b/libraries/src/Component/Router/Rules/NomenuRules.php
@@ -79,7 +79,7 @@ public function parse(&$segments, &$vars)
 
                 if (isset($view->key) && isset($segments[0])) {
                     if (\is_callable([$this->router, 'get' . ucfirst($view->name) . 'Id'])) {
-                        $input = $this->app->getInput();
+                        $input = $this->router->app->getInput();
                         if ($view->parent_key && $input->get($view->parent_key)) {
                             $vars[$view->parent->key] = $input->get($view->parent_key);
                             $vars[$view->parent_key]  = $input->get($view->parent_key);

diff --git a/libraries/src/Filesystem/File.php b/libraries/src/Filesystem/File.php
@@ -24,6 +24,8 @@
  * A File handling class
  *
  * @since  1.7.0
+ * @deprecated  4.4 will be removed in 6.0
+ *              Use Joomla\Filesystem\File instead.
  */
 class File
 {
@@ -69,6 +71,8 @@ public static function getExt($file)
      * @return  string  The file name without the extension
      *
      * @since   1.7.0
+     * @deprecated  4.4 will be removed in 6.0
+     *              Use Joomla\Filesystem\File::stripExt() instead.
      */
     public static function stripExt($file)
     {
@@ -83,6 +87,8 @@ public static function stripExt($file)
      * @return  string  The sanitised string
      *
      * @since   1.7.0
+     * @deprecated  4.4 will be removed in 6.0
+     *              Use Joomla\Filesystem\File::makeSafe() instead.
      */
     public static function makeSafe($file)
     {
@@ -111,6 +117,9 @@ public static function makeSafe($file)
      * @return  boolean  True on success
      *
      * @since   1.7.0
+     * @deprecated  4.4 will be removed in 6.0
+     *              Use Joomla\Filesystem\File::copy() instead.
+     *              The framework class throws Exceptions in case of error which you have to catch.
      */
     public static function copy($src, $dest, $path = null, $useStreams = false)
     {
@@ -187,6 +196,8 @@ public static function copy($src, $dest, $path = null, $useStreams = false)
      *                 FALSE from opcache_invalidate (like file not found).
      *
      * @since 4.0.1
+     * @deprecated  4.4 will be removed in 6.0
+     *              Use Joomla\Filesystem\File::invalidateFileCache() instead.
      */
     public static function invalidateFileCache($filepath, $force = true)
     {
@@ -210,6 +221,9 @@ public static function invalidateFileCache($filepath, $force = true)
      * @return boolean TRUE if we can proceed to use opcache_invalidate to flush a file from the OPCache
      *
      * @since 4.0.1
+     * @deprecated  4.4 will be removed in 6.0
+     *              Use Joomla\Filesystem\File::invalidateFileCache() instead.
+     *              This method will be removed without replacement.
      */
     public static function canFlushFileCache()
     {
@@ -238,6 +252,9 @@ public static function canFlushFileCache()
      * @return  boolean  True on success
      *
      * @since   1.7.0
+     * @deprecated  4.4 will be removed in 6.0
+     *              Use Joomla\Filesystem\File::delete() instead.
+     *              The framework class throws Exceptions in case of error which you have to catch.
      */
     public static function delete($file)
     {
@@ -311,6 +328,9 @@ public static function delete($file)
      * @return  boolean  True on success
      *
      * @since   1.7.0
+     * @deprecated  4.4 will be removed in 6.0
+     *              Use Joomla\Filesystem\File::move() instead.
+     *              The framework class throws Exceptions in case of error which you have to catch.
      */
     public static function move($src, $dest, $path = '', $useStreams = false)
     {
@@ -382,6 +402,8 @@ public static function move($src, $dest, $path = '', $useStreams = false)
      * @return  boolean  True on success
      *
      * @since   1.7.0
+     * @deprecated  4.4 will be removed in 6.0
+     *              Use Joomla\Filesystem\File::write() instead.
      */
     public static function write($file, $buffer, $useStreams = false)
     {
@@ -440,6 +462,7 @@ public static function write($file, $buffer, $useStreams = false)
      * @return  boolean  True on success
      *
      * @since   3.6.0
+     *
      */
     public static function append($file, $buffer, $useStreams = false)
     {
@@ -499,6 +522,9 @@ public static function append($file, $buffer, $useStreams = false)
      * @return  boolean  True on success
      *
      * @since   1.7.0
+     * @deprecated  4.4 will be removed in 6.0
+     *              Use Joomla\Filesystem\File::upload() instead.
+     *              The framework class throws Exceptions in case of error which you have to catch.
      */
     public static function upload($src, $dest, $useStreams = false, $allowUnsafe = false, $safeFileOptions = [])
     {
@@ -588,6 +614,8 @@ public static function upload($src, $dest, $useStreams = false, $allowUnsafe = f
      * @return  boolean  True if path is a file
      *
      * @since   1.7.0
+     * @deprecated  4.4 will be removed in 6.0
+     *              Use is_file() instead.
      */
     public static function exists($file)
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -249,7 +249,7 @@ private function getNamespaces(string $type): array @@
         }
         /**
-         * Returns an array of with extension paths as keys and manifest paths as values.
+         * Returns an array of extensions with their respective paths as keys and manifest paths as values.
          *
          * @param   string  $type  The extension type
          *
@@ Expand Down @@