[loggable] separate mapping of superclasses

lib/Gedmo/Loggable/Document/LogEntry.php

@@ -9,7 +9,7 @@ use Doctrine\ODM\MongoDB\Mapping\Annotations\Document;
  *
  * @Document(repositoryClass="Gedmo\Loggable\Document\Repository\LogEntryRepository")
  */
-class LogEntry extends AbstractLogEntry
+class LogEntry extends MappedSuperclass\AbstractLogEntry
 {
     /**
      * All required columns are mapped through inherited superclass

lib/Gedmo/Loggable/Document/AbstractLogEntry.php

@@ -1,78 +1,72 @@
 <?php
 
-namespace Gedmo\Loggable\Document;
+namespace Gedmo\Loggable\Document\MappedSuperclass;
 
-use Doctrine\ODM\MongoDB\Mapping\Annotations\MappedSuperclass;
-use Doctrine\ODM\MongoDB\Mapping\Annotations\Id;
-use Doctrine\ODM\MongoDB\Mapping\Annotations\String;
-use Doctrine\ODM\MongoDB\Mapping\Annotations\Index;
-use Doctrine\ODM\MongoDB\Mapping\Annotations\Date;
-use Doctrine\ODM\MongoDB\Mapping\Annotations\Int;
-use Doctrine\ODM\MongoDB\Mapping\Annotations\Hash;
+use Doctrine\ODM\MongoDB\Mapping\Annotations as MongoODM;
 
 /**
- * Gedmo\Loggable\Document\AbstractLogEntry
+ * Gedmo\Loggable\Document\MappedSuperclass\AbstractLogEntry
  *
- * @MappedSuperclass
+ * @MongoODM\MappedSuperclass
  */
 abstract class AbstractLogEntry
 {
     /**
      * @var integer $id
      *
-     * @Id
+     * @MongoODM\Id
      */
     protected $id;
 
     /**
      * @var string $action
      *
-     * @String
+     * @MongoODM\String
      */
     protected $action;
 
     /**
      * @var datetime $loggedAt
      *
-     * @Index
-     * @Date
+     * @MongoODM\Index
+     * @MongoODM\Date
      */
     protected $loggedAt;
 
     /**
      * @var string $objectId
      *
-     * @String(nullable=true)
+     * @MongoODM\String(nullable=true)
      */
     protected $objectId;
 
     /**
      * @var string $objectClass
      *
-     * @Index
-     * @String
+     * @MongoODM\Index
+     * @MongoODM\String
      */
     protected $objectClass;
 
     /**
      * @var integer $version
      *
-     * @Int
+     * @MongoODM\Int
      */
     protected $version;
 
     /**
      * @var text $data
      *
-     * @Hash(nullable=true)
+     * @MongoODM\Hash(nullable=true)
      */
     protected $data;
 
     /**
      * @var string $data
      *
-     * @Index
-     * @String(nullable=true)
+     * @MongoODM\Index
+     * @MongoODM\String(nullable=true)
      */
     protected $username;
 

lib/Gedmo/Loggable/Entity/LogEntry.php

@@ -19,7 +19,7 @@ use Doctrine\ORM\Mapping\Entity;
  * )
  * @Entity(repositoryClass="Gedmo\Loggable\Entity\Repository\LogEntryRepository")
  */
-class LogEntry extends AbstractLogEntry
+class LogEntry extends MappedSuperclass\AbstractLogEntry
 {
     /**
      * All required columns are mapped through inherited superclass

lib/Gedmo/Loggable/Entity/AbstractLogEntry.php

@@ -1,74 +1,71 @@
 <?php
 
-namespace Gedmo\Loggable\Entity;
+namespace Gedmo\Loggable\Entity\MappedSuperclass;
 
-use Doctrine\ORM\Mapping\Column;
-use Doctrine\ORM\Mapping\MappedSuperclass;
-use Doctrine\ORM\Mapping\Id;
-use Doctrine\ORM\Mapping\GeneratedValue;
+use Doctrine\ORM\Mapping as ORM;
 
 /**
  * Gedmo\Loggable\Entity\AbstractLog
  *
- * @MappedSuperclass
+ * @ORM\MappedSuperclass
  */
 abstract class AbstractLogEntry
 {
     /**
      * @var integer $id
      *
-     * @Column(type="integer")
-     * @Id
-     * @GeneratedValue
+     * @ORM\Column(type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
     protected $id;
 
     /**
      * @var string $action
      *
-     * @Column(type="string", length=8)
+     * @ORM\Column(type="string", length=8)
      */
     protected $action;
 
     /**
      * @var string $loggedAt
      *
-     * @Column(name="logged_at", type="datetime")
+     * @ORM\Column(name="logged_at", type="datetime")
      */
     protected $loggedAt;
 
     /**
      * @var string $objectId
      *
-     * @Column(name="object_id", length=32, nullable=true)
+     * @ORM\Column(name="object_id", length=32, nullable=true)
      */
     protected $objectId;
 
     /**
      * @var string $objectClass
      *
-     * @Column(name="object_class", type="string", length=255)
+     * @ORM\Column(name="object_class", type="string", length=255)
      */
     protected $objectClass;
 
     /**
      * @var integer $version
      *
-     * @Column(type="integer")
+     * @ORM\Column(type="integer")
      */
     protected $version;
 
     /**
      * @var text $data
      *
-     * @Column(type="array", nullable=true)
+     * @ORM\Column(type="array", nullable=true)
      */
     protected $data;
 
     /**
      * @var text $data
      *
-     * @Column(length=255, nullable=true)
+     * @ORM\Column(length=255, nullable=true)
      */
     protected $username;
 

tests/Gedmo/Loggable/Fixture/Document/Log/Comment.php

@@ -2,7 +2,7 @@
 
 namespace Loggable\Fixture\Document\Log;
 
-use Gedmo\Loggable\Document\AbstractLogEntry;
+use Gedmo\Loggable\Document\MappedSuperclass\AbstractLogEntry;
 use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
 
 /**

tests/Gedmo/Loggable/Fixture/Entity/Log/Comment.php

@@ -2,7 +2,7 @@
 
 namespace Loggable\Fixture\Entity\Log;
 
-use Gedmo\Loggable\Entity\AbstractLogEntry;
+use Gedmo\Loggable\Entity\MappedSuperclass\AbstractLogEntry;
 use Doctrine\ORM\Mapping as ORM;
 
 /**