kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 17:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

bug #14691 [Fix] Symfony container reanimation after friendsofsymfony/rest-bundle: 3.5.0 release (Rafikooo)

Browse source 
This PR was merged into the 1.11 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.11, 1.12 and 1.13 <!-- see the comment below -->                  |
| Bug fix?        | yes                                                       |
| New feature?    | no                                                      |
| BC breaks?      | no                                                      |
| Deprecations?   | no<!-- don't forget to update the UPGRADE-*.md file --> |
| Related tickets | [Reference](https://github.com/FriendsOfSymfony/FOSRestBundle/pull/2377/files#diff-d4b44e8c91108217ce008ebe22c2ca4cef95ce48b18295f4d2a6e48fe97cf8a7L25-R25)
| License         | MIT                                                          |

<!--
 - Bug fixes must be submitted against the 1.11 or 1.12 branch
 - Features and deprecations must be submitted against the 1.13 branch
 - Make sure that the correct base branch is set

 To be sure you are not breaking any Backward Compatibilities, check the documentation:
 https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->


Commits
-------

7624482c42 [Fix] Symfony container reanimation after friendsofsymfony/rest-bundle: 3.5.0 release
85f17ce969 [Composer] Add conflict with doctrine/annotations: ^2.0
This commit is contained in:
Grzegorz Sadowski 2023-01-09 14:05:47 +01:00 • committed by GitHub
commit 98875e7a01
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpstan.neon.dist
View file

@ -35,6 +35,7 @@ parameters:
- 'src/Sylius/Bundle/CoreBundle/Doctrine/DQL/**.php'
ignoreErrors:
- '/Access to an undefined property Doctrine\\Common\\Collections\\ArrayCollection/'
- '/Method Symfony\\Component\\Serializer\\Normalizer\\NormalizerInterface\:\:supportsNormalization\(\) invoked with 3 parameters\, 1\-2 required\./'
- '/Parameter \$templatingEngine of method Sylius\\Bundle\\AdminBundle\\Controller\\CustomerStatisticsController\:\:\_\_construct\(\) has invalid typehint type Symfony\\Bundle\\FrameworkBundle\\Templating\\EngineInterface\./'
- '/Parameter \$templatingEngine of method Sylius\\Bundle\\AdminBundle\\Controller\\Dashboard\\StatisticsController\:\:\_\_construct\(\) has invalid typehint type Symfony\\Bundle\\FrameworkBundle\\Templating\\EngineInterface\./'
- '/Parameter \$templatingEngine of method Sylius\\Bundle\\AdminBundle\\Controller\\DashboardController\:\:\_\_construct\(\) has invalid typehint type Symfony\\Bundle\\FrameworkBundle\\Templating\\EngineInterface\./'

3
src/Sylius/Bundle/ApiBundle/Serializer/FlattenExceptionNormalizer.php
View file

@ -15,11 +15,12 @@ namespace Sylius\Bundle\ApiBundle\Serializer;
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
final class FlattenExceptionNormalizer implements ContextAwareNormalizerInterface
{
public function __construct(
private ContextAwareNormalizerInterface $decorated,
private ContextAwareNormalizerInterface|NormalizerInterface $decorated,
private RequestStack $requestStack,
private string $newApiRoute,
) {

1
src/Sylius/Bundle/UiBundle/composer.json
View file

@ -43,6 +43,7 @@
"laminas/laminas-stdlib": "^3.2"
},
"conflict": {
"doctrine/annotations": "^2.0",
"twig/twig": "^1.0"
},
"require-dev": {