kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-15 09:30:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch '1.13' into 1.14

Browse source 
* 1.13:
  Fix note
  Fix rebase
  Add CONFLICTS.md note
  Add gedmo/doctrine-extensions conflict
This commit is contained in:
Grzegorz Sadowski 2024-10-07 08:21:13 +02:00
commit 8dfedae34c
No known key found for this signature in database
GPG key ID: EF87FF4E6E3BD364
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CONFLICTS.md
View file

@ -37,3 +37,8 @@ references related issues.
This version has a bug, which lead to a fatal error: This version has a bug, which lead to a fatal error:
`An exception has been thrown during the rendering of a template ("Warning: Undefined variable $blocks").` `An exception has been thrown during the rendering of a template ("Warning: Undefined variable $blocks").`
- `gedmo/doctrine-extensions:3.17.0`:
This version has a bug, which on Symfony 6.4 leads to a fatal error:
`[Semantical Error] The annotation "@note" in property Gedmo\Loggable\Entity\MappedSuperclass\AbstractLogEntry::$data was never imported.`

3
composer.json
View file

@ -192,7 +192,8 @@
"lexik/jwt-authentication-bundle": "^2.18", "lexik/jwt-authentication-bundle": "^2.18",
"stof/doctrine-extensions-bundle": "1.8.0", "stof/doctrine-extensions-bundle": "1.8.0",
"symfony/validator": "5.4.25", "symfony/validator": "5.4.25",
"twig/twig": "3.9.0" "twig/twig": "3.9.0",
"gedmo/doctrine-extensions": "^3.17.0"
}, },
"require-dev": { "require-dev": {
"behat/behat": "^3.6.1", "behat/behat": "^3.6.1",