Skip to content

Commit c1194eb

Browse files
committed
Merge branch '4.6'
2 parents 2b36a0b + b1216b1 commit c1194eb

File tree

3 files changed

+17
-12
lines changed

3 files changed

+17
-12
lines changed

skeleton/extension/composer.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
},
1818
"require-dev": {
1919
"ibexa/code-style": "~2.0.0",
20-
"phpstan/phpstan": "^1.10",
21-
"phpstan/phpstan-phpunit": "^1.3",
22-
"phpstan/phpstan-symfony": "^1.3",
20+
"phpstan/phpstan": "^2.0",
21+
"phpstan/phpstan-phpunit": "^2.0",
22+
"phpstan/phpstan-symfony": "^2.0",
2323
"phpunit/phpunit": "^9.0",
2424
"qossmic/deptrac": "^2.0"
2525
},
@@ -57,6 +57,7 @@
5757
}
5858
},
5959
"config": {
60-
"sort-packages": true
60+
"sort-packages": true,
61+
"allow-plugins": false
6162
}
6263
}

skeleton/ibexa-ee/composer.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@
2525
"require-dev": {
2626
"ibexa/behat": "~5.0.x-dev",
2727
"ibexa/code-style": "~2.0.0",
28+
"ibexa/doctrine-schema": "~5.0.x-dev",
2829
"ibexa/phpstan": "~5.0.x-dev",
29-
"phpstan/phpstan": "^1.10",
30-
"phpstan/phpstan-phpunit": "^1.3",
31-
"phpstan/phpstan-symfony": "^1.3",
30+
"phpstan/phpstan": "^2.0",
31+
"phpstan/phpstan-phpunit": "^2.0",
32+
"phpstan/phpstan-symfony": "^2.0",
3233
"phpunit/phpunit": "^9",
3334
"qossmic/deptrac": "^2.0"
3435
},
@@ -66,6 +67,7 @@
6667
}
6768
},
6869
"config": {
69-
"sort-packages": true
70+
"sort-packages": true,
71+
"allow-plugins": false
7072
}
7173
}

skeleton/ibexa-oss/composer.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@
1919
"require-dev": {
2020
"ibexa/behat": "~5.0.x-dev",
2121
"ibexa/code-style": "~2.0.0",
22+
"ibexa/doctrine-schema": "~5.0.x-dev",
2223
"ibexa/phpstan": "~5.0.x-dev",
23-
"phpstan/phpstan": "^1.10",
24-
"phpstan/phpstan-phpunit": "^1.3",
25-
"phpstan/phpstan-symfony": "^1.3",
24+
"phpstan/phpstan": "^2.0",
25+
"phpstan/phpstan-phpunit": "^2.0",
26+
"phpstan/phpstan-symfony": "^2.0",
2627
"phpunit/phpunit": "^9.0",
2728
"qossmic/deptrac": "^2.0"
2829
},
@@ -60,6 +61,7 @@
6061
}
6162
},
6263
"config": {
63-
"sort-packages": true
64+
"sort-packages": true,
65+
"allow-plugins": false
6466
}
6567
}

0 commit comments

Comments
 (0)