ISSUE-337: test fix

Author: tatevikg1

.gitignore

@@ -13,3 +13,4 @@
 /public/
 /var/
 /vendor/
+.phpunit.result.cache

composer.json

@@ -27,17 +27,19 @@
     "require": {
         "php": "^8.1",
         "phplist/core": "dev-ISSUE-337",
-        "friendsofsymfony/rest-bundle": "*"
+        "friendsofsymfony/rest-bundle": "*",
+        "symfony/test-pack": "^1.0",
+        "symfony/process": "^6.4"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.0",
         "guzzlehttp/guzzle": "^6.3.0",
         "squizlabs/php_codesniffer": "^3.2.0",
-        "phpstan/phpstan": "^0.7.0|0.12.57",
-        "nette/caching": "^2.5.0|^3.0.0",
+        "phpstan/phpstan": "^0.12.57",
+        "nette/caching": "^3.0.0",
         "nikic/php-parser": "^4.19.1",
         "phpmd/phpmd": "^2.6.0",
-        "doctrine/instantiator": "^1.0.5"
+        "doctrine/instantiator": "^2.0."
     },
     "autoload": {
         "psr-4": {

tests/Integration/Composer/ScriptsTest.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpList\RestBundle\Tests\Integration\Composer;
@@ -12,17 +13,11 @@
  */
 class ScriptsTest extends TestCase
 {
-    /**
-     * @test
-     */
-    public function publicDirectoryHasBeenCreated()
+    public function testPublicDirectoryHasBeenCreated()
     {
-        static::assertDirectoryExists($this->getAbsolutePublicDirectoryPath());
+        self::assertDirectoryExists($this->getAbsolutePublicDirectoryPath());
     }
 
-    /**
-     * @return string
-     */
     private function getAbsolutePublicDirectoryPath(): string
     {
         return dirname(__DIR__, 3) . '/public/';
@@ -31,7 +26,7 @@ private function getAbsolutePublicDirectoryPath(): string
     /**
      * @return string[][]
      */
-    public function publicDirectoryFilesDataProvider(): array
+    public static function publicDirectoryFilesDataProvider(): array
     {
         return [
             'production entry point' => ['app.php'],
@@ -42,26 +37,18 @@ public function publicDirectoryFilesDataProvider(): array
     }
 
     /**
-     * @test
-     * @param string $fileName
      * @dataProvider publicDirectoryFilesDataProvider
      */
-    public function publicDirectoryFilesExist(string $fileName)
+    public function testPublicDirectoryFilesExist(string $fileName)
     {
-        static::assertFileExists($this->getAbsolutePublicDirectoryPath() . $fileName);
+        self::assertFileExists($this->getAbsolutePublicDirectoryPath() . $fileName);
     }
 
-    /**
-     * @test
-     */
-    public function binariesDirectoryHasBeenCreated()
+    public function testBinariesDirectoryHasBeenCreated()
     {
-        static::assertDirectoryExists($this->getAbsoluteBinariesDirectoryPath());
+        self::assertDirectoryExists($this->getAbsoluteBinariesDirectoryPath());
     }
 
-    /**
-     * @return string
-     */
     private function getAbsoluteBinariesDirectoryPath(): string
     {
         return dirname(__DIR__, 3) . '/bin/';
@@ -70,115 +57,90 @@ private function getAbsoluteBinariesDirectoryPath(): string
     /**
      * @return string[][]
      */
-    public function binariesDataProvider(): array
+    public static function binariesDataProvider(): array
     {
         return [
             'Symfony console' => ['console'],
         ];
     }
 
     /**
-     * @test
-     * @param string $fileName
      * @dataProvider binariesDataProvider
      */
-    public function binariesExist(string $fileName)
+    public function testBinariesExist(string $fileName)
     {
-        static::assertFileExists($this->getAbsoluteBinariesDirectoryPath() . $fileName);
+        self::assertFileExists($this->getAbsoluteBinariesDirectoryPath() . $fileName);
     }
 
-    /**
-     * @return string
-     */
     private function getBundleConfigurationFilePath(): string
     {
         return dirname(__DIR__, 3) . '/config/bundles.yml';
     }
 
-    /**
-     * @test
-     */
-    public function bundleConfigurationFileExists()
+    public function testBundleConfigurationFileExists()
     {
-        static::assertFileExists($this->getBundleConfigurationFilePath());
+        self::assertFileExists($this->getBundleConfigurationFilePath());
     }
 
     /**
      * @return string[][]
      */
-    public function bundleClassNameDataProvider(): array
+    public static function bundleClassNameDataProvider(): array
     {
         return [
-            'framework bundle' => ['Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle'],
-            'rest bundle' => ['PhpList\\RestBundle\\PhpListRestBundle'],
+            'framework bundle' => ['Symfony\Bundle\FrameworkBundle\FrameworkBundle'],
+            'rest bundle' => ['PhpList\RestBundle\PhpListRestBundle'],
         ];
     }
 
     /**
-     * @test
-     * @param string $bundleClassName
      * @dataProvider bundleClassNameDataProvider
      */
-    public function bundleConfigurationFileContainsModuleBundles(string $bundleClassName)
+    public function testBundleConfigurationFileContainsModuleBundles(string $bundleClassName)
     {
         $fileContents = file_get_contents($this->getBundleConfigurationFilePath());
 
-        static::assertContains($bundleClassName, $fileContents);
+        self::assertStringContainsString($bundleClassName, $fileContents);
     }
 
-    /**
-     * @return string
-     */
     private function getModuleRoutesConfigurationFilePath(): string
     {
         return dirname(__DIR__, 3) . '/config/routing_modules.yml';
     }
-
-    /**
-     * @test
-     */
-    public function moduleRoutesConfigurationFileExists()
+    public function testModuleRoutesConfigurationFileExists()
     {
-        static::assertFileExists($this->getModuleRoutesConfigurationFilePath());
+        self::assertFileExists($this->getModuleRoutesConfigurationFilePath());
     }
 
     /**
      * @return string[][]
      */
-    public function moduleRoutingDataProvider(): array
+    public static function moduleRoutingDataProvider(): array
     {
         return [
             'route name' => ['phplist/rest-api.rest-api'],
             'resource' => ["resource: '@PhpListRestBundle/Controller/'"],
-            'type' => ['type: annotation'],
+            'type' => ['type: attribute'],
         ];
     }
 
     /**
-     * @test
-     * @param string $routeSearchString
      * @dataProvider moduleRoutingDataProvider
      */
-    public function moduleRoutesConfigurationFileContainsModuleRoutes(string $routeSearchString)
+    public function testModuleRoutesConfigurationFileContainsModuleRoutes(string $routeSearchString)
     {
         $fileContents = file_get_contents($this->getModuleRoutesConfigurationFilePath());
 
-        static::assertContains($routeSearchString, $fileContents);
+        self::assertStringContainsString($routeSearchString, $fileContents);
     }
 
-    /**
-     * @test
-     */
-    public function parametersConfigurationFileExists()
+    public function testParametersConfigurationFileExists()
     {
-        static::assertFileExists(dirname(__DIR__, 3) . '/config/parameters.yml');
+        self::assertFileExists(dirname(__DIR__, 3) . '/config/parameters.yml');
     }
 
-    /**
-     * @test
-     */
-    public function modulesConfigurationFileExists()
+    public function testModulesConfigurationFileExists()
     {
-        static::assertFileExists(dirname(__DIR__, 3) . '/config/config_modules.yml');
+        self::assertFileExists(dirname(__DIR__, 3) . '/config/config_modules.yml');
     }
 }