+ A +
++ B + C +
+ + +HTML +); + + $xpath = new \DOMXPath($document); + $nodeList = $xpath->query($translator->cssToXPath('span:only-of-type')); + + $this->assertSame(1, $nodeList->length); + $this->assertSame('A', $nodeList->item(0)->textContent); + } + public function getXpathLiteralTestData() { return [ @@ -175,7 +202,7 @@ class TranslatorTest extends TestCase ['e:first-of-type', '*/e[position() = 1]'], ['e:last-of-type', '*/e[position() = last()]'], ['e:only-child', "*/*[(name() = 'e') and (last() = 1)]"], - ['e:only-of-type', 'e[last() = 1]'], + ['e:only-of-type', 'e[count(preceding-sibling::e)=0 and count(following-sibling::e)=0]'], ['e:empty', 'e[not(*) and not(string-length())]'], ['e:EmPTY', 'e[not(*) and not(string-length())]'], ['e:root', 'e[not(parent::*)]'], diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php index 27fe47f9a5..288a9e695e 100644 --- a/src/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php +++ b/src/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php @@ -123,11 +123,13 @@ class PseudoClassExtension extends AbstractExtension */ public function translateOnlyOfType(XPathExpr $xpath) { - if ('*' === $xpath->getElement()) { + $element = $xpath->getElement(); + + if ('*' === $element) { throw new ExpressionErrorException('"*:only-of-type" is not implemented.'); } - return $xpath->addCondition('last() = 1'); + return $xpath->addCondition(sprintf('count(preceding-sibling::%s)=0 and count(following-sibling::%s)=0', $element, $element)); } /** diff --git a/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php index 9915e2c112..5d70c19024 100644 --- a/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php +++ b/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php @@ -19,6 +19,7 @@ use Symfony\Component\Templating\EngineInterface; use Twig\Environment; use Twig\Error\LoaderError; use Twig\Loader\ExistsLoaderInterface; +use Twig\Loader\SourceContextLoaderInterface; /** * Implements the Hinclude rendering strategy. @@ -135,22 +136,23 @@ class HIncludeFragmentRenderer extends RoutableFragmentRenderer } $loader = $this->templating->getLoader(); - if ($loader instanceof ExistsLoaderInterface || method_exists($loader, 'exists')) { - return $loader->exists($template); - } - try { - if (method_exists($loader, 'getSourceContext')) { - $loader->getSourceContext($template); - } else { - $loader->getSource($template); + if (1 === Environment::MAJOR_VERSION && !$loader instanceof ExistsLoaderInterface) { + try { + if ($loader instanceof SourceContextLoaderInterface) { + $loader->getSourceContext($template); + } else { + $loader->getSource($template); + } + + return true; + } catch (LoaderError $e) { } - return true; - } catch (LoaderError $e) { + return false; } - return false; + return $loader->exists($template); } /** diff --git a/src/Symfony/Component/Security/Http/Firewall/X509AuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/X509AuthenticationListener.php index 43d4627bbb..7e785bdb58 100644 --- a/src/Symfony/Component/Security/Http/Firewall/X509AuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/X509AuthenticationListener.php @@ -46,7 +46,7 @@ class X509AuthenticationListener extends AbstractPreAuthenticatedListener $user = $request->server->get($this->userKey); } elseif ( $request->server->has($this->credentialKey) - && preg_match('#emailAddress=(.+\@.+\.[^,/]+)($|,|/)#', $request->server->get($this->credentialKey), $matches) + && preg_match('#emailAddress=([^,/@]++@[^,/]++)#', $request->server->get($this->credentialKey), $matches) ) { $user = $matches[1]; } diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php index 9ada4b1b49..e35e685d5b 100644 --- a/src/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php +++ b/src/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php @@ -81,6 +81,7 @@ class X509AuthenticationListenerTest extends TestCase yield ['cert+something@example.com', 'CN=Sample certificate DN,emailAddress=cert+something@example.com']; yield ['cert+something@example.com', 'emailAddress=cert+something@example.com,CN=Sample certificate DN']; yield ['cert+something@example.com', 'emailAddress=cert+something@example.com']; + yield ['firstname.lastname@mycompany.co.uk', 'emailAddress=firstname.lastname@mycompany.co.uk,CN=Firstname.Lastname,OU=london,OU=company design and engineering,OU=Issuer London,OU=Roaming,OU=Interactive,OU=Users,OU=Standard,OU=Business,DC=england,DC=core,DC=company,DC=co,DC=uk']; } public function testGetPreAuthenticatedDataNoData() diff --git a/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php b/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php index 123b447b5f..44409d59fa 100644 --- a/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php +++ b/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php @@ -45,8 +45,12 @@ class CsvEncoder implements EncoderInterface, DecoderInterface /** * @param array $defaultContext */ - public function __construct($defaultContext = [], string $enclosure = '"', string $escapeChar = '\\', string $keySeparator = '.', bool $escapeFormulas = false) + public function __construct($defaultContext = [], string $enclosure = '"', string $escapeChar = '', string $keySeparator = '.', bool $escapeFormulas = false) { + if ('' === $escapeChar && \PHP_VERSION_ID < 70400) { + $escapeChar = '\\'; + } + if (!\is_array($defaultContext)) { @trigger_error('Passing configuration options directly to the constructor is deprecated since Symfony 4.2, use the default context instead.', E_USER_DEPRECATED); diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php index 7663e7446b..da45e30a7f 100644 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php @@ -397,16 +397,18 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer return null; } - if ($type->isCollection() && null !== ($collectionValueType = $type->getCollectionValueType()) && Type::BUILTIN_TYPE_OBJECT === $collectionValueType->getBuiltinType()) { + $collectionValueType = $type->isCollection() ? $type->getCollectionValueType() : null; + + // Fix a collection that contains the only one element + // This is special to xml format only + if ('xml' === $format && null !== $collectionValueType && (!\is_array($data) || !\is_int(key($data)))) { + $data = [$data]; + } + + if (null !== $collectionValueType && Type::BUILTIN_TYPE_OBJECT === $collectionValueType->getBuiltinType()) { $builtinType = Type::BUILTIN_TYPE_OBJECT; $class = $collectionValueType->getClassName().'[]'; - // Fix a collection that contains the only one element - // This is special to xml format only - if ('xml' === $format && !\is_int(key($data))) { - $data = [$data]; - } - if (null !== $collectionKeyType = $type->getCollectionKeyType()) { $context['key_type'] = $collectionKeyType; } diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php index 0f93a99cd9..a4e4dfa8e7 100644 --- a/src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php +++ b/src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php @@ -36,15 +36,51 @@ class CsvEncoderTest extends TestCase 'int' => 2, 'false' => false, 'true' => true, + 'int_one' => 1, + 'string_one' => '1', ]; // Check that true and false are appropriately handled - $this->assertEquals(<<<'CSV' -string,int,false,true -foo,2,0,1 + $this->assertSame($csv = <<<'CSV' +string,int,false,true,int_one,string_one +foo,2,0,1,1,1 CSV - , $this->encoder->encode($data, 'csv')); + , $this->encoder->encode($data, 'csv')); + + $this->assertSame([ + 'string' => 'foo', + 'int' => '2', + 'false' => '0', + 'true' => '1', + 'int_one' => '1', + 'string_one' => '1', + ], $this->encoder->decode($csv, 'csv')); + } + + /** + * @requires PHP 7.4 + */ + public function testDoubleQuotesAndSlashes() + { + $this->assertSame($csv = <<<'CSV' +0,1,2,3,4,5 +,"""","foo""","\""",\,foo\ + +CSV + , $this->encoder->encode($data = ['', '"', 'foo"', '\\"', '\\', 'foo\\'], 'csv')); + + $this->assertSame($data, $this->encoder->decode($csv, 'csv')); + } + + /** + * @requires PHP 7.4 + */ + public function testSingleSlash() + { + $this->assertSame($csv = "0\n\\\n", $this->encoder->encode($data = ['\\'], 'csv')); + $this->assertSame($data, $this->encoder->decode($csv, 'csv')); + $this->assertSame($data, $this->encoder->decode(trim($csv), 'csv')); } public function testSupportEncoding() diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php index ff4700cace..a45722423f 100644 --- a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php +++ b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php @@ -132,16 +132,54 @@ class AbstractObjectNormalizerTest extends TestCase $extractor = $this->getMockBuilder(PhpDocExtractor::class)->getMock(); $extractor->method('getTypes') ->will($this->onConsecutiveCalls( - [ - new Type( - 'array', - false, - null, - true, - new Type('int'), - new Type('object', false, DummyChild::class) - ), - ], + [new Type('array', false, null, true, new Type('int'), new Type('object', false, DummyChild::class))], + null + )); + + $denormalizer = new AbstractObjectNormalizerCollectionDummy(null, null, $extractor); + $arrayDenormalizer = new ArrayDenormalizerDummy(); + $serializer = new SerializerCollectionDummy([$arrayDenormalizer, $denormalizer]); + $arrayDenormalizer->setSerializer($serializer); + $denormalizer->setSerializer($serializer); + + return $denormalizer; + } + + public function testDenormalizeStringCollectionDecodedFromXmlWithOneChild() + { + $denormalizer = $this->getDenormalizerForStringCollection(); + + // if an xml-node can have children which should be deserialized as string[] + // and only one child exists + $stringCollection = $denormalizer->denormalize(['children' => 'foo'], StringCollection::class, 'xml'); + + $this->assertInstanceOf(StringCollection::class, $stringCollection); + $this->assertIsArray($stringCollection->children); + $this->assertCount(1, $stringCollection->children); + $this->assertEquals('foo', $stringCollection->children[0]); + } + + public function testDenormalizeStringCollectionDecodedFromXmlWithTwoChildren() + { + $denormalizer = $this->getDenormalizerForStringCollection(); + + // if an xml-node can have children which should be deserialized as string[] + // and only one child exists + $stringCollection = $denormalizer->denormalize(['children' => ['foo', 'bar']], StringCollection::class, 'xml'); + + $this->assertInstanceOf(StringCollection::class, $stringCollection); + $this->assertIsArray($stringCollection->children); + $this->assertCount(2, $stringCollection->children); + $this->assertEquals('foo', $stringCollection->children[0]); + $this->assertEquals('bar', $stringCollection->children[1]); + } + + private function getDenormalizerForStringCollection() + { + $extractor = $this->getMockBuilder(PhpDocExtractor::class)->getMock(); + $extractor->method('getTypes') + ->will($this->onConsecutiveCalls( + [new Type('array', false, null, true, new Type('int'), new Type('string'))], null )); @@ -258,6 +296,12 @@ class AbstractObjectNormalizerWithMetadata extends AbstractObjectNormalizer } } +class StringCollection +{ + /** @var string[] */ + public $children; +} + class DummyCollection { /** @var DummyChild[] */