Merge branch '4.4'

* 4.4:
  Fixing bug where PropertyInfoLoader tried to add validation to non-existent properties
  [TwigBundle] fix tests
  [travis] increase concurrency
  [FrameworkBundle] fix FC with HttpKernel v5
This commit is contained in:
Nicolas Grekas 2019-06-07 20:32:40 +02:00
commit e33ee9d530
5 changed files with 12 additions and 3 deletions

View File

@ -243,12 +243,12 @@ install:
tfold 'composer update' $COMPOSER_UP
tfold 'phpunit install' ./phpunit install
if [[ $deps = high ]]; then
echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && $COMPOSER_UP && $PHPUNIT_X$LEGACY'"
echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && $COMPOSER_UP && $PHPUNIT_X$LEGACY'"
elif [[ $deps = low ]]; then
[[ -e ~/php-ext/composer-lowest.lock.tar ]] && tar -xf ~/php-ext/composer-lowest.lock.tar
tar -cf ~/php-ext/composer-lowest.lock.tar --files-from /dev/null
php .github/rm-invalid-lowest-lock-files.php $COMPONENTS
echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && ([ -e composer.lock ] && ${COMPOSER_UP/update/install} || $COMPOSER_UP --prefer-lowest --prefer-stable) && $PHPUNIT_X'"
echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && ([ -e composer.lock ] && ${COMPOSER_UP/update/install} || $COMPOSER_UP --prefer-lowest --prefer-stable) && $PHPUNIT_X'"
echo "$COMPONENTS" | xargs -n1 -I{} tar --append -f ~/php-ext/composer-lowest.lock.tar {}/composer.lock
else
echo "$COMPONENTS" | parallel --gnu "tfold {} $PHPUNIT_X {}"

View File

@ -399,7 +399,7 @@ class ConfigurationWithArrayNodeRequiringOneElement implements ConfigurationInte
public function getConfigTreeBuilder()
{
$treeBuilder = new TreeBuilder('env_extension');
$treeBuilder
$treeBuilder->getRootNode()
->children()
->arrayNode('nodes')
->isRequired()

View File

@ -60,6 +60,10 @@ final class PropertyInfoLoader implements LoaderInterface
continue;
}
if (!property_exists($className, $property)) {
continue;
}
$types = $this->typeExtractor->getTypes($className, $property);
if (null === $types) {
continue;

View File

@ -48,4 +48,8 @@ class PropertyInfoLoaderEntity
public $alreadyPartiallyMappedCollection;
public $readOnly;
public function setNonExistentField()
{
}
}

View File

@ -46,6 +46,7 @@ class PropertyInfoLoaderTest extends TestCase
'alreadyMappedNotBlank',
'alreadyPartiallyMappedCollection',
'readOnly',
'nonExistentField',
])
;
$propertyInfoStub