Merge branch '1.x' into 2.x

.php-cs-fixer.dist.php

@@ -45,6 +45,11 @@
     'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => true],
     'ordered_class_elements' => true,
     'ordered_imports' => ['sort_algorithm' => 'alpha', 'imports_order' => ['class', 'function', 'const']],
+    'phpdoc_order' => ['order' => ['var', 'param', 'throws', 'return', 'phpstan-var', 'psalm-var', 'phpstan-param', 'psalm-param', 'phpstan-return', 'psalm-return']],
+    'phpdoc_separation' => ['groups' => [
+        ['phpstan-template', 'phpstan-template-covariant', 'phpstan-extends', 'phpstan-implements', 'phpstan-var', 'psalm-var', 'phpstan-param', 'psalm-param', 'phpstan-return', 'psalm-return'],
+        ['psalm-suppress', 'phpstan-ignore-next-line'],
+    ]],
     'php_unit_strict' => true,
     'php_unit_test_case_static_method_calls' => true,
     'phpdoc_to_comment' => ['ignored_tags' => ['psalm-suppress', 'phpstan-var']],

CHANGELOG.md

@@ -20,6 +20,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 See UPGRADE-2.0.md for all the changes
 
+## [1.18.1](https://github.com/sonata-project/sonata-doctrine-extensions/compare/1.18.0...1.18.1) - 2022-09-01
+### Fixed
+- [[#448](https://github.com/sonata-project/sonata-doctrine-extensions/pull/448)] JsonType::convertToPHPValue and JsonType::convertToDatabaseValue can return null ([@dmitryuk](https://github.com/dmitryuk))
+
 ## [1.18.0](https://github.com/sonata-project/sonata-doctrine-extensions/compare/1.17.0...1.18.0) - 2022-08-16
 ### Added
 - [[#443](https://github.com/sonata-project/sonata-doctrine-extensions/pull/443)] Added `TransactionalManagerInterface::class` interface. ([@eerison](https://github.com/eerison))

src/Mapper/ORM/DoctrineORMMapper.php

@@ -38,6 +38,7 @@ final class DoctrineORMMapper implements EventSubscriber
 
     /**
      * @var array<class-string, int>
+     *
      * @phpstan-var array<class-string, ORMClassMetadata::INHERITANCE_TYPE_*>
      */
     private array $inheritanceTypes = [];