Merge branch '3.4' into 4.4
* 3.4: [MimeType] Duplicated MimeType due to PHP Bug fix guessing form types for DateTime types fix handling typed properties as constraint options
This commit is contained in:
commit
2e2fac8766
@ -97,6 +97,7 @@ class ValidatorTypeGuesser implements FormTypeGuesserInterface
|
|||||||
case 'long':
|
case 'long':
|
||||||
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\IntegerType', [], Guess::MEDIUM_CONFIDENCE);
|
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\IntegerType', [], Guess::MEDIUM_CONFIDENCE);
|
||||||
|
|
||||||
|
case \DateTime::class:
|
||||||
case '\DateTime':
|
case '\DateTime':
|
||||||
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateType', [], Guess::MEDIUM_CONFIDENCE);
|
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateType', [], Guess::MEDIUM_CONFIDENCE);
|
||||||
|
|
||||||
|
@ -12,9 +12,17 @@
|
|||||||
namespace Symfony\Component\Form\Tests\Extension\Validator;
|
namespace Symfony\Component\Form\Tests\Extension\Validator;
|
||||||
|
|
||||||
use PHPUnit\Framework\TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
|
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
|
||||||
|
use Symfony\Component\Form\Extension\Core\Type\CollectionType;
|
||||||
|
use Symfony\Component\Form\Extension\Core\Type\DateType;
|
||||||
|
use Symfony\Component\Form\Extension\Core\Type\IntegerType;
|
||||||
|
use Symfony\Component\Form\Extension\Core\Type\NumberType;
|
||||||
|
use Symfony\Component\Form\Extension\Core\Type\TextType;
|
||||||
use Symfony\Component\Form\Extension\Validator\ValidatorTypeGuesser;
|
use Symfony\Component\Form\Extension\Validator\ValidatorTypeGuesser;
|
||||||
use Symfony\Component\Form\Guess\Guess;
|
use Symfony\Component\Form\Guess\Guess;
|
||||||
|
use Symfony\Component\Form\Guess\TypeGuess;
|
||||||
use Symfony\Component\Form\Guess\ValueGuess;
|
use Symfony\Component\Form\Guess\ValueGuess;
|
||||||
|
use Symfony\Component\Validator\Constraint;
|
||||||
use Symfony\Component\Validator\Constraints\Email;
|
use Symfony\Component\Validator\Constraints\Email;
|
||||||
use Symfony\Component\Validator\Constraints\File;
|
use Symfony\Component\Validator\Constraints\File;
|
||||||
use Symfony\Component\Validator\Constraints\IsTrue;
|
use Symfony\Component\Validator\Constraints\IsTrue;
|
||||||
@ -60,6 +68,35 @@ class ValidatorTypeGuesserTest extends TestCase
|
|||||||
$this->guesser = new ValidatorTypeGuesser($this->metadataFactory);
|
$this->guesser = new ValidatorTypeGuesser($this->metadataFactory);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dataProvider guessTypeProvider
|
||||||
|
*/
|
||||||
|
public function testGuessType(Constraint $constraint, TypeGuess $guess)
|
||||||
|
{
|
||||||
|
$this->metadata->addPropertyConstraint(self::TEST_PROPERTY, $constraint);
|
||||||
|
|
||||||
|
$this->assertEquals($guess, $this->guesser->guessType(self::TEST_CLASS, self::TEST_PROPERTY));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function guessTypeProvider()
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
[new Type('array'), new TypeGuess(CollectionType::class, [], Guess::MEDIUM_CONFIDENCE)],
|
||||||
|
[new Type('bool'), new TypeGuess(CheckboxType::class, [], Guess::MEDIUM_CONFIDENCE)],
|
||||||
|
[new Type('boolean'), new TypeGuess(CheckboxType::class, [], Guess::MEDIUM_CONFIDENCE)],
|
||||||
|
[new Type('double'), new TypeGuess(NumberType::class, [], Guess::MEDIUM_CONFIDENCE)],
|
||||||
|
[new Type('float'), new TypeGuess(NumberType::class, [], Guess::MEDIUM_CONFIDENCE)],
|
||||||
|
[new Type('numeric'), new TypeGuess(NumberType::class, [], Guess::MEDIUM_CONFIDENCE)],
|
||||||
|
[new Type('real'), new TypeGuess(NumberType::class, [], Guess::MEDIUM_CONFIDENCE)],
|
||||||
|
[new Type('int'), new TypeGuess(IntegerType::class, [], Guess::MEDIUM_CONFIDENCE)],
|
||||||
|
[new Type('integer'), new TypeGuess(IntegerType::class, [], Guess::MEDIUM_CONFIDENCE)],
|
||||||
|
[new Type('long'), new TypeGuess(IntegerType::class, [], Guess::MEDIUM_CONFIDENCE)],
|
||||||
|
[new Type('string'), new TypeGuess(TextType::class, [], Guess::LOW_CONFIDENCE)],
|
||||||
|
[new Type(\DateTime::class), new TypeGuess(DateType::class, [], Guess::MEDIUM_CONFIDENCE)],
|
||||||
|
[new Type('\DateTime'), new TypeGuess(DateType::class, [], Guess::MEDIUM_CONFIDENCE)],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
public function guessRequiredProvider()
|
public function guessRequiredProvider()
|
||||||
{
|
{
|
||||||
$allowEmptyString = property_exists(Length::class, 'allowEmptyString') ? ['allowEmptyString' => true] : [];
|
$allowEmptyString = property_exists(Length::class, 'allowEmptyString') ? ['allowEmptyString' => true] : [];
|
||||||
|
@ -68,7 +68,13 @@ class FileinfoMimeTypeGuesser implements MimeTypeGuesserInterface
|
|||||||
if (!$finfo = new \finfo(FILEINFO_MIME_TYPE, $this->magicFile)) {
|
if (!$finfo = new \finfo(FILEINFO_MIME_TYPE, $this->magicFile)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
$mimeType = $finfo->file($path);
|
||||||
|
|
||||||
return $finfo->file($path);
|
if ($mimeType && 0 === (\strlen($mimeType) % 2)) {
|
||||||
|
$mimeStart = substr($mimeType, 0, \strlen($mimeType) >> 1);
|
||||||
|
$mimeType = $mimeStart.$mimeStart === $mimeType ? $mimeStart : $mimeType;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $mimeType;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Binary file not shown.
@ -61,6 +61,11 @@ class MimeTypeTest extends TestCase
|
|||||||
$this->assertEquals('application/octet-stream', MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/.unknownextension'));
|
$this->assertEquals('application/octet-stream', MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/.unknownextension'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testGuessWithDuplicatedFileType()
|
||||||
|
{
|
||||||
|
$this->assertEquals('application/vnd.openxmlformats-officedocument.wordprocessingml.document', MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/test.docx'));
|
||||||
|
}
|
||||||
|
|
||||||
public function testGuessWithIncorrectPath()
|
public function testGuessWithIncorrectPath()
|
||||||
{
|
{
|
||||||
$this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
|
$this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
|
||||||
|
@ -57,7 +57,13 @@ class FileinfoMimeTypeGuesser implements MimeTypeGuesserInterface
|
|||||||
if (false === $finfo = new \finfo(FILEINFO_MIME_TYPE, $this->magicFile)) {
|
if (false === $finfo = new \finfo(FILEINFO_MIME_TYPE, $this->magicFile)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
$mimeType = $finfo->file($path);
|
||||||
|
|
||||||
return $finfo->file($path);
|
if ($mimeType && 0 === (\strlen($mimeType) % 2)) {
|
||||||
|
$mimeStart = substr($mimeType, 0, \strlen($mimeType) >> 1);
|
||||||
|
$mimeType = $mimeStart.$mimeStart === $mimeType ? $mimeStart : $mimeType;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $mimeType;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -79,6 +79,11 @@ abstract class AbstractMimeTypeGuesserTest extends TestCase
|
|||||||
$this->assertEquals('application/octet-stream', $this->getGuesser()->guessMimeType(__DIR__.'/Fixtures/mimetypes/.unknownextension'));
|
$this->assertEquals('application/octet-stream', $this->getGuesser()->guessMimeType(__DIR__.'/Fixtures/mimetypes/.unknownextension'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testGuessWithDuplicatedFileType()
|
||||||
|
{
|
||||||
|
$this->assertEquals('application/vnd.openxmlformats-officedocument.wordprocessingml.document', $this->getGuesser()->guessMimeType(__DIR__.'/Fixtures/test.docx'));
|
||||||
|
}
|
||||||
|
|
||||||
public function testGuessWithIncorrectPath()
|
public function testGuessWithIncorrectPath()
|
||||||
{
|
{
|
||||||
if (!$this->getGuesser()->isGuesserSupported()) {
|
if (!$this->getGuesser()->isGuesserSupported()) {
|
||||||
|
BIN
src/Symfony/Component/Mime/Tests/Fixtures/test.docx
Normal file
BIN
src/Symfony/Component/Mime/Tests/Fixtures/test.docx
Normal file
Binary file not shown.
@ -108,7 +108,7 @@ abstract class Constraint
|
|||||||
$defaultOption = $this->getDefaultOption();
|
$defaultOption = $this->getDefaultOption();
|
||||||
$invalidOptions = [];
|
$invalidOptions = [];
|
||||||
$missingOptions = array_flip((array) $this->getRequiredOptions());
|
$missingOptions = array_flip((array) $this->getRequiredOptions());
|
||||||
$knownOptions = get_object_vars($this);
|
$knownOptions = get_class_vars(static::class);
|
||||||
|
|
||||||
// The "groups" option is added to the object lazily
|
// The "groups" option is added to the object lazily
|
||||||
$knownOptions['groups'] = true;
|
$knownOptions['groups'] = true;
|
||||||
|
@ -13,10 +13,13 @@ namespace Symfony\Component\Validator\Tests;
|
|||||||
|
|
||||||
use PHPUnit\Framework\TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Symfony\Component\Validator\Constraint;
|
use Symfony\Component\Validator\Constraint;
|
||||||
|
use Symfony\Component\Validator\Exception\InvalidOptionsException;
|
||||||
use Symfony\Component\Validator\Tests\Fixtures\ClassConstraint;
|
use Symfony\Component\Validator\Tests\Fixtures\ClassConstraint;
|
||||||
use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
|
use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
|
||||||
use Symfony\Component\Validator\Tests\Fixtures\ConstraintB;
|
use Symfony\Component\Validator\Tests\Fixtures\ConstraintB;
|
||||||
use Symfony\Component\Validator\Tests\Fixtures\ConstraintC;
|
use Symfony\Component\Validator\Tests\Fixtures\ConstraintC;
|
||||||
|
use Symfony\Component\Validator\Tests\Fixtures\ConstraintWithStaticProperty;
|
||||||
|
use Symfony\Component\Validator\Tests\Fixtures\ConstraintWithTypedProperty;
|
||||||
use Symfony\Component\Validator\Tests\Fixtures\ConstraintWithValue;
|
use Symfony\Component\Validator\Tests\Fixtures\ConstraintWithValue;
|
||||||
use Symfony\Component\Validator\Tests\Fixtures\ConstraintWithValueAsDefault;
|
use Symfony\Component\Validator\Tests\Fixtures\ConstraintWithValueAsDefault;
|
||||||
|
|
||||||
@ -245,4 +248,25 @@ class ConstraintTest extends TestCase
|
|||||||
$this->expectExceptionMessage('No default option is configured for constraint "Symfony\Component\Validator\Tests\Fixtures\ConstraintB".');
|
$this->expectExceptionMessage('No default option is configured for constraint "Symfony\Component\Validator\Tests\Fixtures\ConstraintB".');
|
||||||
new ConstraintB(['value' => 1]);
|
new ConstraintB(['value' => 1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testStaticPropertiesAreNoOptions()
|
||||||
|
{
|
||||||
|
$this->expectException(InvalidOptionsException::class);
|
||||||
|
|
||||||
|
new ConstraintWithStaticProperty([
|
||||||
|
'foo' => 'bar',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @requires PHP 7.4
|
||||||
|
*/
|
||||||
|
public function testSetTypedProperty()
|
||||||
|
{
|
||||||
|
$constraint = new ConstraintWithTypedProperty([
|
||||||
|
'foo' => 'bar',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertSame('bar', $constraint->foo);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,10 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Symfony\Component\Validator\Tests\Fixtures;
|
||||||
|
|
||||||
|
use Symfony\Component\Validator\Constraint;
|
||||||
|
|
||||||
|
class ConstraintWithStaticProperty extends Constraint
|
||||||
|
{
|
||||||
|
public static $foo;
|
||||||
|
}
|
@ -0,0 +1,10 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Symfony\Component\Validator\Tests\Fixtures;
|
||||||
|
|
||||||
|
use Symfony\Component\Validator\Constraint;
|
||||||
|
|
||||||
|
class ConstraintWithTypedProperty extends Constraint
|
||||||
|
{
|
||||||
|
public string $foo;
|
||||||
|
}
|
Reference in New Issue
Block a user