php mapping

lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php

@@ -147,10 +147,9 @@ class AnnotationDriver implements Driver
         // Evaluate Entity annotation
         if (isset($classAnnotations['Doctrine\ORM\Mapping\Entity'])) {
             $entityAnnot = $classAnnotations['Doctrine\ORM\Mapping\Entity'];
-            if($entityAnnot->repositoryClass !== null) {
+            if ($entityAnnot->repositoryClass !== null) {
                 $metadata->setCustomRepositoryClass($entityAnnot->repositoryClass);
             }
-
             if ($entityAnnot->readOnly) {
                 $metadata->markReadOnly();
             }

tests/Doctrine/Tests/Models/DDC869/DDC869ChequePayment.php

@@ -28,5 +28,13 @@ class DDC869ChequePayment extends DDC869Payment
 
     /** @column(type="string") */
     protected $serialNumber;
+    
+    public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata)
+    {
+        $metadata->mapField(array(
+           'fieldName'  => 'serialNumber',
+           'type'       => 'string',
+        ));
+    }
 
 }

tests/Doctrine/Tests/Models/DDC869/DDC869CreditCardPayment.php

@@ -28,5 +28,13 @@ class DDC869CreditCardPayment extends DDC869Payment
 
     /** @column(type="string") */
     protected $creditCardNumber;
+    
+    public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata)
+    {
+        $metadata->mapField(array(
+           'fieldName'  => 'creditCardNumber',
+           'type'       => 'string',
+        ));
+    }
 
 }

tests/Doctrine/Tests/Models/DDC869/DDC869Payment.php

@@ -35,5 +35,22 @@ class DDC869Payment
 
     /** @column(type="float") */
     protected $value;
+    
+    
+    public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata)
+    {
+        $metadata->mapField(array(
+           'id'         => true,
+           'fieldName'  => 'id',
+           'type'       => 'integer',
+           'columnName' => 'id',
+        ));
+        $metadata->mapField(array(
+           'fieldName'  => 'value',
+           'type'       => 'float',
+          ));
+        $metadata->setCustomRepositoryClass("Doctrine\Tests\Models\DDC869\DDC869PaymentRepository");
+        $metadata->setIdGeneratorType(\Doctrine\ORM\Mapping\ClassMetadataInfo::GENERATOR_TYPE_AUTO);
+    }
 
 }

tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php

@@ -297,10 +297,6 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
      */
     public function testMappedSuperclassWithRepository()
     {
-        if (strpos(get_class($this), 'PHPMappingDriver') !== false) {
-            $this->markTestSkipped('PHP Mapping Drivers have no defaults.');
-        }
-        
         $driver     = $this->_loadDriver();
         $em         = $this->_getTestEntityManager();
         $factory    = new \Doctrine\ORM\Mapping\ClassMetadataFactory();

tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869ChequePayment.php

@@ -0,0 +1,5 @@
+<?php
+$metadata->mapField(array(
+   'fieldName'  => 'serialNumber',
+   'type'       => 'string',
+));

tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869CreditCardPayment.php

@@ -0,0 +1,5 @@
+<?php
+$metadata->mapField(array(
+   'fieldName'  => 'creditCardNumber',
+   'type'       => 'string',
+));

tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869Payment.php

@@ -0,0 +1,16 @@
+<?php
+
+use Doctrine\ORM\Mapping\ClassMetadataInfo;
+
+$metadata->mapField(array(
+   'id'         => true,
+   'fieldName'  => 'id',
+   'type'       => 'integer',
+   'columnName' => 'id',
+));
+$metadata->mapField(array(
+   'fieldName'  => 'value',
+   'type'       => 'float',
+  ));
+$metadata->setCustomRepositoryClass("Doctrine\Tests\Models\DDC869\DDC869PaymentRepository");
+$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO);