Merge pull request #401 from doctrine/prepare-release

prepare release

Author: dbu

CHANGELOG.md

@@ -1,13 +1,16 @@
 Changelog
 =========
 
-3.0.0 (unreleased)
-------------------
+Version 3
+=========
+
+3.0.0
+-----
 
 * Upgrade to PHPCR-ODM 2.0
 * Support Jackalope 2.0
 * Drop support for PHP 7
-* Replace doctrine cache with PSR-6 cache with the `symfony/cache` implementation.
+* Replace Doctrine cache with PSR-6 cache with the `symfony/cache` implementation.
   The configuration of metadata_cache_driver changed. By default, it creates an `array` cache.
   To configure a service, specify `type: service` and specify your service in the `id` property.
   To use a cache pool, specify the service id of that pool.

composer.json

@@ -29,18 +29,16 @@
         "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0"
     },
     "conflict": {
-        "doctrine/annotations": "< 1.7.0",
         "doctrine/doctrine-bundle": "< 2.0.3",
         "jackalope/jackalope-jackrabbit": "<2",
         "jackalope/jackalope": "< 1.3.1",
-        "phpcr/phpcr-shell": "< 1.0.0-beta1",
         "symfony/dependency-injection": "< 3",
         "symfony/console": "< 4"
     },
     "require-dev": {
         "ext-libxml": "*",
         "doctrine/doctrine-bundle": "^2.0.3",
-        "doctrine/phpcr-odm": "2.x-dev",
+        "doctrine/phpcr-odm": "^2.0",
         "doctrine/orm": "^2.0 || ^3.0",
         "jackalope/jackalope-doctrine-dbal": "^2.0",
         "matthiasnoback/symfony-dependency-injection-test": "^4.3.1 || ^5.0",
@@ -89,7 +87,5 @@
         "psr-4": {
             "Doctrine\\Bundle\\PHPCRBundle\\Tests\\": "tests/"
         }
-    },
-    "prefer-stable": true,
-    "minimum-stability": "beta"
+    }
 }

phpunit.xml.dist

@@ -2,25 +2,20 @@
 <phpunit
     colors="true"
     bootstrap="vendor/autoload.php"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
 >
 
     <testsuites>
         <testsuite name="Symfony DoctrinePHPCRBundle Test Suite">
             <directory>./tests</directory>
         </testsuite>
     </testsuites>
-
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory>.</directory>
-            <exclude>
-                <directory>Resources/</directory>
-                <directory>Tests/</directory>
-                <directory>vendor/</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-
+    <coverage includeUncoveredFiles="true">
+        <include>
+            <directory>src/</directory>
+        </include>
+    </coverage>
     <php>
         <server name="KERNEL_CLASS" value="Doctrine\Bundle\PHPCRBundle\Tests\Fixtures\App\Kernel"/>
         <env name="SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT" value="1"/>