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] Remove unreachable code #25158

Merged
merged 1 commit into from Nov 26, 2017
Merged

[DI] Remove unreachable code #25158

merged 1 commit into from Nov 26, 2017

Conversation

@GwendolenLynch
Copy link
Contributor

@GwendolenLynch GwendolenLynch commented Nov 26, 2017

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

#24033 added the ability to ignore uninitialized references, but the regex above the conditional would lead to an InvalidArgumentException being thrown.

@GwendolenLynch
Copy link
Contributor Author

@GwendolenLynch GwendolenLynch commented Nov 26, 2017

@nicolas-grekas I am scratching my head on all the test fails here, they pass locally under the same PHP versions. Hints welcome 😄

Loading

@nicolas-grekas
Copy link
Member

@nicolas-grekas nicolas-grekas commented Nov 26, 2017

What's the use case? Can't you use an iterator instead? The downside is that this would be a Symfony specific syntax, whereas I'm aiming at making this function a PSR, so that I'd prefer handling only things that might be accepted by the FIG...

Loading

@GwendolenLynch
Copy link
Contributor Author

@GwendolenLynch GwendolenLynch commented Nov 26, 2017

Zero stress, happy to close off.

In that case, doesn't it make this dead code then:

} elseif ($optionalBehavior = '!' === $type[0]) {
$type = substr($type, 1);
$optionalBehavior = ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE;
}

… as the regex will only allow ? or a letter.

Loading

@nicolas-grekas
Copy link
Member

@nicolas-grekas nicolas-grekas commented Nov 26, 2017

In that case, doesn't it make this dead code then:

correct! let's remove that :)

Loading

@nicolas-grekas nicolas-grekas added this to the 3.4 milestone Nov 26, 2017
@GwendolenLynch
Copy link
Contributor Author

@GwendolenLynch GwendolenLynch commented Nov 26, 2017

No worries, I'll rebase and change direction 👍

Loading

@nicolas-grekas nicolas-grekas changed the title [DI] Add ! to regex check in service subscriber compiler [DI] Remove unreachable code Nov 26, 2017
@@ -68,15 +68,12 @@ protected function processValue($value, $isRoot = false)
$declaringClass = (new \ReflectionMethod($class, 'getSubscribedServices'))->class;

foreach ($class::getSubscribedServices() as $key => $type) {
if (!is_string($type) || !preg_match('/^\??[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+(?:\\\\[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+)*+$/', $type)) {
if (!is_string($type) || !preg_match('/^[\?!]?[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+(?:\\\\[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+)*+$/', $type)) {
Copy link
Member

@nicolas-grekas nicolas-grekas Nov 26, 2017

Choose a reason for hiding this comment

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

should be reverted

Loading

Copy link
Contributor Author

@GwendolenLynch GwendolenLynch Nov 26, 2017

Choose a reason for hiding this comment

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

🤦‍♂️

Loading

xabbuh
xabbuh approved these changes Nov 26, 2017
fabpot
fabpot approved these changes Nov 26, 2017
@fabpot
Copy link
Member

@fabpot fabpot commented Nov 26, 2017

Thank you @GawainLynch.

Loading

@fabpot fabpot merged commit ced0857 into symfony:3.4 Nov 26, 2017
3 checks passed
Loading
fabpot added a commit that referenced this issue Nov 26, 2017
This PR was merged into the 3.4 branch.

Discussion
----------

[DI] Remove unreachable code

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

#24033 added the ability to ignore uninitialized references, but the regex above the conditional would lead to an `InvalidArgumentException` being thrown.

Commits
-------

ced0857 Remove unreachable code
@GwendolenLynch GwendolenLynch deleted the di-uninit-ref branch Nov 26, 2017
@fabpot fabpot mentioned this pull request Nov 30, 2017
@fabpot fabpot mentioned this pull request Nov 30, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants