Uplift some doc block removal 6.0 versions to 7.0

laoneo · laoneo · commit 54fc704710cf · 2026-06-19T09:58:50.000+02:00
diff --git a/administrator/components/com_categories/tmpl/categories/modal.php b/administrator/components/com_categories/tmpl/categories/modal.php
@@ -33,7 +33,7 @@
     ->useScript('modal-content-select');
 
 $extension = $this->escape($this->state->get('filter.extension'));
-// @todo: Use of Function is deprecated and should be removed in 6.0. It stays only for backward compatibility.
+// @todo: Use of Function is deprecated and should be removed in 7.0. It stays only for backward compatibility.
 $function  = $app->getInput()->getCmd('function', 'jSelectCategory');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
diff --git a/administrator/components/com_contact/tmpl/contacts/modal.php b/administrator/components/com_contact/tmpl/contacts/modal.php
@@ -32,7 +32,7 @@
 $wa->useScript('modal-content-select')
     ->useScript('com_contact.admin-contacts-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 7.0. It stays only for backward compatibility.
 $function  = $app->getInput()->getCmd('function', 'jSelectContact');
 $editor    = $app->getInput()->getCmd('editor', '');
 $listOrder = $this->escape($this->state->get('list.ordering'));
diff --git a/administrator/components/com_content/tmpl/articles/modal.php b/administrator/components/com_content/tmpl/articles/modal.php
@@ -34,7 +34,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 7.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_menus/tmpl/items/modal.php b/administrator/components/com_menus/tmpl/items/modal.php
@@ -30,7 +30,7 @@
 $wa = $this->getDocument()->getWebAssetManager();
 $wa->useScript('com_menus.admin-items-modal')->useScript('modal-content-select');
 
-// @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 7.0. It stays only for backward compatibility.
 $function  = $app->getInput()->get('function', 'jSelectMenuItem', 'cmd');
 $editor    = $app->getInput()->getCmd('editor', '');
 $listOrder = $this->escape($this->state->get('list.ordering'));
diff --git a/administrator/components/com_modules/tmpl/module/modal.php b/administrator/components/com_modules/tmpl/module/modal.php
@@ -13,7 +13,7 @@
 /** @var \Joomla\Component\Modules\Administrator\View\Module\HtmlView $this */
 
 // A backward compatibility for bootstrap modals: hide toolbar
-// @TODO: Remove in 6.0
+// @TODO: Remove in 7.0
 $this->getDocument()->getWebAssetManager()->addInlineScript('
 if (window.parent.Joomla.Modal) {
     const modal = window.parent.Joomla.Modal.getCurrent();
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php
@@ -27,7 +27,7 @@
 
 $app = Factory::getApplication();
 
-// @todo: Use of Function is deprecated and should be removed in 6.0. It stays only for backward compatibility.
+// @todo: Use of Function is deprecated and should be removed in 7.0. It stays only for backward compatibility.
 $function  = $app->getInput()->getCmd('function', 'jSelectNewsfeed');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
diff --git a/administrator/components/com_plugins/tmpl/plugin/modal.php b/administrator/components/com_plugins/tmpl/plugin/modal.php
@@ -13,7 +13,7 @@
 /** @var \Joomla\Component\Plugins\Administrator\View\Plugin\HtmlView $this */
 
 // A backward compatibility for bootstrap modals: hide toolbar
-// @TODO: Remove in 6.0
+// @TODO: Remove in 7.0
 $this->getDocument()->getWebAssetManager()->addInlineScript('
 if (window.parent.Joomla.Modal) {
     const modal = window.parent.Joomla.Modal.getCurrent();
@@ -33,4 +33,3 @@
     <?php $this->setLayout('edit'); ?>
     <?php echo $this->loadTemplate(); ?>
 </div>
-
diff --git a/components/com_tags/src/Service/Router.php b/components/com_tags/src/Service/Router.php
@@ -187,7 +187,7 @@ public function preprocess($query)
             }
         }
 
-        // TODO: Remove this whole block in 6.0 as it is a bug
+        // TODO: Remove this whole block in 7.0 as it is a bug
         if (!$this->sefparams->get('strictrouting', 0)) {
             // If not found, return language specific home link
             if (!isset($query['Itemid'])) {
diff --git a/installation/language/ms-MY/joomla.ini b/installation/language/ms-MY/joomla.ini
@@ -155,7 +155,7 @@ JERROR_LAYOUT_AN_OUT_OF_DATE_BOOKMARK_FAVOURITE="<strong>penanda buku/kegemaran
 JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST="Satu ralat telah berlaku semasa memproses permintaan anda."
 JERROR_LAYOUT_GO_TO_THE_HOME_PAGE="Pergi ke Halaman Utama"
 JERROR_LAYOUT_HOME_PAGE="Halaman Utama"
-; deprecated will be removed in 6.0
+; deprecated will be removed in 7.0
 JERROR_LAYOUT_MIS_TYPED_ADDRESS="<strong>alamat yang salah taip</strong>"
 JERROR_LAYOUT_MISTYPED_ADDRESS="<strong>alamat yang salah taip</strong>"
 JERROR_LAYOUT_NOT_ABLE_TO_VISIT="Anda mungkin tidak dapat melawat halaman ini kerana:"
diff --git a/layouts/joomla/form/field/radiobasic.php b/layouts/joomla/form/field/radiobasic.php
@@ -7,7 +7,7 @@
  * @copyright   (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  *
- * @deprecated  5.2 will be moved to the b/c plugin in 6.0 and removed in 7.0
+ * @deprecated  5.2 will be moved to the b/c plugin in 7.0 and removed in 7.0
  *
  */
 
diff --git a/libraries/src/Application/CMSApplication.php b/libraries/src/Application/CMSApplication.php
@@ -508,7 +508,7 @@ public function getCfg($varname, $default = null)
     {
         try {
             Log::add(
-                \sprintf('%s() is deprecated and will be removed in 6.0. Use Factory->getApplication()->get() instead.', __METHOD__),
+                \sprintf('%s() is deprecated and will be removed in 7.0. Use Factory->getApplication()->get() instead.', __METHOD__),
                 Log::WARNING,
                 'deprecated'
             );
diff --git a/libraries/src/Component/Router/Rules/MenuRules.php b/libraries/src/Component/Router/Rules/MenuRules.php
@@ -171,7 +171,7 @@ public function preprocess(&$query)
             }
         }
 
-        // TODO: Remove this whole block in 6.0 as it is a bug
+        // TODO: Remove this whole block in 7.0 as it is a bug
         if (!$this->sefparams->get('strictrouting', 0)) {
             // Check if the active menuitem matches the requested language
             if (
diff --git a/libraries/src/Console/FinderIndexCommand.php b/libraries/src/Console/FinderIndexCommand.php
@@ -246,7 +246,7 @@ private function configureIO(InputInterface $input, OutputInterface $output): vo
         try {
             $language = $this->getLanguage();
         } catch (\UnexpectedValueException) {
-            @trigger_error(\sprintf('Language must be set in 6.0 in %s', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(\sprintf('Language must be set in 7.0 in %s', __METHOD__), E_USER_DEPRECATED);
             $language = Factory::getLanguage();
         }
 
diff --git a/libraries/src/Form/Field/RadiobasicField.php b/libraries/src/Form/Field/RadiobasicField.php
@@ -19,7 +19,7 @@
  *
  * @since      4.0.0
  *
- * @deprecated 5.2 will be moved to the b/c plugin in 6.0 and removed in 7.0
+ * @deprecated 5.2 will be moved to the b/c plugin in 7.0 and removed in 7.0
  *             Use \Joomla\CMS\Form\Field\RadioField instead
  */
 class RadiobasicField extends ListField
diff --git a/libraries/src/Form/FormField.php b/libraries/src/Form/FormField.php
@@ -1120,7 +1120,7 @@ public function filter($value, $group = null, ?Registry $input = null)
                     return \call_user_func(explode('::', $filter), $value);
                 }
 
-                /** @deprecated Can be removed with Joomla 6.0 since the class alias is deprecated since Joomla 7.0*/
+                /** @deprecated Can be removed with Joomla 7.0 since the class alias is deprecated since Joomla 4.0*/
                 [$class, $method] = explode('::', $filter);
                 if ($class === 'JComponentHelper') {
                     throw new \UnexpectedValueException(
diff --git a/libraries/src/HTML/HTMLHelper.php b/libraries/src/HTML/HTMLHelper.php
@@ -90,7 +90,7 @@ protected static function extract($key)
 
         if (\count($parts) === 3) {
             @trigger_error(
-                'Support for a three segment service key is deprecated and will be removed in Joomla 6.0, use the service registry instead',
+                'Support for a three segment service key is deprecated and will be removed in Joomla 7.0, use the service registry instead',
                 E_USER_DEPRECATED
             );
         }
@@ -166,7 +166,7 @@ final public static function _(string $key, ...$methodArgs)
                     throw new \InvalidArgumentException(\sprintf('%s not found.', $className), 500);
                 }
 
-                // @deprecated with 5.0 remove with 6.0 or 7.0 (depends on other relevant code)
+                // @deprecated with 5.0 remove with 7.0 (depends on other relevant code)
                 $className = 'JHtml' . ucfirst($file);
 
                 \JLoader::register($className, $path);
@@ -1202,7 +1202,7 @@ public static function calendar($value, $name, $id, $format = '%Y-%m-%d', $attri
     public static function addIncludePath($path = '')
     {
         @trigger_error(
-            'Support for registering lookup paths is deprecated and will be removed in Joomla 6.0, use the service registry instead',
+            'Support for registering lookup paths is deprecated and will be removed in Joomla 7.0, use the service registry instead',
             E_USER_DEPRECATED
         );
 
diff --git a/libraries/src/Installer/InstallerAdapter.php b/libraries/src/Installer/InstallerAdapter.php
@@ -974,7 +974,7 @@ protected function setupScriptfile()
         // When none is set, then use the legacy way
         if (!$container->has(InstallerScriptInterface::class)) {
             @trigger_error(
-                'Legacy installer files are deprecated and will be removed in 6.0. Use a service provider instead.',
+                'Legacy installer files are deprecated and will be removed in 7.0. Use a service provider instead.',
                 E_USER_DEPRECATED
             );
 
diff --git a/libraries/src/Installer/LegacyInstallerScript.php b/libraries/src/Installer/LegacyInstallerScript.php
@@ -180,7 +180,7 @@ private function callOnScript(string $name, array $arguments): bool
             try {
                 $this->installerScript->setDatabase($this->getDatabase());
             } catch (DatabaseNotFoundException) {
-                @trigger_error(\sprintf('Database must be set, this will not be caught anymore in 6.0 in %s.', __METHOD__), E_USER_DEPRECATED);
+                @trigger_error(\sprintf('Database must be set, this will not be caught anymore in 7.0 in %s.', __METHOD__), E_USER_DEPRECATED);
                 $this->installerScript->setDatabase(Factory::getContainer()->get(DatabaseInterface::class));
             }
         }
diff --git a/libraries/src/MVC/Controller/BaseController.php b/libraries/src/MVC/Controller/BaseController.php
@@ -1228,7 +1228,7 @@ protected function prepareViewModel(ViewInterface $view)
      * Get the event dispatcher.
      *
      * The override was made to keep a backward compatibility for legacy component.
-     * TODO: Remove the override in 6.0
+     * TODO: Remove the override in 7.0
      *
      * @return  DispatcherInterface
      *
@@ -1239,7 +1239,7 @@ public function getDispatcher()
     {
         if (!$this->dispatcher) {
             @trigger_error(
-                \sprintf('Dispatcher for %s should be set through MVC factory. It will throw an exception in 6.0', __CLASS__),
+                \sprintf('Dispatcher for %s should be set through MVC factory. It will throw an exception in 7.0', __CLASS__),
                 E_USER_DEPRECATED
             );
 
diff --git a/libraries/src/MVC/Model/BaseDatabaseModel.php b/libraries/src/MVC/Model/BaseDatabaseModel.php
@@ -105,7 +105,7 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null)
         $db = \array_key_exists('dbo', $config) ? $config['dbo'] : Factory::getDbo();
 
         if ($db) {
-            @trigger_error('Database is not available in constructor in 6.0.', E_USER_DEPRECATED);
+            @trigger_error('Database is not available in constructor in 7.0.', E_USER_DEPRECATED);
             $this->setDatabase($db);
 
             // Is needed, when models use the deprecated MVC DatabaseAwareTrait, as the trait is overriding the local functions
diff --git a/libraries/src/MVC/Model/FormModel.php b/libraries/src/MVC/Model/FormModel.php
@@ -199,7 +199,7 @@ public function validate($form, $data, $group = null)
 
         if (!empty($dispatcher->getListeners('onUserBeforeDataValidation'))) {
             @trigger_error(
-                'The `onUserBeforeDataValidation` event is deprecated and will be removed in 6.0.'
+                'The `onUserBeforeDataValidation` event is deprecated and will be removed in 7.0.'
                 . 'Use the `onContentBeforeValidateData` event instead.',
                 E_USER_DEPRECATED
             );
diff --git a/libraries/src/MVC/Model/WorkflowBehaviorTrait.php b/libraries/src/MVC/Model/WorkflowBehaviorTrait.php
@@ -83,7 +83,7 @@ public function setUpWorkflow($extension)
         if (method_exists($this, 'getDatabase')) {
             $db = $this->getDatabase();
         } else {
-            @trigger_error('From 6.0 implementing the getDatabase method will be mandatory.', E_USER_DEPRECATED);
+            @trigger_error('From 7.0 implementing the getDatabase method will be mandatory.', E_USER_DEPRECATED);
             $db = Factory::getContainer()->get(DatabaseDriver::class);
         }
 
diff --git a/libraries/src/MVC/View/AbstractView.php b/libraries/src/MVC/View/AbstractView.php
@@ -308,7 +308,7 @@ public function getDispatcher()
     {
         if (!$this->dispatcher) {
             @trigger_error(
-                \sprintf('Dispatcher for %s should be set through MVC factory. It will throw an exception in 6.0', __CLASS__),
+                \sprintf('Dispatcher for %s should be set through MVC factory. It will throw an exception in 7.0', __CLASS__),
                 E_USER_DEPRECATED
             );
 
diff --git a/libraries/src/String/PunycodeHelper.php b/libraries/src/String/PunycodeHelper.php
@@ -196,7 +196,7 @@ public static function urlToUTF8($uri)
     public static function emailToPunycode($email)
     {
         if ($email === null) {
-            @trigger_error(\sprintf('Passing null value is deprecated in %s and will throw an exception in 6.0.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(\sprintf('Passing null value is deprecated in %s and will throw an exception in 7.0.', __METHOD__), E_USER_DEPRECATED);
             return '';
         }
 
diff --git a/libraries/src/Table/Table.php b/libraries/src/Table/Table.php
@@ -333,7 +333,7 @@ public static function getInstance($type, $prefix = 'JTable', $config = [])
             /*
             * If unable to find the class file in the Table include paths. Return false.
             * The warning JLIB_DATABASE_ERROR_NOT_SUPPORTED_FILE_NOT_FOUND has been removed in 3.6.3.
-            * In 6.0 an Exception (type to be determined) will be thrown.
+            * in 7.0 an Exception (type to be determined) will be thrown.
             * For more info see https://github.com/joomla/joomla-cms/issues/11570
             */
 
diff --git a/libraries/src/Tag/TaggableTableTrait.php b/libraries/src/Tag/TaggableTableTrait.php
@@ -28,7 +28,7 @@ trait TaggableTableTrait
      * @var    TagsHelper
      * @since  4.0.0
      * @note   The tags helper property is set to public for backwards compatibility for Joomla 4.0. It will be made a
-     *         protected property in Joomla 6.0
+     *         protected property in Joomla 7.0
      */
     public $tagsHelper;
 
diff --git a/libraries/src/Toolbar/Button/PopupButton.php b/libraries/src/Toolbar/Button/PopupButton.php
@@ -150,7 +150,7 @@ protected function renderButton(array &$options): string
         }
 
         @trigger_error(
-            'Use of BS Modal is deprecated in Joomla\CMS\Toolbar\Button\PopupButton, and will be removed in 6.0',
+            'Use of BS Modal is deprecated in Joomla\CMS\Toolbar\Button\PopupButton, and will be removed in 7.0',
             E_USER_DEPRECATED
         );
 
diff --git a/libraries/src/Toolbar/Toolbar.php b/libraries/src/Toolbar/Toolbar.php
@@ -147,7 +147,7 @@ public static function getInstance($name = 'toolbar')
     {
         $toolbar = Factory::getApplication()->getDocument()->getToolbar($name);
 
-        // @todo b/c remove with Joomla 7.0 or removed in 6.0 with this function
+        // @todo b/c remove with Joomla 7.0 or removed in 7.0 with this function
         if (empty(self::$instances[$name])) {
             self::$instances[$name] = $toolbar;
         }
diff --git a/libraries/src/User/CurrentUserTrait.php b/libraries/src/User/CurrentUserTrait.php
@@ -32,7 +32,7 @@ trait CurrentUserTrait
 
     /**
      * Returns the current user, if none is set the identity of the global app
-     * is returned. This will change in 6.0 and an empty user will be returned.
+     * is returned. This will change in 7.0 and an empty user will be returned.
      *
      * @return  User
      *
@@ -42,7 +42,7 @@ protected function getCurrentUser(): User
     {
         if (!$this->currentUser) {
             @trigger_error(
-                \sprintf('User must be set in %s. This will not be caught anymore in 6.0', __METHOD__),
+                \sprintf('User must be set in %s. This will not be caught anymore in 7.0', __METHOD__),
                 E_USER_DEPRECATED
             );
             $this->currentUser = Factory::getApplication()->getIdentity() ?: Factory::getUser();
diff --git a/libraries/src/Workflow/Workflow.php b/libraries/src/Workflow/Workflow.php
@@ -111,7 +111,7 @@ public function __construct(string $extension, ?CMSApplicationInterface $app = n
 
         // Initialise default objects if none have been provided
         if ($app === null) {
-            @trigger_error('From 6.0 declaring the app dependency will be mandatory.', E_USER_DEPRECATED);
+            @trigger_error('From 7.0 declaring the app dependency will be mandatory.', E_USER_DEPRECATED);
             $app = Factory::getApplication();
         }
 
@@ -122,7 +122,7 @@ public function __construct(string $extension, ?CMSApplicationInterface $app = n
         $this->app = $app;
 
         if ($db === null) {
-            @trigger_error('From 6.0 declaring the database dependency will be mandatory.', E_USER_DEPRECATED);
+            @trigger_error('From 7.0 declaring the database dependency will be mandatory.', E_USER_DEPRECATED);
             $db = Factory::getContainer()->get(DatabaseDriver::class);
         }
 
diff --git a/media_source/system/js/fields/validate.es6.js b/media_source/system/js/fields/validate.es6.js
@@ -315,7 +315,7 @@ document.formvalidator = new JFormValidator();
 
 /**
  * Expose the classes to the global scope
- * These will be removed in Joomla! 6.0
+ * These will be removed in Joomla! 7.0
  */
 window.JFormValidator = JFormValidator;
 window.punycode = punycode;
diff --git a/plugins/behaviour/compat6/classes/Application/BaseApplication.php b/plugins/behaviour/compat6/classes/Application/BaseApplication.php
@@ -24,7 +24,7 @@
  *
  * @since       3.0.0
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Application classes should directly be based on \Joomla\Application\AbstractApplication
  *              don't use this class anymore
  */
diff --git a/plugins/behaviour/compat6/classes/Application/CLI/CliInput.php b/plugins/behaviour/compat6/classes/Application/CLI/CliInput.php
@@ -18,7 +18,7 @@
  *
  * @since       4.0.0
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use the `joomla/console` package instead
  */
 class CliInput
diff --git a/plugins/behaviour/compat6/classes/Application/CLI/CliOutput.php b/plugins/behaviour/compat6/classes/Application/CLI/CliOutput.php
@@ -20,7 +20,7 @@
  *
  * @since       4.0.0
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use the `joomla/console` package instead
  */
 abstract class CliOutput
diff --git a/plugins/behaviour/compat6/classes/Application/CLI/ColorStyle.php b/plugins/behaviour/compat6/classes/Application/CLI/ColorStyle.php
@@ -18,7 +18,7 @@
  *
  * @since       4.0.0
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use the `joomla/console` package instead
  */
 final class ColorStyle
diff --git a/plugins/behaviour/compat6/classes/Application/CLI/Output/Processor/ColorProcessor.php b/plugins/behaviour/compat6/classes/Application/CLI/Output/Processor/ColorProcessor.php
@@ -20,7 +20,7 @@
  *
  * @since       4.0.0
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use the `joomla/console` package instead
  */
 class ColorProcessor implements ProcessorInterface
diff --git a/plugins/behaviour/compat6/classes/Application/CLI/Output/Processor/ProcessorInterface.php b/plugins/behaviour/compat6/classes/Application/CLI/Output/Processor/ProcessorInterface.php
@@ -18,7 +18,7 @@
  *
  * @since       4.0.0
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use the `joomla/console` package instead
  */
 interface ProcessorInterface
diff --git a/plugins/behaviour/compat6/classes/Application/CLI/Output/Stdout.php b/plugins/behaviour/compat6/classes/Application/CLI/Output/Stdout.php
@@ -20,7 +20,7 @@
  *
  * @since       4.0.0
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use the `joomla/console` package instead
  */
 class Stdout extends CliOutput
diff --git a/plugins/behaviour/compat6/classes/Application/CLI/Output/Xml.php b/plugins/behaviour/compat6/classes/Application/CLI/Output/Xml.php
diff --git a/plugins/behaviour/compat6/classes/Application/CliApplication.php b/plugins/behaviour/compat6/classes/Application/CliApplication.php
diff --git a/plugins/behaviour/compat6/classes/Filesystem/File.php b/plugins/behaviour/compat6/classes/Filesystem/File.php
diff --git a/plugins/behaviour/compat6/classes/Filesystem/FilesystemHelper.php b/plugins/behaviour/compat6/classes/Filesystem/FilesystemHelper.php
diff --git a/plugins/behaviour/compat6/classes/Filesystem/Folder.php b/plugins/behaviour/compat6/classes/Filesystem/Folder.php
diff --git a/plugins/behaviour/compat6/classes/Filesystem/Patcher.php b/plugins/behaviour/compat6/classes/Filesystem/Patcher.php
diff --git a/plugins/behaviour/compat6/classes/Filesystem/Path.php b/plugins/behaviour/compat6/classes/Filesystem/Path.php
diff --git a/plugins/behaviour/compat6/classes/Filesystem/Stream.php b/plugins/behaviour/compat6/classes/Filesystem/Stream.php
diff --git a/plugins/behaviour/compat6/classes/Filesystem/Streams/StreamString.php b/plugins/behaviour/compat6/classes/Filesystem/Streams/StreamString.php
diff --git a/plugins/behaviour/compat6/classes/Filesystem/Support/StringController.php b/plugins/behaviour/compat6/classes/Filesystem/Support/StringController.php
diff --git a/plugins/behaviour/compat6/classes/Input/Cookie.php b/plugins/behaviour/compat6/classes/Input/Cookie.php
diff --git a/plugins/behaviour/compat6/classes/Input/Files.php b/plugins/behaviour/compat6/classes/Input/Files.php
diff --git a/plugins/behaviour/compat6/classes/Input/Input.php b/plugins/behaviour/compat6/classes/Input/Input.php
diff --git a/plugins/behaviour/compat6/classes/Input/Json.php b/plugins/behaviour/compat6/classes/Input/Json.php

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ public function preprocess($query)`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`
`190`		`- // TODO: Remove this whole block in 6.0 as it is a bug`
	`190`	`+ // TODO: Remove this whole block in 7.0 as it is a bug`
`191`	`191`	`if (!$this->sefparams->get('strictrouting', 0)) {`
`192`	`192`	`// If not found, return language specific home link`
`193`	`193`	`if (!isset($query['Itemid'])) {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* @copyright (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>`
`8`	`8`	`* @license GNU General Public License version 2 or later; see LICENSE.txt`
`9`	`9`	`*`
`10`		`- * @deprecated 5.2 will be moved to the b/c plugin in 6.0 and removed in 7.0`
	`10`	`+ * @deprecated 5.2 will be moved to the b/c plugin in 7.0 and removed in 7.0`
`11`	`11`	`*`
`12`	`12`	`*/`
`13`	`13`