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

[FrameworkBundle] [Workflow] Fix service marking store configuration #20760

Closed
wants to merge 3 commits into
base: master
from

Conversation

Projects
None yet
4 participants
@fduch
Copy link
Contributor

fduch commented Dec 5, 2016

Q A
Branch? "master"
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets no
License MIT
Doc PR no

Currently workflow marking store configuration checks that service and arguments fields are not specified simultaneously using isset function.

Since arguments node defines prototype node inside, even if arguments node is not specified, - after processing it looks like empty array. If service setting is set it leads to failing build with validation error message (due to isset([]) returns true):
"arguments" and "service" cannot be used together..

This patch addresses this issue.

@fduch

This comment has been minimized.

Copy link
Contributor

fduch commented Dec 8, 2016

Also tests added

@fduch fduch force-pushed the fduch:fix-workflow-configuration branch from d10d90b to 1bc83c5 Dec 8, 2016

@stof

stof approved these changes Dec 8, 2016

from:
- first
to:
- last

This comment has been minimized.

@stof

stof Dec 8, 2016

Member

please add the final EOL

This comment has been minimized.

@fduch

fduch Dec 8, 2016

Contributor

done

@stof

This comment has been minimized.

Copy link
Member

stof commented Dec 8, 2016

👍
Status: reviewed

@nicolas-grekas

This comment has been minimized.

Copy link
Member

nicolas-grekas commented Dec 8, 2016

Thank you @fduch.

nicolas-grekas added a commit that referenced this pull request Dec 8, 2016

bug #20760 [FrameworkBundle] [Workflow] Fix service marking store con…
…figuration (fduch)

This PR was submitted for the master branch but it was merged into the 3.2 branch instead (closes #20760).

Discussion
----------

[FrameworkBundle] [Workflow] Fix service marking store configuration

| Q             | A
| ------------- | ---
| Branch?       | "master"
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | no
| License       | MIT
| Doc PR        | no

Currently workflow marking store configuration [checks](https://github.com/symfony/symfony/blob/3.2/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php#L271-L272) that `service` and `arguments` fields are not specified simultaneously using `isset` function.

Since [arguments node](https://github.com/symfony/symfony/blob/3.2/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php#L253-L261) defines prototype node inside, even if `arguments` node is not specified, -  after processing it looks like empty array. If `service` setting is set it leads to failing build with validation error message (due to `isset([])` returns `true`):
`"arguments" and "service" cannot be used together.`.

This patch addresses this issue.

Commits
-------

3289b10 [FrameworkBundle] [Workflow] Fix service marking store configuration

@fduch fduch deleted the fduch:fix-workflow-configuration branch Dec 8, 2016

@fduch fduch restored the fduch:fix-workflow-configuration branch Dec 8, 2016

@fabpot fabpot referenced this pull request Dec 13, 2016

Merged

Release v3.2.1 #20897

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment