fix PHP class inlining

Author: HeahDude

log.txt

@@ -41,10 +41,7 @@ Deprecated: Return type of SymfonyTools\CodeBlockChecker\Issue\IssueCollection::
 [PHP syntax] Syntax error, unexpected EOF, expecting '{' in file contributing/code/conventions.rst at 188
 [PHP syntax] Syntax error, unexpected '}', expecting ';' or '{' in file http_client.rst at 1312
 [Twig] Unknown "price" filter. in file templating/twig_extension.rst at 23
-[PHP syntax] Syntax error, unexpected T_NAMESPACE in file controller/upload_file.rst at 330
 [PHP syntax] Syntax error, unexpected ':' in file components/serializer.rst at 471
-[PHP syntax] Syntax error, unexpected T_VARIABLE in file components/serializer.rst at 1116
-[PHP syntax] Syntax error, unexpected '}', expecting EOF in file components/serializer.rst at 1124
 [PHP syntax] Syntax error, unexpected T_VARIABLE, expecting ')' in file components/cache/adapters/doctrine_adapter.rst at 26
 [PHP syntax] Syntax error, unexpected ',' in file components/cache/adapters/doctrine_adapter.rst at 29
 [PHP syntax] Syntax error, unexpected ')' in file components/cache/adapters/doctrine_adapter.rst at 35
@@ -68,7 +65,7 @@ Deprecated: Return type of SymfonyTools\CodeBlockChecker\Issue\IssueCollection::
 [PHP syntax] Syntax error, unexpected T_DOUBLE_ARROW, expecting ',' or ']' or ')' in file components/config/definition.rst at 302
 [PHP syntax] Syntax error, unexpected T_DOUBLE_ARROW, expecting ',' or ']' or ')' in file components/config/definition.rst at 377
 [PHP syntax] Syntax error, unexpected T_DOUBLE_ARROW, expecting ',' or ']' or ')' in file components/config/definition.rst at 382
-[PHP syntax] Syntax error, unexpected '}', expecting ';' or '{' in file components/filesystem.rst at 218
+[PHP syntax] Syntax error, unexpected '}', expecting ';' or '{' in file components/filesystem.rst at 219
 [Yaml syntax] Unable to parse at line 1 (near "|"). in file components/yaml/yaml_format.rst at 86
 [Yaml syntax] Unable to parse at line 1 (near ">"). in file components/yaml/yaml_format.rst at 95
 [PHP syntax] Syntax error, unexpected EOF in file components/dependency_injection/compilation.rst at 155
@@ -111,7 +108,7 @@ Deprecated: Return type of SymfonyTools\CodeBlockChecker\Issue\IssueCollection::
 [PHP syntax] Syntax error, unexpected T_DOUBLE_ARROW in file reference/forms/types/dateinterval.rst at 299
 [PHP syntax] Syntax error, unexpected ',' in file reference/forms/types/dateinterval.rst at 299
 [PHP syntax] Syntax error, unexpected ',' in file reference/forms/types/dateinterval.rst at 302
-[PHP syntax] Syntax error, unexpected T_ELLIPSIS in file reference/forms/types/file.rst at 40
+[PHP syntax] Syntax error, unexpected T_ELLIPSIS in file reference/forms/types/file.rst at 41
 [PHP syntax] Syntax error, unexpected T_DOUBLE_ARROW in file reference/forms/types/birthday.rst at 1
 [PHP syntax] Syntax error, unexpected EOF in file reference/forms/types/birthday.rst at 3
 [PHP syntax] Syntax error, unexpected T_DOUBLE_ARROW in file reference/forms/types/choice.rst at 1
@@ -135,16 +132,15 @@ Deprecated: Return type of SymfonyTools\CodeBlockChecker\Issue\IssueCollection::
 [Twig] Unknown "transchoice" tag. in file reference/twig_reference.rst at 578
 [Twig] Unknown "trans_default_domain" tag. in file reference/twig_reference.rst at 597
 [Twig] Unknown "stopwatch" tag. in file reference/twig_reference.rst at 611
-[PHP syntax] Syntax error, unexpected T_AS, expecting ';' or '{' in file validation/raw_values.rst at 12
 [PHP syntax] Syntax error, unexpected EOF in file bundles/configuration.rst at 142
 [PHP syntax] Syntax error, unexpected EOF in file bundles/configuration.rst at 164
 [PHP syntax] Syntax error, unexpected T_PUBLIC in file bundles/extension.rst at 122
-[PHP syntax] Syntax error, unexpected T_PUBLIC, expecting ';' or '{' in file create_framework/http_kernel_controller_resolver.rst at 109
-[PHP syntax] Syntax error, unexpected '}', expecting ';' or '{' in file create_framework/http_kernel_controller_resolver.rst at 110
-[PHP syntax] Syntax error, unexpected '}', expecting ';' or '{' in file create_framework/http_kernel_controller_resolver.rst at 116
-[PHP syntax] Syntax error, unexpected T_PUBLIC, expecting ';' or '{' in file create_framework/http_kernel_controller_resolver.rst at 123
-[PHP syntax] Syntax error, unexpected '}', expecting ';' or '{' in file create_framework/http_kernel_controller_resolver.rst at 124
-[PHP syntax] Syntax error, unexpected '}', expecting ';' or '{' in file create_framework/http_kernel_controller_resolver.rst at 129
+[PHP syntax] Syntax error, unexpected T_PUBLIC, expecting ';' or '{' in file create_framework/http_kernel_controller_resolver.rst at 110
+[PHP syntax] Syntax error, unexpected '}', expecting ';' or '{' in file create_framework/http_kernel_controller_resolver.rst at 111
+[PHP syntax] Syntax error, unexpected '}', expecting ';' or '{' in file create_framework/http_kernel_controller_resolver.rst at 117
+[PHP syntax] Syntax error, unexpected T_PUBLIC, expecting ';' or '{' in file create_framework/http_kernel_controller_resolver.rst at 124
+[PHP syntax] Syntax error, unexpected '}', expecting ';' or '{' in file create_framework/http_kernel_controller_resolver.rst at 125
+[PHP syntax] Syntax error, unexpected '}', expecting ';' or '{' in file create_framework/http_kernel_controller_resolver.rst at 130
 
- [ERROR] Build completed with 134 errors                                                                                
+ [ERROR] Build completed with 130 errors                                                                                
 

src/Service/CodeValidator/PhpValidator.php

@@ -41,8 +41,13 @@ private function getParser(): Parser
     private function getContents(CodeNode $node, &$linesPrepended = null): string
     {
         $contents = $node->getValue();
-        if (!preg_match('#(class|interface) [a-zA-Z]+#s', $contents) && preg_match('#(public|protected|private)( static)? (\$[a-z]+|function)#s', $contents)) {
-            $contents = 'class Foobar {'.$contents.'}';
+        if (
+            !preg_match('#(class|interface) [a-zA-Z]+#s', $contents)
+            && !preg_match('#= new class#s', $contents)
+            && preg_match('#(public|protected|private)( static)? (\$[a-z]+|function).*#s', $contents, $matches)
+        ) {
+            // keep "uses" and other code before the class definition
+            $contents = substr($contents, 0, strpos($contents, $matches[1])).PHP_EOL.'class Foobar {'.$matches[0].'}';
         }
 
         // Allow us to use "..." as a placeholder