[2.6] CS Fixes And Removed An Unused Import #12872
Conversation
| { | ||
| return $this->name; | ||
| } | ||
| public function getName() |
There was a problem hiding this comment.
This also needs to be applied to the constructor.
There was a problem hiding this comment.
That's odd. I'll report this bug to the php-cs-fixer repo.
There was a problem hiding this comment.
Manually fixed this. Thanks for pointing this out @xabbuh.
|
👍 |
|
Thank you @GrahamCampbell. |
…ell) This PR was squashed before being merged into the 2.6 branch (closes #12872). Discussion ---------- [2.6] CS Fixes And Removed An Unused Import | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | N/A | License | MIT | Doc PR | N/A ##### This pull request fixes some cs issues in symfony 2.6. This is the sequel to #12856. Commits ------- 2f10a0a [2.6] CS Fixes And Removed An Unused Import
|
@fabpot Is there any chance you could do a 2.6 -> 2.7 merge please? |
|
done |
|
Thanks. I probably won't have time to do this now though. Will send a pull to the 2.7 branch on tuesday morning. |
Modify the expected line value which was affected by the move of the `__LINE__` constant in symfony#12872 to make tests pass again.
|
@fabpot There are actually no more cs fixes to be made to 2.7 that weren't already done in 2.6, so there will be no pull from me. :) |
| @@ -196,7 +196,7 @@ protected function getDriver(ContainerBuilder $container) | |||
| * @return string a service definition name | |||
| * | |||
| * @throws ParameterNotFoundException if none of the managerParameters has a | |||
| * non-empty value. | |||
| * non-empty value. | |||
There was a problem hiding this comment.
Well, that's now it's meant to look? Either that, or we shunt it all onto one line?
…(xabbuh) This PR was merged into the 2.6 branch. Discussion ---------- [HttpKernel] fix DumpDataCollectorTest after CS changes | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Modify the expected line value which was affected by the move of the `__LINE__` constant in #12872 to make tests pass again. Commits ------- 1917b70 fix DumpDataCollectorTest after CS changes
This pull request fixes some cs issues in symfony 2.6.
This is the sequel to #12856.