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

[DI] Fix tracking of env vars in exceptions #25163

Merged
merged 1 commit into from Nov 27, 2017

Conversation

@nicolas-grekas
Copy link
Member

commented Nov 26, 2017

Q A
Branch? 3.3
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets #24270, #24368
License MIT
Doc PR -

Fixes the bad exception message reported in the linked issue (regression introduced in v3.3.7).

Best reviewed ignoring whitespaces.

@nicolas-grekas nicolas-grekas added this to the 3.3 milestone Nov 26, 2017

@nicolas-grekas nicolas-grekas force-pushed the nicolas-grekas:di-merge-env-exceptions branch 2 times, most recently from 1f003f9 to a662881 Nov 26, 2017

@nicolas-grekas nicolas-grekas force-pushed the nicolas-grekas:di-merge-env-exceptions branch from a662881 to 73f1ac5 Nov 26, 2017

$tmpContainer = new ContainerBuilder($resolvingBag);
$tmpContainer->setResourceTracking($container->isTrackingResources());
$tmpContainer->addObjectResource($extension);
if ($extension instanceof ConfigurationExtensionInterface && null !== $configuration = $extension->getConfiguration($config, $tmpContainer)) {

This comment has been minimized.

Copy link
@SCIF

SCIF Nov 26, 2017

Contributor

Assignment in condition?

This comment has been minimized.

Copy link
@nicolas-grekas

nicolas-grekas Nov 27, 2017

Author Member

Indeed :) Was here before, and not forbidden by our policy, you can find many others in the code base.

$extension->load($config, $tmpContainer);
$extension->load($config, $tmpContainer);
} catch (\Exception $e) {

This comment has been minimized.

Copy link
@SCIF

SCIF Nov 26, 2017

Contributor

Any chance to specify less general exception?

This comment has been minimized.

Copy link
@nicolas-grekas

nicolas-grekas Nov 26, 2017

Author Member

Would be a bug. Could be "finally" in fact.

@nicolas-grekas nicolas-grekas merged commit 73f1ac5 into symfony:3.3 Nov 27, 2017

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
fabbot.io Your code looks good.
Details
nicolas-grekas added a commit that referenced this pull request Nov 27, 2017
bug #25163 [DI] Fix tracking of env vars in exceptions (nicolas-grekas)
This PR was merged into the 3.3 branch.

Discussion
----------

[DI] Fix tracking of env vars in exceptions

| Q             | A
| ------------- | ---
| Branch?       | 3.3
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #24270, #24368
| License       | MIT
| Doc PR        | -

Fixes the bad exception message reported in the linked issue (regression introduced in v3.3.7).

Best reviewed [ignoring whitespaces](https://github.com/symfony/symfony/pull/25163/files?w=1).

Commits
-------

73f1ac5 [DI] Fix tracking of env vars in exceptions

@nicolas-grekas nicolas-grekas deleted the nicolas-grekas:di-merge-env-exceptions branch Nov 27, 2017

This was referenced Nov 30, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.