Merge pull request #584 from doctrine/1.8.x

Merge 1.8.x up into 2.2.x
This commit is contained in:
Grégoire Paris
2025-11-09 10:11:28 +01:00
committed by GitHub
8 changed files with 22 additions and 6 deletions

View File

@@ -11,4 +11,4 @@ on:
jobs:
coding-standards:
name: "Coding Standards"
uses: "doctrine/.github/.github/workflows/coding-standards.yml@10.1.0"
uses: "doctrine/.github/.github/workflows/coding-standards.yml@v12.2.0"

View File

@@ -66,7 +66,7 @@ jobs:
run: "vendor/bin/phpunit --coverage-clover=coverage.xml"
- name: "Upload coverage file"
uses: "actions/upload-artifact@v4"
uses: "actions/upload-artifact@v5"
with:
name: "phpunit-${{ matrix.php-version }}-${{ matrix.dependencies }}-${{ matrix.stability }}.coverage"
path: "coverage.xml"
@@ -84,7 +84,7 @@ jobs:
fetch-depth: 2
- name: "Download coverage files"
uses: "actions/download-artifact@v5"
uses: "actions/download-artifact@v6"
with:
path: "reports"

View File

@@ -17,4 +17,4 @@ on:
jobs:
documentation:
name: "Documentation"
uses: "doctrine/.github/.github/workflows/documentation.yml@10.1.0"
uses: "doctrine/.github/.github/workflows/documentation.yml@v12.2.0"

View File

@@ -8,7 +8,7 @@ on:
jobs:
release:
name: "Git tag, release & create merge-up PR"
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@10.1.0"
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@v12.2.0"
secrets:
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

View File

@@ -11,4 +11,4 @@ on:
jobs:
static-analysis:
name: "Static Analysis"
uses: "doctrine/.github/.github/workflows/phpstan.yml@10.1.0"
uses: "doctrine/.github/.github/workflows/phpstan.yml@v12.2.0"

3
.gitignore vendored
View File

@@ -1,3 +1,6 @@
docs/output/
docs/composer.lock
docs/vendor/
phpunit.xml
vendor/
.phpcs-cache

6
docs/composer.json Normal file
View File

@@ -0,0 +1,6 @@
{
"type": "project",
"require": {
"doctrine/docs-builder": "^1.0.3"
}
}

View File

@@ -19,6 +19,8 @@ use function class_exists;
use function dirname;
use function method_exists;
use const PHP_VERSION_ID;
class MongoDBPurgerTest extends BaseTestCase
{
public const TEST_DOCUMENT_ROLE = Role::class;
@@ -38,6 +40,11 @@ class MongoDBPurgerTest extends BaseTestCase
$config->setHydratorNamespace('Hydrators');
$config->setMetadataDriverImpl(AttributeDriver::create(dirname(__DIR__) . '/TestDocument'));
/** @phpstan-ignore function.alreadyNarrowedType (that method exists only since ODM 2.14.0) */
if (PHP_VERSION_ID >= 80400 && method_exists($config, 'setUseNativeLazyObject')) {
$config->setUseNativeLazyObject(true);
}
$dm = DocumentManager::create(null, $config);
$this->skipIfMongoDBUnavailable($dm);