Skip to content

Commit

Permalink
Merge branch '2.7' into 2.8
Browse files Browse the repository at this point in the history
* 2.7:
  Permit empty suffix on Windows
  [Console][Table] fixed render when using multiple rowspans.
  add docblocks for Twig url and path function to improve ide completion
  check for circular refs caused by method calls
  [Serializer] fix upper camel case conversion (see #21399)
  [DI] Auto register extension configuration classes as a resource
  [Console] Updated phpdoc on return types
  • Loading branch information
fabpot committed Feb 16, 2017
2 parents 0110ac4 + 9b244e5 commit 9773908
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion ExecutableFinder.php
Expand Up @@ -75,7 +75,7 @@ public function find($name, $default = null, array $extraDirs = array())
$suffixes = array('');
if ('\\' === DIRECTORY_SEPARATOR) {
$pathExt = getenv('PATHEXT');
$suffixes = $pathExt ? explode(PATH_SEPARATOR, $pathExt) : $this->suffixes;
$suffixes = array_merge($suffixes, $pathExt ? explode(PATH_SEPARATOR, $pathExt) : $this->suffixes);
}
foreach ($suffixes as $suffix) {
foreach ($dirs as $dir) {
Expand Down

0 comments on commit 9773908

Please sign in to comment.