8000 Merge branch '4.4' · symfony/symfony@e33ee9d · GitHub
[go: up one dir, main page]
Skip to content

Commit e33ee9d

Browse files
nicolas-grekasnicolas-grekas
committed
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
2 parents e281087 + 02a792a commit e33ee9d

File tree

5 files changed

+12
-3
lines changed

5 files changed

+12
-3
lines changed

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,12 +243,12 @@ install:
243243
tfold 'composer update' $COMPOSER_UP
244244
tfold 'phpunit install' ./phpunit install
245245
if [[ $deps = high ]]; then
246-
echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && $COMPOSER_UP && $PHPUNIT_X$LEGACY'"
246+
echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && $COMPOSER_UP && $PHPUNIT_X$LEGACY'"
247247
elif [[ $deps = low ]]; then
248248
[[ -e ~/php-ext/composer-lowest.lock.tar ]] && tar -xf ~/php-ext/composer-lowest.lock.tar
249249
tar -cf ~/php-ext/composer-lowest.lock.tar --files-from /dev/null
250250
php .github/rm-invalid-lowest-lock-files.php $COMPONENTS
251-
echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && ([ -e composer.lock ] && ${COMPOSER_UP/update/install} || $COMPOSER_UP --prefer-lowest --prefer-stable) && $PHPUNIT_X'"
251+
echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && ([ -e composer.lock ] && ${COMPOSER_UP/update/install} || $COMPOSER_UP --prefer-lowest --prefer-stable) && $PHPUNIT_X'"
252252
echo "$COMPONENTS" | xargs -n1 -I{} tar --append -f ~/php-ext/composer-lowest.lock.tar {}/composer.lock
253253
else
254254
echo "$COMPONENTS" | parallel --gnu "tfold {} $PHPUNIT_X {}"

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ class ConfigurationWithArrayNodeRequiringOneElement implements ConfigurationInte
399399
public function getConfigTreeBuilder()
400400
{
401401
$treeBuilder = new TreeBuilder('env_extension');
402-
$treeBuilder
402+
$treeBuilder->getRootNode()
403403
->children()
404404
->arrayNode('nodes')
405405
->isRequired()

‎src/Symfony/Component/Validator/Mapping/Loader/PropertyInfoLoader.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ public function loadClassMetadata(ClassMetadata $metadata)
6060
continue;
6161
}
6262

63+
if (!property_exists($className, $property)) {
64+
continue;
65+
}
66+
6367
$types = $this->typeExtractor->getTypes($className, $property);
6468
if (null === $types) {
6569
continue;

‎src/Symfony/Component/Validator/Tests/Fixtures/PropertyInfoLoaderEntity.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,8 @@ class PropertyInfoLoaderEntity
4848
public $alreadyPartiallyMappedCollection;
4949

5050
public $readOnly;
51+
52+
public function setNonExistentField()
53+
{
54+
}
5155
}

‎src/Symfony/Component/Validator/Tests/Mapping/Loader/PropertyInfoLoaderTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public function testLoadClassMetadata()
4646
'alreadyMappedNotBlank',
4747
'alreadyPartiallyMappedCollection',
4848
'readOnly',
49+
'nonExistentField',
4950
])
5051
;
5152
$propertyInfoStub

0 commit comments

Comments
 (0)
0