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

Update to Symfony 5 #243

Merged
merged 19 commits into from Dec 20, 2019
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env
Expand Up @@ -14,7 +14,7 @@ APP_SECRET=67d829bf61dc5f87a73fd814e2c9f629
# See
# - http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
# - http://symfony.com/doc/current/configuration/external_parameters.html#environment-variables
DATABASE_HOST=mysql
DATABASE_HOST=localhost
DATABASE_USER=root
DATABASE_PORT=3306
DATABASE_PASSWORD=root
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -60,7 +60,7 @@ source/assets/images/sponsor

###> symfony/webpack-encore-bundle ###
/node_modules/
/public/build/
/public/build
npm-debug.log
yarn-error.log
###< symfony/webpack-encore-bundle ###
11 changes: 1 addition & 10 deletions .travis.yml
Expand Up @@ -47,17 +47,11 @@ jobs:
- composer rector-dry

-
name: 'Linting YAML and Templates'
name: 'Symfony Linting'
script:
- bin/console lint:yaml src packages
- bin/console lint:twig packages templates

-
name: 'Dead Links'
script:
- composer dead-links
- nano invalid-links.txt

# 2. Build Docker image → deploy
-
stage: warmup
Expand Down Expand Up @@ -86,9 +80,6 @@ jobs:
if: branch = master AND type = cron
script: docker run --rm -e APP_ENV=prod -e TWITTER_CONSUMER_KEY -e TWITTER_CONSUMER_SECRET -e TWITTER_OAUTH_ACCESS_TOKEN -e TWITTER_OAUTH_ACCESS_TOKEN_SECRET pehapkari/pehapkari.cz php vendor/bin/statie tweet-post statie/source

allow_failures:
- name: 'Dead Links'

matrix:
fast_finish: true

Expand Down
103 changes: 48 additions & 55 deletions composer.json
Expand Up @@ -8,79 +8,73 @@
"ext-json": "*",
"ext-pdo": "*",
"ext-pdo_mysql": "*",
"alterphp/easyadmin-extension-bundle": "^2.1",
"alterphp/easyadmin-extension-bundle": "^3.0",
"chumper/zipper": "^1.0",
"composer/ca-bundle": "^1.2",
"dfridrich/ares": "^1.2",
"doctrine/annotations": "^1.8",
"doctrine/cache": "^1.8",
"doctrine/doctrine-bundle": "^1.11",
"doctrine/orm": "2.7.x-dev",
"easycorp/easyadmin-bundle": "^2.3",
"doctrine/cache": "^1.10",
"doctrine/doctrine-bundle": "^2.0",
"doctrine/orm": "^2.7",
"easycorp/easyadmin-bundle": "^2.3.3",
"egulias/email-validator": "^2.1",
"fakturoid/fakturoid-php": "^1.0",
"guzzlehttp/guzzle": "^6.3",
"guzzlehttp/guzzle": "^6.5",
"j7mbo/twitter-api-php": "^1.0",
"knplabs/doctrine-behaviors": "^1.6",
"knplabs/doctrine-behaviors": "dev-master",
"sensio/framework-extra-bundle": "^5.5",
"sentry/sentry": "^2.2",
"sentry/sentry-symfony": "^3.2",
"sentry/sentry-symfony": "dev-master#e30be17",
"setasign/fpdf": "^1.8",
"setasign/fpdi": "^2.2",
"spatie/calendar-links": "^1.2",
"stof/doctrine-extensions-bundle": "^1.3",
"symfony/asset": "^4.4|^5.0",
"symfony/console": "^4.4|^5.0",
"symfony/debug-bundle": "^4.4|^5.0",
"symfony/dependency-injection": "^4.4|^5.0",
"symfony/dotenv": "^4.4|^5.0",
"symfony/error-renderer": "^4.4|^5.0",
"symfony/event-dispatcher": "^4.4|^5.0",
"symfony/expression-language": "^4.4|^5.0",
"symfony/asset": "^5.0",
"symfony/console": "^5.0",
"symfony/debug-bundle": "^5.0",
"symfony/dependency-injection": "^5.0",
"symfony/dotenv": "^5.0",
"symfony/event-dispatcher": "^5.0",
"symfony/expression-language": "^5.0",
"symfony/flex": "^1.4",
"symfony/form": "^4.4|^5.0",
"symfony/framework-bundle": "^4.4|^5.0",
"symfony/http-client": "^4.4|^5.0",
"symfony/http-kernel": "^4.4|^5.0",
"symfony/intl": "^4.4|^5.0",
"symfony/mailer": "^4.4|^5.0",
"symfony/mailgun-mailer": "^4.4|^5.0",
"symfony/maker-bundle": "^1.13",
"symfony/mime": "^4.4|^5.0",
"symfony/form": "^5.0",
"symfony/framework-bundle": "^5.0",
"symfony/http-client": "^5.0",
"symfony/http-kernel": "^5.0",
"symfony/intl": "^5.0",
"symfony/mailer": "^5.0",
"symfony/mailgun-mailer": "^5.0",
"symfony/maker-bundle": "^1.14",
"symfony/mime": "^5.0",
"symfony/orm-pack": "^1.0.7",
"symfony/security": "^4.4|^5.0",
"symfony/security-bundle": "^4.4|^5.0",
"symfony/swiftmailer-bundle": "^3.2",
"symfony/templating": "^4.4|^5.0",
"symfony/translation": "^4.4|^5.0",
"symfony/twig-bridge": "^4.4|^5.0",
"symfony/twig-bundle": "^4.4|^5.0",
"symfony/validator": "^4.4|^5.0",
"symfony/web-profiler-bundle": "^4.4|^5.0",
"symfony/security-bundle": "^5.0",
"symfony/templating": "^5.0",
"symfony/translation": "^5.0",
"symfony/twig-bridge": "^5.0",
"symfony/twig-bundle": "^5.0",
"symfony/validator": "^5.0",
"symfony/web-profiler-bundle": "^5.0",
"symfony/webpack-encore-bundle": "^1.6",
"symfony/yaml": "^4.4|^5.0",
"symplify/autodiscovery": "^6.1",
"symplify/flex-loader": "^6.1",
"symplify/package-builder": "^6.1",
"symplify/statie": "^6.1",
"twig/extensions": "^1.5",
"vich/uploader-bundle": "^1.10"
"symfony/yaml": "^5.0",
"symplify/autodiscovery": "^7.1",
"symplify/flex-loader": "^7.1",
"symplify/package-builder": "^7.1",
"symplify/statie": "^7.1",
"vich/uploader-bundle": "^1.12"
},
"require-dev": {
"latte/latte": "^2.5",
"nette/application": "^3.0",
"nette/bootstrap": "^3.0",
"nette/forms": "^3.0",
"phpstan/phpstan": "^0.11.16",
"phpstan/phpstan-doctrine": "^0.11.6",
"phpunit/phpunit": "^8.4",
"rector/rector": "^0.5",
"roave/security-advisories": "dev-master",
"spatie/http-status-check": "^3.1",
"symfony/var-dumper": "^4.4|^5.0",
"symfony/browser-kit": "^4.4|^5.0",
"symplify/coding-standard": "^6.1",
"symplify/easy-coding-standard": "^6.1",
"symplify/phpstan-extensions": "^6.1"
"phpstan/phpstan": "^0.12",
"phpstan/phpstan-doctrine": "^0.12",
"phpunit/phpunit": "^8.5",
"rector/rector": "dev-master",
"symfony/var-dumper": "^5.0",
"symfony/browser-kit": "^5.0",
"symplify/coding-standard": "^7.1",
"symplify/easy-coding-standard": "^7.1",
"symplify/phpstan-extensions": "^7.1"
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: symfony/xxxx * + config version cannot be used, because of symfony/error-renderer, that somehow blocks Symfony 5 install and forces 4.4

},
"autoload": {
"psr-4": {
Expand Down Expand Up @@ -117,8 +111,7 @@
"check-cs": "vendor/bin/ecs check packages src statie --ansi",
"fix-cs": "vendor/bin/ecs check packages src statie/src statie/tests --fix --ansi",
"doctrine": "bin/console doctrine:schema:update --dump-sql --force --ansi",
"phpstan": "php -d memory_limit=1G vendor/bin/phpstan analyse packages src statie/src statie/tests --error-format symplify --ansi",
"dead-links": "vendor/bin/http-status-check scan https://pehapkari.cz --output invalid-links.txt --ansi",
"phpstan": "php -d memory_limit=1G vendor/bin/phpstan analyse packages src statie/src statie/tests --ansi --error-format symplify",
"rector": "vendor/bin/rector process src tests --config rector-ci.yaml --ansi",
"rector-dry": "vendor/bin/rector process src tests --config rector-ci.yaml --ansi --dry-run"
},
Expand Down