Skip to content

Commit 5bfbc0a

Browse files
greg0iregreg0ire
committed
Merge remote-tracking branch 'origin/3.6.x' into 4.0.x
2 parents ff933f4 + 49ecc56 commit 5bfbc0a

File tree

11 files changed

+68
-65
lines changed

11 files changed

+68
-65
lines changed

‎.doctrine-project.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,75 +9,75 @@
99
"slug": "latest",
1010
"upcoming": true
1111
},
12+
{
13+
"name": "3.6",
14+
"branchName": "3.6.x",
15+
"slug": "3.6",
16+
"upcoming": true
17+
},
18+
{
19+
"name": "3.5",
20+
"branchName": "3.5.x",
21+
"slug": "3.5",
22+
"current": true
23+
},
1224
{
1325
"name": "3.4",
14-
"branchName": "3.4.x",
1526
"slug": "3.4",
16-
"current": true
27+
"maintained": false
1728
},
1829
{
1930
"name": "3.3",
20-
"branchName": "3.3.x",
2131
"slug": "3.3",
2232
"maintained": false
2333
},
2434
{
2535
"name": "3.2",
26-
"branchName": "3.2.x",
2736
"slug": "3.2",
2837
"maintained": false
2938
},
3039
{
3140
"name": "3.1",
32-
"branchName": "3.1.x",
3341
"slug": "3.1",
3442
"maintained": false
3543
},
3644
{
3745
"name": "3.0",
38-
"branchName": "3.0.x",
3946
"slug": "3.0",
4047
"maintained": false
4148
},
4249
{
4350
"name": "2.2",
44-
"branchName": "2.2.x",
4551
"slug": "2.2",
4652
"maintained": true
4753
},
4854
{
4955
"name": "2.1",
50-
"branchName": "2.1.x",
5156
"slug": "2.1",
5257
"maintained": false
5358
},
5459
{
5560
"name": "2.0",
56-
"branchName": "2.0.x",
5761
"slug": "2.0",
5862
"maintained": false
5963
},
6064
{
6165
"name": "1.3",
62-
"branchName": "1.3",
6366
"slug": "1.3",
6467
"maintained": false
6568
},
6669
{
6770
"name": "1.2",
68-
"branchName": "1.2",
6971
"slug": "1.2",
7072
"maintained": false
7173
},
7274
{
7375
"name": "1.1",
74-
"branchName": "1.1",
7576
"slug": "1.1",
7677
"maintained": false
7778
},
7879
{
7980
"name": "1.0",
80-
"branchName": "1.0",
8181
"slug": "1.0",
8282
"maintained": false
8383
}

‎.github/workflows/coding-standards.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ on:
1212
jobs:
1313
coding-standards:
1414
name: "Coding Standards"
15-
uses: "doctrine/.github/.github/workflows/coding-standards.yml@8.0.0"
15+
uses: "doctrine/.github/.github/workflows/coding-standards.yml@v12.2.0"

‎.github/workflows/composer-lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ on:
1717
jobs:
1818
composer-lint:
1919
name: "Composer Lint"
20-
uses: "doctrine/.github/.github/workflows/composer-lint.yml@8.0.0"
20+
uses: "doctrine/.github/.github/workflows/composer-lint.yml@v12.2.0"

‎.github/workflows/continuous-integration.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ on:
1212
jobs:
1313
phpunit:
1414
name: "PHPUnit"
15-
uses: "doctrine/.github/.github/workflows/continuous-integration.yml@8.0.0"
15+
uses: "doctrine/.github/.github/workflows/continuous-integration.yml@v12.2.0"
1616
with:
1717
php-versions: '["8.4"]'
1818
secrets:
1919
CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"
2020

2121
phpunit-with-dev-deps:
2222
name: "PHPUnit with dev dependencies"
23-
uses: "doctrine/.github/.github/workflows/continuous-integration-symfony-unstable.yml@8.0.0"
23+
uses: "doctrine/.github/.github/workflows/continuous-integration-symfony-unstable.yml@v12.2.0"
2424
with:
2525
symfony-version-constraint: "^7"
2626
secrets:

‎.github/workflows/release-on-milestone-closed.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
release:
1010
name: "Git tag, release & create merge-up PR"
11-
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@8.0.0"
11+
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@v12.2.0"
1212
secrets:
1313
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
1414
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

‎.github/workflows/static-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ on:
1212
jobs:
1313
static-analysis:
1414
name: "Static Analysis"
15-
uses: "doctrine/.github/.github/workflows/phpstan.yml@8.0.0"
15+
uses: "doctrine/.github/.github/workflows/phpstan.yml@v12.2.0"

‎.symfony.bundle.yaml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
branches: ["3.0.x", "3.1.x", "3.2.x", "3.3.x", "3.4.x", "4.0.x"]
2-
maintained_branches: ["3.4.x", "4.0.x"]
1+
branches:
2+
- "3.0.x"
3+
- "3.1.x"
4+
- "3.2.x"
5+
- "3.3.x"
6+
- "3.4.x"
7+
- "3.5.x"
8+
- "3.6.x"
9+
- "4.0.x"
10+
maintained_branches: ["3.5.x", "3.6.x", "4.0.x"]
311
doc_dir: "docs/"
4-
dev_branch: "3.4.x"
12+
dev_branch: "4.0.x"

‎composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"doctrine/doctrine-bundle": "^3",
2929
"doctrine/migrations": "^3.2",
3030
"symfony/deprecation-contracts": "^2.1 || ^3",
31-
"symfony/framework-bundle": "^6.4 || ^7.0"
31+
"symfony/framework-bundle": "^6.4 || ^7.0 || ^8.0"
3232
},
3333
"require-dev": {
3434
"composer/semver": "^3.0",
@@ -39,8 +39,8 @@
3939
"phpstan/phpstan-phpunit": "^2",
4040
"phpstan/phpstan-strict-rules": "^2",
4141
"phpstan/phpstan-symfony": "^2",
42-
"phpunit/phpunit": "^10.5.40 || ^11.5",
43-
"symfony/var-exporter": "^6.4 || ^7"
42+
"phpunit/phpunit": "^10.5.58 || ^11.5",
43+
"symfony/var-exporter": "^6.4 || ^7 || ^8"
4444
},
4545
"autoload": {
4646
"psr-4": {

‎tests/DependencyInjection/DoctrineMigrationsExtensionTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
use Symfony\Component\DependencyInjection\Alias;
2626
use Symfony\Component\DependencyInjection\ContainerBuilder;
2727
use Symfony\Component\DependencyInjection\Definition;
28-
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
28+
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
2929
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
3030
use Symfony\Component\DependencyInjection\Reference;
3131

@@ -42,8 +42,8 @@ public function testXmlConfigs(): void
4242

4343
$container->setAlias('doctrine.migrations.configuration.test', new Alias('doctrine.migrations.configuration', true));
4444

45-
$loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Fixtures'));
46-
$loader->load('conf.xml');
45+
$loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../Fixtures'));
46+
$loader->load('conf.php');
4747

4848
$container->compile();
4949

@@ -391,8 +391,8 @@ public function testTransactionalIsTrueIfNotSet(): void
391391
$container->registerExtension(new DoctrineMigrationsExtension());
392392
$container->setAlias('doctrine.migrations.configuration.test', new Alias('doctrine.migrations.configuration', true));
393393

394-
$loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Fixtures'));
395-
$loader->load('conf.xml');
394+
$loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../Fixtures'));
395+
$loader->load('conf.php');
396396

397397
$container->compile();
398398

‎tests/Fixtures/conf.php‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
6+
7+
return static function (ContainerConfigurator $container): void {
8+
$container->extension('doctrine_migrations', [
9+
'all_or_nothing' => true,
10+
'check_database_platform' => true,
11+
'organize_migrations' => 'BY_YEAR_AND_MONTH',
12+
'migrations_paths' => [
13+
'DoctrineMigrationsTest' => 'a',
14+
'DoctrineMigrationsTest2' => 'b',
15+
],
16+
'migrations' => [
17+
'Foo',
18+
'Bar',
19+
],
20+
'storage' => [
21+
'table_storage' => [
22+
'table_name' => 'doctrine_migration_versions_test',
23+
'version_column_name' => 'doctrine_migration_column_test',
24+
'version_column_length' => 2000,
25+
'execution_time_column_name' => 'doctrine_migration_execution_time_column_test',
26+
'executed_at_column_name' => 'doctrine_migration_executed_at_column_test',
27+
],
28+
],
29+
]);
30+
};

0 commit comments

Comments
 (0)