PHPUnit9 support

- Apply composer recipes:install phpunit/phpunit --force -v
  - see https://symfony.com/doc/5.4/testing.html

bin/phpunit

@@ -5,12 +5,6 @@ if (!file_exists(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-php
     echo "Unable to find the `simple-phpunit` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
     exit(1);
 }
-if (false === getenv('SYMFONY_PHPUNIT_VERSION')) {
-    putenv('SYMFONY_PHPUNIT_VERSION=8.3');
-}
-if (false === getenv('SYMFONY_PHPUNIT_REMOVE')) {
-    putenv('SYMFONY_PHPUNIT_REMOVE=symfony/yaml');
-}
 if (false === getenv('SYMFONY_PHPUNIT_DIR')) {
     putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');
 }

phpunit.xml.dist

@@ -1,40 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
+<!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          backupGlobals="false"
          colors="true"
          bootstrap="tests/bootstrap.php"
+         convertDeprecationsToExceptions="false"
 >
     <php>
+        <ini name="display_errors" value="1" />
         <ini name="error_reporting" value="-1" />
-        <env name="KERNEL_CLASS" value="Eccube\Kernel" />
-        <env name="APP_ENV" value="test" />
-        <env name="APP_DEBUG" value="1" />
-        <env name="SHELL_VERBOSITY" value="-1" />
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
-        <!-- define your env variables for the test env here -->
+        <server name="KERNEL_CLASS" value="Eccube\Kernel" />
+        <server name="SYMFONY_DEPRECATIONS_HELPER" value="999999" />
+        <server name="APP_ENV" value="test" force="true" />
+        <server name="SHELL_VERBOSITY" value="-1" />
+        <server name="SYMFONY_PHPUNIT_REMOVE" value="symfony/yaml" />
+        <server name="SYMFONY_PHPUNIT_VERSION" value="9.5" />
     </php>
 
     <testsuites>
         <testsuite name="Project Test Suite">
-            <directory>tests/</directory>
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
-            <directory>./src/</directory>
-            <exclude>
-              <directory suffix=".php">./src/Eccube/Resource</directory>
-              <directory suffix=".php">./src/Eccube/Command</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+        <exclude>
+            <directory suffix=".php">./src/Eccube/Resource</directory>
+            <directory suffix=".php">./src/Eccube/Command</directory>
+        </exclude>
+    </coverage>
 
     <listeners>
         <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
         <listener class="\DAMA\DoctrineTestBundle\PHPUnit\PHPUnitListener" />
     </listeners>
+
+    <!-- Run `composer require symfony/panther` before enabling this extension -->
+    <!--
+    <extensions>
+        <extension class="Symfony\Component\Panther\ServerExtension" />
+    </extensions>
+    -->
 </phpunit>

symfony.lock

@@ -271,13 +271,18 @@
         "version": "1.0.9"
     },
     "phpunit/phpunit": {
-        "version": "4.7",
+        "version": "9.5",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "master",
-            "version": "4.7",
-            "ref": "c276fa48d4713de91eb410289b3b1834acb7e403"
-        }
+            "version": "9.3",
+            "ref": "a6249a6c4392e9169b87abf93225f7f9f59025e6"
+        },
+        "files": [
+            ".env.test",
+            "phpunit.xml.dist",
+            "tests/bootstrap.php"
+        ]
     },
     "psr/cache": {
         "version": "1.0.1"

tests/Eccube/Tests/Command/AbstractCommandTest.php

@@ -61,7 +61,7 @@ abstract class AbstractCommandTest extends EccubeTestCase
      */
     protected $loopCheckSum = 0;
 
-    public function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
         Application::clearInstance();

tests/Eccube/Tests/Command/CsvLoaderCommandTest.php

@@ -21,12 +21,12 @@ class CsvLoaderCommandTest extends AbstractCommandTest
     /** @var \SplFileObject */
     protected $file;
 
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         self::markTestIncomplete();
     }
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->markTestIncomplete(get_class($this).' は未実装です');
         parent::setUp();

tests/Eccube/Tests/Command/UpdateSchemaDoctrineCommandTest.php

@@ -48,7 +48,7 @@ class UpdateSchemaDoctrineCommandTest extends EccubeTestCase
 
     const NAME = 'eccube:schema:update';
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $conn = $this->entityManager->getConnection();
@@ -68,7 +68,7 @@ public function setUp()
         $this->schemaService = self::$container->get(SchemaService::class);
     }
 
-    public function tearDown()
+    protected function tearDown(): void
     {
         $schema = $this->getSchemaManager();
         $columns = $schema->listTableColumns('dtb_customer');

tests/Eccube/Tests/Common/EccubeConfigTest.php

@@ -24,7 +24,7 @@ class EccubeConfigTest extends TestCase
      */
     protected $eccubeConfig;
 
-    public function setup()
+    protected function setup(): void
     {
         $container = new Container();
         $this->eccubeConfig = new EccubeConfig($container);

tests/Eccube/Tests/DependencyInjection/Compiler/PluginPassTest.php

@@ -24,7 +24,7 @@ class PluginPassTest extends TestCase
      */
     private $containerBuilder;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->containerBuilder = new ContainerBuilder();
         $this->containerBuilder->register(\Plugin\Sample\TestClass::class)

tests/Eccube/Tests/DependencyInjection/Compiler/PurchaseFlowPassTest.php

@@ -35,7 +35,7 @@ class PurchaseFlowPassTest extends EccubeTestCase
 {
     public static $called = false;
 
-    public function setUp()
+    protected function setUp(): void
     {
         self::$called = false;
         parent::setUp();

tests/Eccube/Tests/DependencyInjection/Compiler/TwigExtensionPassTest.php

@@ -30,7 +30,7 @@ class TwigExtensionPassTest extends TestCase
     /** @var ContainerBuilder */
     protected $containerBuilder;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->containerBuilder = new ContainerBuilder();
 

tests/Eccube/Tests/Doctrine/Common/CsvDataFixtures/CsvFixtureTest.php

@@ -37,7 +37,7 @@ class CsvFixtureTest extends EccubeTestCase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/Eccube/Tests/Doctrine/Common/CsvDataFixtures/Executor/DbalExecutorTest.php

@@ -38,7 +38,7 @@ class DbalExecutorTest extends EccubeTestCase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/Eccube/Tests/Doctrine/Common/CsvDataFixtures/LoaderTest.php

@@ -34,7 +34,7 @@ class LoaderTest extends EccubeTestCase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->loader = new Loader();

tests/Eccube/Tests/Doctrine/ORM/Tools/PaginationTest.php

@@ -58,7 +58,7 @@ class PaginationTest extends EccubeTestCase
      * @throws \Doctrine\ORM\ORMException
      * @throws \Doctrine\ORM\OptimisticLockException
      */
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -104,7 +104,7 @@ public function setUp()
         }
     }
 
-    public function tearDown()
+    protected function tearDown(): void
     {
         /** @var EntityManager $em */
         $em = $this->entityManager;

tests/Eccube/Tests/Doctrine/TimeZone/TimeZoneTest.php

@@ -29,7 +29,7 @@ class TimeZoneTest extends EccubeTestCase
      *
      * @throws \Doctrine\DBAL\DBALException
      */
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/Eccube/Tests/EccubeTestCase.php

@@ -57,10 +57,9 @@ abstract class EccubeTestCase extends WebTestCase
     /**
      * Client を生成しトランザクションを開始する.
      */
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
-        self::bootKernel();
         $this->client = static::createClient();
         $this->entityManager = self::$container->get('doctrine')->getManager();
         $this->eccubeConfig = self::$container->get(EccubeConfig::class);
@@ -69,7 +68,7 @@ public function setUp()
     /**
      * トランザクションをロールバックする.
      */
-    public function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
 

tests/Eccube/Tests/Entity/DeliveryDurationTest.php

@@ -20,7 +20,7 @@ class DeliveryDurationTest extends EccubeTestCase
 {
     private $deliveryDurationRepository;
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->deliveryDurationRepository = $this->entityManager->getRepository(DeliveryDuration::class);

tests/Eccube/Tests/Entity/Master/AbstractMasterEntityTest.php

@@ -23,7 +23,7 @@
  */
 class AbstractMasterEntityTest extends EccubeTestCase
 {
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
     }

tests/Eccube/Tests/Entity/OrderTest.php

@@ -38,7 +38,7 @@ class OrderTest extends EccubeTestCase
     protected $Order;
     protected $rate;
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->Customer = $this->createCustomer();

tests/Eccube/Tests/Form/Type/AbstractTypeTestCase.php

@@ -23,7 +23,7 @@ abstract class AbstractTypeTestCase extends EccubeTestCase
      */
     protected $formFactory;
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->formFactory = self::$container->get('form.factory');

tests/Eccube/Tests/Form/Type/AddressTypeTest.php

@@ -30,7 +30,7 @@ class AddressTypeTest extends AbstractTypeTestCase
         ],
     ];
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/Eccube/Tests/Form/Type/Admin/AuthenticationTypeTest.php

@@ -27,7 +27,7 @@ class AuthenticationTypeTest extends AbstractTypeTestCase
         'authentication_key' => 'abc123ABCZz',
     ];
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/Eccube/Tests/Form/Type/Admin/CalendarTypeTest.php

@@ -31,7 +31,7 @@ class CalendarTypeTest extends AbstractTypeTestCase
     /** @var FormInterface */
     protected $form;
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/Eccube/Tests/Form/Type/Admin/CategoryTypeTest.php

@@ -25,7 +25,7 @@ class CategoryTypeTest extends \Eccube\Tests\Form\Type\AbstractTypeTestCase
         'name' => 'テスト家具',
     ];
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/Eccube/Tests/Form/Type/Admin/CustomerSearchTypeTest.php

@@ -20,7 +20,7 @@ class CustomerSearchTypeTest extends \Eccube\Tests\Form\Type\AbstractTypeTestCas
     /** @var \Symfony\Component\Form\FormInterface */
     protected $form;
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/Eccube/Tests/Form/Type/Admin/CustomerTypeTest.php

@@ -50,7 +50,7 @@ class CustomerTypeTest extends \Eccube\Tests\Form\Type\AbstractTypeTestCase
         'note' => 'note',
     ];
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/Eccube/Tests/Form/Type/Admin/DeliveryFeeTypeTest.php

@@ -54,7 +54,7 @@ public function getValidTestData()
         ];
     }
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/Eccube/Tests/Form/Type/Admin/DeliveryTimeTypeTest.php

@@ -26,7 +26,7 @@ class DeliveryTimeTypeTest extends \Eccube\Tests\Form\Type\AbstractTypeTestCase
         'sort_no' => '1',
     ];
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/Eccube/Tests/Form/Type/Admin/LayoutTypeTest.php

@@ -29,7 +29,7 @@ class LayoutTypeTest extends AbstractTypeTestCase
         'Page' => 2,
     ];
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/Eccube/Tests/Form/Type/Admin/LogTypeTest.php

@@ -27,7 +27,7 @@ class LogTypeTest extends \Eccube\Tests\Form\Type\AbstractTypeTestCase
 
     protected $logTest;
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -53,7 +53,7 @@ public function setUp()
             ->getForm();
     }
 
-    public function tearDown()
+    protected function tearDown(): void
     {
         // Delete the previously created file
         @unlink($this->logTest);