Update

stfalcon-studio · Dec 2, 2021 · 5f8b1e3 · 5f8b1e3
1 parent 321c2bd
commit 5f8b1e3
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 50 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -41,7 +41,7 @@ jobs:
             - name: 'Setup PHP'
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: 8.0
+                  php-version: 8.1
                   ini-values: memory_limit=-1
                   coverage: none
                   tools: composer:v2
@@ -66,7 +66,7 @@ jobs:
             - name: 'Setup PHP'
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: 8.0
+                  php-version: 8.1
                   ini-values: memory_limit=-1
                   coverage: none
                   tools: composer:v2
@@ -86,13 +86,12 @@ jobs:
             fail-fast: false
             matrix:
                 php-version:
-                    - '7.3'
                     - '7.4'
                     - '8.0'
+                    - '8.1'
                 symfony-version:
-                    - '5.0'
-                    - '5.1'
-                    - '5.2'
+                    - '5.3'
+                    - '5.4'
         steps:
             - name: 'Checkout Code'
               uses: actions/checkout@v2
@@ -127,7 +126,7 @@ jobs:
             - name: 'Setup PHP'
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: 7.3
+                  php-version: 8.1
                   ini-values: memory_limit=-1
                   coverage: pcov
                   tools: composer:v2

diff --git a/Command/GenerateDocsCommand.php b/Command/GenerateDocsCommand.php
@@ -24,8 +24,7 @@ class GenerateDocsCommand extends Command
 {
     protected static $defaultName = 'swagger:generate-docs';
 
-    /** @var Generator */
-    private $generator;
+    private Generator $generator;
 
     /**
      * @param Generator $generator

diff --git a/Config/ConfigParser.php b/Config/ConfigParser.php
@@ -20,8 +20,7 @@
  */
 class ConfigParser
 {
-    /** @var string */
-    private $configFolder;
+    private string $configFolder;
 
     /**
      * @param string $configFolder

diff --git a/Generator/Generator.php b/Generator/Generator.php
@@ -21,14 +21,11 @@
  */
 class Generator
 {
-    /** @var Environment */
-    private $twig;
+    private Environment $twig;
 
-    /** @var ConfigParser */
-    private $configParser;
+    private ConfigParser $configParser;
 
-    /** @var string */
-    private $docsFolder;
+    private string$docsFolder;
 
     /**
      * @param Environment  $twig

diff --git a/Tests/Config/ConfigParserTest.php b/Tests/Config/ConfigParserTest.php
@@ -17,8 +17,7 @@
 
 final class ConfigParserTest extends TestCase
 {
-    /** @var ConfigParser */
-    private $configParser;
+    private ConfigParser $configParser;
 
     protected function setUp(): void
     {

diff --git a/Tests/Generator/GeneratorTest.php b/Tests/Generator/GeneratorTest.php
@@ -21,23 +21,19 @@
 
 final class GeneratorTest extends TestCase
 {
-    /** @var string */
-    private $docsFolder = __DIR__.'/Fixtures/';
+    private string $docsFolder = __DIR__.'/Fixtures/';
 
-    /** @var string */
-    private $docsFile = __DIR__.'/Fixtures/index.html';
+    private string $docsFile = __DIR__.'/Fixtures/index.html';
 
     /** @var Environment|MockObject */
     private $twig;
 
     /** @var ConfigParser|MockObject */
     private $parser;
 
-    /** @var Filesystem */
-    private $filesystem;
+    private Filesystem $filesystem;
 
-    /** @var Generator */
-    private $generator;
+    private Generator $generator;
 
     protected function setUp(): void
     {

diff --git a/composer.json b/composer.json
@@ -9,31 +9,30 @@
         "issues": "https://github.com/stfalcon-studio/swagger-bundle/issues"
     },
     "require": {
-        "php": ">=7.3",
+        "php": ">=7.4",
         "ext-ctype": "*",
         "ext-iconv": "*",
-        "symfony/console": "^4.4 || ^5.0",
-        "symfony/flex": "^1.6",
-        "symfony/framework-bundle": "^4.4 || ^5.0",
-        "symfony/twig-bundle": "^4.4 || ^5.0",
-        "symfony/yaml": "^4.4 || ^5.0",
-        "symfony/asset": "^4.4 || ^5.0",
-        "symfony/finder": "^4.4 || ^5.0",
+        "symfony/console": "^5.3",
+        "symfony/flex": "^1.17",
+        "symfony/framework-bundle": "^5.3",
+        "symfony/twig-bundle": "^5.3",
+        "symfony/yaml": "^5.3",
+        "symfony/asset": "^5.3",
+        "symfony/finder": "^5.3",
         "symfony/polyfill-ctype": "^1.13",
-        "twig/twig": "^3.0"
+        "twig/twig": "^3.3"
     },
     "require-dev": {
         "escapestudios/symfony2-coding-standard": "^3.12",
-        "friendsofphp/php-cs-fixer": "^3.0",
-        "phpstan/phpstan": "^0.12",
-        "phpstan/phpstan-deprecation-rules": "^0.12",
-        "phpstan/phpstan-doctrine": "^0.12",
-        "phpstan/phpstan-phpunit": "^0.12",
-        "thecodingmachine/phpstan-strict-rules": "^0.12",
+        "phpstan/phpstan": "^1.2",
+        "phpstan/phpstan-doctrine": "^1.0",
+        "phpstan/phpstan-phpunit": "^1.0",
+        "phpstan/phpstan-symfony": "^1.0",
+        "thecodingmachine/phpstan-strict-rules": "^1.0",
         "phpunit/phpunit": "^9.5",
-        "symfony/dotenv": "^4.4 || ^5.0",
-        "symfony/filesystem": "^4.4 || ^5.0",
-        "symfony/phpunit-bridge": "^4.4 || ^5.0"
+        "symfony/dotenv": "^5.3",
+        "symfony/filesystem": "^5.3",
+        "symfony/phpunit-bridge": "^5.3"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpstan.neon b/phpstan.neon
@@ -2,12 +2,12 @@ includes:
     - 'vendor/phpstan/phpstan-phpunit/extension.neon'
     - 'vendor/phpstan/phpstan-phpunit/rules.neon'
     - 'vendor/phpstan/phpstan-doctrine/extension.neon'
+    - 'vendor/phpstan/phpstan-symfony/extension.neon'
 parameters:
-    level: 8
-    excludes_analyse:
+    level: 9
+    excludePaths:
         - '%rootDir%/../../../Tests/*'
-        - '%rootDir%/../../../tests/*'
         - '%rootDir%/../../../vendor/*'
     fileExtensions:
         - 'php'
-    checkMissingIterableValueType: false
+    checkGenericClassInNonGenericObjectType: false
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
          colors="true"
          bootstrap="vendor/autoload.php"
 >