bug #1 Allow Symfony 7 (sstok)

This PR was merged into the 1.0-dev branch. Discussion ---------- | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Fixed tickets | | License | MIT Commits ------- 66a13f3 Allow Symfony 7 c4175bf Correct workflow
rollerworks · Nov 3, 2023 · 0610d02 · 0610d02
2 parents 71b2194 + c4175bf
commit 0610d02
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 29 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -34,23 +34,23 @@ jobs:
             -
                 name: 'Get Composer cache directory'
                 id: 'composer-cache'
-                run: 'echo "::set-output name=cache-dir::$(composer config cache-files-dir)"'
+                run: 'echo "cache_dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT'
 
             -
                 name: 'Cache dependencies'
                 uses: 'actions/cache@v2'
                 with:
-                    path: '${{ steps.composer-cache.outputs.cache-dir }}'
+                    path: '${{ steps.composer-cache.outputs.cache_dir }}'
                     key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
                     restore-keys: 'php-${{ matrix.php-version }}-composer-locked-'
 
             -
                 name: 'Install dependencies'
-                run: 'composer update --no-progress --prefer-stable'
+                run: 'composer install --no-progress'
 
             -
                 name: 'Check the code style'
-                run: 'make cs-full'
+                run: 'make cs'
 
     phpstan:
         name: 'PhpStan'
@@ -77,19 +77,19 @@ jobs:
             -
                 name: 'Get Composer cache directory'
                 id: 'composer-cache'
-                run: 'echo "::set-output name=cache-dir::$(composer config cache-files-dir)"'
+                run: 'echo "cache_dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT'
 
             -
                 name: 'Cache dependencies'
                 uses: 'actions/cache@v2'
                 with:
-                    path: '${{ steps.composer-cache.outputs.cache-dir }}'
+                    path: '${{ steps.composer-cache.outputs.cache_dir }}'
                     key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
                     restore-keys: 'php-${{ matrix.php-version }}-composer-locked-'
 
             -
                 name: 'Install dependencies'
-                run: 'composer update --no-progress --prefer-stable'
+                run: 'composer install --no-progress'
 
             -
                 name: 'Run PhpStan'
@@ -112,12 +112,6 @@ jobs:
                         composer-options: '--prefer-stable'
                         symfony-version: '^6.4'
 
-                    -
-                        php-version: '8.2'
-                        composer-options: '--prefer-stable'
-                        symfony-version: '^6.4'
-                        remove-http-client: 'yes'
-
                     -
                         php-version: '8.2'
                         composer-options: '--prefer-stable'
@@ -138,13 +132,13 @@ jobs:
             -
                 name: 'Get Composer cache directory'
                 id: 'composer-cache'
-                run: 'echo "::set-output name=cache-dir::$(composer config cache-files-dir)"'
+                run: 'echo "cache_dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT'
 
             -
                 name: 'Cache dependencies'
                 uses: 'actions/cache@v2'
                 with:
-                    path: '${{ steps.composer-cache.outputs.cache-dir }}'
+                    path: '${{ steps.composer-cache.outputs.cache_dir }}'
                     key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
                     restore-keys: 'php-${{ matrix.php-version }}-composer-locked-'
 
@@ -153,21 +147,11 @@ jobs:
                 env:
                     COMPOSER_OPTIONS: '${{ matrix.composer-options }}'
                     SYMFONY_REQUIRE: '${{ matrix.symfony-version }}'
-                    REMOVE_HTTP_CLIENT: '${{ matrix.remove-http-client }}'
                 run: |
-                    if [ "$REMOVE_HTTP_CLIENT" == "yes" ]; then 
-                        composer remove --dev symfony/http-client
-                    fi
-                    
                     composer global config --no-plugins allow-plugins.symfony/flex true
                     composer global require --no-progress --no-scripts --no-plugins symfony/flex
                     composer update --no-progress $COMPOSER_OPTIONS
 
-            -
-                name: 'Install PHPUnit'
-                run: 'vendor/bin/simple-phpunit install'
-
             -
                 name: 'Run tests'
-                run: |
-                    vendor/bin/simple-phpunit
+                run: make phpunit
diff --git a/Makefile b/Makefile
@@ -1,4 +1,5 @@
 include vendor/rollerscapes/standards/Makefile
 
 phpunit:
+	#./vendor/bin/simple-phpunit install
 	./vendor/bin/phpunit
diff --git a/composer.json b/composer.json
@@ -18,13 +18,13 @@
     "require": {
         "php": "^8.1",
         "rollerworks/pdb-symfony-bridge": "^1.0",
-        "symfony/validator": "^6.3"
+        "symfony/validator": "^6.3 || ^7.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.4.2",
         "rollerscapes/standards": "^1.0",
-        "symfony/framework-bundle": "^6.3",
-        "symfony/phpunit-bridge": "^7.0 || ^v6.3"
+        "symfony/framework-bundle": "^6.3 || ^7.0",
+        "symfony/phpunit-bridge": "^6.3 || ^7.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,