[PR #263] [CLOSED] Doctrine\Common metadata drivers reuse #7937

Closed
opened 2026-01-22 15:57:38 +01:00 by admin · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/doctrine/orm/pull/263
Author: @Ocramius
Created: 1/17/2012
Status: Closed

Base: masterHead: dcom-metadata-drivers


📝 Commits (10+)

  • 5389a9e Updating mapping driver interface to comply with Doctrine\Common\Persistence\Mapping\Driver\MappingDriver
  • adb3b7b Merge branch 'dcom-metadata-drivers' of github.com:Ocramius/doctrine2
  • 2595c49 Reducing code duplication
  • ee44398 Removing unused code
  • 1db8a88 Emulating feature that has to be moved to Doctrine\Common
  • 3cbbd88 Fixing reflection exceptions caused by changes in the AbstractFileDriver interface
  • cef86a4 Removing API that should be moved to common
  • 70faec3 Moving exception throwing for invalid file mappings to Doctrine\Common\Persistence\Mapping\Driver\FileDriver
  • 3f85684 Removing code duplication, reusing Doctrine\Common\Persistenc\Mapping\Driver\AnnotationDriver
  • 1f02b2c Removing unused imports

📊 Changes

23 files changed (+144 additions, -839 deletions)

View changed files

📝 .gitignore (+1 -1)
📝 UPGRADE_TO_2_3 (+6 -0)
📝 lib/Doctrine/ORM/Configuration.php (+4 -4)
📝 lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php (+1 -1)
lib/Doctrine/ORM/Mapping/Driver/AbstractFileDriver.php (+0 -213)
📝 lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php (+30 -199)
📝 lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php (+6 -9)
lib/Doctrine/ORM/Mapping/Driver/Driver.php (+0 -59)
📝 lib/Doctrine/ORM/Mapping/Driver/DriverChain.php (+7 -7)
📝 lib/Doctrine/ORM/Mapping/Driver/PHPDriver.php (+24 -14)
📝 lib/Doctrine/ORM/Mapping/Driver/SimplifiedXmlDriver.php (+8 -141)
📝 lib/Doctrine/ORM/Mapping/Driver/SimplifiedYamlDriver.php (+8 -146)
📝 lib/Doctrine/ORM/Mapping/Driver/StaticPHPDriver.php (+5 -4)
📝 lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php (+11 -5)
📝 lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php (+14 -7)
📝 lib/Doctrine/ORM/Mapping/MappingException.php (+0 -5)
📝 lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/AbstractCommand.php (+2 -6)
📝 tests/Doctrine/Tests/Mocks/MetadataDriverMock.php (+2 -2)
📝 tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php (+2 -2)
📝 tests/Doctrine/Tests/ORM/Mapping/DriverChainTest.php (+4 -5)

...and 3 more files

📄 Description

This PR is strictly related with https://github.com/doctrine/common/pull/98 and tests won't pass until the doctrine-common submodule points to a merged version of it (will do so later, so please don't merge now ).

Basically, I just stripped any code duplicate of what already available in dcom master under Doctrine\Common\Persistence\Mapping\Driver.

Tests are OK on my environment when using the new commons submodule.


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/doctrine/orm/pull/263 **Author:** [@Ocramius](https://github.com/Ocramius) **Created:** 1/17/2012 **Status:** ❌ Closed **Base:** `master` ← **Head:** `dcom-metadata-drivers` --- ### 📝 Commits (10+) - [`5389a9e`](https://github.com/doctrine/orm/commit/5389a9e1470301d8dd61873231ca5cca97f6be3e) Updating mapping driver interface to comply with Doctrine\Common\Persistence\Mapping\Driver\MappingDriver - [`adb3b7b`](https://github.com/doctrine/orm/commit/adb3b7bf410f75f7a8cec80aa8615b79eb41f615) Merge branch 'dcom-metadata-drivers' of github.com:Ocramius/doctrine2 - [`2595c49`](https://github.com/doctrine/orm/commit/2595c497751292f696d8a50f08ad055dca7c1398) Reducing code duplication - [`ee44398`](https://github.com/doctrine/orm/commit/ee44398ef77cf4cbdaad7f22cac9a85922d1b3ad) Removing unused code - [`1db8a88`](https://github.com/doctrine/orm/commit/1db8a88c4eb18ffe247e4e8552a16f1097bc3765) Emulating feature that has to be moved to Doctrine\Common - [`3cbbd88`](https://github.com/doctrine/orm/commit/3cbbd8860a7bb49ac0e860e8b499ed792f0475cd) Fixing reflection exceptions caused by changes in the AbstractFileDriver interface - [`cef86a4`](https://github.com/doctrine/orm/commit/cef86a4475ed48ecd3768debd4e086c049dc8298) Removing API that should be moved to common - [`70faec3`](https://github.com/doctrine/orm/commit/70faec39c42121b64cbc43aa4f6fc473c51c0ac7) Moving exception throwing for invalid file mappings to Doctrine\Common\Persistence\Mapping\Driver\FileDriver - [`3f85684`](https://github.com/doctrine/orm/commit/3f856844795a62df8bb75f833e783e700d8666c8) Removing code duplication, reusing Doctrine\Common\Persistenc\Mapping\Driver\AnnotationDriver - [`1f02b2c`](https://github.com/doctrine/orm/commit/1f02b2ce52910ebd48d81c3e8bba904d966a9ce2) Removing unused imports ### 📊 Changes **23 files changed** (+144 additions, -839 deletions) <details> <summary>View changed files</summary> 📝 `.gitignore` (+1 -1) 📝 `UPGRADE_TO_2_3` (+6 -0) 📝 `lib/Doctrine/ORM/Configuration.php` (+4 -4) 📝 `lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php` (+1 -1) ➖ `lib/Doctrine/ORM/Mapping/Driver/AbstractFileDriver.php` (+0 -213) 📝 `lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php` (+30 -199) 📝 `lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php` (+6 -9) ➖ `lib/Doctrine/ORM/Mapping/Driver/Driver.php` (+0 -59) 📝 `lib/Doctrine/ORM/Mapping/Driver/DriverChain.php` (+7 -7) 📝 `lib/Doctrine/ORM/Mapping/Driver/PHPDriver.php` (+24 -14) 📝 `lib/Doctrine/ORM/Mapping/Driver/SimplifiedXmlDriver.php` (+8 -141) 📝 `lib/Doctrine/ORM/Mapping/Driver/SimplifiedYamlDriver.php` (+8 -146) 📝 `lib/Doctrine/ORM/Mapping/Driver/StaticPHPDriver.php` (+5 -4) 📝 `lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php` (+11 -5) 📝 `lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php` (+14 -7) 📝 `lib/Doctrine/ORM/Mapping/MappingException.php` (+0 -5) 📝 `lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/AbstractCommand.php` (+2 -6) 📝 `tests/Doctrine/Tests/Mocks/MetadataDriverMock.php` (+2 -2) 📝 `tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php` (+2 -2) 📝 `tests/Doctrine/Tests/ORM/Mapping/DriverChainTest.php` (+4 -5) _...and 3 more files_ </details> ### 📄 Description This PR is strictly related with https://github.com/doctrine/common/pull/98 and tests won't pass until the doctrine-common submodule points to a merged version of it (will do so later, so _please don't merge now_ ). Basically, I just stripped any code duplicate of what already available in dcom master under Doctrine\Common\Persistence\Mapping\Driver. Tests are OK on my environment when using the new commons submodule. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
admin added the pull-request label 2026-01-22 15:57:38 +01:00
admin closed this issue 2026-01-22 15:57:39 +01:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: doctrine/archived-orm#7937