Merge pull request #4678 from soyuka/merge-26

Merge 2.6

Author: soyuka

.gitattributes

@@ -5,6 +5,7 @@
 /.php_cs.dist export-ignore
 /appveyor.yml export-ignore
 /behat.yml.dist export-ignore
+/docs export-ignore
 /features export-ignore
 /phpstan.neon.dist export-ignore
 /phpunit.xml.dist export-ignore

CHANGELOG.md

@@ -47,6 +47,13 @@
 * Mark the GraphQL subsystem as stable (#4500)
 * feat(test): add `Client::loginUser()`
 
+## 2.6.8
+
+* fix: serializing embedded non resource objects
+* chore(openapi): upgrade Swagger UI to version 4.1.3
+* chore(openapi): upgrade ReDoc to version 2.0.0-rc.59
+* chore(graphql): upgrade GraphiQL to version 1.5.16
+
 ## 2.6.7
 
 * feat: compatibility with Symfony 6 (#4503, #4582, #4604, #4564)

CONTRIBUTING.md

@@ -45,7 +45,7 @@ Alternatively, you can also work with the test application we provide:
 ### Matching Coding Standards
 
 The API Platform project follows [Symfony coding standards](https://symfony.com/doc/current/contributing/code/standards.html).
-But don't worry, you can fix CS issues automatically using the [PHP CS Fixer](https://cs.sensiolabs.org/) tool:
+But don't worry, you can fix CS issues automatically using the [PHP CS Fixer](https://cs.symfony.com) tool:
 
     php-cs-fixer.phar fix
 

README.md

@@ -11,7 +11,6 @@ high performance API-first projects. Extend or override everything you want.
 
 [![GitHub Actions](https://github.com/api-platform/core/workflows/CI/badge.svg?branch=main)](https://github.com/api-platform/core/actions?query=workflow%3ACI+branch%3Amain)
 [![Codecov](https://codecov.io/gh/api-platform/core/branch/main/graph/badge.svg)](https://codecov.io/gh/api-platform/core/branch/main)
-[![SymfonyInsight](https://insight.symfony.com/projects/92d78899-946c-4282-89a3-ac92344f9a93/mini.svg)](https://insight.symfony.com/projects/92d78899-946c-4282-89a3-ac92344f9a93)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/api-platform/core/badges/quality-score.png?b=main)](https://scrutinizer-ci.com/g/api-platform/core/?branch=main)
 
 ## Documentation

src/Doctrine/Orm/Extension/FilterEagerLoadingExtension.php

@@ -167,14 +167,14 @@ private function getQueryBuilderWithNewAliases(QueryBuilder $queryBuilder, Query
         // Change join aliases
         foreach ($joinParts[$originAlias] as $joinPart) {
             /** @var Join $joinPart */
-            $joinString = str_replace($aliases, $replacements, $joinPart->getJoin());
+            $joinString = preg_replace($this->buildReplacePatterns($aliases), $replacements, $joinPart->getJoin());
             $pos = strpos($joinString, '.');
             if (false === $pos) {
                 if (null !== $joinPart->getCondition() && null !== $this->resourceClassResolver && $this->resourceClassResolver->isResourceClass($joinString)) {
                     $newAlias = $queryNameGenerator->generateJoinAlias($joinPart->getAlias());
                     $aliases[] = "{$joinPart->getAlias()}.";
                     $replacements[] = "$newAlias.";
-                    $condition = str_replace($aliases, $replacements, $joinPart->getCondition());
+                    $condition = preg_replace($this->buildReplacePatterns($aliases), $replacements, $joinPart->getCondition());
                     $join = new Join($joinPart->getJoinType(), $joinPart->getJoin(), $newAlias, $joinPart->getConditionType(), $condition);
                     /* @phpstan-ignore-next-line */
                     $queryBuilderClone->add('join', [$replacement => $join], true);
@@ -187,12 +187,19 @@ private function getQueryBuilderWithNewAliases(QueryBuilder $queryBuilder, Query
             $newAlias = $queryNameGenerator->generateJoinAlias($association);
             $aliases[] = "{$joinPart->getAlias()}.";
             $replacements[] = "$newAlias.";
-            $condition = str_replace($aliases, $replacements, $joinPart->getCondition() ?? '');
+            $condition = preg_replace($this->buildReplacePatterns($aliases), $replacements, $joinPart->getCondition() ?? '');
             QueryBuilderHelper::addJoinOnce($queryBuilderClone, $queryNameGenerator, $alias, $association, $joinPart->getJoinType(), $joinPart->getConditionType(), $condition, $originAlias, $newAlias);
         }
 
-        $queryBuilderClone->add('where', str_replace($aliases, $replacements, (string) $wherePart));
+        $queryBuilderClone->add('where', preg_replace($this->buildReplacePatterns($aliases), $replacements, (string) $wherePart));
 
         return $queryBuilderClone;
     }
+
+    private function buildReplacePatterns(array $aliases): array
+    {
+        return array_map(static function (string $alias): string {
+            return '/\b'.preg_quote($alias, '/').'/';
+        }, $aliases);
+    }
 }

src/Serializer/AbstractItemNormalizer.php

@@ -765,10 +765,6 @@ protected function getAttributeValue($object, $attribute, $format = null, array
         unset($context['resource_class']);
 
         if ($type && $type->getClassName()) {
-            if (!\is_object($attributeValue) && null !== $attributeValue) {
-                throw new UnexpectedValueException('Unexpected non-object value for object property.');
-            }
-
             $childContext = $this->createChildContext($context, $attribute, $format);
             unset($childContext['iri']);