Skip to content

Commit 818480c

Browse files
committed
Merge branch '2.6' into 2.7
* 2.6: (25 commits) [2.6] link to https://symfony.com where possible Do not override PHP constants, only use when available link to https://symfony.com where possible [FrameworkBundle] Added missing log in server:run command [Finder] Only use GLOB_BRACE when available [HttpFoundation] Allow curly braces in trusted host patterns Fix merge Fix typo in variable name [profiler][security] check authenticated user by tokenClass instead of username. [WebProfiler] fix html syntax for input types [TwigBundle] Fix deprecated use of FlattenException [DependencyInjection] Removed extra strtolower calls Use https://symfony.com/search for searching [Debug] PHP7 compatibility with BaseException [Validator] Fixed Choice when an empty array is used in the "choices" option Fixed tests [StringUtil] Fixed singularification of 'selfies' Fix Portuguese (Portugal) translation for Security improved exception when missing required component [DependencyInjection] resolve circular reference ... Conflicts: src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig src/Symfony/Component/Form/README.md src/Symfony/Component/Intl/README.md src/Symfony/Component/Security/README.md src/Symfony/Component/Translation/README.md src/Symfony/Component/Validator/README.md
2 parents 8c893ad + 704c64c commit 818480c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Finder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ public function in($dirs)
671671
foreach ((array) $dirs as $dir) {
672672
if (is_dir($dir)) {
673673
$resolvedDirs[] = $dir;
674-
} elseif ($glob = glob($dir, GLOB_BRACE | GLOB_ONLYDIR)) {
674+
} elseif ($glob = glob($dir, (defined('GLOB_BRACE') ? GLOB_BRACE : 0) | GLOB_ONLYDIR)) {
675675
$resolvedDirs = array_merge($resolvedDirs, $glob);
676676
} else {
677677
throw new \InvalidArgumentException(sprintf('The "%s" directory does not exist.', $dir));

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ You can run the unit tests with the following command:
5050

5151
[1]: http://api.symfony.com/2.5/Symfony/Component/Finder/SplFileInfo.html
5252
[2]: http://php.net/splfileinfo
53-
[3]: http://symfony.com/doc/current/components/finder.html#usage
53+
[3]: https://symfony.com/doc/current/components/finder.html#usage

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "library",
44
"description": "Symfony Finder Component",
55
"keywords": [],
6-
"homepage": "http://symfony.com",
6+
"homepage": "https://symfony.com",
77
"license": "MIT",
88
"authors": [
99
{
@@ -12,7 +12,7 @@
1212
},
1313
{
1414
"name": "Symfony Community",
15-
"homepage": "http://symfony.com/contributors"
15+
"homepage": "https://symfony.com/contributors"
1616
}
1717
],
1818
"require": {

0 commit comments

Comments
 (0)