Merge branch 'doctrine-extensions:main' into feature/blameable-allow-uuid

Author: fwolfsjaeger

.php-cs-fixer.dist.php

@@ -51,6 +51,7 @@
         'no_superfluous_elseif' => true,
         'no_unset_on_property' => true,
         'no_useless_else' => true,
+        'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => true],
         'ordered_class_elements' => true,
         'ordered_imports' => ['sort_algorithm' => 'alpha'],
         'phpdoc_summary' => false,

CHANGELOG.md

@@ -18,9 +18,14 @@ a release.
 ---
 
 ## [Unreleased]
+### Changed
+- Add conflict with "doctrine/orm" >=2.16 (temporary change until code is fixed)
+
+## [3.12.0] - 2023-07-08
 ### Added
 - Tree: `setSibling()` and `getSibling()` methods in the `Node` interface through the BC `@method` annotation
 - Tree: Support array of fields and directions in the `$sortByField` and `$direction` parameters at `AbstractTreeRepository::recover()`
+- Loggable: Support for composite identifiers
 
 ### Changed
 - Named arguments have precedence over the values passed in the `$data` array in annotation classes at `Gedmo\Mapping\Annotation\`
@@ -34,6 +39,8 @@ a release.
 
 ### Deprecated
 - Tree: Not implementing `Node` interface in classes that are used as nodes
+- Implementing the `Gedmo\Tool\WrapperInterface::getIdentifier()` method without the second argument (`$flatten`) is deprecated and will
+  be required in version 4.0
 
 ## [3.11.1] - 2023-02-20
 ### Fixed

README.md

@@ -98,7 +98,7 @@ To set up and run the tests, follow these steps:
 
 - Install [Docker](https://www.docker.com/) and ensure you have `docker compose`
 - From the project root, run `docker compose up -d` to start containers in daemon mode
-- Enter the container via `docker compose exec php bash` and navigate to the root directory: `cd /var/www`
+- Enter the container via `docker compose exec php bash` (you are now in the root directory: `/var/www`)
 - Install Composer dependencies via `composer install`
 - Run the tests: `bin/phpunit -c tests/`
 
@@ -107,8 +107,8 @@ To set up and run the tests, follow these steps:
 To set up and run example, follow these steps:
 
 - go to the root directory of extensions
-- download composer: `wget https://getcomposer.org/composer.phar`
-- install dev libraries: `php composer.phar install`
+- [download composer](https://getcomposer.org/download/)
+- install dev libraries: `composer install`
 - edit `example/em.php` and configure your database on top of the file
 - run: `php example/bin/console` or `php example/bin/console` for console commands
 - run: `php example/bin/console orm:schema-tool:create` to create the schema

composer.json

@@ -41,7 +41,7 @@
     },
     "require": {
         "php": "^7.2 || ^8.0",
-        "behat/transliterator": "~1.2",
+        "behat/transliterator": "^1.2",
         "doctrine/annotations": "^1.13 || ^2.0",
         "doctrine/collections": "^1.2 || ^2.0",
         "doctrine/common": "^2.13 || ^3.0",
@@ -71,7 +71,7 @@
     "conflict": {
         "doctrine/dbal": "<2.13.1 || ^3.0 <3.2",
         "doctrine/mongodb-odm": "<2.3",
-        "doctrine/orm": "<2.10.2",
+        "doctrine/orm": "<2.10.2 || >= 2.16.0",
         "sebastian/comparator": "<2.0"
     },
     "suggest": {
@@ -94,7 +94,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "3.12-dev"
+            "dev-main": "3.13-dev"
         }
     },
     "scripts": {