Skip to content
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.

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

Fix problem of overwriting envs #883

Merged
merged 1 commit into from
Apr 3, 2022
Merged

Conversation

alexander-schranz
Copy link
Contributor

@alexander-schranz alexander-schranz commented Mar 11, 2022

Fixes problem of flex overwriting bundles.php envs.

Fixes #879 which currently breaks @sulu skeleton installation.

@alexander-schranz
Copy link
Contributor Author

Not sure how to fix:

Method getPackage may not return value of type Composer\Package\Package, its declared return type is "Composer\Package\RootPackageInterface"

@@ -114,7 +115,7 @@ class DockerComposeConfiguratorTest extends TestCase
/** @var DockerComposeConfigurator */
private $configurator;

/** @var Package */
/** @var PackageInterface */
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the error message you see here are coming from the mock configuration. So that's unrelated to that phpdoc

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the right fix is to make it use a RootPackage instead of a Package for this property (but also for the actual value, not just for the comment)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thx that seems to fix the tests 👍 Had todo the same for LockArrayRepository in FlexTest.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For backwards compatibility to composer 1.0.2 there a class_exists had to be added.

@alexander-schranz alexander-schranz marked this pull request as ready for review March 11, 2022 11:30
src/Configurator/BundlesConfigurator.php Outdated Show resolved Hide resolved
@@ -114,7 +115,7 @@ class DockerComposeConfiguratorTest extends TestCase
/** @var DockerComposeConfigurator */
private $configurator;

/** @var Package */
/** @var PackageInterface */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the error message you see here are coming from the mock configuration. So that's unrelated to that phpdoc

@@ -114,7 +115,7 @@ class DockerComposeConfiguratorTest extends TestCase
/** @var DockerComposeConfigurator */
private $configurator;

/** @var Package */
/** @var PackageInterface */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the right fix is to make it use a RootPackage instead of a Package for this property (but also for the actual value, not just for the comment)

@fabpot
Copy link
Member

fabpot commented Apr 3, 2022

Thank you @alexander-schranz.

@fabpot fabpot merged commit 22c14c5 into symfony:1.x Apr 3, 2022
@alexander-schranz alexander-schranz deleted the patch-1 branch April 4, 2022 10:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Flex changing bundles.php environments
4 participants