Skip to content

Commit

Permalink
Symfony 6.3, updated dependencies, added phpmd for the tests folder, …
Browse files Browse the repository at this point in the history
…updated some configuration.
  • Loading branch information
DKravtsov committed Jun 25, 2023
1 parent 86bb6fc commit 2cfa155
Show file tree
Hide file tree
Showing 21 changed files with 2,006 additions and 1,903 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jobs:
build:
working_directory: ~/html
machine:
image: ubuntu-2004:202101-01
image: ubuntu-2204:2023.04.2
branches:
ignore:
- develop
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -235,11 +235,11 @@ drop-migrate: ## Drops databases and runs all migrations for the main/test datab
@make migrate

migrate-no-test: ## Runs all migrations for main database
@make exec cmd="php bin/console doctrine:migrations:migrate --no-interaction --all-or-nothing"
@make exec cmd="php bin/console doctrine:migrations:migrate --no-interaction"

migrate: ## Runs all migrations for main/test databases
@make exec cmd="php bin/console doctrine:migrations:migrate --no-interaction --all-or-nothing"
@make exec cmd="php bin/console doctrine:migrations:migrate --no-interaction --all-or-nothing --env=test"
@make exec cmd="php bin/console doctrine:migrations:migrate --no-interaction"
@make exec cmd="php bin/console doctrine:migrations:migrate --no-interaction --env=test"

fixtures: ## Runs all fixtures for test database without --append option (tables will be dropped and recreated)
@make exec cmd="php bin/console doctrine:fixtures:load --env=test"
Expand Down Expand Up @@ -280,7 +280,7 @@ phpcpd: ## Runs php copy/paste detector
@make exec cmd="php phpcpd.phar --fuzzy src tests"

phpmd: ## Runs php mess detector
@make exec cmd="php ./vendor/bin/phpmd src text phpmd_ruleset.xml --suffixes php"
@make exec cmd="php ./vendor/bin/phpmd src,tests text phpmd_ruleset.xml --suffixes php"

phpstan: ## Runs PhpStan static analysis tool
ifeq ($(INSIDE_DOCKER_CONTAINER), 1)
Expand Down
76 changes: 38 additions & 38 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,43 +31,43 @@
"ext-pdo": "*",
"ext-pdo_mysql": "*",
"doctrine/annotations": "^2.0",
"doctrine/doctrine-bundle": "^2.9",
"doctrine/doctrine-bundle": "^2.10",
"doctrine/doctrine-migrations-bundle": "^3.2",
"doctrine/orm": "^2.14",
"doctrine/orm": "^2.15",
"phpdocumentor/reflection-docblock": "^5.3",
"dukecity/command-scheduler-bundle": "^5.0",
"symfony/apache-pack": "^1.0",
"symfony/asset": "6.2.*",
"symfony/config": "6.2.*",
"symfony/console": "6.2.*",
"symfony/dotenv": "6.2.*",
"symfony/expression-language": "6.2.*",
"symfony/asset": "6.3.*",
"symfony/config": "6.3.*",
"symfony/console": "6.3.*",
"symfony/dotenv": "6.3.*",
"symfony/expression-language": "6.3.*",
"symfony/flex": "^2.2",
"symfony/form": "6.2.*",
"symfony/framework-bundle": "6.2.*",
"symfony/http-client": "6.2.*",
"symfony/intl": "6.2.*",
"symfony/mailer": "6.2.*",
"symfony/messenger": "6.2.*",
"symfony/amqp-messenger": "6.2.*",
"symfony/doctrine-messenger": "6.2.*",
"symfony/mime": "6.2.*",
"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/amqp-messenger": "6.3.*",
"symfony/doctrine-messenger": "6.3.*",
"symfony/mime": "6.3.*",
"symfony/monolog-bundle": "^3.8",
"symfony/notifier": "6.2.*",
"symfony/process": "6.2.*",
"symfony/property-access": "6.2.*",
"symfony/property-info": "6.2.*",
"symfony/proxy-manager-bridge": "6.2.*",
"symfony/runtime": "6.2.*",
"symfony/routing": "6.2.*",
"symfony/security-bundle": "6.2.*",
"symfony/serializer": "6.2.*",
"symfony/string": "6.2.*",
"symfony/translation": "6.2.*",
"symfony/twig-bundle": "6.2.*",
"symfony/validator": "6.2.*",
"symfony/web-link": "6.2.*",
"symfony/yaml": "6.2.*",
"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/routing": "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/validator": "6.3.*",
"symfony/web-link": "6.3.*",
"symfony/yaml": "6.3.*",
"twig/extra-bundle": "^2.12|^3.0"
},
"conflict": {
Expand All @@ -80,13 +80,13 @@
"doctrine/doctrine-fixtures-bundle": "^3.4",
"systemsdk/easy-log-bundle": "2.0.*",
"roave/security-advisories": "dev-latest",
"symfony/browser-kit": "6.2.*",
"symfony/debug-bundle": "6.2.*",
"symfony/maker-bundle": "^1.48",
"symfony/browser-kit": "6.3.*",
"symfony/debug-bundle": "6.3.*",
"symfony/maker-bundle": "^1.49",
"symfony/requirements-checker": "^2.0",
"symfony/stopwatch": "6.2.*",
"symfony/var-dumper": "6.2.*",
"symfony/web-profiler-bundle": "6.2.*"
"symfony/stopwatch": "6.3.*",
"symfony/var-dumper": "6.3.*",
"symfony/web-profiler-bundle": "6.3.*"
},
"replace": {
"symfony/polyfill-ctype": "*",
Expand Down Expand Up @@ -114,7 +114,7 @@
},
"symfony": {
"allow-contrib": true,
"require": "6.2.*"
"require": "6.3.*"
}
},
"autoload": {
Expand Down
Loading

0 comments on commit 2cfa155

Please sign in to comment.