Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit ecdd681

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
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 e122d88 + a8d21b5 commit ecdd681
Copy full SHA for ecdd681

File tree

Expand file treeCollapse file tree

40 files changed

+89
-30
lines changed
Filter options
Expand file treeCollapse file tree

40 files changed

+89
-30
lines changed

‎composer.json

Copy file name to clipboardExpand all lines: composer.json
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
"doctrine/orm": "~2.4,>=2.4.5",
8484
"doctrine/doctrine-bundle": "~1.2",
8585
"monolog/monolog": "~1.11",
86+
"zendframework/zend-stdlib": "~2.5",
8687
"ocramius/proxy-manager": "~0.4|~1.0",
8788
"egulias/email-validator": "~1.2",
8889
"phpdocumentor/reflection": "^1.0.7"

‎phpunit.xml.dist

Copy file name to clipboardExpand all lines: phpunit.xml.dist
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@
4040
<directory>./src/Symfony/Bundle/*/Resources</directory>
4141
<directory>./src/Symfony/Component/*/Resources</directory>
4242
<directory>./src/Symfony/Component/*/*/Resources</directory>
43+
<directory>./src/Symfony/Bridge/*/vendor</directory>
44+
<directory>./src/Symfony/Bundle/*/vendor</directory>
45+
<directory>./src/Symfony/Component/*/vendor</directory>
46+
<directory>./src/Symfony/Component/*/*/vendor</directory>
4347
</exclude>
4448
</whitelist>
4549
</filter>

‎src/Symfony/Bridge/Doctrine/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/phpunit.xml.dist
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<exclude>
2323
<directory>./Resources</directory>
2424
<directory>./Tests</directory>
25+
<directory>./vendor</directory>
2526
</exclude>
2627
</whitelist>
2728
</filter>

‎src/Symfony/Bridge/Monolog/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Monolog/phpunit.xml.dist
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<exclude>
2323
<directory>./Resources</directory>
2424
<directory>./Tests</directory>
25+
<directory>./vendor</directory>
2526
</exclude>
2627
</whitelist>
2728
</filter>

‎src/Symfony/Bridge/ProxyManager/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/ProxyManager/composer.json
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"require": {
1919
"php": ">=5.3.9",
2020
"symfony/dependency-injection": "~2.8|~3.0.0",
21+
"zendframework/zend-stdlib": "~2.5",
2122
"ocramius/proxy-manager": "~0.4|~1.0"
2223
},
2324
"require-dev": {

‎src/Symfony/Bundle/DebugBundle/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/DebugBundle/phpunit.xml.dist
+1-1Lines 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>./Tests</directory>
2423
<directory>./Resources</directory>
24+
<directory>./Tests</directory>
2525
<directory>./vendor</directory>
2626
</exclude>
2727
</whitelist>

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/router_dev.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/config/router_dev.php
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
$_SERVER = array_merge($_SERVER, $_ENV);
3434
$_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR.'app_dev.php';
3535

36+
// Since we are rewriting to app_dev.php, adjust SCRIPT_NAME and PHP_SELF accordingly
37+
$_SERVER['SCRIPT_NAME'] = DIRECTORY_SEPARATOR.'app_dev.php';
38+
$_SERVER['PHP_SELF'] = DIRECTORY_SEPARATOR.'app_dev.php';
39+
3640
require 'app_dev.php';
3741

3842
error_log(sprintf('%s:%d [%d]: %s', $_SERVER['REMOTE_ADDR'], $_SERVER['REMOTE_PORT'], http_response_code(), $_SERVER['REQUEST_URI']), 4);

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/router_prod.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/config/router_prod.php
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
$_SERVER = array_merge($_SERVER, $_ENV);
3434
$_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR.'app.php';
3535

36+
// Since we are rewriting to app.php, adjust SCRIPT_NAME and PHP_SELF accordingly
37+
$_SERVER['SCRIPT_NAME'] = DIRECTORY_SEPARATOR.'app.php';
38+
$_SERVER['PHP_SELF'] = DIRECTORY_SEPARATOR.'app.php';
39+
3640
require 'app.php';
3741

3842
error_log(sprintf('%s:%d [%d]: %s', $_SERVER['REMOTE_ADDR'], $_SERVER['REMOTE_PORT'], http_response_code(), $_SERVER['REQUEST_URI']), 4);

‎src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
<whitelist>
2121
<directory>./</directory>
2222
<exclude>
23-
<directory>./vendor</directory>
2423
<directory>./Resources</directory>
2524
<directory>./Tests</directory>
25+
<directory>./vendor</directory>
2626
</exclude>
2727
</whitelist>
2828
</filter>

‎src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist
+1-1Lines 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>./Tests</directory>
2423
<directory>./Resources</directory>
24+
<directory>./Tests</directory>
2525
<directory>./vendor</directory>
2626
</exclude>
2727
</whitelist>

‎src/Symfony/Bundle/TwigBundle/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/phpunit.xml.dist
+1-1Lines 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>./Tests</directory>
2423
<directory>./Resources</directory>
24+
<directory>./Tests</directory>
2525
<directory>./vendor</directory>
2626
</exclude>
2727
</whitelist>

‎src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist
+1-1Lines 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>./Tests</directory>
2423
<directory>./Resources</directory>
24+
<directory>./Tests</directory>
2525
<directory>./vendor</directory>
2626
</exclude>
2727
</whitelist>

‎src/Symfony/Component/Asset/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Component/Asset/phpunit.xml.dist
+1-1Lines 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>

‎src/Symfony/Component/Console/Style/SymfonyStyle.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Style/SymfonyStyle.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ public function createProgressBar($max = 0)
303303
{
304304
$progressBar = parent::createProgressBar($max);
305305

306-
if ('\\' === DIRECTORY_SEPARATOR) {
306+
if ('\\' !== DIRECTORY_SEPARATOR) {
307307
$progressBar->setEmptyBarCharacter('░'); // light shade character \u2591
308308
$progressBar->setProgressCharacter('');
309309
$progressBar->setBarCharacter('▓'); // dark shade character \u2593

‎src/Symfony/Component/Filesystem/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Component/Filesystem/phpunit.xml.dist
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<directory>./</directory>
2222
<exclude>
2323
<directory>./Tests</directory>
24+
<directory>./vendor</directory>
2425
</exclude>
2526
</whitelist>
2627
</filter>

‎src/Symfony/Component/Form/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/phpunit.xml.dist
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<whitelist>
2121
<directory>./</directory>
2222
<exclude>
23+
<directory>./Resources</directory>
2324
<directory>./Tests</directory>
2425
<directory>./vendor</directory>
2526
</exclude>

‎src/Symfony/Component/HttpFoundation/Tests/RequestTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ public function testGetUserInfo()
590590
{
591591
$request = new Request();
592592

593-
$server['PHP_AUTH_USER'] = 'fabien';
593+
$server = array('PHP_AUTH_USER' => 'fabien');
594594
$request->initialize(array(), array(), array(), array(), array(), $server);
595595
$this->assertEquals('fabien', $request->getUserInfo());
596596

‎src/Symfony/Component/Intl/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/phpunit.xml.dist
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<whitelist>
2727
<directory>./</directory>
2828
<exclude>
29+
<directory>./Resources</directory>
2930
<directory>./Tests</directory>
3031
<directory>./vendor</directory>
3132
</exclude>

‎src/Symfony/Component/OptionsResolver/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Component/OptionsResolver/phpunit.xml.dist
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<exclude>
2323
<directory>./Resources</directory>
2424
<directory>./Tests</directory>
25+
<directory>./vendor</directory>
2526
</exclude>
2627
</whitelist>
2728
</filter>

‎src/Symfony/Component/Process/Process.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Process/Process.php
+12Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,20 @@ public function start($callback = null)
280280
}
281281
}
282282

283+
$ptsWorkaround = null;
284+
285+
if (!$this->useFileHandles && $this->enhanceSigchildCompatibility && $this->isSigchildEnabled()) {
286+
// Workaround for the bug, when PTS functionality is enabled.
287+
// @see : https://bugs.php.net/69442
288+
$ptsWorkaround = fopen('php://fd/0', 'r');
289+
}
290+
283291
$this->process = proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $this->env, $this->options);
284292

293+
if ($ptsWorkaround) {
294+
fclose($ptsWorkaround);
295+
}
296+
285297
if (!is_resource($this->process)) {
286298
throw new RuntimeException('Unable to launch a new process.');
287299
}

‎src/Symfony/Component/Process/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Component/Process/phpunit.xml.dist
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<directory>./</directory>
2222
<exclude>
2323
<directory>./Tests</directory>
24+
<directory>./vendor</directory>
2425
</exclude>
2526
</whitelist>
2627
</filter>

‎src/Symfony/Component/PropertyAccess/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Component/PropertyAccess/phpunit.xml.dist
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<exclude>
2323
<directory>./Resources</directory>
2424
<directory>./Tests</directory>
25+
<directory>./vendor</directory>
2526
</exclude>
2627
</whitelist>
2728
</filter>

‎src/Symfony/Component/Routing/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/phpunit.xml.dist
+1-1Lines 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>

‎src/Symfony/Component/Security/Core/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/phpunit.xml.dist
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@
2525
<whitelist>
2626
<directory>./</directory>
2727
<exclude>
28-
<directory>./vendor</directory>
28+
<directory>./Resources</directory>
2929
<directory>./Tests</directory>
30+
<directory>./vendor</directory>
3031
</exclude>
3132
</whitelist>
3233
</filter>

‎src/Symfony/Component/Security/Csrf/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Csrf/phpunit.xml.dist
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
<whitelist>
2626
<directory>./</directory>
2727
<exclude>
28-
<directory>./vendor</directory>
2928
<directory>./Tests</directory>
29+
<directory>./vendor</directory>
3030
</exclude>
3131
</whitelist>
3232
</filter>

‎src/Symfony/Component/Security/Guard/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Guard/phpunit.xml.dist
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@
2525
<whitelist>
2626
<directory>./</directory>
2727
<exclude>
28-
<directory>./vendor</directory>
28+
<directory>./Resources</directory>
2929
<directory>./Tests</directory>
30+
<directory>./vendor</directory>
3031
</exclude>
3132
</whitelist>
3233
</filter>

‎src/Symfony/Component/Security/Http/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Http/phpunit.xml.dist
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
<whitelist>
2626
<directory>./</directory>
2727
<exclude>
28-
<directory>./vendor</directory>
2928
<directory>./Tests</directory>
29+
<directory>./vendor</directory>
3030
</exclude>
3131
</whitelist>
3232
</filter>

‎src/Symfony/Component/Security/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/phpunit.xml.dist
+6-8Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,20 @@
1313
<testsuites>
1414
<testsuite name="Symfony Security Component Test Suite">
1515
<directory>./Tests/</directory>
16-
<directory>./Acl/Tests/</directory>
17-
<directory>./Core/Tests/</directory>
18-
<directory>./Http/Tests/</directory>
19-
<directory>./Guard/Tests/</directory>
16+
<directory>./*/Tests/</directory>
2017
</testsuite>
2118
</testsuites>
2219

2320
<filter>
2421
<whitelist>
2522
<directory>./</directory>
2623
<exclude>
27-
<directory>./vendor</directory>
24+
<directory>./Resources</directory>
2825
<directory>./Tests</directory>
29-
<directory>./Acl/Tests</directory>
30-
<directory>./Core/Tests</directory>
31-
<directory>./Http/Tests</directory>
26+
<directory>./vendor</directory>
27+
<directory>./*/Resources</directory>
28+
<directory>./*/Tests</directory>
29+
<directory>./*/vendor</directory>
3230
</exclude>
3331
</whitelist>
3432
</filter>

‎src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ public function normalize($object, $format = null, array $context = array())
6868
$reflClass = new \ReflectionClass($object);
6969
foreach ($reflClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $reflMethod) {
7070
if (
71+
!$reflMethod->isStatic() &&
7172
!$reflMethod->isConstructor() &&
7273
!$reflMethod->isDestructor() &&
7374
0 === $reflMethod->getNumberOfRequiredParameters()
@@ -86,7 +87,9 @@ public function normalize($object, $format = null, array $context = array())
8687

8788
// properties
8889
foreach ($reflClass->getProperties(\ReflectionProperty::IS_PUBLIC) as $reflProperty) {
89-
$attributes[$reflProperty->getName()] = true;
90+
if (!$reflProperty->isStatic()) {
91+
$attributes[$reflProperty->getName()] = true;
92+
}
9093
}
9194

9295
$attributes = array_keys($attributes);

‎src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
+16Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,11 @@ public function testNoTraversableSupport()
456456
{
457457
$this->assertFalse($this->normalizer->supportsNormalization(new \ArrayObject()));
458458
}
459+
460+
public function testNormalizeStatic()
461+
{
462+
$this->assertEquals(array('foo' => 'K'), $this->normalizer->normalize(new ObjectWithStaticPropertiesAndMethods()));
463+
}
459464
}
460465

461466
class ObjectDummy
@@ -605,3 +610,14 @@ public function otherMethod()
605610
throw new \RuntimeException('Dummy::otherMethod() should not be called');
606611
}
607612
}
613+
614+
class ObjectWithStaticPropertiesAndMethods
615+
{
616+
public $foo = 'K';
617+
public static $bar = 'A';
618+
619+
public static function getBaz()
620+
{
621+
return 'L';
622+
}
623+
}

‎src/Symfony/Component/Serializer/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/phpunit.xml.dist
+1-1Lines 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>

‎src/Symfony/Component/Templating/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Component/Templating/phpunit.xml.dist
+1-1Lines 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>

‎src/Symfony/Component/Translation/PluralizationRules.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/PluralizationRules.php
+1Lines 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':

‎src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php
+1-1Lines 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()),

‎src/Symfony/Component/Translation/phpunit.xml.dist

Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/phpunit.xml.dist
+1-1Lines 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>

‎src/Symfony/Component/Validator/Constraints/UrlValidator.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Constraints/UrlValidator.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class UrlValidator extends ConstraintValidator
3434
\] # a IPv6 address
3535
)
3636
(:[0-9]+)? # a port (optional)
37-
(/?|/\S+|\?|\#) # a /, nothing, a / with something, a query or a fragment
37+
(/?|/\S+|\?\S*|\#\S*) # a /, nothing, a / with something, a query or a fragment
3838
$~ixu';
3939

4040
/**

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.