l3pp4rd · MisatoTremor · Mar 24, 2014 · Mar 24, 2014 · Mar 25, 2014 · Mar 25, 2014
diff --git a/.travis.yml b/.travis.yml
@@ -16,3 +16,4 @@ script: phpunit --coverage-text -c tests/
 notifications:
   email:
     - [email protected]
+    - [email protected]
diff --git a/doc/uploadable.md b/doc/uploadable.md
@@ -247,7 +247,7 @@ Entity\File:
       type: string
       gedmo:
         - uploadableFilePath
-    path:
+    name:
       type: string
       gedmo:
         - uploadableFileName

diff --git a/lib/Gedmo/Blameable/BlameableListener.php b/lib/Gedmo/Blameable/BlameableListener.php
@@ -2,10 +2,8 @@
 
 namespace Gedmo\Blameable;
 
-use Doctrine\Common\EventArgs;
 use Doctrine\Common\NotifyPropertyChanged;
 use Gedmo\Exception\InvalidArgumentException;
-use Gedmo\Mapping\MappedEventSubscriber;
 use Gedmo\Timestampable\TimestampableListener;
 use Gedmo\Blameable\Mapping\Event\BlameableAdapter;
 
@@ -83,6 +81,10 @@ protected function updateField($object, $ea, $meta, $field)
         $oldValue = $property->getValue($object);
         $newValue = $this->getUserValue($meta, $field);
 
+        //if blame is reference, persist object
+        if ($meta->hasAssociation($field)) {
+            $ea->getObjectManager()->persist($newValue);
+        }
         $property->setValue($object, $newValue);
         if ($object instanceof NotifyPropertyChanged) {
             $uow = $ea->getObjectManager()->getUnitOfWork();

diff --git a/lib/Gedmo/Blameable/Mapping/Event/Adapter/ORM.php b/lib/Gedmo/Blameable/Mapping/Event/Adapter/ORM.php
@@ -4,7 +4,6 @@
 
 use Gedmo\Mapping\Event\Adapter\ORM as BaseAdapterORM;
 use Gedmo\Blameable\Mapping\Event\BlameableAdapter;
-use Gedmo\Exception\InvalidArgumentException;
 
 /**
  * Doctrine event adapter for ORM adapted

diff --git a/lib/Gedmo/Blameable/Traits/BlameableDocument.php b/lib/Gedmo/Blameable/Traits/BlameableDocument.php
@@ -11,12 +11,14 @@
 trait BlameableDocument
 {
     /**
+     * @var string
      * @Gedmo\Blameable(on="create")
      * @ODM\String
      */
     private $createdBy;
 
     /**
+     * @var string
      * @Gedmo\Blameable(on="update")
      * @ODM\String
      */

diff --git a/lib/Gedmo/Blameable/Traits/BlameableEntity.php b/lib/Gedmo/Blameable/Traits/BlameableEntity.php
@@ -11,12 +11,14 @@
 trait BlameableEntity
 {
     /**
+     * @var string
      * @Gedmo\Blameable(on="create")
      * @ORM\Column(type="string", nullable=true)
      */
     private $createdBy;
 
     /**
+     * @var string
      * @Gedmo\Blameable(on="update")
      * @ORM\Column(type="string", nullable=true)
      */

diff --git a/lib/Gedmo/IpTraceable/Traits/IpTraceableDocument.php b/lib/Gedmo/IpTraceable/Traits/IpTraceableDocument.php
@@ -11,12 +11,14 @@
 trait IpTraceableDocument
 {
     /**
+     * @var string
      * @Gedmo\IpTraceable(on="create")
      * @ODM\String
      */
     private $createdFromIp;
 
     /**
+     * @var string
      * @Gedmo\IpTraceable(on="update")
      * @ODM\String
      */

diff --git a/lib/Gedmo/IpTraceable/Traits/IpTraceableEntity.php b/lib/Gedmo/IpTraceable/Traits/IpTraceableEntity.php
@@ -11,12 +11,14 @@
 trait IpTraceableEntity
 {
     /**
+     * @var string
      * @Gedmo\IpTraceable(on="create")
      * @ORM\Column(type="string", length=45, nullable=true)
      */
     protected $createdFromIp;
 
     /**
+     * @var string
      * @Gedmo\IpTraceable(on="update")
      * @ORM\Column(type="string", length=45, nullable=true)
      */

diff --git a/lib/Gedmo/Mapping/Driver/AbstractAnnotationDriver.php b/lib/Gedmo/Mapping/Driver/AbstractAnnotationDriver.php
@@ -2,7 +2,6 @@
 
 namespace Gedmo\Mapping\Driver;
 
-use Gedmo\Mapping\Driver\AnnotationDriverInterface;
 use Doctrine\Common\Persistence\Mapping\ClassMetadata;
 
 /**

diff --git a/lib/Gedmo/Mapping/ExtensionMetadataFactory.php b/lib/Gedmo/Mapping/ExtensionMetadataFactory.php
@@ -10,7 +10,6 @@
 use Doctrine\Common\Version as CommonLibVer;
 use Gedmo\Mapping\Driver\File as FileDriver;
 use Gedmo\Mapping\Driver\AnnotationDriverInterface;
-use Doctrine\ORM\Tools\DisconnectedClassMetadataFactory;
 
 /**
  * The extension metadata factory is responsible for extension driver

diff --git a/lib/Gedmo/Mapping/MappedEventSubscriber.php b/lib/Gedmo/Mapping/MappedEventSubscriber.php
@@ -5,7 +5,6 @@
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\CachedReader;
 use Doctrine\Common\Cache\ArrayCache;
-use Gedmo\Mapping\ExtensionMetadataFactory;
 use Doctrine\Common\EventSubscriber;
 use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\Common\EventArgs;

diff --git a/lib/Gedmo/References/Mapping/Event/Adapter/ODM.php b/lib/Gedmo/References/Mapping/Event/Adapter/ODM.php
@@ -2,12 +2,10 @@
 
 namespace Gedmo\References\Mapping\Event\Adapter;
 
-use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\ODM\MongoDB\DocumentManager;
 use Doctrine\ODM\MongoDB\Proxy\Proxy as MongoDBProxy;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Proxy\Proxy as ORMProxy;
-use Gedmo\Exception\InvalidArgumentException;
 use Gedmo\Mapping\Event\Adapter\ODM as BaseAdapterODM;
 use Gedmo\References\Mapping\Event\ReferencesAdapter;
 

diff --git a/lib/Gedmo/References/Mapping/Event/Adapter/ORM.php b/lib/Gedmo/References/Mapping/Event/Adapter/ORM.php
@@ -2,7 +2,6 @@
 
 namespace Gedmo\References\Mapping\Event\Adapter;
 
-use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\ODM\MongoDB\DocumentManager;
 use Doctrine\ODM\MongoDB\Proxy\Proxy as MongoDBProxy;
 use Doctrine\ORM\EntityManager;

diff --git a/lib/Gedmo/References/Mapping/Event/ReferencesAdapter.php b/lib/Gedmo/References/Mapping/Event/ReferencesAdapter.php
@@ -2,7 +2,6 @@
 
 namespace Gedmo\References\Mapping\Event;
 
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
 use Doctrine\Common\Persistence\ObjectManager;
 use Gedmo\Mapping\Event\AdapterInterface;
 

diff --git a/lib/Gedmo/References/ReferencesListener.php b/lib/Gedmo/References/ReferencesListener.php
@@ -4,11 +4,6 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\EventArgs;
-use Doctrine\ORM\Mapping\ClassMetadata as ORMClassMetadata;
-use Doctrine\ORM\EntityManager;
-use Doctrine\ODM\MongoDB\DocumentManager;
-use Doctrine\ODM\MongoDB\Mapping\ClassMetadata as MongoDBClassMetadata;
-use Gedmo\Exception\InvalidArgumentException;
 use Gedmo\Mapping\MappedEventSubscriber;
 
 /**

diff --git a/lib/Gedmo/Sluggable/Sluggable.php b/lib/Gedmo/Sluggable/Sluggable.php
@@ -33,7 +33,7 @@ interface Sluggable
      * 
      * example:
      * 
-     * @gedmo:Slug(style="camel", separator="_", prefix="", suffix="" updatable=false, unique=false)
+     * @gedmo:Slug(style="camel", separator="_", prefix="", suffix="", updatable=false, unique=false)
      * @Column(type="string", length=64)
      * $property
      */

diff --git a/lib/Gedmo/Sluggable/SluggableListener.php b/lib/Gedmo/Sluggable/SluggableListener.php
@@ -6,6 +6,7 @@
 use Gedmo\Mapping\MappedEventSubscriber;
 use Gedmo\Sluggable\Mapping\Event\SluggableAdapter;
 use Doctrine\Common\Persistence\ObjectManager;
+use Gedmo\Tool\Wrapper\AbstractWrapper;
 
 /**
  * The SluggableListener handles the generation of slugs
@@ -224,6 +225,8 @@ public function onFlush(EventArgs $args)
         }
 
         $this->manageFiltersAfterGeneration($om);
+
+        AbstractWrapper::clear();
     }
 
     /**

diff --git a/lib/Gedmo/Sluggable/Util/Urlizer.php b/lib/Gedmo/Sluggable/Util/Urlizer.php
@@ -405,6 +405,11 @@ private static function postProcessText($text, $separator)
             $text = strtolower($text);
         }
 
+        // Should remove apostrophes prior to none-word characters,
+        //   as replacing with hyphens isn't ideal.
+        // Consider: Bon Jovi's Tour Cancelled (bon-jovi-s-tour-cancelled)
+        $text = preg_replace("/'/", '', $text);
+
         // Remove all none word characters
         $text = preg_replace('/\W/', ' ', $text);
 

diff --git a/lib/Gedmo/SoftDeleteable/Mapping/Event/Adapter/ORM.php b/lib/Gedmo/SoftDeleteable/Mapping/Event/Adapter/ORM.php
@@ -4,7 +4,6 @@
 
 use Gedmo\Mapping\Event\Adapter\ORM as BaseAdapterORM;
 use Gedmo\SoftDeleteable\Mapping\Event\SoftDeleteableAdapter;
-use Gedmo\Exception\InvalidArgumentException;
 
 /**
  * Doctrine event adapter for ORM adapted

diff --git a/lib/Gedmo/SoftDeleteable/Query/TreeWalker/SoftDeleteableWalker.php b/lib/Gedmo/SoftDeleteable/Query/TreeWalker/SoftDeleteableWalker.php
@@ -5,10 +5,7 @@
 use Doctrine\ORM\Query\SqlWalker;
 use Doctrine\ORM\Query\AST\DeleteStatement;
 use Doctrine\ORM\Query\AST\DeleteClause;
-use Doctrine\ORM\Query\AST\UpdateClause;
-use Doctrine\ORM\Query\AST\UpdateItem;
 use Doctrine\ORM\Query\Exec\SingleTableDeleteUpdateExecutor;
-use Doctrine\ORM\Query\AST\PathExpression;
 use Gedmo\SoftDeleteable\SoftDeleteableListener;
 use Gedmo\SoftDeleteable\Query\TreeWalker\Exec\MultiTableDeleteExecutor;
 

diff --git a/lib/Gedmo/SoftDeleteable/Traits/SoftDeleteableDocument.php b/lib/Gedmo/SoftDeleteable/Traits/SoftDeleteableDocument.php
@@ -11,6 +11,7 @@
 trait SoftDeleteableDocument
 {
     /**
+     * @var \DateTime
      * @ODM\Date
      */
     protected $deletedAt;

diff --git a/lib/Gedmo/SoftDeleteable/Traits/SoftDeleteableEntity.php b/lib/Gedmo/SoftDeleteable/Traits/SoftDeleteableEntity.php
@@ -11,6 +11,7 @@
 trait SoftDeleteableEntity
 {
     /**
+     * @var \DateTime
      * @ORM\Column(type="datetime", nullable=true)
      */
     protected $deletedAt;

diff --git a/lib/Gedmo/Sortable/Mapping/Event/Adapter/ODM.php b/lib/Gedmo/Sortable/Mapping/Event/Adapter/ODM.php
@@ -3,7 +3,6 @@
 namespace Gedmo\Sortable\Mapping\Event\Adapter;
 
 use Gedmo\Mapping\Event\Adapter\ODM as BaseAdapterODM;
-use Doctrine\ODM\MongoDB\Cursor;
 use Gedmo\Sortable\Mapping\Event\SortableAdapter;
 
 /**

diff --git a/lib/Gedmo/Sortable/Mapping/Event/Adapter/ORM.php b/lib/Gedmo/Sortable/Mapping/Event/Adapter/ORM.php
@@ -3,7 +3,6 @@
 namespace Gedmo\Sortable\Mapping\Event\Adapter;
 
 use Gedmo\Mapping\Event\Adapter\ORM as BaseAdapterORM;
-use Doctrine\ORM\Query;
 use Gedmo\Sortable\Mapping\Event\SortableAdapter;
 
 /**

diff --git a/lib/Gedmo/Timestampable/Traits/TimestampableDocument.php b/lib/Gedmo/Timestampable/Traits/TimestampableDocument.php
@@ -11,12 +11,14 @@
 trait TimestampableDocument
 {
     /**
+     * @var \DateTime
      * @Gedmo\Timestampable(on="create")
      * @ODM\Date
      */
     private $createdAt;
 
     /**
+     * @var \DateTime
      * @Gedmo\Timestampable(on="update")
      * @ODM\Date
      */

diff --git a/lib/Gedmo/Timestampable/Traits/TimestampableEntity.php b/lib/Gedmo/Timestampable/Traits/TimestampableEntity.php
@@ -11,12 +11,14 @@
 trait TimestampableEntity
 {
     /**
+     * @var \DateTime
      * @Gedmo\Timestampable(on="create")
      * @ORM\Column(type="datetime")
      */
     protected $createdAt;
 
     /**
+     * @var \DateTime
      * @Gedmo\Timestampable(on="update")
      * @ORM\Column(type="datetime")
      */

diff --git a/lib/Gedmo/Translatable/Mapping/Event/Adapter/ODM.php b/lib/Gedmo/Translatable/Mapping/Event/Adapter/ODM.php
@@ -4,7 +4,6 @@
 
 use Gedmo\Mapping\Event\Adapter\ODM as BaseAdapterODM;
 use Gedmo\Tool\Wrapper\AbstractWrapper;
-use Doctrine\ODM\MongoDB\DocumentManager;
 use Doctrine\ODM\MongoDB\Mapping\ClassMetadataInfo;
 use Doctrine\ODM\MongoDB\Cursor;
 use Gedmo\Translatable\Mapping\Event\TranslatableAdapter;

diff --git a/lib/Gedmo/Translatable/Query/TreeWalker/TranslationWalker.php b/lib/Gedmo/Translatable/Query/TreeWalker/TranslationWalker.php
@@ -7,7 +7,6 @@
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\SqlWalker;
-use Doctrine\ORM\Query\TreeWalkerAdapter;
 use Doctrine\ORM\Query\AST\SelectStatement;
 use Doctrine\ORM\Query\Exec\SingleSelectExecutor;
 use Doctrine\ORM\Query\AST\RangeVariableDeclaration;
@@ -317,7 +316,10 @@ private function prepareTranslatedComponents()
 
                 // Treat translation as original field type
                 $fieldMapping = $meta->getFieldMapping($field);
-                if (!in_array($fieldMapping["type"], array("datetime", "datetimetz", "date", "time"))) {
+                if ((($this->platform instanceof \Doctrine\DBAL\Platforms\MySqlPlatform) && 
+                    in_array($fieldMapping["type"], array("decimal"))) ||
+                    (!($this->platform instanceof \Doctrine\DBAL\Platforms\MySqlPlatform) && 
+                    !in_array($fieldMapping["type"], array("datetime", "datetimetz", "date", "time")))) {
                     $type = Type::getType($fieldMapping["type"]);
                     $substituteField = 'CAST(' . $substituteField . ' AS ' . $type->getSQLDeclaration($fieldMapping, $this->platform) . ')';
                 }

diff --git a/lib/Gedmo/Translatable/TranslatableListener.php b/lib/Gedmo/Translatable/TranslatableListener.php
@@ -7,9 +7,6 @@
 use Gedmo\Tool\Wrapper\AbstractWrapper;
 use Gedmo\Mapping\MappedEventSubscriber;
 use Gedmo\Translatable\Mapping\Event\TranslatableAdapter;
-use Gedmo\Translatable\Entity\MappedSuperclass\AbstractPersonalTranslation;
-use Gedmo\Translatable\Entity\MappedSuperclass\AbstractTranslation;
-
 /**
  * The translation listener handles the generation and
  * loading of translations for entities which implements

diff --git a/lib/Gedmo/Tree/Entity/Repository/ClosureTreeRepository.php b/lib/Gedmo/Tree/Entity/Repository/ClosureTreeRepository.php
@@ -7,7 +7,6 @@
 use Gedmo\Tree\Strategy;
 use Gedmo\Tree\Strategy\ORM\Closure;
 use Gedmo\Tool\Wrapper\EntityWrapper;
-use Doctrine\ORM\Proxy\Proxy;
 
 /**
  * The ClosureTreeRepository has some useful functions

diff --git a/lib/Gedmo/Tree/Mapping/Event/Adapter/ODM.php b/lib/Gedmo/Tree/Mapping/Event/Adapter/ODM.php
@@ -3,9 +3,6 @@
 namespace Gedmo\Tree\Mapping\Event\Adapter;
 
 use Gedmo\Mapping\Event\Adapter\ODM as BaseAdapterODM;
-use Doctrine\ODM\MongoDB\DocumentManager;
-use Doctrine\ODM\MongoDB\Mapping\ClassMetadataInfo;
-use Doctrine\ODM\MongoDB\Cursor;
 use Gedmo\Tree\Mapping\Event\TreeAdapter;
 
 /**

diff --git a/lib/Gedmo/Tree/Mapping/Event/Adapter/ORM.php b/lib/Gedmo/Tree/Mapping/Event/Adapter/ORM.php
@@ -3,9 +3,6 @@
 namespace Gedmo\Tree\Mapping\Event\Adapter;
 
 use Gedmo\Mapping\Event\Adapter\ORM as BaseAdapterORM;
-use Doctrine\ORM\EntityManager;
-use Doctrine\ORM\Mapping\ClassMetadataInfo;
-use Doctrine\ORM\Query;
 use Gedmo\Tree\Mapping\Event\TreeAdapter;
 
 /**

diff --git a/lib/Gedmo/Tree/Strategy/AbstractMaterializedPath.php b/lib/Gedmo/Tree/Strategy/AbstractMaterializedPath.php
@@ -3,10 +3,7 @@
 namespace Gedmo\Tree\Strategy;
 
 use Gedmo\Tree\Strategy;
-use Doctrine\ORM\EntityManager;
 use Gedmo\Tree\TreeListener;
-use Doctrine\ORM\Mapping\ClassMetadataInfo;
-use Doctrine\ORM\Query;
 use Doctrine\Common\Persistence\ObjectManager;
 use Gedmo\Mapping\Event\AdapterInterface;
 use Gedmo\Exception\RuntimeException;

diff --git a/lib/Gedmo/Tree/Strategy/ORM/Closure.php b/lib/Gedmo/Tree/Strategy/ORM/Closure.php
@@ -4,7 +4,6 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\ORM\Version;
-use Doctrine\ORM\Proxy\Proxy;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 use Doctrine\Common\Persistence\ObjectManager;

diff --git a/lib/Gedmo/Tree/Strategy/ORM/MaterializedPath.php b/lib/Gedmo/Tree/Strategy/ORM/MaterializedPath.php
@@ -3,8 +3,6 @@
 namespace Gedmo\Tree\Strategy\ORM;
 
 use Gedmo\Tree\Strategy\AbstractMaterializedPath;
-use Doctrine\Common\Persistence\ObjectManager;
-use Gedmo\Mapping\Event\AdapterInterface;
 use Gedmo\Tool\Wrapper\AbstractWrapper;
 
 /**

diff --git a/lib/Gedmo/Tree/Strategy/ORM/Nested.php b/lib/Gedmo/Tree/Strategy/ORM/Nested.php
@@ -4,12 +4,10 @@
 
 use Gedmo\Exception\UnexpectedValueException;
 use Doctrine\ORM\Proxy\Proxy;
-use Gedmo\Tool\Wrapper\EntityWrapper;
 use Gedmo\Tool\Wrapper\AbstractWrapper;
 use Gedmo\Tree\Strategy;
 use Doctrine\ORM\EntityManager;
 use Gedmo\Tree\TreeListener;
-use Doctrine\ORM\Mapping\ClassMetadataInfo;
 use Doctrine\ORM\Query;
 use Gedmo\Mapping\Event\AdapterInterface;