Merge pull request #218 from symfony-cmf/support-phpcr-bundle-3

support phpcr-bundle 3

Author: dbu

CHANGELOG.md

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+4.x
+===
+
+4.4.3
+-----
+
+* Support phpcr-bundle 3.
+
 4.4.2
 -----
 

composer.json

@@ -15,7 +15,7 @@
     },
     "require-dev": {
         "doctrine/doctrine-bundle": "^1.8 || ^2.0",
-        "doctrine/phpcr-bundle": "^1.3 || ^2.0.0",
+        "doctrine/phpcr-bundle": "^1.3 || ^2.0 || ^3.0",
         "symfony/console": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0",
         "symfony/dependency-injection": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0",
         "symfony/doctrine-bridge": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0",

src/Functional/BaseTestCase.php

@@ -167,7 +167,14 @@ protected function getDbManager(string $type)
             ));
         }
 
-        $dbManager = new $className($this->getContainer());
+        $refl = new \ReflectionClass($className);
+        if (1 === $refl->getConstructor()->getNumberOfParameters()) {
+            // phpcr-bundle < 3
+            $dbManager = new $className(self::getContainer());
+        } else {
+            // phpcr-bundle >= 3
+            $dbManager = new $className(self::getContainer()->get('doctrine_phpcr'), self::getContainer()->get('doctrine_phpcr.initializer_manager'));
+        }
 
         $this->dbManagers[$type] = $dbManager;
 
@@ -178,10 +185,10 @@ protected static function assertResponseSuccess(Response $response)
     {
         libxml_use_internal_errors(true);
 
-        $dom = new \DomDocument();
+        $dom = new \DOMDocument();
         $dom->loadHTML($response->getContent());
 
-        $xpath = new \DOMXpath($dom);
+        $xpath = new \DOMXPath($dom);
         $result = $xpath->query('//div[contains(@class,"text-exception")]/h1');
         $exception = null;
         if ($result->length) {

src/Unit/Constraint/SchemaAcceptsXml.php

@@ -35,7 +35,7 @@ public function matches($schemaFile): bool
                 throw new \InvalidArgumentException(sprintf('Can only test a file if it contains 1 <config> element, %d given', $configElement->length));
             }
 
-            $configDom = new \DomDocument();
+            $configDom = new \DOMDocument();
             $configDom->appendChild($configDom->importNode($configElement->item(0), true));
 
             libxml_use_internal_errors(true);

tests/Functional/BaseTestCaseTest.php

@@ -11,6 +11,8 @@
 
 namespace Symfony\Cmf\Component\Testing\Tests\Functional;
 
+use Doctrine\Bundle\PHPCRBundle\Initializer\InitializerManager;
+use Doctrine\Bundle\PHPCRBundle\ManagerRegistryInterface;
 use Doctrine\Bundle\PHPCRBundle\Test\RepositoryManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -25,12 +27,12 @@
 class BaseTestCaseTest extends TestCase
 {
     /**
-     * @var ContainerInterface|MockObject
+     * @var ContainerInterface&MockObject
      */
     private $container;
 
     /**
-     * @var KernelInterface|MockObject
+     * @var KernelInterface&MockObject
      */
     private $kernel;
 
@@ -47,20 +49,24 @@ class BaseTestCaseTest extends TestCase
     protected function setUp(): void
     {
         $this->container = $this->createMock(ContainerInterface::class);
-        $this->container->expects($this->any())
+        $this->container
             ->method('get')
-            ->will($this->returnCallback(function ($name) {
-                $dic = ['test.client' => $this->client];
+            ->willReturnCallback(function ($name) {
+                $dic = [
+                    'test.client' => $this->client,
+                    'doctrine_phpcr' => $this->createMock(ManagerRegistryInterface::class),
+                    'doctrine_phpcr.initializer_manager' => $this->createMock(InitializerManager::class),
+                ];
 
                 return $dic[$name];
-            }));
+            });
 
         $this->kernel = $this->createMock(KernelInterface::class);
-        $this->kernel->expects($this->any())
+        $this->kernel
             ->method('getContainer')
             ->willReturn($this->container)
         ;
-        $this->kernel->expects($this->any())
+        $this->kernel
             ->method('getEnvironment')
             ->willReturn('phpcr')
         ;
@@ -74,7 +80,7 @@ protected function setUp(): void
             $this->client = $this->createMock(Client::class);
         }
 
-        $this->client->expects($this->any())
+        $this->client
             ->method('getContainer')
             ->willReturn($this->container);
     }
@@ -122,6 +128,7 @@ public function provideTestDb()
 
     /**
      * @dataProvider provideTestDb
+     *
      * @depends testGetContainer
      */
     public function testDb($dbName, $expected)

tests/Unit/Constraint/SchemaAcceptsXmlTest.php

@@ -53,11 +53,11 @@ public function getAssertingData()
 
         $data = [];
 
-        $dom1 = new \DomDocument();
+        $dom1 = new \DOMDocument();
         $dom1->loadXML('<container><config xmlns="http://cmf.symfony.com/schema/dic/foo" required="f"/></container>');
         $data[] = [[$dom1], $schema1, true];
 
-        $dom2 = new \DomDocument();
+        $dom2 = new \DOMDocument();
         $dom2->loadXML('<container><config xmlns="http://cmf.symfony.com/schema/dic/foo" /></container>');
         $data[] = [[$dom2], $schema1, false];
 
@@ -70,7 +70,7 @@ public function getAssertingData()
 
     public function testFailsIfNoConfigElementIsAvailable()
     {
-        $dom = new \DomDocument();
+        $dom = new \DOMDocument();
         $dom->loadXML('<container></container>');
 
         $constraint = new SchemaAcceptsXml([$dom]);

tests/Unit/XmlSchemaTestCaseTest.php

@@ -17,14 +17,14 @@ class XmlSchemaTestCaseTest extends XmlSchemaTestCase
 {
     public function testAcceptsSingleDomsWithoutArray()
     {
-        $dom = new \DomDocument();
+        $dom = new \DOMDocument();
         $dom->loadXML('<container><config xmlns="http://cmf.symfony.com/schema/dic/foo" required="f"/></container>');
         $this->assertSchemaAcceptsXml($dom, __DIR__.'/../Fixtures/schema/schema1.xsd');
     }
 
     public function testNegativeAssertion()
     {
-        $dom = new \DomDocument();
+        $dom = new \DOMDocument();
         $dom->loadXML('<container><config xmlns="http://cmf.symfony.com/schema/dic/foo" /></container>');
 
         $this->assertSchemaRefusesXml($dom, __DIR__.'/../Fixtures/schema/schema1.xsd');