Skip to content

[DependencyInjection] remove unused fixtures file #24466

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

Jump to bottom
Merged
merged 1 commit into from
Oct 6, 2017
Merged

[DependencyInjection] remove unused fixtures file #24466

merged 1 commit into from
Oct 6, 2017

Conversation

xabbuh
Copy link
Member

@xabbuh xabbuh commented Oct 6, 2017

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

I was wondering why the conflict markers in the master branch (see

symfony/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services31.php

Lines 43 to 52 in b6e9471

<<<<<<< HEAD
=======
public function isFrozen()
{
@trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
return true;
}
>>>>>>> 3.4
) did not cause any issues. Turned out that this fixtures file was not used anymore (it was only partially removed in #23022).

@xabbuh xabbuh added this to the 3.3 milestone Oct 6, 2017
@fabpot
Copy link
Member

fabpot commented Oct 6, 2017

Thank you @xabbuh.

@fabpot fabpot merged commit 3702e5f into symfony:3.3 Oct 6, 2017
fabpot added a commit that referenced this pull request Oct 6, 2017
@fabpot
minor #24466 [DependencyInjection] remove unused fixtures file (xabbuh)
7ffd22b 
This PR was merged into the 3.3 branch.

Discussion
----------

[DependencyInjection] remove unused fixtures file

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

I was wondering why the conflict markers in the `master` branch (see https://github.com/symfony/symfony/blob/b6e9471ded49e698c8c2468be9c1b42c621efeac/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services31.php#L43-L52) did not cause any issues. Turned out that this fixtures file was not used anymore (it was only partially removed in #23022).

Commits
-------

3702e5f remove unused fixtures file
@xabbuh xabbuh deleted the pr-23022 branch October 6, 2017 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stof stof stof approved these changes

Assignees
No one assigned
Labels
DependencyInjection Status: Reviewed
Projects
None yet
Milestone
3.3
Development

Successfully merging this pull request may close these issues.
4 participants
@xabbuh @fabpot @stof @carsonbot