Skip to content

Commit a761768

Browse files
committed
Merge branch '2.15' into 2.16
# Conflicts: # CHANGELOG.md # src/Console/Application.php
2 parents c899264 + 0c6db16 commit a761768

File tree

2 files changed

+66
-1
lines changed

2 files changed

+66
-1
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ jobs:
151151
token:
152152
secure: K9NKi7X1OPz898fxtVc1RfWrSI+4hTFFYOik932wTz1jC4dQJ64Khh1LV9frA1+JiDS3+R6TvmQtpzbkX3y4L75UrSnP1ADH5wfMYIVmydG3ZjTMo8SWQWHmRMh3ORAKTMMpjl4Q7EkRkLp6RncKe+FAFPP5mgv55mtIMaE4qUk=
153153
file: php-cs-fixer.phar
154-
cleanup: false
154+
skip_cleanup: true
155155
on:
156156
repo: FriendsOfPHP/PHP-CS-Fixer
157157
tags: true

CHANGELOG.md

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,71 @@ Changelog for v2.16.0
200200
* minor #4619 Fix PHP 7.3 strict mode warnings (keradus)
201201
* minor #4621 Add single_line_throw to Symfony ruleset (keradus)
202202

203+
Changelog for v2.15.9
204+
---------------------
205+
206+
* bug #4378 PhpUnitNoExpectationAnnotationFixer - annotation in single line doc comment (kubawerlos)
207+
* bug #4936 HeaderCommentFixer - Fix unexpected removal of regular comments (julienfalque)
208+
* bug #5017 PhpdocTrimConsecutiveBlankLineSeparationFixer - must run after AlignMultilineCommentFixer (kubawerlos)
209+
* bug #5033 VoidReturnFixer - must run after NoSuperfluousPhpdocTagsFixer (kubawerlos)
210+
* bug #5038 HelpCommandTest - toString nested array (SpacePossum)
211+
* bug #5040 LinebreakAfterOpeningTagFixer - do not change code if linebreak already present (kubawerlos)
212+
* bug #5044 StandardizeIncrementFixer - fix handling static properties (kubawerlos)
213+
* bug #5045 BacktickToShellExecFixer - add priority relation to NativeFunctionInvocationFixer and SingleQuoteFixer (kubawerlos)
214+
* bug #5054 PhpdocTypesFixer - fix for multidimensional array (kubawerlos)
215+
* bug #5065 TernaryOperatorSpacesFixer - fix for discovering ":" correctly (kubawerlos)
216+
* bug #5068 Fixed php-cs-fixer crashes on input file syntax error (GrahamCampbell)
217+
* bug #5087 NoAlternativeSyntaxFixer - add support for switch and declare (SpacePossum)
218+
* bug #5105 ClassKeywordRemoveFixer - fix for fully qualified class (kubawerlos)
219+
* bug #5113 TernaryOperatorSpacesFixer - handle goto labels (SpacePossum)
220+
* bug #5124 Fix TernaryToNullCoalescingFixer when dealing with object properties (HypeMC)
221+
* bug #5137 DoctrineAnnotationSpacesFixer - fix for typed properties (kubawerlos)
222+
* bug #5180 Always lint test cases with the stricter process linter (GrahamCampbell)
223+
* bug #5190 PhpUnit*Fixers - Only fix in unit test class scope (SpacePossum)
224+
* bug #5195 YodaStyle - statements in braces should be treated as variables in strict … (SpacePossum)
225+
* bug #5220 NoUnneededFinalMethodFixer - do not fix private constructors (SpacePossum)
226+
* feature #3475 Rework documentation (julienfalque, SpacePossum)
227+
* feature #5166 PHP8 (SpacePossum)
228+
* minor #4878 ArrayIndentationFixer - refactor (julienfalque)
229+
* minor #5031 CI: skip_cleanup: true (keradus)
230+
* minor #5048 Allow composer/semver ^2.0 and ^3.0 (thomasvargiu)
231+
* minor #5050 DX: moving integration test for braces, indentation_type and no_break_comment into right place (kubawerlos)
232+
* minor #5051 DX: move all tests from AutoReview\FixerTest to Test\AbstractFixerTestCase (kubawerlos)
233+
* minor #5053 DX: cleanup FunctionTypehintSpaceFixer (kubawerlos)
234+
* minor #5056 DX: add missing priority test for indentation_type and phpdoc_indent (kubawerlos)
235+
* minor #5077 DX: add missing priority test between NoUnsetCastFixer and BinaryOperatorSpacesFixer (kubawerlos)
236+
* minor #5083 Update composer.json to prevent issue #5030 (mvorisek)
237+
* minor #5088 NoBreakCommentFixer - NoUselessElseFixer - priority test (SpacePossum)
238+
* minor #5100 Fixed invalid PHP 5.6 syntax (GrahamCampbell)
239+
* minor #5106 Symfony's finder already ignores vcs and dot files by default (GrahamCampbell)
240+
* minor #5112 DX: check file permissions (kubawerlos, SpacePossum)
241+
* minor #5122 Show runtime PHP version (kubawerlos)
242+
* minor #5132 Do not allow assignments in if statements (SpacePossum)
243+
* minor #5133 RuleSetTest - Early return for boolean and detect more defaults (SpacePossum)
244+
* minor #5139 revert some unneeded exclusions (SpacePossum)
245+
* minor #5148 Upgrade Xcode (kubawerlos)
246+
* minor #5149 NoUnsetOnPropertyFixer - risky description tweaks (SpacePossum)
247+
* minor #5161 minors (SpacePossum)
248+
* minor #5172 Remove accidentally inserted newlines (GrahamCampbell)
249+
* minor #5173 Fix PHP8 RuleSet inherit (SpacePossum)
250+
* minor #5174 Corrected linting error messages (GrahamCampbell)
251+
* minor #5177 PHP8 (SpacePossum)
252+
* minor #5188 DX: Update sibling debs to version supporting PHP8/PHPUnit9 (keradus)
253+
* minor #5189 Create temporary linting file in system temp dir (keradus)
254+
* minor #5191 MethodArgumentSpaceFixer - support use/import of anonymous functions. (undefinedor)
255+
* minor #5193 DX: add AbstractPhpUnitFixer (kubawerlos)
256+
* minor #5204 DX: cleanup NullableTypeTransformerTest (kubawerlos)
257+
* minor #5207 Add © for logo (keradus)
258+
* minor #5208 DX: cleanup php-cs-fixer entry file (keradus)
259+
* minor #5210 CICD - temporarily disable problematic test (keradus)
260+
* minor #5211 CICD: fix file permissions (keradus)
261+
* minor #5213 DX: move report schemas to dedicated dir (keradus)
262+
* minor #5214 CICD: fix file permissions (keradus)
263+
* minor #5215 CICD: update checkbashisms (keradus)
264+
* minor #5217 CICD: use Composer v2 and drop hirak/prestissimo plugin (keradus)
265+
* minor #5218 DX: .gitignore - add .phpunit.result.cache (keradus)
266+
* minor #5222 Upgrade Xcode (kubawerlos)
267+
203268
Changelog for v2.15.8
204269
---------------------
205270

0 commit comments

Comments
 (0)