[5.4] Extend deprecation for editors and captcha to 7

libraries/src/Captcha/Captcha.php

@@ -86,7 +86,7 @@ public function __construct($captcha, $options)
             $this->provider = $registry->get($captcha);
         } else {
             @trigger_error(
-                'Use of legacy Captcha is deprecated. Use onCaptchaSetup event to register your Captcha provider.',
+                'Use of legacy Captcha is deprecated. Use onCaptchaSetup event to register your Captcha provider. Will be removed in 7.0.',
                 E_USER_DEPRECATED
             );
 
@@ -130,10 +130,10 @@ public static function getInstance($captcha, array $options = [])
      *
      * @return  boolean  True on success
      *
-     * @since   2.5
      * @throws  \RuntimeException
      *
-     * @deprecated  Without replacement
+     * @since   2.5
+     * @deprecated  Without replacement. Will be removed in 7.0.
      */
     public function initialise($id)
     {
@@ -253,7 +253,7 @@ public function setupField(CaptchaField $field, \SimpleXMLElement $element)
      *
      * @since   4.0.0
      *
-     * @deprecated  Without replacement
+     * @deprecated  Without replacement. Will be removed in 7.0.
      */
     private function update($name, &$args)
     {
@@ -271,10 +271,10 @@ private function update($name, &$args)
      *
      * @return  void
      *
-     * @since   2.5
      * @throws  \RuntimeException
      *
-     * @deprecated  Should use CaptchaRegistry
+     * @since   2.5
+     * @deprecated  Should use CaptchaRegistry. Will be removed in 7.0.
      */
     private function _load(array $options = [])
     {

libraries/src/Editor/Button/Button.php

@@ -79,7 +79,7 @@ public function get(string $name, $default = null)
     {
         if ($name === 'options') {
             @trigger_error(
-                'Accessing options property is deprecated. To access the Button options use getOptions() method.',
+                'Accessing options property is deprecated. To access the Button options use getOptions() method. Will be removed in 7.0.',
                 \E_USER_DEPRECATED
             );
 
@@ -102,7 +102,7 @@ public function set(string $name, $value): ButtonInterface
     {
         if ($name === 'options') {
             @trigger_error(
-                'Accessing options property is deprecated. To set the Button options use setOptions() method.',
+                'Accessing options property is deprecated. To set the Button options use setOptions() method.  Will be removed in 7.0.',
                 \E_USER_DEPRECATED
             );
 
@@ -148,11 +148,11 @@ public function setOptions(array $options): ButtonInterface
      * @return string|null A value if the property name is valid, null otherwise.
      *
      * @since       5.0.0
-     * @deprecated  6.0  This is a B/C proxy for deprecated read accesses
+     * @deprecated  7.0  This is a B/C proxy for deprecated read accesses
      */
     public function __get($name)
     {
-        @trigger_error('Property access is deprecated in Joomla\CMS\Editor\Button class, use get/set methods.', \E_USER_DEPRECATED);
+        @trigger_error('Property access is deprecated in Joomla\CMS\Editor\Button class, use get/set methods. Will be removed in 7.0.', \E_USER_DEPRECATED);
 
         return $this->get($name);
     }
@@ -166,11 +166,11 @@ public function __get($name)
      * @return void
      *
      * @since       5.0.0
-     * @deprecated  6.0  This is a B/C proxy for deprecated write accesses
+     * @deprecated  7.0  This is a B/C proxy for deprecated write accesses
      */
     public function __set($name, $value)
     {
-        @trigger_error('Property access is deprecated in Joomla\CMS\Editor\Button class, use get/set methods.', \E_USER_DEPRECATED);
+        @trigger_error('Property access is deprecated in Joomla\CMS\Editor\Button class, use get/set methods. Will be removed in 7.0.', \E_USER_DEPRECATED);
 
         $this->set($name, $value);
     }

libraries/src/Editor/Button/ButtonsRegistry.php

@@ -121,7 +121,7 @@ public function initRegistry(array $options = []): ButtonsRegistryInterface
                 continue;
             }
 
-            @trigger_error('6.0 Button "' . $plugin->name . '" instance should be set up onEditorButtonsSetup event.', \E_USER_DEPRECATED);
+            @trigger_error('7.0 Button "' . $plugin->name . '" instance should be set up onEditorButtonsSetup event.', \E_USER_DEPRECATED);
 
             // Transform Legacy buttons to Button object
             if ($legacyButton instanceof CMSObject || $legacyButton instanceof Registry) {

libraries/src/Editor/Editor.php

@@ -104,7 +104,7 @@ public function __construct(string $editor = 'none', ?DispatcherInterface $dispa
         } else {
             // Fallback to legacy editor logic
             @trigger_error(
-                '6.0 Discovering an editor "' . $this->_name . '" outside of EditorsRegistry is deprecated.',
+                '7.0 Discovering an editor "' . $this->_name . '" outside of EditorsRegistry is deprecated.',
                 \E_USER_DEPRECATED
             );
 
@@ -120,7 +120,7 @@ public function __construct(string $editor = 'none', ?DispatcherInterface $dispa
                 'getButtons',
                 function (AbstractEvent $event) {
                     @trigger_error(
-                        '6.0 Use Button "getButtons" event is deprecated,  buttons should be set up onEditorButtonsSetup event.',
+                        '7.0 Use Button "getButtons" event is deprecated,  buttons should be set up onEditorButtonsSetup event.',
                         \E_USER_DEPRECATED
                     );
 
@@ -161,7 +161,7 @@ public static function getInstance($editor = 'none')
      *
      * @since   1.5
      *
-     * @deprecated  6.0 Without replacement
+     * @deprecated  7.0 Without replacement
      */
     public function initialise()
     {
@@ -174,7 +174,7 @@ public function initialise()
             return;
         }
 
-        @trigger_error('6.0 Method onInit() for Editor instance is deprecated, without replacement.', \E_USER_DEPRECATED);
+        @trigger_error('7.0 Method onInit() for Editor instance is deprecated, without replacement.', \E_USER_DEPRECATED);
 
         if (method_exists($this->_editor, 'onInit')) {
             \call_user_func([$this->_editor, 'onInit']);
@@ -316,7 +316,7 @@ public function getButtons($editor, $buttons = true)
      *
      * @since   1.5
      *
-     * @deprecated  6.0 Should use EditorRegistry
+     * @deprecated  7.0 Should use EditorRegistry
      */
     protected function _loadEditor($config = [])
     {
@@ -325,7 +325,7 @@ protected function _loadEditor($config = [])
             return false;
         }
 
-        @trigger_error('6.0 Editor "' . $this->_name . '" instance should be set up onEditorSetup event.', \E_USER_DEPRECATED);
+        @trigger_error('7.0 Editor "' . $this->_name . '" instance should be set up onEditorSetup event.', \E_USER_DEPRECATED);
 
         // Build the path to the needed editor plugin
         $name = InputFilter::getInstance()->clean($this->_name, 'cmd');

phpstan-baseline.neon

@@ -11479,7 +11479,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method _load\(\) of class Joomla\\CMS\\Captcha\\Captcha\:
-				Should use CaptchaRegistry$#
+				Should use CaptchaRegistry\. Will be removed in 7\.0\.$#
 			'''
 			identifier: method.deprecated
 			count: 1

plugins/editors/tinymce/src/Extension/TinyMCE.php

@@ -39,7 +39,7 @@ final class TinyMCE extends CMSPlugin implements SubscriberInterface, Dispatcher
     use DatabaseAwareTrait;
     use DispatcherAwareTrait;
 
-    // @todo: KnownButtons, ToolbarPresets for backward compatibility. Remove in Joomla 6
+    // @todo: KnownButtons, ToolbarPresets for backward compatibility. Remove in Joomla 7
     use KnownButtons;
     use ToolbarPresets;