Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Bump symfony/* deps#2672

Closed
keradus wants to merge 2 commits into
PHP-CS-Fixer:masterfrom
keradus:2.3_symfony
Closed

Bump symfony/* deps#2672
keradus wants to merge 2 commits into
PHP-CS-Fixer:masterfrom
keradus:2.3_symfony

Conversation

@keradus
Copy link
Copy Markdown
Member

@keradus keradus commented Apr 3, 2017

requires #2568

@keradus
Copy link
Copy Markdown
Member Author

keradus commented Apr 3, 2017 •
edited
Loading

cc @sstok, you have always asked for bumping it, I think it's good moment for doing this (bumping min PHP version)

@SpacePossum
Copy link
Copy Markdown
Contributor

SpacePossum commented Apr 3, 2017

yeah, lets go! :) 👍

@julienfalque
Copy link
Copy Markdown
Member

julienfalque commented Apr 4, 2017 •
edited
Loading

Wouldn't ^2.8|^3.0 be better? As Symfony 3.0 is just Symfony 2.8 with deprecated code removed, if your code is compatible with 3.0, then it is automatically compatible with 2.8.

Anyway, 👍 for idea. Should the code related to old versions of Symfony be dropped in this PR as well?

@SpacePossum
Copy link
Copy Markdown
Contributor

SpacePossum commented Apr 4, 2017

The removal of deprecated code in 3.0 is a good reason to jump to it :)
It makes sure our code doesn't use deprecated SF code, but also that users of the code in this repo are.

Should the code related to old versions of Symfony be dropped in this PR as well?

where needed yes, everything else can be done all in time

(note to self; symfony/symfony#17255 can now be used in the tests)

@julienfalque
Copy link
Copy Markdown
Member

julienfalque commented Apr 4, 2017

The test suite runs on 3.x so deprecated code from 2.x can't be used anyway. Removing the ^2.8 part of the constraint would force every side project to update to 3.x even if their code is compatible with 2.8. And I don't think keeping 2.8 would be a maintenance burden.

@keradus keradus added this to the v2.3 milestone Apr 19, 2017
@keradus keradus closed this in 0f68656 Apr 21, 2017
@keradus keradus deleted the 2.3_symfony branch April 21, 2017 17:09
@glensc
Copy link
Copy Markdown
Contributor

glensc commented Apr 25, 2017

@julienfalque this means such projects are forced to use .phar version of the tool, or composer global. so i agree ^2.8|^3.0 would had been better.

@keradus
Copy link
Copy Markdown
Member Author

keradus commented Apr 26, 2017

That's exactly why (deps issues) we do have phar releases as well.
If you for some reason have to stack with old deps and cannot upgrade them, you may not integrate PHP CS Fixer directly in project composer file or just stack with PHP CS Fixer like with other deps - keeping it on 2.2.x level

keradus added a commit that referenced this pull request Aug 22, 2017
@keradus
minor #2994 ProtectedToPrivateFixer: minor optimization (Slamdunk)
75a5c25 
This PR was submitted for the 2.4 branch but it was merged into the 2.2 branch instead (closes #2994).

Discussion
----------

ProtectedToPrivateFixer: minor optimization

Following #2972 (comment) I tried to make this fixer faster, but the [trait check](https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/2.4/src/Fixer/ClassNotation/ProtectedToPrivateFixer.php#L135) doesn't let me skip getting the class close before the main loop.

Any other idea is welcome

Commits
-------

7233e84 ProtectedToPrivateFixer: minor optimization
39a57b6 Merge branch '2.2' into 2.4
f507e1a Merge branch '2.2' into 2.4
176e618 minor #2989 CiIntegrationTest - fix min supported PHP versions (keradus)
8ce604e CiIntegrationTest - fix min supported PHP versions
5d0d668 Merge branch '2.2' into 2.4
6b1a9b2 bug #2959 MethodArgumentSpaceFixer - Skip body of fixed function (greg0ire)
7a087d0 bug #2984 AlignMultilineCommentFixer - handle uni code (SpacePossum)
5df5258 Merge branch '2.2' into 2.4
4c9d570 Merge branch '2.2' into 2.4
ef2dca6 AlignMultilineCommentFixer - handle ucode
240d8da Merge branch '2.2' into 2.4
f9abae0 Merge branch '2.2' into 2.4
b1b52d9 minor #2968 AssertTokensTrait - don't use AccessibleObject (keradus)
1735850 AssertTokensTrait - don't use AccessibleObject
f087642 Merge branch '2.2' into 2.4
9fd0483 Skip body of fixed function
3fd0bda bug #2954 NoBreakCommentFixer - Disable case sensitivity (julienfalque)
5cea194 minor #2955 Travis - stop using old TASK_SCA residue (keradus)
b322632 Merge branch '2.2' into 2.4
d7290d8 Travis - stop using old TASK_SCA residue
fb19b7b Disable case sensitivity
f394201 minor #2952 BlankLineBeforeStatementFixer - Reference fixer instead of test class (localheinz)
26df6cf Fix: Reference fixer instead of test class
9495672 Merge branch '2.2'
99fb7e6 minor #2945 BlankLineBeforeStatementFixerTest - Fix covered class (julienfalque)
582025e Merge branch '2.2'
8313df2 minor #2924 Add missing Token deprecations (julienfalque)
88337c7 Add missing Token deprecations
e68ea74 Fix covered class
ea2041a Merge branch '2.2'
d751a88 Merge branch '2.2'
98bcb56 bumped version
d9127f2 Merge branch '2.2'
63661f3 prepared the 2.4.0 release
faa989d minor #2921 InvalidForEnvFixerConfigurationException - fix handling in tests on 2.4 line (keradus)
348e910 Merge branch '2.3'
cd1e6c4 prepared the 2.3.3 release
8124224 Merge branch '2.2' into 2.3
4f8c340 Merge branch '2.3'
e5aa3fb Merge branch '2.2' into 2.3
89c5e01 Merge branch '2.3'
1d79dff Merge branch '2.2' into 2.3
dd2b707 InvalidForEnvFixerConfigurationException - fix handling in tests on 2.4 line
4ed2920 Merge branch '2.3'
2feb1e9 Merge branch '2.2' into 2.3
7fe4e62 Merge branch '2.3'
544c5b7 Merge branch '2.2' into 2.3
b09cda1 feature #2825 Add PhpdocTypesOrderFixer (julienfalque, keradus)
2c0cdb5 Add PhpdocTypesOrderFixer
311e5d8 Merge branch '2.3'
e1066bb Merge branch '2.2' into 2.3
3e41a53 Merge branch '2.3'
c247d95 Merge branch '2.2' into 2.3
0496cd2 feature #2857 Add AlignMultilineCommentFixer (Slamdunk, keradus)
591ee63 Add AlignMultilineCommentFixer
9eba191 bug #2880 NoBreakCommentFixer - fix edge case (julienfalque)
69a4fc5 feature #2684 BracesFixer - new options for braces position after control structures and anonymous constructs (aidantwoods, keradus)
8c6d50c BracesFixer - new options for braces position after control structures and anonymous constructs
844bfa9 NoBreakCommentFixer - fix edge case
ff2236b bug #2900 VoidReturnFixer - handle functions containing anonymous functions/classes (bendavies, keradus)
c1f4952 Merge branch '2.3'
f005e0f Merge branch '2.2' into 2.3
89538af VoidReturnFixer - handle functions containing anonymous functions/classes
4941e8b VoidReturnFixer - add failing test
5212e8b bug #2902 Fix test classes constructor (julienfalque)
2998702 Fix test classes constructor
80ddad8 Merge branch '2.3'
0f67a86 Merge branch '2.2' into 2.3
99135fe Merge branch '2.3'
055d67b Merge branch '2.2' into 2.3
ea057db Merge branch '2.3'
051f28d Merge branch '2.2' into 2.3
4f76ee4 minor #2894 NonPrintableCharacterFixer - fix handling required PHP version on PHPUnit 4.x (keradus)
a3385aa feature #2384 Add BlankLineBeforeStatementFixer (localheinz, keradus, SpacePossum)
0ae03ef NonPrintableCharacterFixer - fix handling required PHP version on PHPUnit 4.x
c05a48a Merge branch '2.3'
594bea2 Merge branch '2.2' into 2.3
a5036e0 BlankLineBeforeControlStatementFixer - rename to BlankLineBeforeStatementFixer, update the fixer
dff72c6 Merge branch '2.3'
dc8eee8 Merge branch '2.2' into 2.3
eb021d9 BlankLineBeforeControlStatementFixer - adjust fixer to newest code requirements
b71a6da Add BlankLineBeforeControlStatementFixer
ac20c3b Merge branch '2.3'
7ceb53b Merge branch '2.2' into 2.3
711a831 feature #2701 NoExtraConsecutiveBlankLinesFixer - Add more configuration options related to switch statements (SpacePossum)
42abe56 Add more configuration options related to switch statements.
091a8e6 Merge branch '2.3'
a3f4677 Merge branch '2.2' into 2.3
aefcac2 Merge branch '2.3'
d2dc99d Merge branch '2.2' into 2.3
19d5207 feature #2815 NonPrintableCharacterFixer - Add option to replace with escape sequences (julienfalque, keradus)
cc3cf7e NonPrintableCharacterFixer - Add option to replace with escape sequences
5c28c97 feature #2667 Add NoBreakCommentFixer (julienfalque)
f7241f5 feature #2866 Add SingleLineCommentStyleFixer, deprecate HashToSlashCommentFixer (Slamdunk, keradus)
ecffd89 Add SingleLineCommentStyleFixer, deprecate HashToSlashCommentFixer
e17c116 Merge branch '2.3'
bc68ab9 Merge branch '2.2' into 2.3
57891bc Merge branch '2.3'
bfb0ae1 Merge branch '2.2' into 2.3
95aec52 Add NoBreakCommentFixer
ce2aceb feature #2822 Add NoNullPropertyInitializationFixer (ntzm, julienfalque, SpacePossum)
b3ddc0a minor #2877 Fix PHPMD report (julienfalque)
9cc9a7d Merge branch '2.3'
6670722 Merge branch '2.2' into 2.3
69ad77e Fix PHPMD report
77a9f0b NoNullPropertyInitializationFixer - Rename from NullPropertyDeclarationFixer, update description, fix \null handling
113f8e8 NullPropertyDeclarationFixer - Candidate check include class/trait, remove not needed var., do not remove comments.
3d98b67 NullPropertyDeclarationFixer - Support grouped properties and comments
1665be8 Implement null_property_declaration fixer
69b26d7 feature #2856 CastSpacesFixer - add space option (kubawerlos, keradus)
2ab2e2a CastSpacesFixer - add space option
1565733 Merge branch '2.3'
328a9d2 Merge branch '2.2' into 2.3
476147a Merge branch '2.3'
a984bbf minor #2870 Tokens - ensureWhitespaceAtIndex - Clear tokens before compare. (SpacePossum)
acc826c Clear tokens before compare.
db502a9 Merge branch '2.3'
30e3162 Merge branch '2.2' into 2.3
735d1e6 feature #2765 DoctrineAnnotationIndentationFixer - add option to indent mixed lines (julienfalque)
0b4e986 feature #2664 Add DoctrineAnnotationArrayAssignmentFixer (julienfalque)
ea5d449 feature #2440 MethodArgumentSpaceFixer - add ensure_fully_multiline option (greg0ire)
6877da0 MethodArgumentSpaceFixer - add ensure_fully_multiline option
b21630e Merge branch '2.3'
c2520fe Merge branch '2.2' into 2.3
d83d7ea Add option to indent mixed lines
db54a10 Add Doctrine Annotation array assignment fixer
6dc5756 minor #2773 Travis - use stages (keradus)
624f137 Travis - use stages
3383d54 Merge branch '2.3'
59f23be Merge branch '2.2' into 2.3
202d0b8 Merge branch '2.3'
026565a fix CS
24ee202 Merge branch '2.2' into 2.3
dd0f467 Merge branch '2.3'
671239e Merge branch '2.2' into 2.3
5d509fb Merge branch '2.3'
eee8390 Merge branch '2.2' into 2.3
7d570d0 Merge branch '2.3'
c5a4b2c Merge branch '2.2' into 2.3
f0f3109 Merge branch '2.3'
22f24c2 Merge branch '2.2' into 2.3
87d8acc minor #2818 Token become immutable, performance optimizations (keradus)
964586f Token become immutable, performance optimizations
dca89c0 feature #2649 PhpdocAlignFixer - make fixer configurable (ntzm)
ce3604a Merge branch '2.3'
4ca4aa5 Merge branch '2.2' into 2.3
500ebc8 Merge branch '2.3'
4805e38 Merge branch '2.2' into 2.3
2cfec26 minor #2823 Tokenizer - use future-compatible interface (keradus)
d9bef07 Tokenizer - use future-compatible interface
1b0056f Merge branch '2.3'
edb5009 Merge branch '2.2' into 2.3
91736ad Merge branch '2.3'
ae8f46b Merge branch '2.2' into 2.3
4649ba9 Merge branch '2.3'
b8d39c4 minor #2820 MagicConstantCasingFixer - Remove defined check (SpacePossum)
5202c3b Merge branch '2.2' into 2.3
a5e0b33 Remove defined check.
8f6fac8 Merge branch '2.3'
12d4ec7 Merge branch '2.2' into 2.3
c9ac542 Merge branch '2.3'
76c6546 Merge branch '2.2' into 2.3
a0b1248 Merge branch '2.3'
597745f prepared the 2.3.2 release
0d45f8b Merge branch '2.2' into 2.3
c615d54 minor #2801 ProjectCodeTest - Fix typo in deprecation message (SpacePossum)
1911e1b Merge branch '2.3'
888981c minor #2797 Update .gitattributes (SpacePossum)
03d9f1b Merge branch '2.2' into 2.3
3c28f35 minor #2794 Drop HHVM support (keradus, julienfalque)
9e8b6e8 Fix PHPMD command with unknown files
3c72ea6 Drop HHVM support
f71a5c4 Update ProjectCodeTest.php
ee9a0ae Update .gitattributes
1aae92d feature #2740 Add VoidReturnFixer (mrmark)
505459d Add VoidReturnFixer
61348f0 bumped version
b1d9b1b Merge branch '2.2'
cf9bc2c Merge branch '2.2'
d0f5e75 minor #2774 AssertTokens Trait (keradus)
32c7362 AssertTokens Trait
c9700cf Merge branch '2.2'
a1d52a5 Merge branch '2.2'
cbf1cb1 Merge branch '2.2'
ca0cde5 minor #2304 DX: use PHPMD (keradus)
561fc54 DX: use PHPMD
e98b85d Merge branch '2.2'
5b874a0 Merge branch '2.2'
c606b75 Merge branch '2.2'
dfb997b Merge branch '2.2'
00250d2 Merge branch '2.2'
d830c54 minor #2725 Use method chaining for configuration definitions (julienfalque)
e623eae Use method chaining for configuration definitions
37accf6 Merge branch '2.2'
6e9ea6d Merge branch '2.2'
bd14fb5 Merge branch '2.2'
e0021ef Merge branch '2.2'
b22b513 Merge branch '2.2'
1de1a99 Merge branch '2.2'
2929788 Merge branch '2.2'
085640a Make phpdoc_align configurable
0cd8f38 Merge branch '2.2'
f268941 Merge branch '2.2'
06c14be Merge branch '2.2'
1c41528 Merge branch '2.2'
cf98a1a Merge branch '2.2'
95f4f58 minor #2718 Remove old Symfony exception message expectation (julienfalque)
387a8c6 minor #2742 Code cleanup (GrahamCampbell, keradus)
77d80cc Code cleanup
382e54a Merge branch '2.2'
c794bcf Merge branch '2.2'
d5257f7 prepared the 2.3.1 release
bd8f080 Merge branch '2.2'
6d2f124 Merge branch '2.2'
5002ecd Remove old Symfony exception message expectation
ab8c613 prepared the 2.3.0 release
56417e3 Merge branch '2.2'
0f68656 minor #2672 Bump symfony/* deps (keradus)
ea6f970 Bump symfony/* deps
4411227 feature #2708 Add PhpUnitTestClassRequiresCoversFixer (keradus)
14ce819 Add PhpUnitTestClassRequiresCoversFixer
24a0bd6 Merge branch '2.2'
945b572 feature #2450 Add ListSyntaxFixer (SpacePossum)
f55e705 Add ListSyntaxFixer
312f748 minor #2568 Require PHP 5.6+ (keradus)
b1a3c43 Require PHP 5.6+
b6cd1aa Merge branch '2.2'
3804cd0 Merge branch '2.2'
733ba2f Merge branch '2.2'
0437677 Merge branch '2.2'
502f06c Merge branch '2.2'
8d3f905 Merge branch '2.2'
eb54981 Merge branch '2.2'
0a19b49 Merge branch '2.2'
c9c6217 Merge branch '2.2'
02339fe Merge branch '2.2'
cca97a0 Merge branch '2.2'
82bebae Merge branch '2.2'
3249d40 Merge branch '2.2'
1a031e9 Merge branch '2.2'
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

kind/enhancement

Projects

None yet

Milestone

v2.3.0

Development

Successfully merging this pull request may close these issues.

4 participants

@keradus @SpacePossum @julienfalque @glensc