Merge branch '3.x' of https://github.com/sonata-project/SonataPageBundle

into Deprecate_assets_option
sonata-project · Sep 6, 2022 · eac61ee · eac61ee
2 parents 8129d46 + 9389aab
commit eac61ee
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 39 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -45,9 +45,14 @@
     'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => true],
     'ordered_class_elements' => true,
     'ordered_imports' => ['sort_algorithm' => 'alpha', 'imports_order' => ['class', 'function', 'const']],
+    'phpdoc_order' => ['order' => ['var', 'param', 'throws', 'return', 'phpstan-var', 'psalm-var', 'phpstan-param', 'psalm-param', 'phpstan-return', 'psalm-return']],
+    'phpdoc_separation' => ['groups' => [
+        ['phpstan-template', 'phpstan-template-covariant', 'phpstan-extends', 'phpstan-implements', 'phpstan-var', 'psalm-var', 'phpstan-param', 'psalm-param', 'phpstan-return', 'psalm-return'],
+        ['psalm-suppress', 'phpstan-ignore-next-line'],
+    ]],
     'php_unit_strict' => true,
     'php_unit_test_case_static_method_calls' => true,
-    'phpdoc_to_comment' => ['ignored_tags' => ['psalm-suppress']],
+    'phpdoc_to_comment' => ['ignored_tags' => ['psalm-suppress', 'phpstan-var']],
     'single_line_throw' => false,
     'static_lambda' => true,
     'strict_comparison' => true,

diff --git a/bin/console b/bin/console
@@ -30,6 +30,6 @@ set_time_limit(0);
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
-$kernel = new AppKernel();
+$kernel = new AppKernel('test', false);
 $application = new Application($kernel);
 $application->run(new ArgvInput());
diff --git a/composer.json b/composer.json
@@ -70,6 +70,7 @@
         "sonata-project/cache-bundle": "^3.3",
         "symfony/browser-kit": "^4.4",
         "symfony/css-selector": "^4.4",
+        "symfony/filesystem": "^4.4",
         "symfony/phpunit-bridge": "^5.1.4",
         "vimeo/psalm": "^4.7.2"
     },

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -33,5 +33,8 @@ It's auto-generated by sonata-project/dev-kit package.
     <php>
         <ini name="precision" value="8" />
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0" />
+        <env name="KERNEL_CLASS" value="\Sonata\PageBundle\Tests\App\AppKernel" />
+        <server name="APP_ENV" value="test" force="true" />
+        <server name="APP_DEBUG" value="false" />
     </php>
 </phpunit>
diff --git a/tests/App/AppKernel.php b/tests/App/AppKernel.php
@@ -40,11 +40,6 @@ final class AppKernel extends Kernel
 {
     use MicroKernelTrait;
 
-    public function __construct()
-    {
-        parent::__construct('test', false);
-    }
-
     public function registerBundles(): array
     {
         $bundles = [
@@ -95,6 +90,8 @@ protected function configureRoutes(RouteCollectionBuilder $routes): void
 
     protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void
     {
+        $container->setParameter('app.base_dir', $this->getBaseDir());
+
         $loader->load($this->getProjectDir().'/config/config.yaml');
     }
 

diff --git a/tests/App/config/doctrine.yaml b/tests/App/config/doctrine.yaml
@@ -1,6 +1,6 @@
 doctrine:
     dbal:
-        url: 'sqlite:///%kernel.cache_dir%/data.db'
+        url: 'sqlite:///%app.base_dir%database.db'
     orm:
         auto_generate_proxy_classes: true
         naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware

diff --git a/tests/Command/CleanupSnapshotsCommandTest.php b/tests/Command/CleanupSnapshotsCommandTest.php
@@ -17,7 +17,6 @@
 use Sonata\PageBundle\Model\SiteInterface;
 use Sonata\PageBundle\Model\SiteManagerInterface;
 use Sonata\PageBundle\Service\Contract\CleanupSnapshotBySiteInterface;
-use Sonata\PageBundle\Tests\App\AppKernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Console\Tester\CommandTester;
@@ -174,9 +173,4 @@ public function testCleanupSnapshot(): void
         static::assertStringContainsString('- Cleaning up snapshots ...', $output);
         static::assertStringContainsString('done!', $output);
     }
-
-    protected static function getKernelClass(): string
-    {
-        return AppKernel::class;
-    }
 }
diff --git a/tests/Command/CreateSnapshotsCommandTest.php b/tests/Command/CreateSnapshotsCommandTest.php
@@ -18,7 +18,6 @@
 use Sonata\PageBundle\Model\SiteInterface;
 use Sonata\PageBundle\Model\SiteManagerInterface;
 use Sonata\PageBundle\Service\Contract\CreateSnapshotBySiteInterface;
-use Sonata\PageBundle\Tests\App\AppKernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Console\Input\InputInterface;
@@ -202,9 +201,4 @@ public function testRequireSiteAllArgument()
 
         static::assertStringContainsString('Please provide an --site=SITE_ID option or the --site=all directive', $output);
     }
-
-    protected static function getKernelClass(): string
-    {
-        return AppKernel::class;
-    }
 }
diff --git a/tests/Functional/Snapshot/SnapshotManagerTest.php b/tests/Functional/Snapshot/SnapshotManagerTest.php
@@ -19,7 +19,6 @@
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 use Doctrine\ORM\OptimisticLockException;
 use Sonata\PageBundle\Entity\SnapshotManager;
-use Sonata\PageBundle\Tests\App\AppKernel;
 use Sonata\PageBundle\Tests\App\Entity\SonataPagePage;
 use Sonata\PageBundle\Tests\App\Entity\SonataPageSnapshot;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
@@ -244,9 +243,4 @@ public static function assertDateTimeEquals(\DateTime $expected, \DateTime $actu
     {
         static::assertSame($expected->format('c'), $actual->format('c'));
     }
-
-    protected static function getKernelClass(): string
-    {
-        return AppKernel::class;
-    }
 }
diff --git a/tests/Functional/Ticket/Issue1134Test.php b/tests/Functional/Ticket/Issue1134Test.php
@@ -13,7 +13,6 @@
 
 namespace Sonata\PageBundle\Tests\Functional\Ticket;
 
-use Sonata\PageBundle\Tests\App\AppKernel;
 use Sonata\PageBundle\Tests\App\Entity\SonataPageSite;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Request;
@@ -56,9 +55,4 @@ public function testLabelInShowAction(): void
 
         static::assertSame(Response::HTTP_OK, $client->getResponse()->getStatusCode());
     }
-
-    protected static function getKernelClass(): string
-    {
-        return AppKernel::class;
-    }
 }
diff --git a/tests/Page/TemplateManagerTest.php b/tests/Page/TemplateManagerTest.php
@@ -18,7 +18,6 @@
 use Sonata\PageBundle\Model\PageInterface;
 use Sonata\PageBundle\Model\Template;
 use Sonata\PageBundle\Page\TemplateManager;
-use Sonata\PageBundle\Tests\App\AppKernel;
 use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\DomCrawler\Crawler;
@@ -207,11 +206,6 @@ public function testTemplateShowingBreadcrumbIntoThePage(): void
         static::assertStringContainsString('Foo', $breadcrumbFoo->text());
     }
 
-    protected static function getKernelClass(): string
-    {
-        return AppKernel::class;
-    }
-
     /**
      * Returns the mock template.
      */

diff --git a/tests/custom_bootstrap.php b/tests/custom_bootstrap.php
@@ -15,8 +15,10 @@
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;
+use Symfony\Component\Filesystem\Filesystem;
 
-$application = new Application(new AppKernel());
+$kernel = new AppKernel($_SERVER['APP_ENV'], $_SERVER['APP_DEBUG']);
+$application = new Application($kernel);
 $application->setAutoExit(false);
 
 $input = new ArrayInput([
@@ -35,3 +37,5 @@
     'command' => 'doctrine:schema:create',
 ]);
 $application->run($input, new NullOutput());
+
+(new Filesystem())->remove([$kernel->getCacheDir()]);