Skip to content

Commit ca6a735

Browse files
committed
Merge branch '2.13.x' into 2.14.x
2 parents a91383d + aac7562 commit ca6a735

9 files changed

+9
-8
lines changed

.github/workflows/coding-standards.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ on:
1212
jobs:
1313
coding-standards:
1414
name: "Coding Standards"
15-
uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.3.0"
15+
uses: "doctrine/.github/.github/workflows/coding-standards.yml@7.2.2"
1616
with:
1717
composer-options: "--prefer-dist --prefer-stable"

.github/workflows/composer-lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ on:
1515
jobs:
1616
composer-lint:
1717
name: "Composer Lint"
18-
uses: "doctrine/.github/.github/workflows/composer-lint.yml@5.3.0"
18+
uses: "doctrine/.github/.github/workflows/composer-lint.yml@7.2.2"

.github/workflows/documentation.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ on:
1717
jobs:
1818
documentation:
1919
name: "Documentation"
20-
uses: "doctrine/.github/.github/workflows/documentation.yml@5.3.0"
20+
uses: "doctrine/.github/.github/workflows/documentation.yml@7.2.2"

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

+1-1
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@5.3.0"
11+
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@7.2.2"
1212
secrets:
1313
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
1414
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/static-analysis.yml

+1-1
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@7.1.0"
15+
uses: "doctrine/.github/.github/workflows/phpstan.yml@7.2.2"

tests/DependencyInjection/AbstractDoctrineExtensionTest.php tests/DependencyInjection/AbstractDoctrineExtensionTestCase.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656

5757
use const DIRECTORY_SEPARATOR;
5858

59-
abstract class AbstractDoctrineExtensionTest extends TestCase
59+
abstract class AbstractDoctrineExtensionTestCase extends TestCase
6060
{
6161
abstract protected function loadFromFile(ContainerBuilder $container, string $file): void;
6262

tests/DependencyInjection/XmlDoctrineExtensionTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use Symfony\Component\DependencyInjection\ContainerBuilder;
77
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
88

9-
class XmlDoctrineExtensionTest extends AbstractDoctrineExtensionTest
9+
class XmlDoctrineExtensionTest extends AbstractDoctrineExtensionTestCase
1010
{
1111
protected function loadFromFile(ContainerBuilder $container, string $file): void
1212
{

tests/DependencyInjection/YamlDoctrineExtensionTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use Symfony\Component\DependencyInjection\ContainerBuilder;
77
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
88

9-
class YamlDoctrineExtensionTest extends AbstractDoctrineExtensionTest
9+
class YamlDoctrineExtensionTest extends AbstractDoctrineExtensionTestCase
1010
{
1111
protected function loadFromFile(ContainerBuilder $container, string $file): void
1212
{

tests/RegistryTest.php

+1
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ public function testResetUnknownEntityManager(): void
116116
$registry->resetManager('default');
117117
}
118118

119+
/** @group legacy */
119120
public function testReset(): void
120121
{
121122
if (! interface_exists(EntityManagerInterface::class)) {

0 commit comments

Comments
 (0)