Skip to content

Commit 316c2e7

Browse files
committed
Merge branch '2.15' into 2.16
# Conflicts: # CHANGELOG.md # README.rst # src/Console/Application.php
2 parents b5b76c0 + 45e0d57 commit 316c2e7

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,14 @@ Changelog for v2.16.0
142142
* minor #4619 Fix PHP 7.3 strict mode warnings (keradus)
143143
* minor #4621 Add single_line_throw to Symfony ruleset (keradus)
144144

145+
Changelog for v2.15.7
146+
---------------------
147+
148+
* bug #4915 Fix handling property PHPDocs with unsupported type (julienfalque)
149+
* minor #4916 Fix AppVeyor build (julienfalque)
150+
* minor #4917 CircleCI - Bump xcode to 11.4 (GrahamCampbell)
151+
* minor #4918 DX: do not fix ".phpt" files by default (kubawerlos)
152+
145153
Changelog for v2.15.6
146154
---------------------
147155

src/Finder.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public function __construct()
2727
$this
2828
->files()
2929
->name('*.php')
30-
->name('*.phpt')
3130
->ignoreDotFiles(true)
3231
->ignoreVCS(true)
3332
->exclude('vendor')

0 commit comments

Comments
 (0)