Update dependencies

symfonycorp · Sep 15, 2023 · ae45069 · ae45069
1 parent e1c945e
commit ae45069
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 16 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -20,8 +20,25 @@ jobs:
         runs-on: ubuntu-latest
 
         strategy:
+            fail-fast: false
             matrix:
-                php-version: ["7.2", "7.3", "7.4", "8.0", "8.1"]
+                sf-version: [ '^4.4', '^5.4', '^6.3' ]
+                php-version: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
+                exclude:
+                    -   sf-version: '^4.4'
+                        php-version: '8.0'
+                    -   sf-version: '^4.4'
+                        php-version: '8.1'
+                    -   sf-version: '^4.4'
+                        php-version: '8.2'
+                    -   sf-version: '^6.3'
+                        php-version: '7.2'
+                    -   sf-version: '^6.3'
+                        php-version: '7.3'
+                    -   sf-version: '^6.3'
+                        php-version: '7.4'
+                    -   sf-version: '^6.3'
+                        php-version: '8.0'
 
         steps:
             - uses: actions/checkout@master
@@ -45,8 +62,14 @@ jobs:
 
             - name: Install dependencies
               run: |
-                  composer install --prefer-dist --no-interaction --no-ansi --no-progress
+                  composer global config --no-plugins allow-plugins.symfony/flex true
+                  composer global require symfony/flex:^1.0
+                  export SYMFONY_REQUIRE="${{ matrix.sf-version }}"
+                  composer update --prefer-dist --no-interaction --no-ansi --no-progress
 
             - name: Run the tests suite
               run: |
                   php vendor/bin/simple-phpunit -v --log-junit ./phpunit/junit.xml
+
+            - name: Run cmd
+              run: bin/insight list
diff --git a/Cli/Application.php b/Cli/Application.php
@@ -19,6 +19,8 @@
 use SensioLabs\Insight\Sdk\Api;
 use Symfony\Component\Console\Application as SymfonyApplication;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\HelperSet;
+use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -79,7 +81,7 @@ public function getLongVersion()
         return $version;
     }
 
-    protected function getDefaultHelperSet()
+    protected function getDefaultHelperSet(): HelperSet
     {
         $helperSet = parent::getDefaultHelperSet();
 
@@ -89,7 +91,7 @@ protected function getDefaultHelperSet()
         return $helperSet;
     }
 
-    protected function getDefaultInputDefinition()
+    protected function getDefaultInputDefinition(): InputDefinition
     {
         $definition = parent::getDefaultInputDefinition();
 
@@ -101,7 +103,7 @@ protected function getDefaultInputDefinition()
         return $definition;
     }
 
-    protected function getDefaultCommands()
+    protected function getDefaultCommands(): array
     {
         $defaultCommands = parent::getDefaultCommands();
 

diff --git a/composer.json b/composer.json
@@ -7,14 +7,14 @@
         "ext-json": "*",
         "jms/serializer": "^3.17",
         "psr/log": "^1.0",
-        "symfony/http-client": "^4.4",
-        "symfony/console": "^4.4",
-        "symfony/expression-language": "^4.4"
+        "symfony/http-client": "^4.4|^5.4|^6.3",
+        "symfony/console": "^4.4|^5.4|^6.3",
+        "symfony/expression-language": "^4.4|^5.4|^6.3"
     },
     "require-dev": {
         "monolog/monolog": "^1.4",
-        "symfony/phpunit-bridge": "^4.4|^5.3",
-        "symfony/var-dumper": "^4.4|^5.3"
+        "symfony/phpunit-bridge": "^4.4|^5.4|^6.3",
+        "symfony/var-dumper": "^4.4|^5.4|^6.3"
     },
     "suggest": {
         "monolog/monolog": "Will add some log capability to this library"
@@ -25,14 +25,9 @@
         }
     },
     "bin": ["bin/insight"],
-    "config": {
-        "platform": {
-            "php": "7.2.5"
-        }
-    },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.5.x-dev"
+            "dev-master": "1.10.x-dev"
         }
     }
 }