Merge pull request #2204 from fruitwasp/doctrine/persistence

Allow doctrine/persistence 2.x

Author: malarzm

composer.json

@@ -29,7 +29,7 @@
         "doctrine/collections": "^1.5",
         "doctrine/event-manager": "^1.0",
         "doctrine/instantiator": "^1.1",
-        "doctrine/persistence": "^1.3.5",
+        "doctrine/persistence": "^1.3.5|^2.0",
         "doctrine/reflection": "1.2.1",
         "jean85/pretty-package-versions": "^1.3.0",
         "mongodb/mongodb": "^1.2.0",

docs/en/cookbook/implementing-the-notify-changetracking-policy.rst

@@ -23,8 +23,8 @@ implement the ``NotifyPropertyChanged`` interface from the
 
     <?php
 
-    use Doctrine\Common\NotifyPropertyChanged,
-        Doctrine\Common\PropertyChangedListener;
+    use Doctrine\Persistence\NotifyPropertyChanged,
+        Doctrine\Persistence\PropertyChangedListener;
 
     abstract class DomainObject implements NotifyPropertyChanged
     {
@@ -72,4 +72,4 @@ listeners:
 The check whether the new value is different from the old one is
 not mandatory but recommended. That way you can avoid unnecessary
 updates and also have full control over when you consider a
-property changed.
+property changed.

docs/en/reference/change-tracking-policies.rst

@@ -73,8 +73,8 @@ follows:
 
     <?php
 
-    use Doctrine\Common\NotifyPropertyChanged,
-        Doctrine\Common\PropertyChangedListener;
+    use Doctrine\Persistence\NotifyPropertyChanged,
+        Doctrine\Persistence\PropertyChangedListener;
 
     /**
      * @Document

lib/Doctrine/ODM/MongoDB/Proxy/Factory/StaticProxyFactory.php

@@ -5,13 +5,13 @@
 namespace Doctrine\ODM\MongoDB\Proxy\Factory;
 
 use Closure;
-use Doctrine\Common\NotifyPropertyChanged;
 use Doctrine\ODM\MongoDB\DocumentManager;
 use Doctrine\ODM\MongoDB\DocumentNotFoundException;
 use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
 use Doctrine\ODM\MongoDB\Persisters\DocumentPersister;
 use Doctrine\ODM\MongoDB\UnitOfWork;
 use Doctrine\ODM\MongoDB\Utility\LifecycleEventManager;
+use Doctrine\Persistence\NotifyPropertyChanged;
 use ProxyManager\Factory\LazyLoadingGhostFactory;
 use ProxyManager\Proxy\GhostObjectInterface;
 use ReflectionProperty;

lib/Doctrine/ODM/MongoDB/UnitOfWork.php

@@ -7,8 +7,6 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\EventManager;
-use Doctrine\Common\NotifyPropertyChanged;
-use Doctrine\Common\PropertyChangedListener;
 use Doctrine\ODM\MongoDB\Hydrator\HydratorFactory;
 use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
 use Doctrine\ODM\MongoDB\Mapping\MappingException;
@@ -23,6 +21,8 @@
 use Doctrine\ODM\MongoDB\Utility\LifecycleEventManager;
 use Doctrine\Persistence\Mapping\ReflectionService;
 use Doctrine\Persistence\Mapping\RuntimeReflectionService;
+use Doctrine\Persistence\NotifyPropertyChanged;
+use Doctrine\Persistence\PropertyChangedListener;
 use InvalidArgumentException;
 use MongoDB\BSON\UTCDateTime;
 use ProxyManager\Proxy\GhostObjectInterface;

tests/Doctrine/ODM/MongoDB/Tests/UnitOfWorkTest.php

@@ -7,14 +7,14 @@
 use Closure;
 use DateTime;
 use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\NotifyPropertyChanged;
-use Doctrine\Common\PropertyChangedListener;
 use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
 use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
 use Doctrine\ODM\MongoDB\MongoDBException;
 use Doctrine\ODM\MongoDB\Tests\Mocks\ExceptionThrowingListenerMock;
 use Doctrine\ODM\MongoDB\Tests\Mocks\PreUpdateListenerMock;
 use Doctrine\ODM\MongoDB\UnitOfWork;
+use Doctrine\Persistence\NotifyPropertyChanged;
+use Doctrine\Persistence\PropertyChangedListener;
 use Documents\Address;
 use Documents\File;
 use Documents\FileWithoutMetadata;

tests/Documents/ProfileNotify.php

@@ -5,9 +5,9 @@
 namespace Documents;
 
 use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\NotifyPropertyChanged;
-use Doctrine\Common\PropertyChangedListener;
 use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
+use Doctrine\Persistence\NotifyPropertyChanged;
+use Doctrine\Persistence\PropertyChangedListener;
 
 /** @ODM\Document @ODM\ChangeTrackingPolicy("NOTIFY") */
 class ProfileNotify implements NotifyPropertyChanged