cleanup

packages/BetterPhpDocParser/tests/NodeAnalyzer/DocBlockAnalyzerTest.php

@@ -35,18 +35,18 @@ final class DocBlockAnalyzerTest extends AbstractContainerAwareTestCase
         $this->docBlockAnalyzer->removeTagFromNode($node, 'param');
         $this->assertNull($node->getDocComment());
 
-        $initDoc = <<<'EOT'
+        $initDoc = <<<'CODE_SAMPLE'
  * @param ParamType $paramName
  * @param AnotherValue $anotherValue
-EOT;
+CODE_SAMPLE;
         $node = $this->createNodeWithDoc($initDoc);
         $this->docBlockAnalyzer->removeParamTagByName($node, 'paramName');
 
-        $expectedDoc = <<<'EOT'
+        $expectedDoc = <<<'CODE_SAMPLE'
 /**
  * @param AnotherValue $anotherValue
  */
-EOT;
+CODE_SAMPLE;
         $this->assertSame($expectedDoc, $node->getDocComment()->getText());
     }
 

src/Rector/Architecture/RepositoryAsService/ReplaceParentRepositoryCallsByRepositoryPropertyRector.php

@@ -67,7 +67,7 @@ final class ReplaceParentRepositoryCallsByRepositoryPropertyRector extends Abstr
             'Handles method calls in child of Doctrine EntityRepository and moves them to "$this->repository" property.',
             [
                 new CodeSample(
-<<<'SAMPLE'
+<<<'CODE_SAMPLE'
 <?php
 
 use Doctrine\ORM\EntityRepository;
@@ -79,9 +79,9 @@ class SomeRepository extends EntityRepository
         return $this->findAll();
     }
 }
-SAMPLE
+CODE_SAMPLE
                     ,
-<<<'SAMPLE_TWO'
+<<<'CODE_SAMPLE'
 <?php
 
 use Doctrine\ORM\EntityRepository;
@@ -93,7 +93,7 @@ class SomeRepository extends EntityRepository
         return $this->repository->findAll();
     }
 }
-SAMPLE_TWO
+CODE_SAMPLE
                 ),
             ]
         );

src/Rector/Typehint/ParentTypehintedArgumentRector.php

@@ -81,11 +81,6 @@ class SomeClass implements SomeInterface
     public read(string $content);
 }
 CODE_SAMPLE
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> 7732517c... misc
                 ,
                 [
                     '$typehintForArgumentByMethodAndClass' => [
@@ -96,12 +91,7 @@ CODE_SAMPLE
                         ],
                     ],
                 ]
-<<<<<<< HEAD
->>>>>>> 70b22375... fixup! misc
             ),
-=======
-                ),
->>>>>>> 7732517c... misc
         ]);
     }