Only add strict_types back in if it wasn't added by transformer

Author: AydinHassan

src/CodePatcher.php

@@ -6,6 +6,7 @@
 
 use PhpParser\Error;
 use PhpParser\Node\Stmt;
+use PhpParser\Node\Stmt\Declare_;
 use PhpParser\Parser;
 use PhpParser\PrettyPrinter\Standard;
 use PhpSchool\PhpWorkshop\Exercise\ExerciseInterface;
@@ -91,7 +92,7 @@ private function applyPatch(Patch $patch, string $code): string
         }
 
         $declare = null;
-        if (isset($statements[0]) && $statements[0] instanceof \PhpParser\Node\Stmt\Declare_) {
+        if ($this->isFirstStatementStrictTypesDeclare($statements)) {
             $declare = array_shift($statements);
         }
 
@@ -107,13 +108,18 @@ private function applyPatch(Patch $patch, string $code): string
             }
         }
 
-        if ($declare !== null) {
+        if ($declare !== null && !$this->isFirstStatementStrictTypesDeclare($statements)) {
             array_unshift($statements, $declare);
         }
 
         return $this->printer->prettyPrintFile($statements);
     }
 
+    public function isFirstStatementStrictTypesDeclare(array $statements): bool
+    {
+        return isset($statements[0]) && $statements[0] instanceof Declare_;
+    }
+
     /**
      * @param CodeInsertion $codeInsertion
      * @param array<Stmt> $statements

test/CodePatcherTest.php

@@ -4,10 +4,13 @@
 
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Name;
+use PhpParser\Node\Scalar\LNumber;
 use PhpParser\Node\Stmt\Catch_;
+use PhpParser\Node\Stmt\DeclareDeclare;
 use PhpParser\Node\Stmt\TryCatch;
 use PhpParser\ParserFactory;
 use PhpParser\PrettyPrinter\Standard;
+use PhpParser\PrettyPrinterAbstract;
 use PhpSchool\PhpWorkshop\CodePatcher;
 use PhpSchool\PhpWorkshop\Exercise\ExerciseInterface;
 use PhpSchool\PhpWorkshop\Patch;
@@ -169,4 +172,32 @@ public function testTransformerWithStrictTypes(): void
             $patcher->patch($exercise, $code)
         );
     }
+
+    public function testTransformerWhichAddsStrictTypesDoesNotResultInDoubleStrictTypesStatement(): void
+    {
+        $code = '<?php declare(strict_types=1); $original = true;';
+        $patch = (new Patch())
+            ->withTransformer(function (array $statements) {
+                return [new \PhpParser\Node\Stmt\Declare_([
+                    new DeclareDeclare(
+                        new \PhpParser\Node\Identifier('strict_types'),
+                        new LNumber(1)
+                    )
+                ])];
+            });
+
+        $patcher = new CodePatcher((new ParserFactory())->create(ParserFactory::PREFER_PHP7), new Standard());
+
+        $exercise = $this->createMock(PatchableExercise::class);
+
+        $exercise
+            ->expects($this->once())
+            ->method('getPatch')
+            ->willReturn($patch);
+
+        $this->assertEquals(
+            "<?php\n\ndeclare (strict_types=1);",
+            $patcher->patch($exercise, $code)
+        );
+    }
 }