Issue #3048495 by jonathan1055, quietone, rajandro, Spokje, Pooja Ganjage,...

Issue #3048495 by jonathan1055, quietone, rajandro, Spokje, Pooja Ganjage, andypost, kishor_kolekar, msuthars, munish.kumar, ankithashetty, ayushmishra206, ravi.shankar, naveenvalecha, longwave, Gábor Hojtsy, alexpott, smustgrave, Lendude, xjm, adityasingh, daffie: Fix Drupal.Semantics.FunctionTriggerError coding standard

core/modules/system/tests/modules/deprecation_test/deprecation_test.module

@@ -17,6 +17,7 @@
  * @see https://www.drupal.org/project/drupal/issues/2870194
  */
 function deprecation_test_function() {
+  // phpcs:ignore Drupal.Semantics.FunctionTriggerError
   @trigger_error('This is the deprecation message for deprecation_test_function().', E_USER_DEPRECATED);
   return 'known_return_value';
 }

core/modules/system/tests/modules/deprecation_test/src/Deprecation/DrupalStandardsListenerDeprecatedClass.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\deprecation_test\Deprecation;
 
+// phpcs:ignore Drupal.Semantics.FunctionTriggerError
 @trigger_error(__NAMESPACE__ . '\DrupalStandardsListenerDeprecatedClass is deprecated.', E_USER_DEPRECATED);
 
 /**

core/modules/system/tests/modules/deprecation_test/src/Deprecation/FixtureDeprecatedClass.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\deprecation_test\Deprecation;
 
+// phpcs:ignore Drupal.Semantics.FunctionTriggerError
 @trigger_error(__NAMESPACE__ . '\FixtureDeprecatedClass is deprecated.', E_USER_DEPRECATED);
 
 /**

core/modules/system/tests/modules/test_page_test/src/Controller/Test.php

@@ -226,7 +226,9 @@ public function renderPageWithoutDuplicateIds() {
   public function deprecations() {
     // Create 2 identical deprecation messages. This should only trigger a
     // single response header.
+    // phpcs:ignore Drupal.Semantics.FunctionTriggerError
     @trigger_error('Test deprecation message', E_USER_DEPRECATED);
+    // phpcs:ignore Drupal.Semantics.FunctionTriggerError
     @trigger_error('Test deprecation message', E_USER_DEPRECATED);
     return [
       '#markup' => 'Content that triggers deprecation messages',

core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php

@@ -625,7 +625,7 @@ public function testReferencedEntity() {
    * @see https://www.drupal.org/node/3354596
    */
   protected function createCacheId(array $keys, array $contexts) {
-    @trigger_error(__FUNCTION__ . '() is deprecated in drupal:10.2.0 and is removed from drupal:11.0.0. There is no replacement. See: https://www.drupal.org/project/drupal/issues/2551419.', E_USER_DEPRECATED);
+    @trigger_error(__FUNCTION__ . '() is deprecated in drupal:10.2.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3354596', E_USER_DEPRECATED);
     $cid_parts = $keys;
 
     $contexts = \Drupal::service('cache_contexts_manager')->convertTokensToKeys($contexts);

core/modules/tour/src/TourTipPluginInterface.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\tour;
 
-@trigger_error('The ' . __NAMESPACE__ . '\TourTipPluginInterface is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Implement ' . __NAMESPACE__ . '\TipPluginInterface instead. See https://www.drupal.org/node/3340701.', E_USER_DEPRECATED);
+@trigger_error('The ' . __NAMESPACE__ . '\TourTipPluginInterface is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Implement ' . __NAMESPACE__ . '\TipPluginInterface instead. See https://www.drupal.org/node/3340701', E_USER_DEPRECATED);
 
 /**
  * Defines an interface for tour items.

core/modules/tour/tests/src/Kernel/TourTipLegacyTest.php

@@ -15,7 +15,7 @@ class TourTipLegacyTest extends TestCase {
   use ExpectDeprecationTrait;
 
   public function testPluginHelperDeprecation(): void {
-    $this->expectDeprecation('The Drupal\tour\TourTipPluginInterface is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Implement Drupal\tour\TipPluginInterface instead. See https://www.drupal.org/node/3340701.');
+    $this->expectDeprecation('The Drupal\tour\TourTipPluginInterface is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Implement Drupal\tour\TipPluginInterface instead. See https://www.drupal.org/node/3340701');
     $plugin = $this->createMock(TourTipPluginInterface::class);
     $this->assertInstanceOf(TourTipPluginInterface::class, $plugin);
   }

core/modules/workspaces/src/WorkspaceOperationFactory.php

@@ -85,7 +85,7 @@ public function __construct(EntityTypeManagerInterface $entity_type_manager, Con
     $this->workspaceAssociation = $workspace_association;
     $this->cacheTagsInvalidator = $cache_tags_invalidator;
     if (!$event_dispatcher) {
-      @trigger_error('The event dispatcher service should be passed to WorkspaceOperationFactory::__construct() since 10.1.0. This will be required in Drupal 11.0.0.', E_USER_DEPRECATED);
+      @trigger_error('Calling ' . __METHOD__ . '() without the $event_dispatcher argument is deprecated in drupal:10.1.0 and it will be required in drupal:11.0.0. See https://www.drupal.org/node/3242573', E_USER_DEPRECATED);
       $event_dispatcher = \Drupal::service('event_dispatcher');
     }
     $this->eventDispatcher = $event_dispatcher;

core/phpcs.xml.dist

@@ -123,6 +123,7 @@
   <rule ref="Drupal.Semantics.FunctionT">
     <exclude name="Drupal.Semantics.FunctionT.NotLiteralString"/>
   </rule>
+  <rule ref="Drupal.Semantics.FunctionTriggerError"/>
   <rule ref="Drupal.Semantics.FunctionWatchdog"/>
   <rule ref="Drupal.Semantics.InstallHooks"/>
   <rule ref="Drupal.Semantics.LStringTranslatable"/>

core/tests/Drupal/FunctionalJavascriptTests/WebDriverTestBase.php

@@ -112,6 +112,7 @@ protected function tearDown(): void {
       $warnings = $this->getSession()->evaluateScript("JSON.parse(sessionStorage.getItem('js_testing_log_test.warnings') || JSON.stringify([]))");
       foreach ($warnings as $warning) {
         if (str_starts_with($warning, '[Deprecation]')) {
+          // phpcs:ignore Drupal.Semantics.FunctionTriggerError
           @trigger_error('Javascript Deprecation:' . substr($warning, 13), E_USER_DEPRECATED);
         }
       }

core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php

@@ -545,16 +545,16 @@ public function testResourceDeprecation() {
     $image = imagecreate(10, 10);
     $this->expectDeprecation('Drupal\system\Plugin\ImageToolkit\GDToolkit::setResource() is deprecated in drupal:10.2.0 and is removed from drupal:11.0.0. Use \Drupal\system\Plugin\ImageToolkit\GDToolkit::setImage() instead. See https://www.drupal.org/node/3265963');
     $toolkit->setResource($image);
-    $this->expectDeprecation('Checking the \Drupal\system\Plugin\ImageToolkit\GDToolkit::resource property is deprecated in drupal:10.2.0 and is removed from drupal:11.0.0. Use \Drupal\system\Plugin\ImageToolkit\GDToolkit::image instead.');
+    $this->expectDeprecation('Checking the \Drupal\system\Plugin\ImageToolkit\GDToolkit::resource property is deprecated in drupal:10.2.0 and is removed from drupal:11.0.0. Use \Drupal\system\Plugin\ImageToolkit\GDToolkit::image instead. See https://www.drupal.org/node/3265963');
     $this->assertTrue(isset($toolkit->resource));
     $this->expectDeprecation('Drupal\system\Plugin\ImageToolkit\GDToolkit::getResource() is deprecated in drupal:10.2.0 and is removed from drupal:11.0.0. Use \Drupal\system\Plugin\ImageToolkit\GDToolkit::getImage() instead. See https://www.drupal.org/node/3265963');
     $this->assertSame($image, $toolkit->getResource());
-    $this->expectDeprecation('Accessing the \Drupal\system\Plugin\ImageToolkit\GDToolkit::resource property is deprecated in drupal:10.2.0 and is removed from drupal:11.0.0. Use \Drupal\system\Plugin\ImageToolkit\GDToolkit::image instead.');
+    $this->expectDeprecation('Accessing the \Drupal\system\Plugin\ImageToolkit\GDToolkit::resource property is deprecated in drupal:10.2.0 and is removed from drupal:11.0.0. Use \Drupal\system\Plugin\ImageToolkit\GDToolkit::image instead. See https://www.drupal.org/node/3265963');
     $this->assertSame($image, $toolkit->resource);
-    $this->expectDeprecation('Setting the \Drupal\system\Plugin\ImageToolkit\GDToolkit::resource property is deprecated in drupal:10.2.0 and is removed from drupal:11.0.0. Use \Drupal\system\Plugin\ImageToolkit\GDToolkit::image instead.');
+    $this->expectDeprecation('Setting the \Drupal\system\Plugin\ImageToolkit\GDToolkit::resource property is deprecated in drupal:10.2.0 and is removed from drupal:11.0.0. Use \Drupal\system\Plugin\ImageToolkit\GDToolkit::image instead. See https://www.drupal.org/node/3265963');
     $toolkit->resource = NULL;
     $this->assertNull($toolkit->getImage());
-    $this->expectDeprecation('Unsetting the \Drupal\system\Plugin\ImageToolkit\GDToolkit::resource property is deprecated in drupal:10.2.0 and is removed from drupal:11.0.0. Use \Drupal\system\Plugin\ImageToolkit\GDToolkit::image instead.');
+    $this->expectDeprecation('Unsetting the \Drupal\system\Plugin\ImageToolkit\GDToolkit::resource property is deprecated in drupal:10.2.0 and is removed from drupal:11.0.0. Use \Drupal\system\Plugin\ImageToolkit\GDToolkit::image instead. See https://www.drupal.org/node/3265963');
     $toolkit->setImage($image);
     unset($toolkit->resource);
     $this->assertNull($toolkit->getImage());

core/tests/Drupal/Tests/Component/Plugin/PluginHelperLegacyTest.php

@@ -16,7 +16,7 @@ class PluginHelperLegacyTest extends TestCase {
   use ExpectDeprecationTrait;
 
   public function testPluginHelperDeprecation(): void {
-    $this->expectDeprecation('The Drupal\Component\Plugin\PluginHelper is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Instead, use instanceof() to check for \Drupal\Component\Plugin\ConfigurableInterface. See http://drupal.org/node/3198285');
+    $this->expectDeprecation('The Drupal\Component\Plugin\PluginHelper is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Instead, use instanceof() to check for \Drupal\Component\Plugin\ConfigurableInterface. See https://www.drupal.org/node/3198285');
     $this->assertEquals($this instanceof ConfigurableInterface, PluginHelper::isConfigurable($this));
     $plugin = $this->createMock(ConfigurableInterface::class);
     $this->assertEquals($plugin instanceof ConfigurableInterface, PluginHelper::isConfigurable($plugin));

core/tests/Drupal/Tests/Core/Cache/CacheTest.php

@@ -192,7 +192,7 @@ public function testBuildTags($prefix, array $suffixes, array $expected, $glue =
    * @group legacy
    */
   public function testKeyFromQuery() {
-    $this->expectDeprecation('Drupal\Core\Cache\Cache::keyFromQuery is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. No replacement provided. https://www.drupal.org/node/3322044');
+    $this->expectDeprecation('Drupal\Core\Cache\Cache::keyFromQuery is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. No replacement provided. See https://www.drupal.org/node/3322044');
     $query = new Select(new StubConnection(new StubPDO(), []), 'dne');
     Cache::keyFromQuery($query);
   }

core/tests/Drupal/Tests/Core/Utility/TokenTest.php

@@ -335,7 +335,7 @@ public function testScan() {
    * @group legacy
    */
   public function testScanDeprecation() {
-    $this->expectDeprecation('Calling Drupal\Core\Utility\Token::scan() with a $text parameter of type other than string is deprecated in drupal:10.1.0, a typehint will be added in drupal:11.0.0. See https://www.drupal.org/node/3334317');
+    $this->expectDeprecation('Calling Drupal\Core\Utility\Token::scan() with a $text parameter of type other than string is deprecated in drupal:10.1.0 and will cause an error in drupal:11.0.0. See https://www.drupal.org/node/3334317');
     $this->assertSame([], $this->token->scan(NULL));
   }
 

core/tests/Drupal/Tests/ExpectDeprecationTest.php

@@ -19,6 +19,7 @@ class ExpectDeprecationTest extends TestCase {
    */
   public function testExpectDeprecation() {
     $this->expectDeprecation('Test deprecation');
+    // phpcs:ignore Drupal.Semantics.FunctionTriggerError
     @trigger_error('Test deprecation', E_USER_DEPRECATED);
   }
 
@@ -30,6 +31,7 @@ public function testExpectDeprecation() {
    */
   public function testExpectDeprecationInIsolation() {
     $this->expectDeprecation('Test isolated deprecation');
+    // phpcs:ignore Drupal.Semantics.FunctionTriggerError
     @trigger_error('Test isolated deprecation', E_USER_DEPRECATED);
   }
 

core/tests/Drupal/Tests/Listeners/DrupalListener.php

@@ -54,7 +54,7 @@ public function startTest(Test $test): void {
     // Check for incorrect visibility of the $modules property.
     $class = new \ReflectionClass($test);
     if ($class->hasProperty('modules') && !$class->getProperty('modules')->isProtected()) {
-      @trigger_error('The ' . get_class($test) . '::$modules property must be declared protected. See https://www.drupal.org/node/2909426', E_USER_DEPRECATED);
+      @trigger_error('Declaring ' . get_class($test) . '::$modules with public visibility is deprecated in drupal:9.1.0 and must be declared protected in drupal:10.0.0. See https://www.drupal.org/node/2909426', E_USER_DEPRECATED);
     }
   }