Fix AssertHelperTrait deprecation

Deprecated the trait, but this breaks the test; the autoloader triggers the deprecation and I can't figure out how to add an expectation for it.

Also spotted a typo in the existing AssertHelperTraitTest, probably should spin that out to a new issue.

I am not sure if this works.

Thanks! This solution works and while it is a bit convoluted, it is only in test code that is to be removed so I don't see any issue with it. It also provides a pattern for us to use again if we need to.

+++ b/core/tests/Drupal/TestTools/AssertHelperTestClass.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Drupal\TestTools;
+
+use Drupal\Tests\AssertHelperTrait;
+
+/**
+ * A helper class for deprecation of AssertHelperTrait.
+ *
+ * @todo remove this class in Drupal 10.
+ *
+ * @internal
+ */
+class AssertHelperTestClass {
+  use AssertHelperTrait;
+
+  public function testMethod($value) {
+    return $this->castSafeStrings($value);
+  }
+
+}

+++ b/core/tests/Drupal/Tests/AssertHelperTrait.php
--- a/core/tests/Drupal/Tests/AssertHelperTraitTest.php
+++ b/core/tests/Drupal/Tests/AssertHelperTraitTest.php

+++ b/core/tests/Drupal/Tests/AssertHelperTraitTest.php
@@ -3,6 +3,7 @@
+use Drupal\TestTools\AssertHelperTestClass;

Let's not put this in TestTools - it's not necessary as far as I know. And this is not a test tool. I think this can go in core/tests/Drupal/Tests/fixtures.

Made the changes asked in #13. Please review.

I am sorry, please ignore the previous patch.

--- /dev/null
+++ b/core/tests/Drupal/TestTools/AssertHelperTestClass.php

@@ -0,0 +1,19 @@
+use Drupal\Tests\AssertHelperTrait;

@@ -3,6 +3,7 @@
+use Drupal\TestTools\AssertHelperTestClass;

We need to move the class to core/tests/Drupal/Tests/fixtures (note the directory needs to be created) and the namespace needs to be changed to namespace Drupal\Tests\fixtures; and therefore the use needs to be changed.

You can run core/tests/Drupal/Tests/AssertHelperTraitTest.php test before uploading to check you have everything correct.

Rerolled the patch in #20. Thanks!

+++ b/core/tests/Drupal/Tests/AssertHelperTraitTest.php
@@ -12,10 +12,18 @@
-   * @expectDeprecation AssertHelperTrait::castSafeStrings() is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. There is no replacement; assertEquals() will automatically cast MarkupInterface to strings when needed. See https://www.drupal.org/node/3123638
+   * @expectedDeprecation AssertHelperTrait::castSafeStrings() is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. There is no replacement; assertEquals() will automatically cast MarkupInterface to strings when needed. See https://www.drupal.org/node/3123638

@ankithashetty: You missed this change is your reroll.

Hi @daffie, the code that you mentioned in #25 has been updated in this issue #3172438: Since symfony/phpunit-bridge 5.1: Using "@expectedDeprecation" annotations in tests is deprecated, use the "ExpectDeprecationTrait::expectDeprecation()" method instead.. So, I think it's no longer required. Updated the patch accordingly. Thank you...

Hi,

I've applied the patch in #26 and it applied cleanly. But the file(core/tests/fixtures/AssertHelperTestClass.php) which is created as being part of this is having a 'use' statement that is not being used. which caused the Custom Commands Failure.

I removed that line. Please review.

The deprecation in the patch needs to be updated to 9.2.

Hi, Corrected that to 9.2.

Please review.

+++ b/core/tests/Drupal/Tests/AssertHelperTrait.php
@@ -4,8 +4,15 @@
+@trigger_error(__NAMESPACE__ . '\AssertHelperTrait is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. There is no replacement. See https://www.drupal.org/node/3123638', E_USER_DEPRECATED);

You missed one.

Hi,

Creating a patch as suggested in #30 comment.

Please review the patch.

Thanks.

Fixed the failing test.

The trait Drupal\Tests\AssertHelperTrait has only one method and we are deprecating that method.
Therefore we can deprecate the whole trait and that is what is patch does.
There is a deprecation message test added to the patch.
There is also a CR.
For me it is RTBC.

Committed 3302b4e and pushed to 9.2.x. Thanks!