10000 Dynamically fix compatibility with doctrine/data-fixtures v2 by greg0ire · Pull Request #58865 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

Dynamically fix compatibility with doctrine/data-fixtures v2 #58865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 20, 2024
Merged

Dynamically fix compatibility with doctrine/data-fixtures v2 #58865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Dynamically fix compatibility with doctrine/data-fixtures v2 
Classes that extend ContainerAwareLoader have to also extend Loader, meaning
this is no breaking change because it can be argued that the incompatibility of
the extending class would be with the Loader interface.
  • Loading branch information
@greg0ire @nicolas-grekas
greg0ire authored and nicolas-grekas committed Nov 20, 2024
commit 1812aafe0657e0ebcd22174f19110a0e1411e2e3
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
"doctrine/annotations": "^1.13.1|^2",
"doctrine/cache": "^1.11|^2.0",
"doctrine/collections": "^1.0|^2.0",
"doctrine/data-fixtures": "^1.1",
"doctrine/data-fixtures": "^1.1|^2",
"doctrine/dbal": "^2.13.1|^3.0",
"doctrine/orm": "^2.7.4",
"guzzlehttp/promises": "^1.4|^2.0",
Expand Down
35 changes: 35 additions & 0 deletions src/Symfony/Bridge/Doctrine/DataFixtures/AddFixtureImplementation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?php

/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace Symfony\Bridge\Doctrine\DataFixtures;

use Doctrine\Common\DataFixtures\FixtureInterface;
use Doctrine\Common\DataFixtures\ReferenceRepository;

if (method_exists(ReferenceRepository::class, 'getReferences')) {
/** @internal */
trait AddFixtureImplementation
{
public function addFixture(FixtureInterface $fixture)
{
$this->doAddFixture($fixture);
}
}
} else {
/** @internal */
trait AddFixtureImplementation

Check failure on line 28 in src/Symfony/Bridge/Doctrine/DataFixtures/AddFixtureImplementation.php

View workflow job for this annotation

GitHub Actions / Psalm

DuplicateClass 

src/Symfony/Bridge/Doctrine/DataFixtures/AddFixtureImplementation.php:28:11: DuplicateClass: Class Symfony\Bridge\Doctrine\DataFixtures\AddFixtureImplementation has already been defined in /home/runner/work/symfony/symfony/src/Symfony/Bridge/Doctrine/DataFixtures/AddFixtureImplementation.php (see https://psalm.dev/071)

Check failure on line 28 in src/Symfony/Bridge/Doctrine/DataFixtures/AddFixtureImplementation.php

View workflow job for this annotation

GitHub Actions / Psalm

DuplicateClass 

src/Symfony/Bridge/Doctrine/DataFixtures/AddFixtureImplementation.php:28:11: DuplicateClass: Class Symfony\Bridge\Doctrine\DataFixtures\AddFixtureImplementation has already been defined in /home/runner/work/symfony/symfony/src/Symfony/Bridge/Doctrine/DataFixtures/AddFixtureImplementation.php (see https://psalm.dev/071)
{
public function addFixture(FixtureInterface $fixture): void

Check failure on line 30 in src/Symfony/Bridge/Doctrine/DataFixtures/AddFixtureImplementation.php

View workflow job for this annotation

GitHub Actions / Psalm

MethodSignatureMismatch 

src/Symfony/Bridge/Doctrine/DataFixtures/AddFixtureImplementation.php:30:9: MethodSignatureMismatch: Method Symfony\Bridge\Doctrine\DataFixtures\AddFixtureImplementation::addFixture with return type '' is different to return type 'void' of inherited method Doctrine\Common\DataFixtures\Loader::addFixture (see https://psalm.dev/042)

Check failure on line 30 in src/Symfony/Bridge/Doctrine/DataFixtures/AddFixtureImplementation.php

View workflow job for this annotation

GitHub Actions / Psalm

MethodSignatureMismatch 

src/Symfony/Bridge/Doctrine/DataFixtures/AddFixtureImplementation.php:30:9: MethodSignatureMismatch: Method Symfony\Bridge\Doctrine\DataFixtures\AddFixtureImplementation::addFixture with return type '' is different to return type 'void' of inherited method Doctrine\Common\DataFixtures\Loader::addFixture (see https://psalm.dev/042)
{
$this->doAddFixture($fixture);
}
}
}
7 changes: 3 additions & 4 deletions src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,16 @@
*/
class ContainerAwareLoader extends Loader
{
use AddFixtureImplementation;

private $container;

public function __construct(ContainerInterface $container)
{
$this->container = $container;
}

/**
* {@inheritdoc}
*/
public function addFixture(FixtureInterface $fixture)
private function doAddFixture(FixtureInterface $fixture): void
{
if ($fixture instanceof ContainerAwareInterface) {
$fixture->setContainer($this->container);
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/Doctrine/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"symfony/var-dumper": "^4.4|^5.0|^6.0",
"doctrine/annotations": "^1.10.4|^2",
"doctrine/collections": "^1.0|^2.0",
"doctrine/data-fixtures": "^1.1",
"doctrine/data-fixtures": "^1.1|^2",
"doctrine/dbal": "^2.13.1|^3|^4",
"doctrine/orm": "^2.7.4|^3",
"psr/log": "^1|^2|^3"
Expand Down
Loading
0