Allow Symfony 6

.github/workflows/test-application.yaml

@@ -0,0 +1,199 @@
+name: Test application
+
+on:
+    pull_request:
+    push:
+        branches:
+            - 'master'
+
+jobs:
+    phpunit-doctrine_dbal:
+        name: 'PHP ${{ matrix.php-version }} Doctrine DBAL ${{ matrix.dependencies }} ${{ matrix.symfony-require }}'
+
+        runs-on: ubuntu-20.04
+
+        services:
+            mysql:
+                image: mysql:5.7
+                env:
+                    MYSQL_ALLOW_EMPTY_PASSWORD: yes
+                    MYSQL_DATABASE: phpcr_odm_tests
+                ports:
+                    - 3306:3306
+                options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
+        env:
+            SYMFONY_REQUIRE: ${{ matrix.symfony-require }}
+
+        strategy:
+            fail-fast: false
+
+            matrix:
+                php-version:
+                    - '7.1'
+                    - '7.2'
+                    - '7.3'
+                    - '7.4'
+                    - '8.0'
+                dependencies: [highest]
+                symfony-require: ['']
+                include:
+                    - php-version: '7.1'
+                      dependencies: lowest
+                    - php-version: '7.4'
+                      dependencies: highest
+                      symfony-require: 2.3.*
+                    - php-version: '7.4'
+                      dependencies: highest
+                      symfony-require: 3.4.*
+                    - php-version: '7.4'
+                      dependencies: highest
+                      symfony-require: 4.4.*
+                      php-bench: true 
+                    - php-version: '8.0'
+                      dependencies: highest
+                      symfony-require: 5.0.*
+                    - php-version: '8.0'
+                      dependencies: highest
+                      symfony-require: 6.0.*
+
+        steps:
+            - name: Checkout project
+              uses: actions/checkout@v2
+
+            - name: Install and configure PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php-version }}
+                  tools: 'composer:v2'
+
+            - name: Globally install symfony/flex
+              if: matrix.symfony-require != ''
+              run: composer global require --no-progress --no-scripts --no-plugins symfony/flex
+
+            - name: Allow unstable dependencies
+              if: matrix.symfony-require == '6.0.*'
+              run: composer config minimum-stability dev
+
+            - name: Remove dev dependencies not compatible with Symfony 6
+              if: matrix.symfony-require == '6.0.*'
+              run: composer remove liip/rmt --dev --no-update --no-interaction
+
+            - name: Install Jackalope Doctrine DBAL transport
+              run: composer require jackalope/jackalope-doctrine-dbal:"~1.0" --no-update
+
+            - name: Install PHPBench
+              if: matrix.php-bench == true
+              run: composer require phpbench/phpbench:"~0.16" --no-update
+
+            - name: Install dependencies with Composer
+              uses: ramsey/composer-install@v1
+              with:
+                  dependency-versions: ${{ matrix.dependencies }}
+                  composer-options: --prefer-dist
+
+            - name: Run configuration script
+              run: ./tests/script_doctrine_dbal.sh
+
+            - name: Execute test cases
+              run: vendor/bin/phpunit -c tests/phpunit_doctrine_dbal.xml.dist
+
+            - name: Execute PHPBench
+              if: matrix.php-bench == true
+              run: vendor/bin/phpbench run --report=all
+              env:
+                  TRANSPORT: doctrine_dbal
+
+    phpunit-jackrabbit:
+        name: 'PHP ${{ matrix.php-version }} Jackrabbit ${{ matrix.dependencies }} ${{ matrix.symfony-require }}'
+
+        runs-on: ubuntu-20.04
+
+        env:
+            SYMFONY_REQUIRE: ${{ matrix.symfony-require }}
+
+        strategy:
+            fail-fast: false
+
+            matrix:
+                php-version:
+                    - '7.1'
+                    - '7.2'
+                    - '7.3'
+                    - '7.4'
+                    - '8.0'
+                dependencies: [highest]
+                symfony-require: ['']
+                include:
+                    - php-version: '7.1'
+                      dependencies: lowest
+                    - php-version: '7.4'
+                      dependencies: highest
+                      symfony-require: 2.3.*
+                    - php-version: '7.4'
+                      dependencies: highest
+                      symfony-require: 3.4.*
+                      php-bench: true
+                    - php-version: '7.4'
+                      dependencies: highest
+                      symfony-require: 4.4.*
+                      php-bench: true 
+                    - php-version: '8.0'
+                      dependencies: highest
+                      symfony-require: 5.0.*
+                    - php-version: '8.0'
+                      dependencies: highest
+                      symfony-require: 6.0.*
+
+        steps:
+            - name: Checkout project
+              uses: actions/checkout@v2
+
+            - name: Install and configure PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php-version }}
+                  tools: 'composer:v2'
+
+            - name: Install and configure Java
+              uses: actions/setup-java@v2
+              with:
+                  distribution: temurin
+                  java-version: '8'
+
+            - name: Globally install symfony/flex
+              if: matrix.symfony-require != ''
+              run: composer global require --no-progress --no-scripts --no-plugins symfony/flex
+
+            - name: Allow unstable dependencies
+              if: matrix.symfony-require == '6.0.*'
+              run: composer config minimum-stability dev
+
+            - name: Remove dev dependencies not compatible with Symfony 6
+              if: matrix.symfony-require == '6.0.*'
+              run: composer remove liip/rmt --dev --no-update --no-interaction
+
+            - name: Install Jackalope Jackrabbit
+              run: composer require jackalope/jackalope-jackrabbit:~1.0 --no-update
+
+            - name: Install PHPBench
+              if: matrix.php-bench == true
+              run: composer require phpbench/phpbench:"~0.16" --no-update
+
+            - name: Install dependencies with Composer
+              uses: ramsey/composer-install@v1
+              with:
+                  dependency-versions: ${{ matrix.dependencies }}
+                  composer-options: --prefer-dist
+
+            - name: Run configuration script
+              run: ./tests/script_jackrabbit.sh
+
+            - name: Execute test cases
+              run: vendor/bin/phpunit -c tests/phpunit_jackrabbit.xml.dist
+
+            - name: Execute PHPBench
+              if: matrix.php-bench == true
+              run: vendor/bin/phpbench run --report=all
+              env:
+                  TRANSPORT: jackrabbit

cli-config.doctrine_dbal.php.dist

@@ -12,7 +12,7 @@ $extraCommands[] = new \Jackalope\Tools\Console\Command\InitDoctrineDbalCommand(
 
 $params = array(
     'driver'    => 'pdo_mysql',
-    'host'      => 'localhost',
+    'host'      => '127.0.0.1',
     'user'      => 'root',
     'password'  => '',
     'dbname'    => 'phpcr_odm_tests',

cli-config.jackrabbit.php.dist

@@ -20,7 +20,7 @@ if (! isset($argv[1])
 }
 
 $params = array(
-    'jackalope.jackrabbit_uri'  => 'http://localhost:8080/server/',
+    'jackalope.jackrabbit_uri'  => 'http://127.0.0.1:8080/server/',
 );
 
 $workspace = 'default';

composer.json

@@ -32,16 +32,16 @@
         "phpcr/phpcr-implementation": "^2.1",
         "phpcr/phpcr-utils": "^1.3.0",
         "doctrine/instantiator": "^1.0.1",
-        "symfony/console": "^3.4 || ^4.3 || ^5.0"
+        "symfony/console": "^3.4 || ^4.3 || ^5.0 || ^6.0"
     },
     "require-dev": {
-        "symfony/yaml": "^3.4 || ^4.3 || ^5.0",
+        "symfony/yaml": "^3.4 || ^4.3 || ^5.0 || ^6.0",
         "symfony/phpunit-bridge": "^5.0",
         "liip/rmt": "^1.3",
-        "phpunit/phpunit": "^7.0 || ^8.0"
+        "phpunit/phpunit": "^7.5 || ^8.0"
     },
     "suggest": {
-        "symfony/yaml": "^3.4 || ^4.3 || ^5.0",
+        "symfony/yaml": "^3.4 || ^4.3 || ^5.0 || ^6.0",
         "jackalope/jackalope-doctrine-dbal": "^1.3",
         "jackalope/jackalope-jackrabbit": "^1.3"
     },

lib/Doctrine/ODM/PHPCR/Mapping/ClassMetadata.php

@@ -2,7 +2,6 @@
 
 namespace Doctrine\ODM\PHPCR\Mapping;
 
-use Doctrine\Common\ClassLoader;
 use Doctrine\Instantiator\Instantiator;
 use Doctrine\Instantiator\InstantiatorInterface;
 use Doctrine\ODM\PHPCR\Event;
@@ -541,7 +540,7 @@ public function validateReferences()
     {
         foreach ($this->referenceMappings as $fieldName) {
             $mapping = $this->mappings[$fieldName];
-            if (!empty($mapping['targetDocument']) && !ClassLoader::classExists($mapping['targetDocument'])) {
+            if (!empty($mapping['targetDocument']) && !class_exists($mapping['targetDocument']) && !interface_exists($mapping['targetDocument'])) {
                 throw MappingException::invalidTargetDocumentClass($mapping['targetDocument'], $this->name, $mapping['fieldName']);
             }
         }
@@ -1131,7 +1130,7 @@ public function validateClassMapping()
             foreach ($this->referrersMappings as $referrerName) {
                 $mapping = $this->mappings[$referrerName];
                 // only a santiy check with reflection. otherwise we could run into endless loops
-                if (!ClassLoader::classExists($mapping['referringDocument'])) {
+                if (!class_exists($mapping['referringDocument']) && !interface_exists($mapping['referringDocument'])) {
                     throw new MappingException(sprintf(
                         'Invalid referrer mapping on document "%s" for field "%s": The referringDocument class "%s" does not exist',
                         $this->name,

lib/Doctrine/ODM/PHPCR/Mapping/Driver/XmlDriver.php

@@ -295,9 +295,7 @@ private function addReferenceMapping(PhpcrClassMetadata $class, $reference, $typ
     protected function loadMappingFile($file)
     {
         $result = [];
-        $entity = libxml_disable_entity_loader(true);
         $xmlElement = simplexml_load_string(file_get_contents($file));
-        libxml_disable_entity_loader($entity);
 
         foreach (['document', 'mapped-superclass'] as $type) {
             if (isset($xmlElement->$type)) {

tests/Doctrine/Tests/ODM/PHPCR/Functional/EventObjectUpdateTest.php

@@ -54,7 +54,7 @@ public function testComputingBetweenEvents()
         $this->dm->flush();
 
         $this->assertInstanceOf('stdClass', $entity->status);
-        $this->assertAttributeNotEmpty('value', $entity->status);
+        $this->assertObjectHasAttribute('value', $entity->status);
         $this->assertEquals($entity->status->value, 'active');
         $this->assertObjectNotHasAttribute('foo', $entity->status);
 
@@ -65,7 +65,7 @@ public function testComputingBetweenEvents()
         $this->dm->flush();
 
         $this->assertInstanceOf('stdClass', $entity->status);
-        $this->assertAttributeNotEmpty('value', $entity->status);
+        $this->assertObjectHasAttribute('value', $entity->status);
         $this->assertEquals($entity->status->value, 'inactive');
         $this->assertObjectNotHasAttribute('foo', $entity->status);
         $this->assertEquals($entity->text, 'test2');
@@ -75,7 +75,7 @@ public function testComputingBetweenEvents()
         $entity = $this->dm->find(null, $entity->id);
 
         $this->assertInstanceOf('stdClass', $entity->status);
-        $this->assertAttributeNotEmpty('value', $entity->status);
+        $this->assertObjectHasAttribute('value', $entity->status);
         $this->assertEquals($entity->status->value, 'inactive');
         $this->assertObjectNotHasAttribute('foo', $entity->status);
         $this->assertEquals($entity->text, 'test2');
@@ -85,7 +85,7 @@ public function testComputingBetweenEvents()
         $this->dm->flush();
 
         $this->assertInstanceOf('stdClass', $entity->status);
-        $this->assertAttributeNotEmpty('value', $entity->status);
+        $this->assertObjectHasAttribute('value', $entity->status);
         $this->assertEquals($entity->status->value, 'active');
         $this->assertEquals($entity->text, 'test2');
     }

tests/Doctrine/Tests/ODM/PHPCR/Functional/Translation/AttributeTranslationStrategyTest.php

@@ -354,7 +354,7 @@ public function testGetLocalesFor()
         $strategy = new AttributeTranslationStrategy($this->dm);
         $locales = $strategy->getLocalesFor($doc, $node, $this->metadata);
 
-        $this->assertInternalType('array', $locales);
+        $this->assertIsArray($locales);
         $this->assertCount(3, $locales);
         $this->assertContains('fr', $locales);
         $this->assertContains('en', $locales);