Merge branch '4.3' into 4.4

* 4.3:
  Fixing bug where PropertyInfoLoader tried to add validation to non-existent properties
  [TwigBundle] fix tests
  [travis] increase concurrency
This commit is contained in:
Nicolas Grekas 2019-06-07 20:28:30 +02:00
commit 3bef037b7b
5 changed files with 17 additions and 5 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

@ -11,10 +11,13 @@
namespace Symfony\Bundle\TwigBundle\Tests\Loader;
use Symfony\Bundle\FrameworkBundle\Templating\TemplateReference;
use Symfony\Bundle\TwigBundle\Loader\FilesystemLoader;
use Symfony\Bundle\TwigBundle\Tests\TestCase;
use Symfony\Component\Templating\TemplateReferenceInterface;
/**
* @group legacy
*/
class FilesystemLoaderTest extends TestCase
{
public function testGetSourceContext()
@ -61,7 +64,7 @@ class FilesystemLoaderTest extends TestCase
->expects($this->once())
->method('parse')
->with('name.format.engine')
->willReturn(new TemplateReference('', '', 'name', 'format', 'engine'))
->willReturn($this->getMockBuilder(TemplateReferenceInterface::class)->getMock())
;
$locator = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
@ -85,7 +88,7 @@ class FilesystemLoaderTest extends TestCase
->expects($this->once())
->method('parse')
->with('name.format.engine')
->willReturn(new TemplateReference('', '', 'name', 'format', 'engine'))
->willReturn($this->getMockBuilder(TemplateReferenceInterface::class)->getMock())
;
$locator = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();

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