Skip to content

Commit

Permalink
Merge pull request #10 from gurman/update_to_symfony6
Browse files Browse the repository at this point in the history
Update to symfony6
  • Loading branch information
mcfedr committed Feb 21, 2022
2 parents 06d7477 + 0c14ff1 commit 0624d51
Show file tree
Hide file tree
Showing 17 changed files with 2,814 additions and 1,640 deletions.
34 changes: 34 additions & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Tests

on:
push:

jobs:
tests:
runs-on: ubuntu-18.04
strategy:
fail-fast: false
matrix:
version:
- php: '8.0'
symfony: '5.4'
- php: '8.0'
symfony: '6.0'
name: PHP ${{ matrix.version.php }} Symfony ${{ matrix.version.symfony }}
steps:
- uses: actions/checkout@v2
- uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.version.php }}
tools: phpunit-bridge, flex
extensions: pdo_sqlite, redis
coverage: none
- run: |
composer config extra.symfony.require ${{ matrix.version.symfony }}
composer update
- run: vendor/bin/php-cs-fixer fix --dry-run --diff
- run: tests/console cache:clear
- run: vendor/bin/phpstan analyse
- run: vendor/bin/phpunit
env:
SYMFONY_DEPRECATIONS_HELPER: 'disabled=1'
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/vendor/
/tests/cache/
/tests/logs/
/.php_cs.cache
/var
/.phpunit.result.cache
/.php-cs-fixer.cache
2 changes: 1 addition & 1 deletion .php_cs.dist → .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
$finder = PhpCsFixer\Finder::create()
->in(['src', 'tests']);

return PhpCsFixer\Config::create()
return (new PhpCsFixer\Config())
->setRules([
'@PhpCsFixer' => true,
'@PhpCsFixer:risky' => true,
Expand Down
27 changes: 0 additions & 27 deletions .travis.yml

This file was deleted.

26 changes: 16 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,27 @@
"classmap": ["tests/TestKernel.php"]
},
"require": {
"php": ">=7.2.5",
"symfony/framework-bundle": "^4.0|^5",
"symfony/form": "^4|^5",
"symfony/validator": "^4.0|^5",
"php": ">=8.0",
"symfony/framework-bundle": "^5.0|^6.0",
"sensio/framework-extra-bundle": "^5.0|^6.0",
"symfony/form": "^5.0|^6.0",
"symfony/validator": "^5.0|^6.0",
"psr/container": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "^8",
"symfony/monolog-bundle": "^3.4.0",
"friendsofphp/php-cs-fixer": "^2.1",
"symfony/browser-kit": "^4|^5",
"phpunit/phpunit": "^9",
"symfony/monolog-bundle": "^3.0|^4.0",
"friendsofphp/php-cs-fixer": "^2.0|^3.0",
"symfony/browser-kit": "^5.0|^6.0",
"phpstan/phpstan-phpunit": "^0.12",
"phpstan/phpstan-symfony": "^0.12",
"phpstan/phpstan-doctrine": "^0.12",
"symfony/phpunit-bridge": "*",
"symfony/yaml": "^4|^5"
"symfony/phpunit-bridge": "^5.0|^6.0",
"symfony/yaml": "^5.0|^6.0"
},
"config": {
"allow-plugins": {
"composer/package-versions-deprecated": true
}
}
}
Loading

0 comments on commit 0624d51

Please sign in to comment.