Skip to content

Commit

Permalink
Merge pull request #57 from yaleksandr89/update-symfony-to-v6.4
Browse files Browse the repository at this point in the history
Минорное обновление Symfony v6.4.9, рефаторинг, исправление ошибок
  • Loading branch information
yaleksandr89 committed Jul 16, 2024
2 parents 7eac999 + 4f7338f commit 710ac48
Show file tree
Hide file tree
Showing 125 changed files with 3,812 additions and 3,498 deletions.
4 changes: 3 additions & 1 deletion .env-example
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,6 @@ MESSENGER_TRANSPORT_DSN=doctrine://default
###< symfony/messenger ###

# SITE_BASE_SCHEME=https
# SITE_BASE_HOST=example.com
# SITE_BASE_HOST=example.com

APP_TIMEZONE=Europe/Moscow
4 changes: 3 additions & 1 deletion .env.panther
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@ DATABASE_URL="sqlite:///%kernel.project_dir%/var/db_for_test.db"
SITE_BASE_SCHEME=https
SITE_BASE_HOST=127.0.0.1:8000

CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$'
CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$'

APP_TIMEZONE=Europe/Moscow
4 changes: 3 additions & 1 deletion .env.test
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@ DATABASE_URL="sqlite:///%kernel.project_dir%/var/db_for_test.db"
SITE_BASE_SCHEME=https
SITE_BASE_HOST=127.0.0.1:8000

CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$'
CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$'

APP_TIMEZONE=Europe/Moscow
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
###> Custom Rules ###
log-execute-phpunit.txt
.phpunit.cache/
uploads/
uploads
deploy.php
Expand Down
7 changes: 4 additions & 3 deletions bin/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ echo APP_ENV:'['$APP_ENV']'
php bin/console doctrine:database:drop --force
php bin/console doctrine:database:create

php bin/console doctrine:schema:update --dump-sql
php bin/console doctrine:schema:update --force
#php bin/console doctrine:schema:update --dump-sql # выводит на экран сгенерированный sql запрос
php bin/console doctrine:schema:update --complete --force

php bin/console hautelook:fixtures:load -n

php ./vendor/bin/phpunit --testdox --group unit,integration,functional,functional-panther,functional-selenium
php ./vendor/bin/phpunit --testdox --group unit --group integration --group functional --group functional-selenium --group functional-panther
# --log-events-verbose-text log-execute-phpunit.txt #если нужно посмотреть логи выполнения тестов (сохраняется в корень проекта)
Binary file not shown.
Binary file added bin/selenium-server-standalone-3.141.59.jar
Binary file not shown.
128 changes: 64 additions & 64 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,78 +15,78 @@
"ext-iconv": "*",
"ext-json": "*",
"aego/oauth2-yandex": "^0.2.2",
"api-platform/core": "^2.6",
"composer/package-versions-deprecated": "^1.11.99",
"api-platform/core": "^2.0",
"composer/package-versions-deprecated": "^1.0",
"doctrine/annotations": "^2.0",
"doctrine/doctrine-bundle": "^2.4",
"doctrine/doctrine-migrations-bundle": "^3.1",
"doctrine/orm": "^2.9",
"imagine/imagine": "^1.2",
"knplabs/knp-paginator-bundle": "^5.7",
"knpuniversity/oauth2-client-bundle": "^2.8",
"doctrine/doctrine-bundle": "^2.0",
"doctrine/doctrine-migrations-bundle": "^3.0",
"doctrine/orm": "^2.0",
"imagine/imagine": "^1.0",
"knplabs/knp-paginator-bundle": "^5.0",
"knpuniversity/oauth2-client-bundle": "^2.0",
"league/oauth2-github": "^3.0",
"league/oauth2-google": "^4.0",
"lexik/form-filter-bundle": "^7.0",
"nelmio/cors-bundle": "^2.1",
"php-translation/symfony-bundle": "^0.13",
"phpdocumentor/reflection-docblock": "^5.2",
"sensio/framework-extra-bundle": "^6.1",
"stof/doctrine-extensions-bundle": "^1.6",
"symfony/asset": "6.3.*",
"symfony/console": "6.3.*",
"symfony/doctrine-messenger": "6.3.*",
"symfony/dotenv": "6.3.*",
"symfony/error-handler": "6.3.*",
"symfony/expression-language": "6.3.*",
"symfony/flex": "^1",
"symfony/form": "6.3.*",
"symfony/framework-bundle": "6.3.*",
"symfony/http-client": "6.3.*",
"symfony/intl": "6.3.*",
"symfony/mailer": "6.3.*",
"symfony/messenger": "6.3.*",
"symfony/mime": "6.3.*",
"lexik/form-filter-bundle": "^8.0",
"nelmio/cors-bundle": "^2.0",
"php-translation/symfony-bundle": "^0.14.3",
"phpdocumentor/reflection-docblock": "^5.0",
"sensio/framework-extra-bundle": "^6.0",
"stof/doctrine-extensions-bundle": "^1.0",
"symfony/asset": "6.4.*",
"symfony/console": "6.4.*",
"symfony/doctrine-messenger": "6.4.*",
"symfony/dotenv": "6.4.*",
"symfony/error-handler": "6.4.*",
"symfony/expression-language": "6.4.*",
"symfony/flex": "^1.0",
"symfony/form": "6.4.*",
"symfony/framework-bundle": "6.4.*",
"symfony/http-client": "6.4.*",
"symfony/intl": "6.4.*",
"symfony/mailer": "6.4.*",
"symfony/messenger": "6.4.*",
"symfony/mime": "6.4.*",
"symfony/monolog-bundle": "^3",
"symfony/notifier": "6.3.*",
"symfony/process": "6.3.*",
"symfony/property-access": "6.3.*",
"symfony/property-info": "6.3.*",
"symfony/proxy-manager-bridge": "6.3.*",
"symfony/runtime": "6.3.*",
"symfony/security-bundle": "6.3.*",
"symfony/serializer": "6.3.*",
"symfony/string": "6.3.*",
"symfony/translation": "6.3.*",
"symfony/twig-bundle": "6.3.*",
"symfony/uid": "6.3.*",
"symfony/validator": "6.3.*",
"symfony/web-link": "6.3.*",
"symfony/notifier": "6.4.*",
"symfony/process": "6.4.*",
"symfony/property-access": "6.4.*",
"symfony/property-info": "6.4.*",
"symfony/proxy-manager-bridge": "6.4.*",
"symfony/runtime": "6.4.*",
"symfony/security-bundle": "6.4.*",
"symfony/serializer": "6.4.*",
"symfony/string": "6.4.*",
"symfony/translation": "6.4.*",
"symfony/twig-bundle": "6.4.*",
"symfony/uid": "6.4.*",
"symfony/validator": "6.4.*",
"symfony/web-link": "6.4.*",
"symfony/webpack-encore-bundle": "^1",
"symfony/yaml": "6.3.*",
"symfonycasts/reset-password-bundle": "^1.9",
"symfonycasts/verify-email-bundle": "^1.5",
"twig/cssinliner-extra": "^3.3",
"twig/extra-bundle": "^2.12|^3.0",
"twig/inky-extra": "^3.3",
"twig/intl-extra": "^3.3",
"twig/twig": "^2.12|^3.0"
"symfony/yaml": "6.4.*",
"symfonycasts/reset-password-bundle": "^1.0",
"symfonycasts/verify-email-bundle": "^1.0",
"twig/cssinliner-extra": "^3.0",
"twig/extra-bundle": "^2.0|^3.0",
"twig/inky-extra": "^3.0",
"twig/intl-extra": "^3.0",
"twig/twig": "^2.0|^3.0"
},
"require-dev": {
"dama/doctrine-test-bundle": "^6.7",
"dama/doctrine-test-bundle": "^8.0",
"dbrekelmans/bdi": "^1.0",
"deployer/dist": "^6",
"friendsofphp/php-cs-fixer": "^3",
"deployer/dist": "^6.0",
"friendsofphp/php-cs-fixer": "^3.0",
"hautelook/alice-bundle": "*",
"phpstan/phpstan": "^1",
"phpunit/phpunit": "9.5.16",
"symfony/browser-kit": "6.3.*",
"symfony/css-selector": "6.3.*",
"symfony/debug-bundle": "6.3.*",
"symfony/maker-bundle": "^1",
"symfony/panther": "^2",
"symfony/phpunit-bridge": "6.3.*",
"symfony/stopwatch": "6.3.*",
"symfony/web-profiler-bundle": "6.3.*"
"phpstan/phpstan": "^1.0",
"phpunit/phpunit": "^11.0",
"symfony/browser-kit": "6.4.*",
"symfony/css-selector": "6.4.*",
"symfony/debug-bundle": "6.4.*",
"symfony/maker-bundle": "^1.0",
"symfony/panther": "^2.0",
"symfony/phpunit-bridge": "6.4.*",
"symfony/stopwatch": "6.4.*",
"symfony/web-profiler-bundle": "6.4.*"
},
"config": {
"optimize-autoloader": true,
Expand Down Expand Up @@ -133,7 +133,7 @@
"extra": {
"symfony": {
"allow-contrib": false,
"require": "6.3.*"
"require": "6.4.*"
}
}
}
Loading

0 comments on commit 710ac48

Please sign in to comment.