DX: Drop IsIdenticalConstraint

tests/Fixer/LanguageConstruct/DeclareEqualNormalizeFixerTest.php

@@ -25,7 +25,7 @@ use PhpCsFixer\Tests\Test\AbstractFixerTestCase;
 final class DeclareEqualNormalizeFixerTest extends AbstractFixerTestCase
 {
     /**
-     * @param string $expected
+     * @param string      $expected
      * @param null|string $input
      *
      * @dataProvider provideFixCases

tests/Test/AbstractFixerTestCase.php

@@ -27,6 +27,7 @@ use PhpCsFixer\Linter\CachingLinter;
 use PhpCsFixer\Linter\Linter;
 use PhpCsFixer\Linter\LinterInterface;
 use PhpCsFixer\Linter\ProcessLinter;
+use PhpCsFixer\PhpunitConstraintIsIdenticalString\Constraint\IsIdenticalString;
 use PhpCsFixer\Preg;
 use PhpCsFixer\StdinFileInfo;
 use PhpCsFixer\Tests\Test\Assert\AssertTokensTrait;
@@ -42,7 +43,6 @@ use PhpCsFixer\Tokenizer\Tokens;
 abstract class AbstractFixerTestCase extends TestCase
 {
     use AssertTokensTrait;
-    use IsIdenticalConstraint;
 
     /**
      * @var null|LinterInterface
@@ -422,7 +422,7 @@ abstract class AbstractFixerTestCase extends TestCase
 
             static::assertThat(
                 $tokens->generateCode(),
-                self::createIsIdenticalStringConstraint($expected),
+                new IsIdenticalString($expected),
                 'Code build on input code must match expected code.'
             );
             static::assertTrue($tokens->isChanged(), 'Tokens collection built on input code must be marked as changed after fixing.');
@@ -454,7 +454,7 @@ abstract class AbstractFixerTestCase extends TestCase
 
         static::assertThat(
             $tokens->generateCode(),
-            self::createIsIdenticalStringConstraint($expected),
+            new IsIdenticalString($expected),
             'Code build on expected code must not change.'
         );
         static::assertFalse($tokens->isChanged(), 'Tokens collection built on expected code must not be marked as changed after fixing.');

tests/Test/AbstractIntegrationTestCase.php

@@ -23,6 +23,7 @@ use PhpCsFixer\Linter\CachingLinter;
 use PhpCsFixer\Linter\Linter;
 use PhpCsFixer\Linter\LinterInterface;
 use PhpCsFixer\Linter\ProcessLinter;
+use PhpCsFixer\PhpunitConstraintIsIdenticalString\Constraint\IsIdenticalString;
 use PhpCsFixer\Runner\Runner;
 use PhpCsFixer\Tests\TestCase;
 use PhpCsFixer\Tokenizer\Tokens;
@@ -62,8 +63,6 @@ use Symfony\Component\Finder\SplFileInfo;
  */
 abstract class AbstractIntegrationTestCase extends TestCase
 {
-    use IsIdenticalConstraint;
-
     /**
      * @var null|LinterInterface
      */
@@ -257,7 +256,7 @@ abstract class AbstractIntegrationTestCase extends TestCase
         $fixedInputCode = file_get_contents($tmpFile);
         static::assertThat(
             $fixedInputCode,
-            self::createIsIdenticalStringConstraint($expected),
+            new IsIdenticalString($expected),
             sprintf(
                 "Expected changes do not match result for \"%s\" in \"%s\".\nFixers applied:\n%s.",
                 $case->getTitle(),

tests/Test/IsIdenticalConstraint.php

@@ -1,35 +0,0 @@
-<?php
-
-/*
- * This file is part of PHP CS Fixer.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *     Dariusz Rumiński <dariusz.ruminski@gmail.com>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace PhpCsFixer\Tests\Test;
-
-use PhpCsFixer\PhpunitConstraintIsIdenticalString\Constraint\IsIdenticalString;
-
-/**
- * @internal
- *
- * @todo Remove me when usages will end up in dedicated package.
- */
-trait IsIdenticalConstraint
-{
-    /**
-     * @todo Remove me when this class will end up in dedicated package.
-     *
-     * @param string $expected
-     *
-     * @return IsIdenticalString
-     */
-    private static function createIsIdenticalStringConstraint($expected)
-    {
-        return new IsIdenticalString($expected);
-    }
-}