Skip to content

Commit 6772657

Browse files
Merge branch '2.7' into 2.8
* 2.7: Fix undefined array $server Fix bug in windows detection [ProxyManager] Tmp fix composer reqs issue in ZF Add missing exclusions from phpunit.xml.dist [Serializer] ObjectNormalizer: don't serialize static methods and props 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/Component/Security/phpunit.xml.dist
2 parents 98b89a9 + e4ecb9c commit 6772657

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

PluralizationRules.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ public static function get($number, $locale)
131131
case 'fr':
132132
case 'gun':
133133
case 'hi':
134+
case 'hy':
134135
case 'ln':
135136
case 'mg':
136137
case 'nso':

Tests/PluralizationRulesTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function successLangcodes()
6161
{
6262
return array(
6363
array('1', array('ay','bo', 'cgg','dz','id', 'ja', 'jbo', 'ka','kk','km','ko','ky')),
64-
array('2', array('nl', 'fr', 'en', 'de', 'de_GE')),
64+
array('2', array('nl', 'fr', 'en', 'de', 'de_GE', 'hy', 'hy_AM')),
6565
array('3', array('be','bs','cs','hr')),
6666
array('4', array('cy','mt', 'sl')),
6767
array('5', array()),

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)