From e2c1d7c38a6d3b75ebdf53b2269edf13e9bd9ec2 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Tue, 10 Jul 2012 02:29:27 +0200 Subject: [PATCH 1/6] Removing deprecated StaticPHPDriver and PHPDriver modifying tests so that the new implementation in Doctrine\Common is referenced --- lib/Doctrine/ORM/Mapping/Driver/PHPDriver.php | 78 --------- .../ORM/Mapping/Driver/StaticPHPDriver.php | 148 ------------------ lib/vendor/doctrine-dbal | 2 +- .../ORM/Mapping/PHPMappingDriverTest.php | 4 +- .../Mapping/StaticPHPMappingDriverTest.php | 2 +- .../AbstractClassMetadataExporterTest.php | 13 +- 6 files changed, 10 insertions(+), 237 deletions(-) delete mode 100644 lib/Doctrine/ORM/Mapping/Driver/PHPDriver.php delete mode 100644 lib/Doctrine/ORM/Mapping/Driver/StaticPHPDriver.php diff --git a/lib/Doctrine/ORM/Mapping/Driver/PHPDriver.php b/lib/Doctrine/ORM/Mapping/Driver/PHPDriver.php deleted file mode 100644 index 4266999a4..000000000 --- a/lib/Doctrine/ORM/Mapping/Driver/PHPDriver.php +++ /dev/null @@ -1,78 +0,0 @@ -. - */ - -namespace Doctrine\ORM\Mapping\Driver; - -use Doctrine\Common\Persistence\Mapping\ClassMetadata, - Doctrine\Common\Persistence\Mapping\Driver\FileDriver; - -/** - * The PHPDriver includes php files which just populate ClassMetadata - * instances with plain php code - * - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.doctrine-project.org - * @since 2.0 - * @version $Revision$ - * @author Benjamin Eberlei - * @author Guilherme Blanco - * @author Jonathan H. Wage - * @author Roman Borschel - */ -class PHPDriver extends FileDriver -{ - const DEFAULT_FILE_EXTENSION = '.php'; - - /** - * - * @var ClassMetadata - */ - protected $_metadata; - - /** - * {@inheritDoc} - */ - public function __construct($locator, $fileExtension = self::DEFAULT_FILE_EXTENSION) - { - parent::__construct($locator, $fileExtension); - } - - /** - * {@inheritDoc} - */ - public function loadMetadataForClass($className, ClassMetadata $metadata) - { - $this->_metadata = $metadata; - $this->getElement($className); - } - - /** - * {@inheritDoc} - */ - protected function loadMappingFile($file) - { - $result = array(); - $metadata = $this->_metadata; - include $file; - // @todo cannot assume that the only loaded metadata is $metadata. Some - // decision about the preferred approach should be taken - $result[$metadata->getName()] = $metadata; - return $result; - } -} \ No newline at end of file diff --git a/lib/Doctrine/ORM/Mapping/Driver/StaticPHPDriver.php b/lib/Doctrine/ORM/Mapping/Driver/StaticPHPDriver.php deleted file mode 100644 index 78dd237dd..000000000 --- a/lib/Doctrine/ORM/Mapping/Driver/StaticPHPDriver.php +++ /dev/null @@ -1,148 +0,0 @@ -. - */ - -namespace Doctrine\ORM\Mapping\Driver; - -use Doctrine\Common\Persistence\Mapping\ClassMetadata, - Doctrine\Common\Persistence\Mapping\Driver\MappingDriver, - Doctrine\ORM\Mapping\MappingException; - -/** - * The StaticPHPDriver calls a static loadMetadata() method on your entity - * classes where you can manually populate the ClassMetadata instance. - * - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.doctrine-project.org - * @since 2.0 - * @author Benjamin Eberlei - * @author Guilherme Blanco - * @author Jonathan H. Wage - * @author Roman Borschel - */ -class StaticPHPDriver implements MappingDriver -{ - /** - * Paths of entity directories. - * - * @var array - */ - private $_paths = array(); - - /** - * Map of all class names. - * - * @var array - */ - private $_classNames; - - /** - * The file extension of mapping documents. - * - * @var string - */ - private $_fileExtension = '.php'; - - /** - * Constructor - * - * @param array $paths Paths where to look for mappings - */ - public function __construct($paths) - { - $this->addPaths((array) $paths); - } - - /** - * Add paths where to look for mappings - * - * @param array $paths - */ - public function addPaths(array $paths) - { - $this->_paths = array_unique(array_merge($this->_paths, $paths)); - } - - /** - * {@inheritDoc} - */ - public function loadMetadataForClass($className, ClassMetadata $metadata) - { - call_user_func_array(array($className, 'loadMetadata'), array($metadata)); - } - - /** - * {@inheritDoc} - */ - public function getAllClassNames() - { - if ($this->_classNames !== null) { - return $this->_classNames; - } - - if (!$this->_paths) { - throw MappingException::pathRequired(); - } - - $classes = array(); - $includedFiles = array(); - - foreach ($this->_paths as $path) { - if (!is_dir($path)) { - throw MappingException::fileMappingDriversRequireConfiguredDirectoryPath($path); - } - - $iterator = new \RecursiveIteratorIterator( - new \RecursiveDirectoryIterator($path), - \RecursiveIteratorIterator::LEAVES_ONLY - ); - - foreach ($iterator as $file) { - if ($file->getBasename($this->_fileExtension) == $file->getBasename()) { - continue; - } - - $sourceFile = realpath($file->getPathName()); - require_once $sourceFile; - $includedFiles[] = $sourceFile; - } - } - - $declared = get_declared_classes(); - - foreach ($declared as $className) { - $rc = new \ReflectionClass($className); - $sourceFile = $rc->getFileName(); - if (in_array($sourceFile, $includedFiles) && !$this->isTransient($className)) { - $classes[] = $className; - } - } - - $this->_classNames = $classes; - - return $classes; - } - - /** - * {@inheritDoc} - */ - public function isTransient($className) - { - return method_exists($className, 'loadMetadata') ? false : true; - } -} diff --git a/lib/vendor/doctrine-dbal b/lib/vendor/doctrine-dbal index 79e894b44..baf30aebd 160000 --- a/lib/vendor/doctrine-dbal +++ b/lib/vendor/doctrine-dbal @@ -1 +1 @@ -Subproject commit 79e894b4493937c0a6eae2e1c8206b188ac2eb7c +Subproject commit baf30aebd60c246b7ac149098cc8c55455c512ce diff --git a/tests/Doctrine/Tests/ORM/Mapping/PHPMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/PHPMappingDriverTest.php index 0aec237bc..c9da3dc7a 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/PHPMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/PHPMappingDriverTest.php @@ -3,7 +3,7 @@ namespace Doctrine\Tests\ORM\Mapping; use Doctrine\ORM\Mapping\ClassMetadata, - Doctrine\ORM\Mapping\Driver\PHPDriver, + Doctrine\Common\Persistence\Mapping\Driver\PHPDriver, Doctrine\ORM\Tools\Export\ClassMetadataExporter; require_once __DIR__ . '/../../TestInit.php'; @@ -28,7 +28,7 @@ class PHPMappingDriverTest extends AbstractMappingDriverTest /** * All class are entitier for php driver - * + * * @group DDC-889 */ public function testinvalidEntityOrMappedSuperClassShouldMentionParentClasses() diff --git a/tests/Doctrine/Tests/ORM/Mapping/StaticPHPMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/StaticPHPMappingDriverTest.php index ab84a48bd..77eafe127 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/StaticPHPMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/StaticPHPMappingDriverTest.php @@ -3,7 +3,7 @@ namespace Doctrine\Tests\ORM\Mapping; use Doctrine\ORM\Mapping\ClassMetadata, - Doctrine\ORM\Mapping\Driver\StaticPHPDriver, + Doctrine\Common\Persistence\Mapping\Driver\StaticPHPDriver, Doctrine\ORM\Tools\Export\ClassMetadataExporter; require_once __DIR__ . '/../../TestInit.php'; diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php index 688a29859..525bdaa65 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php @@ -68,15 +68,14 @@ abstract class AbstractClassMetadataExporterTest extends \Doctrine\Tests\OrmTest protected function _createMetadataDriver($type, $path) { $mappingDriver = array( - 'php' => 'PHPDriver', - 'annotation' => 'AnnotationDriver', - 'xml' => 'XmlDriver', - 'yaml' => 'YamlDriver', + 'php' => 'Doctrine\Common\Persistence\Mapping\Driver\PHPDriver', + 'annotation' => 'Doctrine\ORM\Mapping\Driver\AnnotationDriver', + 'xml' => 'Doctrine\ORM\Mapping\Driver\XmlDriver', + 'yaml' => 'Doctrine\ORM\Mapping\Driver\YamlDriver', ); $this->assertArrayHasKey($type, $mappingDriver, "There is no metadata driver for the type '" . $type . "'."); - $driverName = $mappingDriver[$type]; + $class = $mappingDriver[$type]; - $class = 'Doctrine\ORM\Mapping\Driver\\' . $driverName; if ($type === 'annotation') { $driver = $this->createAnnotationDriver(array($path)); } else { @@ -388,5 +387,5 @@ class Phonenumber } class Group { - + } From 01f058953bd9ca1d8ffbb8125113701983e3cb50 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Tue, 10 Jul 2012 02:47:08 +0200 Subject: [PATCH 2/6] Removing DriverChain and using Doctrine\Common implementation instead --- .../ORM/Mapping/Driver/DriverChain.php | 103 ------------------ lib/vendor/doctrine-common | 2 +- .../Tests/ORM/Mapping/DriverChainTest.php | 4 +- 3 files changed, 3 insertions(+), 106 deletions(-) delete mode 100644 lib/Doctrine/ORM/Mapping/Driver/DriverChain.php diff --git a/lib/Doctrine/ORM/Mapping/Driver/DriverChain.php b/lib/Doctrine/ORM/Mapping/Driver/DriverChain.php deleted file mode 100644 index 70f681e3c..000000000 --- a/lib/Doctrine/ORM/Mapping/Driver/DriverChain.php +++ /dev/null @@ -1,103 +0,0 @@ -. - */ - -namespace Doctrine\ORM\Mapping\Driver; - -use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver, - Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain, - Doctrine\Common\Persistence\Mapping\ClassMetadata, - Doctrine\ORM\Mapping\MappingException; - -/** - * The DriverChain allows you to add multiple other mapping drivers for - * certain namespaces - * - * @since 2.0 - * @author Benjamin Eberlei - * @author Guilherme Blanco - * @author Jonathan H. Wage - * @author Roman Borschel - */ -class DriverChain extends MappingDriverChain -{ - /** - * The default driver - * - * @var MappingDriver - */ - private $defaultDriver; - - /** - * Get the default driver. - * - * @return MappingDriver|null - */ - public function getDefaultDriver() - { - return $this->defaultDriver; - } - - /** - * Set the default driver. - * - * @param MappingDriver $driver - */ - public function setDefaultDriver(MappingDriver $driver) - { - $this->defaultDriver = $driver; - } - - /** - * {@inheritDoc} - * @throws MappingException - */ - public function loadMetadataForClass($className, ClassMetadata $metadata) - { - /* @var $driver MappingDriver */ - foreach ($this->getDrivers() as $namespace => $driver) { - if (strpos($className, $namespace) === 0) { - $driver->loadMetadataForClass($className, $metadata); - return; - } - } - - if ($this->defaultDriver !== null) { - $this->defaultDriver->loadMetadataForClass($className, $metadata); - return; - } - - throw MappingException::classIsNotAValidEntityOrMappedSuperClass($className); - } - - /** - * {@inheritDoc} - */ - public function isTransient($className) - { - if (!parent::isTransient($className)) { - return false; - } - - if ($this->defaultDriver !== null) { - return $this->defaultDriver->isTransient($className); - } - - return true; - } -} diff --git a/lib/vendor/doctrine-common b/lib/vendor/doctrine-common index 8df9cdf3b..f7cdf27f0 160000 --- a/lib/vendor/doctrine-common +++ b/lib/vendor/doctrine-common @@ -1 +1 @@ -Subproject commit 8df9cdf3b921a3b59bbba51d5ba9063509ef6a1a +Subproject commit f7cdf27f04c27ce02e2c14a18ff9064cc37f7284 diff --git a/tests/Doctrine/Tests/ORM/Mapping/DriverChainTest.php b/tests/Doctrine/Tests/ORM/Mapping/DriverChainTest.php index 76ca9d29f..223de44b2 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/DriverChainTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/DriverChainTest.php @@ -2,7 +2,7 @@ namespace Doctrine\Tests\ORM\Mapping; -use Doctrine\ORM\Mapping\Driver\DriverChain; +use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain as DriverChain; require_once __DIR__ . '/../../TestInit.php'; @@ -45,7 +45,7 @@ class DriverChainTest extends \Doctrine\Tests\OrmTestCase $chain = new DriverChain(); - $this->setExpectedException('Doctrine\ORM\Mapping\MappingException'); + $this->setExpectedException('Doctrine\Common\Persistence\Mapping\MappingException'); $chain->loadMetadataForClass($className, $classMetadata); } From f3aae5de0ebed2f39b61ad0521a9ed88afd57820 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Tue, 10 Jul 2012 02:48:28 +0200 Subject: [PATCH 3/6] Removing tests moved to Doctrine\Common --- .../Tests/ORM/Mapping/DriverChainTest.php | 131 ------------------ 1 file changed, 131 deletions(-) delete mode 100644 tests/Doctrine/Tests/ORM/Mapping/DriverChainTest.php diff --git a/tests/Doctrine/Tests/ORM/Mapping/DriverChainTest.php b/tests/Doctrine/Tests/ORM/Mapping/DriverChainTest.php deleted file mode 100644 index 223de44b2..000000000 --- a/tests/Doctrine/Tests/ORM/Mapping/DriverChainTest.php +++ /dev/null @@ -1,131 +0,0 @@ -getMock('Doctrine\Common\Persistence\Mapping\Driver\MappingDriver'); - $driver1->expects($this->never()) - ->method('loadMetadataForClass'); - $driver1->expectS($this->never()) - ->method('isTransient'); - - $driver2 = $this->getMock('Doctrine\Common\Persistence\Mapping\Driver\MappingDriver'); - $driver2->expects($this->at(0)) - ->method('loadMetadataForClass') - ->with($this->equalTo($className), $this->equalTo($classMetadata)); - $driver2->expects($this->at(1)) - ->method('isTransient') - ->with($this->equalTo($className)) - ->will($this->returnValue( true )); - - $chain->addDriver($driver1, 'Doctrine\Tests\Models\Company'); - $chain->addDriver($driver2, 'Doctrine\Tests\ORM\Mapping'); - - $chain->loadMetadataForClass($className, $classMetadata); - - $this->assertTrue( $chain->isTransient($className) ); - } - - public function testLoadMetadata_NoDelegatorFound_ThrowsMappingException() - { - $className = 'Doctrine\Tests\ORM\Mapping\DriverChainEntity'; - $classMetadata = new \Doctrine\ORM\Mapping\ClassMetadata($className); - - $chain = new DriverChain(); - - $this->setExpectedException('Doctrine\Common\Persistence\Mapping\MappingException'); - $chain->loadMetadataForClass($className, $classMetadata); - } - - public function testGatherAllClassNames() - { - $className = 'Doctrine\Tests\ORM\Mapping\DriverChainEntity'; - $classMetadata = new \Doctrine\ORM\Mapping\ClassMetadata($className); - - $chain = new DriverChain(); - - $driver1 = $this->getMock('Doctrine\Common\Persistence\Mapping\Driver\MappingDriver'); - $driver1->expects($this->once()) - ->method('getAllClassNames') - ->will($this->returnValue(array('Doctrine\Tests\Models\Company\Foo'))); - - $driver2 = $this->getMock('Doctrine\Common\Persistence\Mapping\Driver\MappingDriver'); - $driver2->expects($this->once()) - ->method('getAllClassNames') - ->will($this->returnValue(array('Doctrine\Tests\ORM\Mapping\Bar', 'Doctrine\Tests\ORM\Mapping\Baz', 'FooBarBaz'))); - - $chain->addDriver($driver1, 'Doctrine\Tests\Models\Company'); - $chain->addDriver($driver2, 'Doctrine\Tests\ORM\Mapping'); - - $this->assertEquals(array( - 'Doctrine\Tests\Models\Company\Foo', - 'Doctrine\Tests\ORM\Mapping\Bar', - 'Doctrine\Tests\ORM\Mapping\Baz' - ), $chain->getAllClassNames()); - } - - /** - * @group DDC-706 - */ - public function testIsTransient() - { - $chain = new DriverChain(); - $chain->addDriver($this->createAnnotationDriver(), 'Doctrine\Tests\Models\CMS'); - - $this->assertTrue($chain->isTransient('stdClass'), "stdClass isTransient"); - $this->assertFalse($chain->isTransient('Doctrine\Tests\Models\CMS\CmsUser'), "CmsUser is not Transient"); - } - - /** - * @group DDC-1412 - */ - public function testDefaultDriver() - { - $companyDriver = $this->getMock('Doctrine\Common\Persistence\Mapping\Driver\MappingDriver'); - $dafaultDriver = $this->getMock('Doctrine\Common\Persistence\Mapping\Driver\MappingDriver'); - $entityClassName = 'Doctrine\Tests\ORM\Mapping\DriverChainEntity'; - $managerClassName = 'Doctrine\Tests\Models\Company\CompanyManager'; - $chain = new DriverChain(); - - $companyDriver->expects($this->never()) - ->method('loadMetadataForClass'); - $companyDriver->expects($this->once()) - ->method('isTransient') - ->with($this->equalTo($managerClassName)) - ->will($this->returnValue(false)); - - $dafaultDriver->expects($this->never()) - ->method('loadMetadataForClass'); - $dafaultDriver->expects($this->once()) - ->method('isTransient') - ->with($this->equalTo($entityClassName)) - ->will($this->returnValue(true)); - - $this->assertNull($chain->getDefaultDriver()); - - $chain->setDefaultDriver($dafaultDriver); - $chain->addDriver($companyDriver, 'Doctrine\Tests\Models\Company'); - - $this->assertSame($dafaultDriver, $chain->getDefaultDriver()); - - $this->assertTrue($chain->isTransient($entityClassName)); - $this->assertFalse($chain->isTransient($managerClassName)); - } -} - -class DriverChainEntity -{ - -} \ No newline at end of file From 915da58fb768a8aaa8c59ff33d1b6121f306dd3b Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Tue, 10 Jul 2012 02:51:55 +0200 Subject: [PATCH 4/6] Adding upgrade notes about the BC Break --- UPGRADE.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/UPGRADE.md b/UPGRADE.md index f2c99322a..ce4f1698c 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -41,6 +41,12 @@ Metadata drivers have been rewritten to reuse code from Doctrine\Common. Anyone `Doctrine\ORM\Mapping\Driver\AbstractFileDriver`: you should now refer to `Doctrine\Common\Persistence\Mapping\Driver\FileDriver`. +Also, following mapping drivers have been removed, please use their replacements in Doctrine\Common as listed: + + * `Doctrine\ORM\Mapping\Driver\DriverChain` => `Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain` + * `Doctrine\ORM\Mapping\Driver\PHPDriver` => `Doctrine\Common\Persistence\Mapping\Driver\PHPDriver` + * `Doctrine\ORM\Mapping\Driver\StaticPHPDriver` => `Doctrine\Common\Persistence\Mapping\Driver\StaticPHPDriver` + # Upgrade to 2.2 ## ResultCache implementation rewritten From a2e00a96cc4aa8cc10b9819c1abd334e42200066 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Tue, 10 Jul 2012 02:59:33 +0200 Subject: [PATCH 5/6] Reverting change on referenced DBAL commit --- lib/vendor/doctrine-dbal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/vendor/doctrine-dbal b/lib/vendor/doctrine-dbal index baf30aebd..79e894b44 160000 --- a/lib/vendor/doctrine-dbal +++ b/lib/vendor/doctrine-dbal @@ -1 +1 @@ -Subproject commit baf30aebd60c246b7ac149098cc8c55455c512ce +Subproject commit 79e894b4493937c0a6eae2e1c8206b188ac2eb7c From 75276e453e75b0413148b448d4548806f9fa1c17 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Tue, 10 Jul 2012 13:55:58 +0200 Subject: [PATCH 6/6] Restoring class names extending the Doctrine\Common implementation for BC compatibility --- UPGRADE.md | 2 +- .../ORM/Mapping/Driver/DriverChain.php | 31 +++++++++++++++++++ lib/Doctrine/ORM/Mapping/Driver/PHPDriver.php | 31 +++++++++++++++++++ .../ORM/Mapping/Driver/StaticPHPDriver.php | 31 +++++++++++++++++++ 4 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 lib/Doctrine/ORM/Mapping/Driver/DriverChain.php create mode 100644 lib/Doctrine/ORM/Mapping/Driver/PHPDriver.php create mode 100644 lib/Doctrine/ORM/Mapping/Driver/StaticPHPDriver.php diff --git a/UPGRADE.md b/UPGRADE.md index ce4f1698c..ef30c4f04 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -41,7 +41,7 @@ Metadata drivers have been rewritten to reuse code from Doctrine\Common. Anyone `Doctrine\ORM\Mapping\Driver\AbstractFileDriver`: you should now refer to `Doctrine\Common\Persistence\Mapping\Driver\FileDriver`. -Also, following mapping drivers have been removed, please use their replacements in Doctrine\Common as listed: +Also, following mapping drivers have been deprecated, please use their replacements in Doctrine\Common as listed: * `Doctrine\ORM\Mapping\Driver\DriverChain` => `Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain` * `Doctrine\ORM\Mapping\Driver\PHPDriver` => `Doctrine\Common\Persistence\Mapping\Driver\PHPDriver` diff --git a/lib/Doctrine/ORM/Mapping/Driver/DriverChain.php b/lib/Doctrine/ORM/Mapping/Driver/DriverChain.php new file mode 100644 index 000000000..02d409d43 --- /dev/null +++ b/lib/Doctrine/ORM/Mapping/Driver/DriverChain.php @@ -0,0 +1,31 @@ +. + */ + +namespace Doctrine\ORM\Mapping\Driver; + +use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain; + +/** + * {@inheritDoc} + * + * @deprecated this driver will be removed. Use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain instead + */ +class DriverChain extends MappingDriverChain +{ +} \ No newline at end of file diff --git a/lib/Doctrine/ORM/Mapping/Driver/PHPDriver.php b/lib/Doctrine/ORM/Mapping/Driver/PHPDriver.php new file mode 100644 index 000000000..3d60447f4 --- /dev/null +++ b/lib/Doctrine/ORM/Mapping/Driver/PHPDriver.php @@ -0,0 +1,31 @@ +. + */ + +namespace Doctrine\ORM\Mapping\Driver; + +use Doctrine\Common\Persistence\Mapping\Driver\PHPDriver as CommonPHPDriver; + +/** + * {@inheritDoc} + * + * @deprecated this driver will be removed. Use Doctrine\Common\Persistence\Mapping\Driver\PHPDriver instead + */ +class PHPDriver extends CommonPHPDriver +{ +} \ No newline at end of file diff --git a/lib/Doctrine/ORM/Mapping/Driver/StaticPHPDriver.php b/lib/Doctrine/ORM/Mapping/Driver/StaticPHPDriver.php new file mode 100644 index 000000000..6d53f778a --- /dev/null +++ b/lib/Doctrine/ORM/Mapping/Driver/StaticPHPDriver.php @@ -0,0 +1,31 @@ +. + */ + +namespace Doctrine\ORM\Mapping\Driver; + +use Doctrine\Common\Persistence\Mapping\Driver\StaticPHPDriver as CommonStaticPHPDriver; + +/** + * {@inheritDoc} + * + * @deprecated this driver will be removed. Use Doctrine\Common\Persistence\Mapping\Driver\StaticPHPDriver instead + */ +class StaticPHPDriver extends CommonStaticPHPDriver +{ +} \ No newline at end of file