Remove direct dependencies on doctrine/common

Michael Moravec · Michael Moravec · commit 45757362dc18 · 2018-06-15T02:15:56.000+02:00
diff --git a/composer.json b/composer.json
@@ -18,7 +18,11 @@
     "require": {
         "php": "^7.1.3",
         "ext-xml": "*",
-        "doctrine/common": "~2.4",
+        "doctrine/annotations": "~1.0",
+        "doctrine/cache": "~1.6",
+        "doctrine/collections": "~1.0",
+        "doctrine/event-manager": "~1.0",
+        "doctrine/persistence": "~1.0",
         "fig/link-util": "^1.0",
         "twig/twig": "^1.35|^2.4.4",
         "psr/cache": "~1.0",
@@ -86,11 +90,10 @@
     },
     "require-dev": {
         "cache/integration-tests": "dev-master",
-        "doctrine/annotations": "~1.0",
-        "doctrine/cache": "~1.6",
         "doctrine/data-fixtures": "1.0.*",
         "doctrine/dbal": "~2.4",
         "doctrine/orm": "~2.4,>=2.4.5",
+        "doctrine/reflection": "~1.0",
         "doctrine/doctrine-bundle": "~1.4",
         "monolog/monolog": "~1.11",
         "ocramius/proxy-manager": "~0.4|~1.0|~2.0",
diff --git a/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php b/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php
@@ -13,14 +13,14 @@
 
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\Common\Persistence\Mapping\MappingException;
+use Doctrine\Common\Persistence\Proxy;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 use Doctrine\ORM\Mapping\MappingException as LegacyMappingException;
 use Symfony\Component\Form\FormTypeGuesserInterface;
 use Symfony\Component\Form\Guess\Guess;
 use Symfony\Component\Form\Guess\TypeGuess;
 use Symfony\Component\Form\Guess\ValueGuess;
-use Doctrine\Common\Util\ClassUtils;
 
 class DoctrineOrmTypeGuesser implements FormTypeGuesserInterface
 {
@@ -162,7 +162,7 @@ public function guessPattern($class, $property)
     protected function getMetadata($class)
     {
         // normalize class name
-        $class = ClassUtils::getRealClass(ltrim($class, '\\'));
+        $class = self::getRealClass(ltrim($class, '\\'));
 
         if (array_key_exists($class, $this->cache)) {
             return $this->cache[$class];
@@ -179,4 +179,13 @@ protected function getMetadata($class)
             }
         }
     }
+
+    private static function getRealClass(string $class) : string
+    {
+        if (false === $pos = strrpos($class, '\\' . Proxy::MARKER . '\\')) {
+            return $class;
+        }
+
+        return substr($class, $pos + Proxy::MARKER_LENGTH + 2);
+    }
 }
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
@@ -17,9 +17,13 @@
     ],
     "require": {
         "php": "^7.1.3",
-        "doctrine/common": "~2.4",
         "symfony/polyfill-ctype": "~1.8",
-        "symfony/polyfill-mbstring": "~1.0"
+        "symfony/polyfill-mbstring": "~1.0",
+        "doctrine/annotations": "~1.0",
+        "doctrine/cache": "~1.6",
+        "doctrine/collections": "~1.0",
+        "doctrine/event-manager": "~1.0",
+        "doctrine/persistence": "~1.0"
     },
     "require-dev": {
         "symfony/stopwatch": "~3.4|~4.0",
@@ -35,7 +39,8 @@
         "symfony/translation": "~3.4|~4.0",
         "doctrine/data-fixtures": "1.0.*",
         "doctrine/dbal": "~2.4",
-        "doctrine/orm": "^2.4.5"
+        "doctrine/orm": "^2.4.5",
+        "doctrine/reflection": "~1.0"
     },
     "conflict": {
         "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json
@@ -25,7 +25,6 @@
         "symfony/expression-language": "~3.4|~4.0",
         "symfony/dependency-injection": "~3.4|~4.0",
         "doctrine/annotations": "~1.0",
-        "doctrine/common": "~2.2",
         "psr/log": "~1.0"
     },
     "conflict": {

Original file line number	Diff line number	Diff line change
`@@ -13,14 +13,14 @@`
`13`	`13`
`14`	`14`	`use Doctrine\Common\Persistence\ManagerRegistry;`
`15`	`15`	`use Doctrine\Common\Persistence\Mapping\MappingException;`
	`16`	`+use Doctrine\Common\Persistence\Proxy;`
`16`	`17`	`use Doctrine\DBAL\Types\Type;`
`17`	`18`	`use Doctrine\ORM\Mapping\ClassMetadataInfo;`
`18`	`19`	`use Doctrine\ORM\Mapping\MappingException as LegacyMappingException;`
`19`	`20`	`use Symfony\Component\Form\FormTypeGuesserInterface;`
`20`	`21`	`use Symfony\Component\Form\Guess\Guess;`
`21`	`22`	`use Symfony\Component\Form\Guess\TypeGuess;`
`22`	`23`	`use Symfony\Component\Form\Guess\ValueGuess;`
`23`		`-use Doctrine\Common\Util\ClassUtils;`
`24`	`24`
`25`	`25`	`class DoctrineOrmTypeGuesser implements FormTypeGuesserInterface`
`26`	`26`	`{`
`@@ -162,7 +162,7 @@ public function guessPattern($class, $property)`
`162`	`162`	`protected function getMetadata($class)`
`163`	`163`	`{`
`164`	`164`	`// normalize class name`
`165`		`- $class = ClassUtils::getRealClass(ltrim($class, '\\'));`
	`165`	`+ $class = self::getRealClass(ltrim($class, '\\'));`
`166`	`166`
`167`	`167`	`if (array_key_exists($class, $this->cache)) {`
`168`	`168`	`return $this->cache[$class];`
`@@ -179,4 +179,13 @@ protected function getMetadata($class)`
`179`	`179`	`}`
`180`	`180`	`}`
`181`	`181`	`}`
	`182`	`+`
	`183`	`+ private static function getRealClass(string $class) : string`
	`184`	`+ {`
	`185`	`+ if (false === $pos = strrpos($class, '\\' . Proxy::MARKER . '\\')) {`
	`186`	`+ return $class;`
	`187`	`+ }`
	`188`	`+`
	`189`	`+ return substr($class, $pos + Proxy::MARKER_LENGTH + 2);`
	`190`	`+ }`
`182`	`191`	`}`