Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 263223c

Browse files
authored
Merge branch 'symfony:6.4' into 6.4
2 parents 0a3e45f + 41da7e8 commit 263223c

File tree

89 files changed

+1357
-335
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+1357
-335
lines changed

.github/workflows/integration-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107

108108
steps:
109109
- name: Checkout
110-
uses: actions/checkout@v3
110+
uses: actions/checkout@v4
111111

112112
- name: Install system dependencies
113113
run: |
@@ -190,7 +190,7 @@ jobs:
190190
# sudo rm -rf .phpunit
191191
# [ -d .phpunit.bak ] && mv .phpunit.bak .phpunit
192192

193-
- uses: marceloprado/has-changed-path@v1
193+
- uses: marceloprado/has-changed-path@v1.0.1
194194
id: changed-translation-files
195195
with:
196196
paths: src/**/Resources/translations/*.xlf

.github/workflows/intl-data-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
steps:
3636
- name: Checkout
37-
uses: actions/checkout@v3
37+
uses: actions/checkout@v4
3838

3939
- name: Install system dependencies
4040
run: |

.github/workflows/package-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: Ubuntu-20.04
1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
1818

1919
- name: Fetch branch from where the PR started
2020
run: git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*

.github/workflows/phpunit-bridge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
steps:
2828
- name: Checkout
29-
uses: actions/checkout@v3
29+
uses: actions/checkout@v4
3030

3131
- name: Setup PHP
3232
uses: shivammathur/setup-php@v2

.github/workflows/psalm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ jobs:
3030
coverage: none
3131

3232
- name: Checkout target branch
33-
uses: actions/checkout@v3
33+
uses: actions/checkout@v4
3434
with:
3535
ref: ${{ github.base_ref }}
3636

3737
- name: Checkout PR
38-
uses: actions/checkout@v3
38+
uses: actions/checkout@v4
3939

4040
- name: Install dependencies
4141
run: |

.github/workflows/unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939

4040
steps:
4141
- name: Checkout
42-
uses: actions/checkout@v3
42+
uses: actions/checkout@v4
4343
with:
4444
fetch-depth: 2
4545

psalm.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
cacheDirectory="./.github/psalm/cache/"
99
errorBaseline=".github/psalm/psalm.baseline.xml"
1010
findUnusedBaselineEntry="false"
11+
findUnusedCode="false"
1112
>
1213
<projectFiles>
1314
<directory name="src" />

src/Symfony/Bridge/Doctrine/Tests/DoctrineTestHelper.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,7 @@ public static function createTestConfiguration(): Configuration
6161
if (class_exists(DefaultSchemaManagerFactory::class)) {
6262
$config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
6363
}
64-
if (method_exists($config, 'setLazyGhostObjectEnabled')) {
65-
$config->setLazyGhostObjectEnabled(true);
66-
}
64+
$config->setLazyGhostObjectEnabled(true);
6765

6866
return $config;
6967
}

src/Symfony/Bridge/Doctrine/Tests/Middleware/Debug/MiddlewareTest.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,7 @@ private function init(bool $withStopwatch = true): void
5454
if (class_exists(DefaultSchemaManagerFactory::class)) {
5555
$config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
5656
}
57-
if (method_exists($config, 'setLazyGhostObjectEnabled')) {
58-
$config->setLazyGhostObjectEnabled(true);
59-
}
57+
$config->setLazyGhostObjectEnabled(true);
6058
$this->debugDataHolder = new DebugDataHolder();
6159
$config->setMiddlewares([new Middleware($this->debugDataHolder, $this->stopwatch)]);
6260

src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ private function createExtractor(): DoctrineExtractor
4141
if (class_exists(DefaultSchemaManagerFactory::class)) {
4242
$config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
4343
}
44-
if (method_exists($config, 'setLazyGhostObjectEnabled')) {
45-
$config->setLazyGhostObjectEnabled(true);
46-
}
44+
$config->setLazyGhostObjectEnabled(true);
4745

4846
$eventManager = new EventManager();
4947
$entityManager = new EntityManager(DriverManager::getConnection(['driver' => 'pdo_sqlite'], $config, $eventManager), $config, $eventManager);

0 commit comments

Comments
 (0)