Add support for doctrine/common v3

athos-ribeiro · Feb 18, 2022 · dc9c15d · dc9c15d
1 parent 8068e0a
commit dc9c15d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -15,12 +15,12 @@
     },
     "require-dev": {
         "doctrine/collections": "^1.6.8",
-        "doctrine/common": "^2.13.3",
+        "doctrine/common": "^2.13.3 || ^3.2.2",
         "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
     },
     "conflict": {
         "doctrine/collections": "<1.6.8",
-        "doctrine/common": "<2.13.3"
+        "doctrine/common": "<2.13.3 || >=3,<3.2.2"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         colors="true"
-         bootstrap="vendor/autoload.php">
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         colors="true">
 
     <testsuites>
         <testsuite name="Test suite">
-            <directory>./tests</directory>
+            <directory>./tests/DeepCopyTest</directory>
         </testsuite>
     </testsuites>
 

diff --git a/src/DeepCopy/Matcher/Doctrine/DoctrineProxyMatcher.php b/src/DeepCopy/Matcher/Doctrine/DoctrineProxyMatcher.php
@@ -3,7 +3,7 @@
 namespace DeepCopy\Matcher\Doctrine;
 
 use DeepCopy\Matcher\Matcher;
-use Doctrine\Common\Persistence\Proxy;
+use Doctrine\Persistence\Proxy;
 
 /**
  * @final

diff --git a/tests/DeepCopyTest/Matcher/Doctrine/DoctrineProxyMatcherTest.php b/tests/DeepCopyTest/Matcher/Doctrine/DoctrineProxyMatcherTest.php
@@ -4,7 +4,7 @@
 
 use BadMethodCallException;
 use DeepCopy\Matcher\Doctrine\DoctrineProxyMatcher;
-use Doctrine\Common\Persistence\Proxy;
+use Doctrine\Persistence\Proxy;
 use PHPUnit\Framework\TestCase;
 use stdClass;