skobkin/magnetico-web
1
1
Fork 0
Code Issues Pull requests 2 Releases Activity

WIP: Preparations for Symfony 6 upgrade #14

Draft
skobkin wants to merge 4 commits from fix_symfony6_preparations into master
pull from: fix_symfony6_preparations
merge into: skobkin:master
Conversation 0 Commits 4 Files changed 10 +83 -63
3 changed files with 83 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 6d2c70d427 - Show all commits

2
composer.json
View file

@ -22,7 +22,7 @@
"composer/package-versions-deprecated": "1.11.99.5", "composer/package-versions-deprecated": "1.11.99.5",
"doctrine/annotations": "^1.0", "doctrine/annotations": "^1.0",
"doctrine/doctrine-bundle": "^2", "doctrine/doctrine-bundle": "^2",
"doctrine/doctrine-migrations-bundle": "^2", "doctrine/doctrine-migrations-bundle": "^3",
"doctrine/orm": "^2", "doctrine/orm": "^2",
"excelwebzone/recaptcha-bundle": "^1.5", "excelwebzone/recaptcha-bundle": "^1.5",
"pagerfanta/doctrine-orm-adapter": "^3.6", "pagerfanta/doctrine-orm-adapter": "^3.6",

135
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "bfa726a8284bf45a7ccbbb6600e02128", "content-hash": "d075bf85a61c962f3316ab9d71fa4650",
"packages": [ "packages": [
{ {
"name": "babdev/pagerfanta-bundle", "name": "babdev/pagerfanta-bundle",
@ -724,35 +724,38 @@
}, },
{ {
"name": "doctrine/dbal", "name": "doctrine/dbal",
"version": "2.13.9", "version": "3.3.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/dbal.git", "url": "https://github.com/doctrine/dbal.git",
"reference": "c480849ca3ad6706a39c970cdfe6888fa8a058b8" "reference": "9f79d4650430b582f4598fe0954ef4d52fbc0a8a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/c480849ca3ad6706a39c970cdfe6888fa8a058b8", "url": "https://api.github.com/repos/doctrine/dbal/zipball/9f79d4650430b582f4598fe0954ef4d52fbc0a8a",
"reference": "c480849ca3ad6706a39c970cdfe6888fa8a058b8", "reference": "9f79d4650430b582f4598fe0954ef4d52fbc0a8a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"doctrine/cache": "^1.0|^2.0", "composer-runtime-api": "^2",
"doctrine/cache": "^1.11|^2.0",
"doctrine/deprecations": "^0.5.3|^1", "doctrine/deprecations": "^0.5.3|^1",
"doctrine/event-manager": "^1.0", "doctrine/event-manager": "^1.0",
"ext-pdo": "*", "php": "^7.3 || ^8.0",
"php": "^7.1 || ^8" "psr/cache": "^1|^2|^3",
"psr/log": "^1|^2|^3"
}, },
"require-dev": { "require-dev": {
"doctrine/coding-standard": "9.0.0", "doctrine/coding-standard": "9.0.0",
"jetbrains/phpstorm-stubs": "2021.1", "jetbrains/phpstorm-stubs": "2022.1",
"phpstan/phpstan": "1.4.6", "phpstan/phpstan": "1.7.13",
"phpunit/phpunit": "^7.5.20|^8.5|9.5.16", "phpstan/phpstan-strict-rules": "^1.2",
"phpunit/phpunit": "9.5.20",
"psalm/plugin-phpunit": "0.16.1", "psalm/plugin-phpunit": "0.16.1",
"squizlabs/php_codesniffer": "3.6.2", "squizlabs/php_codesniffer": "3.7.0",
"symfony/cache": "^4.4", "symfony/cache": "^5.2|^6.0",
"symfony/console": "^2.0.5|^3.0|^4.0|^5.0", "symfony/console": "^2.7|^3.0|^4.0|^5.0|^6.0",
"vimeo/psalm": "4.22.0" "vimeo/psalm": "4.23.0"
}, },
"suggest": { "suggest": {
"symfony/console": "For helpful console commands such as SQL execution and import of files." "symfony/console": "For helpful console commands such as SQL execution and import of files."
@ -763,7 +766,7 @@
"type": "library", "type": "library",
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Doctrine\\DBAL\\": "lib/Doctrine/DBAL" "Doctrine\\DBAL\\": "src"
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
@ -806,14 +809,13 @@
"queryobject", "queryobject",
"sasql", "sasql",
"sql", "sql",
"sqlanywhere",
"sqlite", "sqlite",
"sqlserver", "sqlserver",
"sqlsrv" "sqlsrv"
], ],
"support": { "support": {
"issues": "https://github.com/doctrine/dbal/issues", "issues": "https://github.com/doctrine/dbal/issues",
"source": "https://github.com/doctrine/dbal/tree/2.13.9" "source": "https://github.com/doctrine/dbal/tree/3.3.7"
}, },
"funding": [ "funding": [
{ {
@ -829,7 +831,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-05-02T20:28:55+00:00" "time": "2022-06-13T21:43:03+00:00"
}, },
{ {
"name": "doctrine/deprecations", "name": "doctrine/deprecations",
@ -990,30 +992,34 @@
}, },
{ {
"name": "doctrine/doctrine-migrations-bundle", "name": "doctrine/doctrine-migrations-bundle",
"version": "2.2.3", "version": "3.2.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/DoctrineMigrationsBundle.git", "url": "https://github.com/doctrine/DoctrineMigrationsBundle.git",
"reference": "0a081b55a88259a887af7be654743a8c5f703e99" "reference": "3393f411ba25ade21969c33f2053220044854d01"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/0a081b55a88259a887af7be654743a8c5f703e99", "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/3393f411ba25ade21969c33f2053220044854d01",
"reference": "0a081b55a88259a887af7be654743a8c5f703e99", "reference": "3393f411ba25ade21969c33f2053220044854d01",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"doctrine/doctrine-bundle": "~1.0|~2.0", "doctrine/doctrine-bundle": "~1.0|~2.0",
"doctrine/migrations": "^2.2", "doctrine/migrations": "^3.2",
"php": "^7.1|^8.0", "php": "^7.2|^8.0",
"symfony/framework-bundle": "~3.4|~4.0|~5.0" "symfony/framework-bundle": "~3.4|~4.0|~5.0|~6.0"
}, },
"require-dev": { "require-dev": {
"doctrine/coding-standard": "^8.0", "doctrine/coding-standard": "^8.0",
"mikey179/vfsstream": "^1.6", "doctrine/orm": "^2.6",
"doctrine/persistence": "^1.3||^2.0",
"phpstan/phpstan": "^0.12", "phpstan/phpstan": "^0.12",
"phpstan/phpstan-deprecation-rules": "^0.12",
"phpstan/phpstan-phpunit": "^0.12",
"phpstan/phpstan-strict-rules": "^0.12", "phpstan/phpstan-strict-rules": "^0.12",
"phpunit/phpunit": "^7.0|^8.0|^9.0" "phpunit/phpunit": "^8.0|^9.0",
"vimeo/psalm": "^4.11"
}, },
"type": "symfony-bundle", "type": "symfony-bundle",
"autoload": { "autoload": {
@ -1035,11 +1041,11 @@
}, },
{ {
"name": "Doctrine Project", "name": "Doctrine Project",
"homepage": "http://www.doctrine-project.org" "homepage": "https://www.doctrine-project.org"
}, },
{ {
"name": "Symfony Community", "name": "Symfony Community",
"homepage": "http://symfony.com/contributors" "homepage": "https://symfony.com/contributors"
} }
], ],
"description": "Symfony DoctrineMigrationsBundle", "description": "Symfony DoctrineMigrationsBundle",
@ -1051,7 +1057,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/doctrine/DoctrineMigrationsBundle/issues", "issues": "https://github.com/doctrine/DoctrineMigrationsBundle/issues",
"source": "https://github.com/doctrine/DoctrineMigrationsBundle/tree/2.2.3" "source": "https://github.com/doctrine/DoctrineMigrationsBundle/tree/3.2.2"
}, },
"funding": [ "funding": [
{ {
@ -1067,7 +1073,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-03-18T20:55:50+00:00" "time": "2022-02-01T18:08:07+00:00"
}, },
{ {
"name": "doctrine/event-manager", "name": "doctrine/event-manager",
@ -1402,49 +1408,63 @@
}, },
{ {
"name": "doctrine/migrations", "name": "doctrine/migrations",
"version": "2.3.5", "version": "3.5.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/migrations.git", "url": "https://github.com/doctrine/migrations.git",
"reference": "28d92a34348fee5daeb80879e56461b2e862fc05" "reference": "c0a01ddead0ccaf0282f3f4fcaa026d11918a481"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/migrations/zipball/28d92a34348fee5daeb80879e56461b2e862fc05", "url": "https://api.github.com/repos/doctrine/migrations/zipball/c0a01ddead0ccaf0282f3f4fcaa026d11918a481",
"reference": "28d92a34348fee5daeb80879e56461b2e862fc05", "reference": "c0a01ddead0ccaf0282f3f4fcaa026d11918a481",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"composer/package-versions-deprecated": "^1.8", "composer-runtime-api": "^2",
"doctrine/dbal": "^2.9", "doctrine/dbal": "^3.3",
"doctrine/deprecations": "^0.5.3 || ^1",
"doctrine/event-manager": "^1.0",
"friendsofphp/proxy-manager-lts": "^1.0", "friendsofphp/proxy-manager-lts": "^1.0",
"php": "^7.1 || ^8.0", "php": "^7.4 || ^8.0",
"symfony/console": "^3.4||^4.4.16||^5.0", "psr/log": "^1.1.3 || ^2 || ^3",
"symfony/stopwatch": "^3.4||^4.0||^5.0" "symfony/console": "^4.4.16 || ^5.4 || ^6.0",
"symfony/stopwatch": "^4.4 || ^5.4 || ^6.0"
},
"conflict": {
"doctrine/orm": "<2.12"
}, },
"require-dev": { "require-dev": {
"doctrine/coding-standard": "^8.2", "doctrine/coding-standard": "^9",
"doctrine/orm": "^2.6", "doctrine/orm": "^2.12",
"doctrine/persistence": "^2 || ^3",
"doctrine/sql-formatter": "^1.0",
"ergebnis/composer-normalize": "^2.9",
"ext-pdo_sqlite": "*", "ext-pdo_sqlite": "*",
"jdorn/sql-formatter": "^1.1", "phpstan/phpstan": "^1.5",
"mikey179/vfsstream": "^1.6", "phpstan/phpstan-deprecation-rules": "^1",
"phpstan/phpstan": "^0.12", "phpstan/phpstan-phpunit": "^1.1",
"phpstan/phpstan-deprecation-rules": "^0.12", "phpstan/phpstan-strict-rules": "^1.1",
"phpstan/phpstan-phpunit": "^0.12", "phpstan/phpstan-symfony": "^1.1",
"phpstan/phpstan-strict-rules": "^0.12", "phpunit/phpunit": "^9.5",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.4", "symfony/cache": "^4.4 || ^5.4 || ^6.0",
"symfony/cache": "^4.4. || ^5.3", "symfony/process": "^4.4 || ^5.4 || ^6.0",
"symfony/process": "^3.4||^4.0||^5.0", "symfony/yaml": "^4.4 || ^5.4 || ^6.0"
"symfony/yaml": "^3.4||^4.0||^5.0"
}, },
"suggest": { "suggest": {
"jdorn/sql-formatter": "Allows to generate formatted SQL with the diff command.", "doctrine/sql-formatter": "Allows to generate formatted SQL with the diff command.",
"symfony/yaml": "Allows the use of yaml for migration configuration files." "symfony/yaml": "Allows the use of yaml for migration configuration files."
}, },
"bin": [ "bin": [
"bin/doctrine-migrations" "bin/doctrine-migrations"
], ],
"type": "library", "type": "library",
"extra": {
"composer-normalize": {
"indent-size": 4,
"indent-style": "space"
}
},
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Doctrine\\Migrations\\": "lib/Doctrine/Migrations" "Doctrine\\Migrations\\": "lib/Doctrine/Migrations"
@ -1473,12 +1493,11 @@
"keywords": [ "keywords": [
"database", "database",
"dbal", "dbal",
"migrations", "migrations"
"php"
], ],
"support": { "support": {
"issues": "https://github.com/doctrine/migrations/issues", "issues": "https://github.com/doctrine/migrations/issues",
"source": "https://github.com/doctrine/migrations/tree/2.3.5" "source": "https://github.com/doctrine/migrations/tree/3.5.1"
}, },
"funding": [ "funding": [
{ {
@ -1494,7 +1513,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-10-19T19:55:20+00:00" "time": "2022-05-09T20:24:38+00:00"
}, },
{ {
"name": "doctrine/orm", "name": "doctrine/orm",

9
config/packages/doctrine_migrations.yaml
View file

@ -1,5 +1,6 @@
doctrine_migrations: doctrine_migrations:
dir_name: '%kernel.project_dir%/src/Migrations' migrations_paths:
# namespace is arbitrary but should be different from App\Migrations 'DoctrineMigrations': '%kernel.project_dir%/src/Migrations'
# as migrations classes should NOT be autoloaded storage:
namespace: DoctrineMigrations table_storage:
table_name: 'migration_versions'