Fix "MigrateCckFieldInterface is deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.x. Use \Drupal\migrate_drupal\Annotation\MigrateField instead." deprecation message.

+++ b/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php
@@ -143,6 +143,7 @@ public static function getSkippedDeprecations() {
+      'MigrateCckFieldInterface is deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.x. Use \Drupal\migrate_drupal\Annotation\MigrateField instead.',

This part of the interdiff is not correct, we shouldn't add back the deprecation message to the trait :)

Cleaning up tags.

Looks great :)

I was just reviewing this issue as well, I came to the same conclusion as @amateescu! RTBC++ :)

+++ b/core/modules/link/tests/src/Kernel/Plugin/migrate/cckfield/d7/LinkCckTest.php
@@ -54,7 +54,6 @@ protected function setUp() {
-   * @expectedDeprecation MigrateCckFieldInterface is deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.x. Use \Drupal\migrate_drupal\Annotation\MigrateField instead.

It's super strange to be removing an @expectedDeprecation.

+++ b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php
@@ -18,7 +18,7 @@
-abstract class CckFieldPluginBase extends FieldPluginBase implements MigrateCckFieldInterface {
+abstract class CckFieldPluginBase extends FieldPluginBase implements MigrateFieldInterface {

This class is deprecated too. It's okay for deprecated code to use deprecated code :)

Can we get a patch that just removes the deprecation?

@alexpott, I also saw this comment in another issue, so I'm wondering: when a patch makes a test method not trigger a deprecation message anymore, shouldn't that patch also remove the @expectedDeprecation annotation?

Not if the test is a legacy test. legacy tests are there to test deprecated code and will be removed at the same time as deprecated code.

Right, that makes sense!

Creating the patch requested by @alexpott in #13.

Set CckFieldBackwardsCompatibilityTest as a legacy test.

@Jo Fitzgerald can you add @expectedDeprecation too?

Added @expectedDeprecation.

I have reviewed this patch and it looks good to me :-)

Testbot Snafu.

Committed and pushed beae7599dc to 8.6.x and 71ae9121fc to 8.5.x. Thanks!

Credited @amateescu and myself for reviews that materially affected the patch. Thanks @davemckain and @borisson_ also for the reviews.