mirror of
https://github.com/doctrine/orm.git
synced 2026-03-23 22:42:18 +01:00
[PR #263] [CLOSED] Doctrine\Common metadata drivers reuse #7937
Reference in New Issue
Block a user
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?
📋 Pull Request Information
Original PR: https://github.com/doctrine/orm/pull/263
Author: @Ocramius
Created: 1/17/2012
Status: ❌ Closed
Base:
master← Head:dcom-metadata-drivers📝 Commits (10+)
5389a9eUpdating mapping driver interface to comply with Doctrine\Common\Persistence\Mapping\Driver\MappingDriveradb3b7bMerge branch 'dcom-metadata-drivers' of github.com:Ocramius/doctrine22595c49Reducing code duplicationee44398Removing unused code1db8a88Emulating feature that has to be moved to Doctrine\Common3cbbd88Fixing reflection exceptions caused by changes in the AbstractFileDriver interfacecef86a4Removing API that should be moved to common70faec3Moving exception throwing for invalid file mappings to Doctrine\Common\Persistence\Mapping\Driver\FileDriver3f85684Removing code duplication, reusing Doctrine\Common\Persistenc\Mapping\Driver\AnnotationDriver1f02b2cRemoving 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.