Cleanup

Author: Nyholm

src/Service/CodeValidator/HtmlPhpValidator.php

@@ -17,14 +17,14 @@ class PhpValidator implements Validator
     public function validate(CodeNode $node, IssueCollection $issues): void
     {
         $language = $node->getLanguage() ?? ($node->isRaw() ? null : 'php');
-        if (!in_array($language, ['php', 'php-symfony', 'php-standalone', 'php-annotations'])) {
+        if (!in_array($language, ['php', 'php-symfony', 'php-standalone', 'php-annotations', 'html+php'])) {
             return;
         }
 
-        $parser = $this->getParser();
-        $errorHandler = new ErrorHandler\Collecting();
+        $linesPrepended = 0;
+        $code = 'html+php' === $language ? $node->getValue() : $this->getContents($node, $linesPrepended);
+        $this->getParser()->parse($code, $errorHandler = new ErrorHandler\Collecting());
 
-        $parser->parse($this->getContents($node, $linesPrepended), $errorHandler);
         foreach ($errorHandler->getErrors() as $error) {
             $issues->addIssue(new Issue($node, $error->getRawMessage(), 'PHP syntax', $node->getEnvironment()->getCurrentFileName(), $error->getStartLine() - $linesPrepended));
         }

src/Service/CodeValidator/PhpValidator.php

@@ -7,6 +7,7 @@
 use Doctrine\RST\Nodes\CodeNode;
 use PHPUnit\Framework\TestCase;
 use SymfonyTools\CodeBlockChecker\Issue\IssueCollection;
+use SymfonyTools\CodeBlockChecker\Service\CodeValidator\HtmlPhpValidator;
 use SymfonyTools\CodeBlockChecker\Service\CodeValidator\PhpValidator;
 use SymfonyTools\CodeBlockChecker\Service\CodeValidator\Validator;
 
@@ -56,11 +57,11 @@ public function testLocalLine()
     /**
      * @dataProvider getCodeExamples
      */
-    public function testCodeExamples(int $errors, string $code)
+    public function testCodeExamples(int $errors, string $code, ?string $language = null)
     {
         $node = new CodeNode(explode(PHP_EOL, $code));
         $node->setEnvironment($this->environment);
-        $node->setLanguage('php');
+        $node->setLanguage($language ?? 'php');
         $this->validator->validate($node, $issues = new IssueCollection());
         $this->assertCount($errors, $issues);
     }
@@ -107,5 +108,14 @@ public static function validate($object, ExecutionContextInterface $context, $pa
     $foo = 2a
 }
 '];
+        yield [0, '
+<h1>Hello</h1>
+<p><? echo $value; ?></p>
+', 'html+php'];
+
+        yield [1, '
+<h1>Hello</h1>
+<p><?php value foobar ?></p>
+', 'html+php'];
     }
 }