diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.2' into 4.3

Browse Source 
* 4.2:
  [PhpUnitBridge] fix running simple-phpunit on Windows
  fixed phpdocs
This commit is contained in:
Nicolas Grekas 2019-07-05 08:35:01 +02:00
commit b78816d647
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php
View File

@ -127,8 +127,9 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
}
$prevRoot = getenv('COMPOSER_ROOT_VERSION');
putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");
$q = '\\' === DIRECTORY_SEPARATOR ? '"' : '';
// --no-suggest is not in the list to keep compat with composer 1.0, which is shipped with Ubuntu 16.04LTS
$exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", array(), $p, getcwd()));
$exit = proc_close(proc_open("$q$COMPOSER install --no-dev --prefer-dist --no-progress --ansi$q", array(), $p, getcwd()));
putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
if ($exit) {
exit($exit);

3
src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php
View File

@ -52,6 +52,9 @@ abstract class AbstractConfigCommand extends ContainerDebugCommand
}
}
/**
* @return ExtensionInterface
*/
protected function findExtension($name)
{
$bundles = $this->initializeBundles();

2
src/Symfony/Component/Config/Definition/ArrayNode.php
View File

@ -141,7 +141,7 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
}
/**
* Whether extra keys should just be ignore without an exception.
* Whether extra keys should just be ignored without an exception.
*
* @param bool $boolean To allow extra keys
* @param bool $remove To remove extra keys