Skip to content

Commit 6954ed9

Browse files
Merge branch '2.3' into 2.7
* 2.3: Fix undefined array $server [ProxyManager] Tmp fix composer reqs issue in ZF Add missing exclusions from phpunit.xml.dist Fix the server variables in the router_*.php files [Validator] Allow an empty path with a non empty fragment or a query The following change adds support for Armenian pluralization. [2.3][Process] fix Proccess run with pts enabled Conflicts: composer.json src/Symfony/Bridge/ProxyManager/composer.json src/Symfony/Bundle/DebugBundle/phpunit.xml.dist src/Symfony/Component/Security/phpunit.xml.dist
2 parents 53f9e77 + 4b97945 commit 6954ed9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

phpunit.xml.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<whitelist>
2121
<directory>./</directory>
2222
<exclude>
23-
<directory>./vendor</directory>
2423
<directory>./Tests</directory>
24+
<directory>./vendor</directory>
2525
</exclude>
2626
</whitelist>
2727
</filter>

0 commit comments

Comments
 (0)