Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SANTA-222: symfony upgrade #581

Merged
merged 21 commits into from
Oct 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ HOST=secretsanta.lndo.site

###> Mailer ###
MAILER_DSN=smtp://mailhog:1025
#MANDRILL_DSN=smtp://smtp.mandrillapp.com:587?encryption=tls&auth_mode=login&username=&password=
#MANDRILL_DSN=mandrill+smtp://<username>:<password>@default
MANDRILL_DSN=smtp://mailhog:1025
NOREPLY_EMAIL=[email protected]
CONTACT_EMAIL=[email protected]
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/run-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ env:
CREATE_DB_PASSWORD: root
DATABASE_URL: mysql://root:[email protected]/secretsanta_test?serverVersion=5.7&charset=utf8mb4
MAILER_DSN: sendmail://localhost
MANDRILL_DSN: sendmail://localhost
APP_DOMAIN: test.secretsantaorganizer.com

jobs:
Expand All @@ -26,14 +27,14 @@ jobs:
with:
php-version: '8.2'
extensions: apcu
- name: Configure recaptcha secrets
run: cp config/recaptcha_secrets.json.dist config/recaptcha_secrets.json
- name: Display PHP version
run: php -v
- name: Composer install
run: composer install
- name: Configure postfix & mailhog
run: sudo bash .github/scripts/mailhog.sh
- name: Configure recaptcha secrets
run: cp config/recaptcha_secrets.json.dist config/recaptcha_secrets.json
- name: Install GeoLite IP DB
run: curl https://www.secretsantaorganizer.com/GeoLite2-City.mmdb > /home/runner/work/SecretSanta/SecretSanta/GeoLite2-City.mmdb
- name: Install Symfony binary
Expand All @@ -46,6 +47,8 @@ jobs:
run: bin/console doctrine:schema:update -vvv --force
- name: Run tests
run: make test
- name: Run PHP CS Fixer
run: PHP_CS_FIXER_FUTURE_MODE=1 php ./vendor/bin/php-cs-fixer fix -v --dry-run --diff
- name: Prepare Symfony local server TLS
run: symfony server:ca:install
- name: Run Cypress E2E tests
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,8 @@ cypress/screenshots
npm-debug.log
yarn-error.log
###< symfony/webpack-encore-bundle ###

###> friendsofphp/php-cs-fixer ###
/.php-cs-fixer.php
/.php-cs-fixer.cache
###< friendsofphp/php-cs-fixer ###
13 changes: 13 additions & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?php

$finder = (new PhpCsFixer\Finder())
->in(__DIR__)
->exclude('var')
;

return (new PhpCsFixer\Config())
->setRules([
'@Symfony' => true,
])
->setFinder($finder)
;
71 changes: 37 additions & 34 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,58 +9,60 @@
"ext-ctype": "*",
"ext-iconv": "*",
"composer/package-versions-deprecated": "1.11.99.*",
"doctrine/annotations": "^2.0",
"doctrine/doctrine-bundle": "^2.2",
"doctrine/orm": "^2.7",
"geoip2/geoip2": "^2.6",
"google/apiclient": "^2.6",
"google/recaptcha": "^1.2",
"jms/i18n-routing-bundle": "^3.1",
"phpdocumentor/reflection-docblock": "^5.2",
"psr/simple-cache": "^1.0",
"sensio/framework-extra-bundle": "^5.1",
"symfony/asset": "5.4.*",
"symfony/cache": "5.4.*",
"symfony/console": "5.4.*",
"symfony/dotenv": "5.4.*",
"symfony/expression-language": "5.4.*",
"symfony/asset": "^6.4",
"symfony/cache": "^6.4",
"symfony/console": "^6.4",
"symfony/dotenv": "^6.4",
"symfony/expression-language": "^6.4",
"symfony/flex": "^1.3.1",
"symfony/form": "5.4.*",
"symfony/framework-bundle": "5.4.*",
"symfony/http-client": "5.4.*",
"symfony/intl": "5.4.*",
"symfony/mailer": "5.4.*",
"symfony/form": "^6.4",
"symfony/framework-bundle": "^6.4",
"symfony/http-client": "^6.4",
"symfony/intl": "^6.4",
"symfony/mailchimp-mailer": "^6.4",
"symfony/mailer": "^6.4",
"symfony/monolog-bundle": "^3.1",
"symfony/process": "5.4.*",
"symfony/property-access": "5.4.*",
"symfony/property-info": "5.4.*",
"symfony/runtime": "5.4.*",
"symfony/security-bundle": "5.4.*",
"symfony/serializer": "5.4.*",
"symfony/swiftmailer-bundle": "^3.5",
"symfony/translation": "5.4.*",
"symfony/process": "^6.4",
"symfony/property-access": "^6.4",
"symfony/property-info": "^6.4",
"symfony/runtime": "^6.4",
"symfony/security-bundle": "^6.4",
"symfony/serializer": "^6.4",
"symfony/translation": "^6.4",
"symfony/twig-bundle": "^5.4",
"symfony/validator": "5.4.*",
"symfony/web-link": "5.4.*",
"symfony/validator": "^6.4",
"symfony/web-link": "^6.4",
"symfony/webpack-encore-bundle": "^1.17",
"symfony/yaml": "5.4.*",
"symfony/yaml": "^6.4",
"twig/extra-bundle": "^2.12|^3.0",
"twig/intl-extra": "^3.1",
"twig/twig": "^2.12|^3.0"
},
"require-dev": {
"doctrine/data-fixtures": "^1.4",
"doctrine/doctrine-fixtures-bundle": "^3.4",
"phpstan/phpstan": "^0.12.98",
"doctrine/doctrine-fixtures-bundle": "^3.6",
"friendsofphp/php-cs-fixer": "^3.64",
"phpstan/extension-installer": "^1.4",
"phpstan/phpstan": "^1.12",
"phpstan/phpstan-doctrine": "^1.5",
"phpunit/phpunit": "^9",
"se/selenium-server-standalone": "3.4.*",
"symfony/browser-kit": "^5.4",
"symfony/css-selector": "^5.4",
"symfony/debug-bundle": "^5.4",
"symfony/browser-kit": "^6.4",
"symfony/css-selector": "^6.4",
"symfony/debug-bundle": "^6.4",
"symfony/maker-bundle": "^1.0",
"symfony/phpunit-bridge": "^5.1",
"symfony/stopwatch": "^5.4",
"symfony/var-dumper": "^5.4",
"symfony/web-profiler-bundle": "^5.4",
"symfony/phpunit-bridge": "^6.4",
"symfony/stopwatch": "^6.4",
"symfony/var-dumper": "^6.4",
"symfony/web-profiler-bundle": "^6.4",
"webmozart/assert": "^1.1"
},
"config": {
Expand All @@ -70,7 +72,8 @@
"sort-packages": true,
"allow-plugins": {
"symfony/flex": true,
"symfony/runtime": true
"symfony/runtime": true,
"phpstan/extension-installer": true
}
},
"autoload": {
Expand Down Expand Up @@ -111,7 +114,7 @@
"extra": {
"symfony": {
"allow-contrib": false,
"require": "5.4.*"
"require": "^6.4"
}
}
}
Loading
Loading