Skip to content

Commit a5c5fe0

Browse files
authored
Merge pull request #580 from greg0ire/3.4.x
Merge 3.3.x up into 3.4.x
2 parents 45d1b74 + b4ced5e commit a5c5fe0

File tree

2 files changed

+40
-12
lines changed

2 files changed

+40
-12
lines changed

.github/workflows/composer-lint.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: "Composer Lint"
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- "*.x"
7+
paths:
8+
- ".github/workflows/composer-lint.yml"
9+
- "composer.json"
10+
push:
11+
branches:
12+
- "*.x"
13+
paths:
14+
- ".github/workflows/composer-lint.yml"
15+
- "composer.json"
16+
17+
jobs:
18+
composer-lint:
19+
name: "Composer Lint"
20+
uses: "doctrine/.github/.github/workflows/[email protected]"

composer.json

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
{
22
"name": "doctrine/doctrine-migrations-bundle",
3-
"type": "symfony-bundle",
43
"description": "Symfony DoctrineMigrationsBundle",
5-
"keywords": ["DBAL", "Migrations", "Schema"],
6-
"homepage": "https://www.doctrine-project.org",
74
"license": "MIT",
5+
"type": "symfony-bundle",
6+
"keywords": [
7+
"DBAL",
8+
"Migrations",
9+
"Schema"
10+
],
811
"authors": [
912
{
1013
"name": "Fabien Potencier",
@@ -19,32 +22,37 @@
1922
"homepage": "https://symfony.com/contributors"
2023
}
2124
],
25+
"homepage": "https://www.doctrine-project.org",
2226
"require": {
23-
"php": "^7.2|^8.0",
24-
"symfony/deprecation-contracts": "^2.1 || ^3",
25-
"symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0",
27+
"php": "^7.2 || ^8.0",
2628
"doctrine/doctrine-bundle": "^2.4",
27-
"doctrine/migrations": "^3.2"
29+
"doctrine/migrations": "^3.2",
30+
"symfony/deprecation-contracts": "^2.1 || ^3",
31+
"symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0"
2832
},
2933
"require-dev": {
3034
"composer/semver": "^3.0",
31-
"phpunit/phpunit": "^8.5|^9.5",
3235
"doctrine/coding-standard": "^12",
36+
"doctrine/orm": "^2.6 || ^3",
37+
"doctrine/persistence": "^2.0 || ^3",
3338
"phpstan/phpstan": "^1.4 || ^2",
3439
"phpstan/phpstan-deprecation-rules": "^1 || ^2",
3540
"phpstan/phpstan-phpunit": "^1 || ^2",
3641
"phpstan/phpstan-strict-rules": "^1.1 || ^2",
3742
"phpstan/phpstan-symfony": "^1.3 || ^2",
38-
"doctrine/orm": "^2.6 || ^3",
39-
"doctrine/persistence": "^2.0 || ^3 ",
43+
"phpunit/phpunit": "^8.5 || ^9.5",
4044
"symfony/phpunit-bridge": "^6.3 || ^7",
4145
"symfony/var-exporter": "^5.4 || ^6 || ^7"
4246
},
4347
"autoload": {
44-
"psr-4": { "Doctrine\\Bundle\\MigrationsBundle\\": "src" }
48+
"psr-4": {
49+
"Doctrine\\Bundle\\MigrationsBundle\\": "src"
50+
}
4551
},
4652
"autoload-dev": {
47-
"psr-4": { "Doctrine\\Bundle\\MigrationsBundle\\Tests\\": "tests" }
53+
"psr-4": {
54+
"Doctrine\\Bundle\\MigrationsBundle\\Tests\\": "tests"
55+
}
4856
},
4957
"config": {
5058
"allow-plugins": {

0 commit comments

Comments
 (0)