doctrine/archived-orm
1
0
Fork 0
mirror of https://github.com/doctrine/orm.git synced 2026-03-24 06:52:09 +01:00
Code Issues 5.3k Packages Projects Releases 100 Wiki Activity

[PR #314] [MERGED] Doctrine\Common metadata drivers reuse #8017

New Issue
Open
opened 2026-01-22 15:57:59 +01:00 by admin · 0 comments
admin commented 2026-01-22 15:57:59 +01:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/doctrine/orm/pull/314
Author: @Ocramius
Created: 3/30/2012
Status: ✅ Merged
Merged: 7/4/2012
Merged by: @guilhermeblanco

Base: master ← Head: dcom-metadata-drivers-reuse

📝 Commits (10+)

  • e6a2bae Updating mapping driver interface to comply with Doctrine\Common\Persistence\Mapping\Driver\MappingDriver
  • 34bb0c4 Reducing code duplication
  • e9f23d5 Removing unused code
  • bb998d1 Emulating feature that has to be moved to Doctrine\Common
  • 82cfda3 Fixing reflection exceptions caused by changes in the AbstractFileDriver interface
  • 03fb734 Removing API that should be moved to common
  • ccace8c Moving exception throwing for invalid file mappings to Doctrine\Common\Persistence\Mapping\Driver\FileDriver
  • abd3ddc Removing code duplication, reusing Doctrine\Common\Persistenc\Mapping\Driver\AnnotationDriver
  • 5b97357 Removing unused imports
  • 905acf9 Removing Doctrine\ORM\Mapping\Driver\Driver interface

📊 Changes

25 files changed (+421 additions, -1425 deletions)

View changed files

📝 .gitignore (+1 -1)
📝 UPGRADE_TO_2_3 (+8 -0)
📝 lib/Doctrine/ORM/Configuration.php (+4 -4)
📝 lib/Doctrine/ORM/Mapping/ClassMetadata.php (+2 -17)
📝 lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php (+99 -364)
📝 lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php (+91 -80)
➖ lib/Doctrine/ORM/Mapping/Driver/AbstractFileDriver.php (+0 -210)
📝 lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php (+36 -203)
📝 lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php (+16 -22)
➖ lib/Doctrine/ORM/Mapping/Driver/Driver.php (+0 -57)
📝 lib/Doctrine/ORM/Mapping/Driver/DriverChain.php (+16 -75)
📝 lib/Doctrine/ORM/Mapping/Driver/PHPDriver.php (+27 -18)
📝 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 (+19 -9)
📝 lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php (+33 -23)
📝 lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php (+30 -22)
📝 lib/Doctrine/ORM/Mapping/MappingException.php (+1 -6)
📝 lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/AbstractCommand.php (+2 -6)
📝 tests/Doctrine/Tests/Mocks/MetadataDriverMock.php (+2 -2)

...and 5 more files

📄 Description

This PR is strictly related with doctrine/common#98, doctrine/common#131 and doctrine/common#150 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 is a cleanup for #263, where I sadly did pull from the remote branch after rebasing)

Build Status

🔄 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/314 **Author:** [@Ocramius](https://github.com/Ocramius) **Created:** 3/30/2012 **Status:** ✅ Merged **Merged:** 7/4/2012 **Merged by:** [@guilhermeblanco](https://github.com/guilhermeblanco) **Base:** `master` ← **Head:** `dcom-metadata-drivers-reuse` --- ### 📝 Commits (10+) - [`e6a2bae`](https://github.com/doctrine/orm/commit/e6a2bae5d7be5edbb0c5f50b004d40e62a042081) Updating mapping driver interface to comply with Doctrine\Common\Persistence\Mapping\Driver\MappingDriver - [`34bb0c4`](https://github.com/doctrine/orm/commit/34bb0c4943fbcecf88c0b57a7ced0e39c069981e) Reducing code duplication - [`e9f23d5`](https://github.com/doctrine/orm/commit/e9f23d51e0108313da2d5c26ab9606862b944df8) Removing unused code - [`bb998d1`](https://github.com/doctrine/orm/commit/bb998d1738f6d0c722892b68b43cbefc23c6ec9d) Emulating feature that has to be moved to Doctrine\Common - [`82cfda3`](https://github.com/doctrine/orm/commit/82cfda3decf7efb6688af5a7915e418eec105776) Fixing reflection exceptions caused by changes in the AbstractFileDriver interface - [`03fb734`](https://github.com/doctrine/orm/commit/03fb734de82b4c064cee4e75f1b509ebff760244) Removing API that should be moved to common - [`ccace8c`](https://github.com/doctrine/orm/commit/ccace8cb8bbfe0ef49e336c1f4e81ba4272879ac) Moving exception throwing for invalid file mappings to Doctrine\Common\Persistence\Mapping\Driver\FileDriver - [`abd3ddc`](https://github.com/doctrine/orm/commit/abd3ddc1b1076da6c9e0c2d791504117e2e136bc) Removing code duplication, reusing Doctrine\Common\Persistenc\Mapping\Driver\AnnotationDriver - [`5b97357`](https://github.com/doctrine/orm/commit/5b973574023dad903c0e5592907c7a90f73406a4) Removing unused imports - [`905acf9`](https://github.com/doctrine/orm/commit/905acf9176618a50989f54f6efbaa379d5a02c9e) Removing Doctrine\ORM\Mapping\Driver\Driver interface ### 📊 Changes **25 files changed** (+421 additions, -1425 deletions) <details> <summary>View changed files</summary> 📝 `.gitignore` (+1 -1) 📝 `UPGRADE_TO_2_3` (+8 -0) 📝 `lib/Doctrine/ORM/Configuration.php` (+4 -4) 📝 `lib/Doctrine/ORM/Mapping/ClassMetadata.php` (+2 -17) 📝 `lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php` (+99 -364) 📝 `lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php` (+91 -80) ➖ `lib/Doctrine/ORM/Mapping/Driver/AbstractFileDriver.php` (+0 -210) 📝 `lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php` (+36 -203) 📝 `lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php` (+16 -22) ➖ `lib/Doctrine/ORM/Mapping/Driver/Driver.php` (+0 -57) 📝 `lib/Doctrine/ORM/Mapping/Driver/DriverChain.php` (+16 -75) 📝 `lib/Doctrine/ORM/Mapping/Driver/PHPDriver.php` (+27 -18) 📝 `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` (+19 -9) 📝 `lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php` (+33 -23) 📝 `lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php` (+30 -22) 📝 `lib/Doctrine/ORM/Mapping/MappingException.php` (+1 -6) 📝 `lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/AbstractCommand.php` (+2 -6) 📝 `tests/Doctrine/Tests/Mocks/MetadataDriverMock.php` (+2 -2) _...and 5 more files_ </details> ### 📄 Description This PR is strictly related with doctrine/common#98, doctrine/common#131 and doctrine/common#150 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 is a cleanup for #263, where I sadly did pull from the remote branch after rebasing) [![Build Status](https://secure.travis-ci.org/Ocramius/doctrine2.png?branch=dcom-metadata-drivers-reuse)](http://travis-ci.org/Ocramius/doctrine2/builds/984207) --- <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:59 +01:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
BC Break
Bug
Can't Fix
Deprecation
Documentation
DQL
Duplicate
Failing Test
Hacktoberfest
Improvement
Improvement
Incomplete
Invalid
Missing Tests
New Feature
PR Created
pull-request
Mirrored from GitHub Pull Request
 Question
Regression
Status: Waiting feedback
Waiting feedback
WIP
Won't Fix
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
admin
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: doctrine/archived-orm#8017
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?