TwigStan tweaks (#99)

Author: ruudk

composer.json

@@ -49,7 +49,7 @@
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.8",
         "phpstan/extension-installer": "^1.3",
-        "phpstan/phpstan-symfony": "^2.0",
+        "phpstan/phpstan-symfony": "^1.0",
         "phpunit/phpunit": "^11.0",
         "roave/security-advisories": "dev-latest",
         "symfony/browser-kit": "~7.1.0",

composer.lock

@@ -5,21 +5,9 @@
 namespace App;
 
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
 
 final class Kernel extends BaseKernel
 {
     use MicroKernelTrait;
-
-    protected function build(ContainerBuilder $container): void
-    {
-        $container->addCompilerPass(new class implements CompilerPassInterface {
-            public function process(ContainerBuilder $container): void
-            {
-                $container->getDefinition('twig')->setPublic(true);
-            }
-        });
-    }
 }

src/Kernel.php

@@ -1,7 +1,5 @@
 {% extends 'base.html.twig' %}
 
-{% types { composer: 'string' } %}
-
 {% block body %}
     <div class="sub-heading">
         <h2>Composer ⚡</h2>

templates/App/Controller/ComposerAction.html.twig

@@ -1,10 +1,5 @@
 {% extends 'base.html.twig' %}
 
-{% types {
-    dto: 'App\\Dto\\RegisterFormDto',
-    form: 'Symfony\\Component\\Form\\FormView'
-} %}
-
 {% set h2 = 'Form example' %}
 
 {% block title %}{{ h2 }} | {{ brand }}{% endblock %}

templates/App/Controller/FormAction.html.twig

@@ -1,7 +1,5 @@
 {% extends 'base.html.twig' %}
 
-{% types { readme: 'string' } %}
-
 {% block body %}
     <p>This page displays the <a att="" target="_blank" href="https://github.com/strangebuzz/MicroSymfony/blob/main/README.md">
             README.md</a> file of the GitHub repository.</p>

templates/App/Controller/HomeAction.html.twig

@@ -9,7 +9,7 @@
 
 (new Dotenv())->bootEnv(__DIR__.'/.env');
 
-$kernel = new Kernel($_ENV['APP_ENV'], (bool) $_ENV['APP_DEBUG']);
+$kernel = new Kernel('test', true);
 $kernel->boot();
 
-return $kernel->getContainer()->get('twig');
+return $kernel->getContainer()->get('test.service_container')->get('twig');

twig-loader.php

@@ -2,23 +2,13 @@
 
 declare(strict_types=1);
 
-return TwigStan\Config\TwigStanConfig::configure(__DIR__)
+use TwigStan\Config\TwigStanConfig;
+
+return TwigStanConfig::configure(__DIR__)
     ->reportUnmatchedIgnoredErrors(true)
     ->phpstanConfigurationFile(__DIR__.'/phpstan.neon')
     ->phpstanMemoryLimit(false)
     ->twigEnvironmentLoader(__DIR__.'/twig-loader.php')
     ->twigPaths(__DIR__.'/templates')
-    // ->twigPaths(__DIR__ . '/tests/EndToEnd/Types')
-    // ->twigExcludes('something.html.twig')
-    // ->phpPaths(__DIR__ . '/tests/Fixtures')
-    // ->phpExcludes('something.php')
-    // ->ignoreErrors(
-    //     TwigStan\Error\IgnoreError::create('#SomeOther#', 'someIdentifier.someValue', __DIR__ . '/some/path.php'),
-    //     TwigStan\Error\IgnoreError::message('#SomePattern#'),
-    //     TwigStan\Error\IgnoreError::identifier('someIdentifier'),
-    //     TwigStan\Error\IgnoreError::path(__DIR__ . '/some/path.php'),
-    //     TwigStan\Error\IgnoreError::messageAndIdentifier('#SomePattern#', 'someIdentifier'),
-    //     TwigStan\Error\IgnoreError::messageAndPath('#SomePattern#', __DIR__ . '/some/path.php'),
-    //     TwigStan\Error\IgnoreError::identifierAndPath('someIdentifier', __DIR__ . '/some/path.php'),
-    // )
+    ->phpPaths(__DIR__.'/src/Controller')
     ->create();