Merge pull request doctrine#881 from webnet-fr/configuration-without-…

…common-package Fix exception when configuration is used without doctrine/orm nor doctrine/common
alcaeus · Jan 7, 2019 · 98551d7 · 98551d7
2 parents 4725c6d + 00c8ebf
commit 98551d7
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -302,8 +302,6 @@ private function configureDbalDriverNode(ArrayNodeDefinition $node)
      */
     private function addOrmSection(ArrayNodeDefinition $node)
     {
-        $generationModes = $this->getAutoGenerateModes();
-
         $node
             ->children()
                 ->arrayNode('orm')
@@ -341,7 +339,9 @@ private function addOrmSection(ArrayNodeDefinition $node)
                         ->scalarNode('auto_generate_proxy_classes')->defaultValue(false)
                             ->info('Auto generate mode possible values are: "NEVER", "ALWAYS", "FILE_NOT_EXISTS", "EVAL"')
                             ->validate()
-                                ->ifTrue(static function ($v) use ($generationModes) {
+                                ->ifTrue(function ($v) {
+                                    $generationModes = $this->getAutoGenerateModes();
+
                                     if (is_int($v) && in_array($v, $generationModes['values']/*array(0, 1, 2, 3)*/)) {
                                         return false;
                                     }

diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Doctrine\Bundle\DoctrineBundle\Tests\DependencyInjection;
+
+use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Configuration;
+use PHPUnit\Framework\TestCase;
+
+class ConfigurationTest extends TestCase
+{
+    /**
+     * Whether or not this test should preserve the global state when
+     * running in a separate PHP process.
+     *
+     * PHPUnit hack to avoid currently loaded classes to leak to
+     * testGetConfigTreeBuilderDoNotUseDoctrineCommon that is run in separate process.
+     *
+     * @var bool
+     */
+    protected $preserveGlobalState = false;
+
+    /**
+     * @runInSeparateProcess
+     */
+    public function testGetConfigTreeBuilderDoNotUseDoctrineCommon()
+    {
+        $configuration = new Configuration(true);
+        $configuration->getConfigTreeBuilder();
+        $this->assertFalse(class_exists('Doctrine\Common\Proxy\AbstractProxyFactory', false));
+    }
+}