Skip to content

Commit

Permalink
Merge pull request #51 from damien-louis/feature/upgrade-to-symfony7
Browse files Browse the repository at this point in the history
Upgrade to Symfony 7 (without Behat for the moment)
  • Loading branch information
damien-louis authored Dec 11, 2023
2 parents 6a08ea8 + 56a2314 commit 37e0eae
Show file tree
Hide file tree
Showing 10 changed files with 496 additions and 1,235 deletions.
10 changes: 0 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.idea/
docker/caddy/certs/
*.sql

###> symfony/framework-bundle ###
Expand All @@ -25,16 +24,7 @@ docker/caddy/certs/
###> phpstan/phpstan ###
phpstan.neon
###< phpstan/phpstan ###

###> friends-of-behat/symfony-extension ###
/behat.yml
###< friends-of-behat/symfony-extension ###
###> phpunit/phpunit ###
/phpunit.xml
.phpunit.result.cache
###< phpunit/phpunit ###

###> symfony/phpunit-bridge ###
.phpunit.result.cache
/phpunit.xml
###< symfony/phpunit-bridge ###
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ vendor: ## Execute 'composer install'

.PHONY: vendor-update
vendor-update: ## Execute 'composer update'
$(APP) composer update
$(APP) composer update -W

.PHONY: cc
cc: ## Execute 'cache:clear'
Expand Down Expand Up @@ -147,7 +147,6 @@ php-cs-fixer-apply: ## Execute php-cs-fixer and apply changes
.PHONY: tests
tests: ## Execute tests
$(APP) vendor/bin/simple-phpunit --configuration ./tests/phpunit.xml.dist --colors=always --testdox
$(APP) vendor/bin/behat --config ./tests/behat.yml

##
## —— ✨ Others ——
Expand Down
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

[![Build Status](https://github.com/damien-louis/symfony-docker/workflows/ci/badge.svg)](https://github.com/damien-louis/symfony-docker/actions?query=workflow%3A%22ci%22)

An up to date clean Symfony based on docker (PHP, Caddy, Postgres) with QA and tests tools
An up to date clean Symfony based on docker (PHP, Caddy, Postgres) with QA and tests tools.
Behat component isn't available for Symfony 7 for the moment. Please use Symfony 6.4 if you need Behat.

- [Symfony 6.4.0](https://github.com/symfony/symfony/releases/tag/v6.4.0)
- [Symfony 7.0.1](https://github.com/symfony/symfony/releases/tag/v7.0.1)
- [PHP 8.3](https://hub.docker.com/r/dmnlouis/php)
- [Caddy 2.7](https://hub.docker.com/r/dmnlouis/caddy)
- [Postgres 16](https://hub.docker.com/_/postgres)
Expand Down Expand Up @@ -38,10 +39,10 @@ Or use `make restart-without-xdebug` if `sed` is installed on your machine.

### QA tools:

- PHP_CodeSniffer [3.7.2](https://github.com/squizlabs/PHP_CodeSniffer/releases/tag/3.7.2)
- PHP-CS-Fixer [3.40.0](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases/tag/v3.40.0)
- PHPStan [1.10.46](https://github.com/phpstan/phpstan/releases/tag/1.10.46)
- PHP Insights [2.10.0](https://github.com/nunomaduro/phpinsights/releases/tag/v2.10.0)
- PHP_CodeSniffer [3.8.0](https://github.com/squizlabs/PHP_CodeSniffer/releases/tag/3.8.0)
- PHP-CS-Fixer [3.41.1](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases/tag/v3.41.1)
- PHPStan [1.10.48](https://github.com/phpstan/phpstan/releases/tag/1.10.48)
- PHP Insights [2.11.0](https://github.com/nunomaduro/phpinsights/releases/tag/v2.11.0)
- YML Linter
- Twig Linter
- Service Container Linter
Expand Down
26 changes: 12 additions & 14 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,28 @@
"doctrine/doctrine-bundle": "^2.10",
"doctrine/doctrine-migrations-bundle": "^3.2",
"doctrine/orm": "^2.16",
"symfony/console": "^6.4|^7.0",
"symfony/dotenv": "^6.4|^7.0",
"symfony/console": "^7.0",
"symfony/dotenv": "^7.0",
"symfony/flex": "^2",
"symfony/framework-bundle": "^6.4|^7.0",
"symfony/runtime": "^6.4|^7.0",
"symfony/yaml": "^6.4|^7.0"
"symfony/framework-bundle": "^7.0",
"symfony/runtime": "^7.0",
"symfony/translation": "^7.0",
"symfony/yaml": "^7.0"
},
"require-dev": {
"friends-of-behat/mink-browserkit-driver": "^1.6",
"friends-of-behat/mink-extension": "^2.7",
"friends-of-behat/symfony-extension": "^2.4",
"friendsofphp/php-cs-fixer": "^3.37",
"nunomaduro/phpinsights": "^2.8",
"phpstan/extension-installer": "^1.2",
"phpstan/phpstan": "^1.9",
"phpunit/phpunit": "^9.6",
"pyrech/composer-changelogs": "^2.1",
"squizlabs/php_codesniffer": "^3.7",
"symfony/browser-kit": "^6.4|^7.0",
"symfony/css-selector": "^6.4|^7.0",
"symfony/browser-kit": "^7.0",
"symfony/css-selector": "^7.0",
"symfony/maker-bundle": "^1.46",
"symfony/phpunit-bridge": "^6.4|^7.0",
"symfony/stopwatch": "^6.4|^7.0",
"symfony/web-profiler-bundle": "^6.4|^7.0"
"symfony/phpunit-bridge": "^7.0",
"symfony/stopwatch": "^7.0",
"symfony/web-profiler-bundle": "^7.0"
},
"config": {
"allow-plugins": {
Expand Down Expand Up @@ -85,7 +83,7 @@
"extra": {
"symfony": {
"allow-contrib": true,
"require": "^6.4|^7.0"
"require": "^7.0"
}
}
}
Loading

0 comments on commit 37e0eae

Please sign in to comment.