Skip to content

Commit 2cfa155

Browse files
author
DKravtsov
committed
Symfony 6.3, updated dependencies, added phpmd for the tests folder, updated some configuration.
1 parent 86bb6fc commit 2cfa155

21 files changed

+2006
-1903
lines changed

‎.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ jobs:
33
build:
44
working_directory: ~/html
55
machine:
6-
image: ubuntu-2004:202101-01
6+
image: ubuntu-2204:2023.04.2
77
branches:
88
ignore:
99
- develop

‎Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -235,11 +235,11 @@ drop-migrate: ## Drops databases and runs all migrations for the main/test datab
235235
@make migrate
236236

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

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

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

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

285285
phpstan: ## Runs PhpStan static analysis tool
286286
ifeq ($(INSIDE_DOCKER_CONTAINER), 1)

‎composer.json

+38-38
Original file line numberDiff line numberDiff line change
@@ -31,43 +31,43 @@
3131
"ext-pdo": "*",
3232
"ext-pdo_mysql": "*",
3333
"doctrine/annotations": "^2.0",
34-
"doctrine/doctrine-bundle": "^2.9",
34+
"doctrine/doctrine-bundle": "^2.10",
3535
"doctrine/doctrine-migrations-bundle": "^3.2",
36-
"doctrine/orm": "^2.14",
36+
"doctrine/orm": "^2.15",
3737
"phpdocumentor/reflection-docblock": "^5.3",
3838
"dukecity/command-scheduler-bundle": "^5.0",
3939
"symfony/apache-pack": "^1.0",
40-
"symfony/asset": "6.2.*",
41-
"symfony/config": "6.2.*",
42-
"symfony/console": "6.2.*",
43-
"symfony/dotenv": "6.2.*",
44-
"symfony/expression-language": "6.2.*",
40+
"symfony/asset": "6.3.*",
41+
"symfony/config": "6.3.*",
42+
"symfony/console": "6.3.*",
43+
"symfony/dotenv": "6.3.*",
44+
"symfony/expression-language": "6.3.*",
4545
"symfony/flex": "^2.2",
46-
"symfony/form": "6.2.*",
47-
"symfony/framework-bundle": "6.2.*",
48-
"symfony/http-client": "6.2.*",
49-
"symfony/intl": "6.2.*",
50-
"symfony/mailer": "6.2.*",
51-
"symfony/messenger": "6.2.*",
52-
"symfony/amqp-messenger": "6.2.*",
53-
"symfony/doctrine-messenger": "6.2.*",
54-
"symfony/mime": "6.2.*",
46+
"symfony/form": "6.3.*",
47+
"symfony/framework-bundle": "6.3.*",
48+
"symfony/http-client": "6.3.*",
49+
"symfony/intl": "6.3.*",
50+
"symfony/mailer": "6.3.*",
51+
"symfony/messenger": "6.3.*",
52+
"symfony/amqp-messenger": "6.3.*",
53+
"symfony/doctrine-messenger": "6.3.*",
54+
"symfony/mime": "6.3.*",
5555
"symfony/monolog-bundle": "^3.8",
56-
"symfony/notifier": "6.2.*",
57-
"symfony/process": "6.2.*",
58-
"symfony/property-access": "6.2.*",
59-
"symfony/property-info": "6.2.*",
60-
"symfony/proxy-manager-bridge": "6.2.*",
61-
"symfony/runtime": "6.2.*",
62-
"symfony/routing": "6.2.*",
63-
"symfony/security-bundle": "6.2.*",
64-
"symfony/serializer": "6.2.*",
65-
"symfony/string": "6.2.*",
66-
"symfony/translation": "6.2.*",
67-
"symfony/twig-bundle": "6.2.*",
68-
"symfony/validator": "6.2.*",
69-
"symfony/web-link": "6.2.*",
70-
"symfony/yaml": "6.2.*",
56+
"symfony/notifier": "6.3.*",
57+
"symfony/process": "6.3.*",
58+
"symfony/property-access": "6.3.*",
59+
"symfony/property-info": "6.3.*",
60+
"symfony/proxy-manager-bridge": "6.3.*",
61+
"symfony/runtime": "6.3.*",
62+
"symfony/routing": "6.3.*",
63+
"symfony/security-bundle": "6.3.*",
64+
"symfony/serializer": "6.3.*",
65+
"symfony/string": "6.3.*",
66+
"symfony/translation": "6.3.*",
67+
"symfony/twig-bundle": "6.3.*",
68+
"symfony/validator": "6.3.*",
69+
"symfony/web-link": "6.3.*",
70+
"symfony/yaml": "6.3.*",
7171
"twig/extra-bundle": "^2.12|^3.0"
7272
},
7373
"conflict": {
@@ -80,13 +80,13 @@
8080
"doctrine/doctrine-fixtures-bundle": "^3.4",
8181
"systemsdk/easy-log-bundle": "2.0.*",
8282
"roave/security-advisories": "dev-latest",
83-
"symfony/browser-kit": "6.2.*",
84-
"symfony/debug-bundle": "6.2.*",
85-
"symfony/maker-bundle": "^1.48",
83+
"symfony/browser-kit": "6.3.*",
84+
"symfony/debug-bundle": "6.3.*",
85+
"symfony/maker-bundle": "^1.49",
8686
"symfony/requirements-checker": "^2.0",
87-
"symfony/stopwatch": "6.2.*",
88-
"symfony/var-dumper": "6.2.*",
89-
"symfony/web-profiler-bundle": "6.2.*"
87+
"symfony/stopwatch": "6.3.*",
88+
"symfony/var-dumper": "6.3.*",
89+
"symfony/web-profiler-bundle": "6.3.*"
9090
},
9191
"replace": {
9292
"symfony/polyfill-ctype": "*",
@@ -114,7 +114,7 @@
114114
},
115115
"symfony": {
116116
"allow-contrib": true,
117-
"require": "6.2.*"
117+
"require": "6.3.*"
118118
}
119119
},
120120
"autoload": {

0 commit comments

Comments
 (0)