*/
class AddRequestFormatsListenerTest extends TestCase
@@ -47,7 +45,7 @@ public function testIsAnEventSubscriber()
public function testRegisteredEvent()
{
- $this->assertEquals(
+ $this->assertSame(
[KernelEvents::REQUEST => ['onKernelRequest', 100]],
AddRequestFormatsListener::getSubscribedEvents()
);
@@ -55,7 +53,7 @@ public function testRegisteredEvent()
public function testSetAdditionalFormats()
{
- $request = $this->getRequestMock();
+ $request = $this->createMock(Request::class);
$event = $this->getRequestEventMock($request);
$request->expects($this->once())
@@ -65,11 +63,6 @@ public function testSetAdditionalFormats()
$this->listener->onKernelRequest($event);
}
- protected function getRequestMock()
- {
- return $this->createMock(Request::class);
- }
-
protected function getRequestEventMock(Request $request)
{
$event = $this->createMock(RequestEvent::class);
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleAwareListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleAwareListenerTest.php
index 20c9f9d8c9e44..ab92a7916877e 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleAwareListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleAwareListenerTest.php
@@ -40,7 +40,7 @@ public function testLocaleIsSetInOnKernelRequest()
->method('setLocale')
->with($this->equalTo('fr'));
- $event = new RequestEvent($this->createHttpKernel(), $this->createRequest('fr'), HttpKernelInterface::MASTER_REQUEST);
+ $event = new RequestEvent($this->createMock(HttpKernelInterface::class), $this->createRequest('fr'), HttpKernelInterface::MASTER_REQUEST);
$this->listener->onKernelRequest($event);
}
@@ -57,7 +57,7 @@ public function testDefaultLocaleIsUsedOnExceptionsInOnKernelRequest()
$this->throwException(new \InvalidArgumentException())
);
- $event = new RequestEvent($this->createHttpKernel(), $this->createRequest('fr'), HttpKernelInterface::MASTER_REQUEST);
+ $event = new RequestEvent($this->createMock(HttpKernelInterface::class), $this->createRequest('fr'), HttpKernelInterface::MASTER_REQUEST);
$this->listener->onKernelRequest($event);
}
@@ -71,7 +71,7 @@ public function testLocaleIsSetInOnKernelFinishRequestWhenParentRequestExists()
$this->requestStack->push($this->createRequest('fr'));
$this->requestStack->push($subRequest = $this->createRequest('de'));
- $event = new FinishRequestEvent($this->createHttpKernel(), $subRequest, HttpKernelInterface::SUB_REQUEST);
+ $event = new FinishRequestEvent($this->createMock(HttpKernelInterface::class), $subRequest, HttpKernelInterface::SUB_REQUEST);
$this->listener->onKernelFinishRequest($event);
}
@@ -84,7 +84,7 @@ public function testLocaleIsSetToDefaultOnKernelFinishRequestWhenParentRequestDo
$this->requestStack->push($subRequest = $this->createRequest('de'));
- $event = new FinishRequestEvent($this->createHttpKernel(), $subRequest, HttpKernelInterface::SUB_REQUEST);
+ $event = new FinishRequestEvent($this->createMock(HttpKernelInterface::class), $subRequest, HttpKernelInterface::SUB_REQUEST);
$this->listener->onKernelFinishRequest($event);
}
@@ -104,15 +104,10 @@ public function testDefaultLocaleIsUsedOnExceptionsInOnKernelFinishRequest()
$this->requestStack->push($this->createRequest('fr'));
$this->requestStack->push($subRequest = $this->createRequest('de'));
- $event = new FinishRequestEvent($this->createHttpKernel(), $subRequest, HttpKernelInterface::SUB_REQUEST);
+ $event = new FinishRequestEvent($this->createMock(HttpKernelInterface::class), $subRequest, HttpKernelInterface::SUB_REQUEST);
$this->listener->onKernelFinishRequest($event);
}
- private function createHttpKernel()
- {
- return $this->createMock(HttpKernelInterface::class);
- }
-
private function createRequest($locale)
{
$request = new Request();
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiAsyncAwsTransportTest.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiAsyncAwsTransportTest.php
index 2984ba31d11da..52a7c29f41cb7 100644
--- a/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiAsyncAwsTransportTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiAsyncAwsTransportTest.php
@@ -100,15 +100,16 @@ public function testSend()
public function testSendThrowsForErrorResponse()
{
$client = new MockHttpClient(function (string $method, string $url, array $options): ResponseInterface {
- $xml = "
-
- i'm a teapot
- 418
-
- ";
-
- return new MockResponse($xml, [
+ $json = json_encode([
+ 'message' => 'i\'m a teapot',
+ 'type' => 'sender',
+ ]);
+
+ return new MockResponse($json, [
'http_code' => 418,
+ 'response_headers' => [
+ 'x-amzn-errortype' => '418',
+ ],
]);
});
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesHttpAsyncAwsTransportTest.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesHttpAsyncAwsTransportTest.php
index 5b79491fbcb0d..6bdd9b779d58d 100644
--- a/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesHttpAsyncAwsTransportTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesHttpAsyncAwsTransportTest.php
@@ -95,15 +95,16 @@ public function testSend()
public function testSendThrowsForErrorResponse()
{
$client = new MockHttpClient(function (string $method, string $url, array $options): ResponseInterface {
- $xml = "
-
- i'm a teapot
- 418
-
- ";
-
- return new MockResponse($xml, [
+ $json = json_encode([
+ 'message' => 'i\'m a teapot',
+ 'type' => 'sender',
+ ]);
+
+ return new MockResponse($json, [
'http_code' => 418,
+ 'response_headers' => [
+ 'x-amzn-errortype' => '418',
+ ],
]);
});
diff --git a/src/Symfony/Component/Mailer/EventListener/MessageListener.php b/src/Symfony/Component/Mailer/EventListener/MessageListener.php
index dbf2570a27eac..f23c69d91dc74 100644
--- a/src/Symfony/Component/Mailer/EventListener/MessageListener.php
+++ b/src/Symfony/Component/Mailer/EventListener/MessageListener.php
@@ -58,7 +58,7 @@ public function addHeaderRule(string $headerName, int $rule): void
throw new InvalidArgumentException(sprintf('The "%d" rule is not supported.', $rule));
}
- $this->headerRules[$headerName] = $rule;
+ $this->headerRules[strtolower($headerName)] = $rule;
}
public function onMessage(MessageEvent $event): void
diff --git a/src/Symfony/Component/Mailer/Tests/EventListener/MessageListenerTest.php b/src/Symfony/Component/Mailer/Tests/EventListener/MessageListenerTest.php
index 6096f5614cb2c..41f71f72adf37 100644
--- a/src/Symfony/Component/Mailer/Tests/EventListener/MessageListenerTest.php
+++ b/src/Symfony/Component/Mailer/Tests/EventListener/MessageListenerTest.php
@@ -101,5 +101,17 @@ public function provideHeaders(): iterable
->add(new MailboxListHeader('bcc', [new Address('bcc-initial@example.com'), new Address('bcc-default@example.com'), new Address('bcc-default-1@example.com')]))
;
yield 'bcc, add another bcc (unique header)' => [$initialHeaders, $defaultHeaders, $expectedHeaders];
+
+ $initialHeaders = (new Headers())
+ ->add(new UnstructuredHeader('foo', 'initial'))
+ ;
+ $defaultHeaders = (new Headers())
+ ->add(new UnstructuredHeader('foo', 'bar'))
+ ->add(new UnstructuredHeader('bar', 'foo'))
+ ;
+ $rules = [
+ 'Foo' => MessageListener::HEADER_REPLACE,
+ ];
+ yield 'Capitalized header rule (case-insensitive), replace if set' => [$initialHeaders, $defaultHeaders, $defaultHeaders, $rules];
}
}
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php
index 9217550d14709..4490c7521f366 100644
--- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php
@@ -87,7 +87,7 @@ public function setup(): void
{
parent::setup();
- $this->executeStatement(implode("\n", $this->getTriggerSql()));
+ $this->executeStatement('BEGIN;'.implode("\n", $this->getTriggerSql()).'COMMIT;');
}
/**
@@ -109,7 +109,6 @@ public function getExtraSetupSqlForTable(Table $createdTable): array
private function getTriggerSql(): array
{
return [
- 'BEGIN;',
sprintf('LOCK TABLE %s;', $this->configuration['table_name']),
// create trigger function
sprintf(<<<'SQL'
@@ -124,7 +123,6 @@ private function getTriggerSql(): array
// register trigger
sprintf('DROP TRIGGER IF EXISTS notify_trigger ON %s;', $this->configuration['table_name']),
sprintf('CREATE TRIGGER notify_trigger AFTER INSERT OR UPDATE ON %1$s FOR EACH ROW EXECUTE PROCEDURE notify_%1$s();', $this->configuration['table_name']),
- 'COMMIT;',
];
}
diff --git a/src/Symfony/Component/Mime/Header/Headers.php b/src/Symfony/Component/Mime/Header/Headers.php
index 9493e2c2da234..b8d8da64f0718 100644
--- a/src/Symfony/Component/Mime/Header/Headers.php
+++ b/src/Symfony/Component/Mime/Header/Headers.php
@@ -143,7 +143,7 @@ public function addParameterizedHeader(string $name, string $value, array $param
*/
public function addHeader(string $name, $argument, array $more = []): self
{
- $parts = explode('\\', self::HEADER_CLASS_MAP[$name] ?? UnstructuredHeader::class);
+ $parts = explode('\\', self::HEADER_CLASS_MAP[strtolower($name)] ?? UnstructuredHeader::class);
$method = 'add'.ucfirst(array_pop($parts));
if ('addUnstructuredHeader' === $method) {
$method = 'addTextHeader';
@@ -217,7 +217,7 @@ public function remove(string $name): void
public static function isUniqueHeader(string $name): bool
{
- return \in_array($name, self::UNIQUE_HEADERS, true);
+ return \in_array(strtolower($name), self::UNIQUE_HEADERS, true);
}
/**
diff --git a/src/Symfony/Component/Mime/Tests/Header/HeadersTest.php b/src/Symfony/Component/Mime/Tests/Header/HeadersTest.php
index 2255dbe7a7c8c..f465fb9e8515f 100644
--- a/src/Symfony/Component/Mime/Tests/Header/HeadersTest.php
+++ b/src/Symfony/Component/Mime/Tests/Header/HeadersTest.php
@@ -239,6 +239,20 @@ public function testRemoveIsNotCaseSensitive()
$this->assertFalse($headers->has('Message-ID'));
}
+ public function testAddHeaderIsNotCaseSensitive()
+ {
+ $headers = new Headers();
+ $headers->addHeader('From', ['from@example.com']);
+
+ $this->assertInstanceOf(MailboxListHeader::class, $headers->get('from'));
+ $this->assertEquals([new Address('from@example.com')], $headers->get('from')->getBody());
+ }
+
+ public function testIsUniqueHeaderIsNotCaseSensitive()
+ {
+ $this->assertTrue(Headers::isUniqueHeader('From'));
+ }
+
public function testToStringJoinsHeadersTogether()
{
$headers = new Headers();
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationTrustResolverTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationTrustResolverTest.php
index 70c8e7a113791..cd1924c63edf6 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationTrustResolverTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationTrustResolverTest.php
@@ -107,8 +107,8 @@ protected function getRememberMeToken()
protected function getResolver()
{
return new AuthenticationTrustResolver(
- 'Symfony\\Component\\Security\\Core\\Authentication\\Token\\AnonymousToken',
- 'Symfony\\Component\\Security\\Core\\Authentication\\Token\\RememberMeToken'
+ AnonymousToken::class,
+ RememberMeToken::class
);
}
}
diff --git a/src/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php b/src/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php
index cb172d2b5138b..b7e2a411b392d 100644
--- a/src/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php
@@ -24,7 +24,7 @@ class ChainUserProviderTest extends TestCase
{
public function testLoadUserByUsername()
{
- $provider1 = $this->getProvider();
+ $provider1 = $this->createMock(UserProviderInterface::class);
$provider1
->expects($this->once())
->method('loadUserByUsername')
@@ -32,12 +32,12 @@ public function testLoadUserByUsername()
->willThrowException(new UsernameNotFoundException('not found'))
;
- $provider2 = $this->getProvider();
+ $provider2 = $this->createMock(UserProviderInterface::class);
$provider2
->expects($this->once())
->method('loadUserByUsername')
->with($this->equalTo('foo'))
- ->willReturn($account = $this->getAccount())
+ ->willReturn($account = $this->createMock(UserInterface::class))
;
$provider = new ChainUserProvider([$provider1, $provider2]);
@@ -47,7 +47,7 @@ public function testLoadUserByUsername()
public function testLoadUserByUsernameThrowsUsernameNotFoundException()
{
$this->expectException(UsernameNotFoundException::class);
- $provider1 = $this->getProvider();
+ $provider1 = $this->createMock(UserProviderInterface::class);
$provider1
->expects($this->once())
->method('loadUserByUsername')
@@ -55,7 +55,7 @@ public function testLoadUserByUsernameThrowsUsernameNotFoundException()
->willThrowException(new UsernameNotFoundException('not found'))
;
- $provider2 = $this->getProvider();
+ $provider2 = $this->createMock(UserProviderInterface::class);
$provider2
->expects($this->once())
->method('loadUserByUsername')
@@ -69,14 +69,14 @@ public function testLoadUserByUsernameThrowsUsernameNotFoundException()
public function testRefreshUser()
{
- $provider1 = $this->getProvider();
+ $provider1 = $this->createMock(UserProviderInterface::class);
$provider1
->expects($this->once())
->method('supportsClass')
->willReturn(false)
;
- $provider2 = $this->getProvider();
+ $provider2 = $this->createMock(UserProviderInterface::class);
$provider2
->expects($this->once())
->method('supportsClass')
@@ -89,7 +89,7 @@ public function testRefreshUser()
->willThrowException(new UnsupportedUserException('unsupported'))
;
- $provider3 = $this->getProvider();
+ $provider3 = $this->createMock(UserProviderInterface::class);
$provider3
->expects($this->once())
->method('supportsClass')
@@ -99,16 +99,16 @@ public function testRefreshUser()
$provider3
->expects($this->once())
->method('refreshUser')
- ->willReturn($account = $this->getAccount())
+ ->willReturn($account = $this->createMock(UserInterface::class))
;
$provider = new ChainUserProvider([$provider1, $provider2, $provider3]);
- $this->assertSame($account, $provider->refreshUser($this->getAccount()));
+ $this->assertSame($account, $provider->refreshUser($this->createMock(UserInterface::class)));
}
public function testRefreshUserAgain()
{
- $provider1 = $this->getProvider();
+ $provider1 = $this->createMock(UserProviderInterface::class);
$provider1
->expects($this->once())
->method('supportsClass')
@@ -121,7 +121,7 @@ public function testRefreshUserAgain()
->willThrowException(new UsernameNotFoundException('not found'))
;
- $provider2 = $this->getProvider();
+ $provider2 = $this->createMock(UserProviderInterface::class);
$provider2
->expects($this->once())
->method('supportsClass')
@@ -131,17 +131,17 @@ public function testRefreshUserAgain()
$provider2
->expects($this->once())
->method('refreshUser')
- ->willReturn($account = $this->getAccount())
+ ->willReturn($account = $this->createMock(UserInterface::class))
;
$provider = new ChainUserProvider([$provider1, $provider2]);
- $this->assertSame($account, $provider->refreshUser($this->getAccount()));
+ $this->assertSame($account, $provider->refreshUser($this->createMock(UserInterface::class)));
}
public function testRefreshUserThrowsUnsupportedUserException()
{
$this->expectException(UnsupportedUserException::class);
- $provider1 = $this->getProvider();
+ $provider1 = $this->createMock(UserProviderInterface::class);
$provider1
->expects($this->once())
->method('supportsClass')
@@ -154,7 +154,7 @@ public function testRefreshUserThrowsUnsupportedUserException()
->willThrowException(new UnsupportedUserException('unsupported'))
;
- $provider2 = $this->getProvider();
+ $provider2 = $this->createMock(UserProviderInterface::class);
$provider2
->expects($this->once())
->method('supportsClass')
@@ -168,12 +168,12 @@ public function testRefreshUserThrowsUnsupportedUserException()
;
$provider = new ChainUserProvider([$provider1, $provider2]);
- $provider->refreshUser($this->getAccount());
+ $provider->refreshUser($this->createMock(UserInterface::class));
}
public function testSupportsClass()
{
- $provider1 = $this->getProvider();
+ $provider1 = $this->createMock(UserProviderInterface::class);
$provider1
->expects($this->once())
->method('supportsClass')
@@ -181,7 +181,7 @@ public function testSupportsClass()
->willReturn(false)
;
- $provider2 = $this->getProvider();
+ $provider2 = $this->createMock(UserProviderInterface::class);
$provider2
->expects($this->once())
->method('supportsClass')
@@ -195,7 +195,7 @@ public function testSupportsClass()
public function testSupportsClassWhenNotSupported()
{
- $provider1 = $this->getProvider();
+ $provider1 = $this->createMock(UserProviderInterface::class);
$provider1
->expects($this->once())
->method('supportsClass')
@@ -203,7 +203,7 @@ public function testSupportsClassWhenNotSupported()
->willReturn(false)
;
- $provider2 = $this->getProvider();
+ $provider2 = $this->createMock(UserProviderInterface::class);
$provider2
->expects($this->once())
->method('supportsClass')
@@ -217,7 +217,7 @@ public function testSupportsClassWhenNotSupported()
public function testAcceptsTraversable()
{
- $provider1 = $this->getProvider();
+ $provider1 = $this->createMock(UserProviderInterface::class);
$provider1
->expects($this->once())
->method('supportsClass')
@@ -230,7 +230,7 @@ public function testAcceptsTraversable()
->willThrowException(new UnsupportedUserException('unsupported'))
;
- $provider2 = $this->getProvider();
+ $provider2 = $this->createMock(UserProviderInterface::class);
$provider2
->expects($this->once())
->method('supportsClass')
@@ -240,11 +240,11 @@ public function testAcceptsTraversable()
$provider2
->expects($this->once())
->method('refreshUser')
- ->willReturn($account = $this->getAccount())
+ ->willReturn($account = $this->createMock(UserInterface::class))
;
$provider = new ChainUserProvider(new \ArrayObject([$provider1, $provider2]));
- $this->assertSame($account, $provider->refreshUser($this->getAccount()));
+ $this->assertSame($account, $provider->refreshUser($this->createMock(UserInterface::class)));
}
public function testPasswordUpgrades()
@@ -268,14 +268,4 @@ public function testPasswordUpgrades()
$provider = new ChainUserProvider([$provider1, $provider2]);
$provider->upgradePassword($user, 'foobar');
}
-
- protected function getAccount()
- {
- return $this->createMock(UserInterface::class);
- }
-
- protected function getProvider()
- {
- return $this->createMock(UserProviderInterface::class);
- }
}
diff --git a/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php b/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
index 617d27f99b4f8..2be5a50ded7b5 100644
--- a/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
@@ -54,7 +54,7 @@ protected function setUp(): void
{
$user = $this->createUser();
$this->tokenStorage = $this->createTokenStorage($user);
- $this->encoder = $this->createPasswordEncoder();
+ $this->encoder = $this->createMock(PasswordEncoderInterface::class);
$this->encoderFactory = $this->createEncoderFactory($this->encoder);
parent::setUp();
@@ -154,11 +154,6 @@ protected function createUser()
return $mock;
}
- protected function createPasswordEncoder($isPasswordValid = true)
- {
- return $this->createMock(PasswordEncoderInterface::class);
- }
-
protected function createEncoderFactory($encoder = null)
{
$mock = $this->createMock(EncoderFactoryInterface::class);
diff --git a/src/Symfony/Component/Security/Http/Tests/Session/SessionAuthenticationStrategyTest.php b/src/Symfony/Component/Security/Http/Tests/Session/SessionAuthenticationStrategyTest.php
index 94ff9228bca29..69953ae6fd14e 100644
--- a/src/Symfony/Component/Security/Http/Tests/Session/SessionAuthenticationStrategyTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Session/SessionAuthenticationStrategyTest.php
@@ -25,7 +25,7 @@ public function testSessionIsNotChanged()
$request->expects($this->never())->method('getSession');
$strategy = new SessionAuthenticationStrategy(SessionAuthenticationStrategy::NONE);
- $strategy->onAuthentication($request, $this->getToken());
+ $strategy->onAuthentication($request, $this->createMock(TokenInterface::class));
}
public function testUnsupportedStrategy()
@@ -36,7 +36,7 @@ public function testUnsupportedStrategy()
$request->expects($this->never())->method('getSession');
$strategy = new SessionAuthenticationStrategy('foo');
- $strategy->onAuthentication($request, $this->getToken());
+ $strategy->onAuthentication($request, $this->createMock(TokenInterface::class));
}
public function testSessionIsMigrated()
@@ -45,7 +45,7 @@ public function testSessionIsMigrated()
$session->expects($this->once())->method('migrate')->with($this->equalTo(true));
$strategy = new SessionAuthenticationStrategy(SessionAuthenticationStrategy::MIGRATE);
- $strategy->onAuthentication($this->getRequest($session), $this->getToken());
+ $strategy->onAuthentication($this->getRequest($session), $this->createMock(TokenInterface::class));
}
public function testSessionIsInvalidated()
@@ -54,7 +54,7 @@ public function testSessionIsInvalidated()
$session->expects($this->once())->method('invalidate');
$strategy = new SessionAuthenticationStrategy(SessionAuthenticationStrategy::INVALIDATE);
- $strategy->onAuthentication($this->getRequest($session), $this->getToken());
+ $strategy->onAuthentication($this->getRequest($session), $this->createMock(TokenInterface::class));
}
private function getRequest($session = null)
@@ -67,9 +67,4 @@ private function getRequest($session = null)
return $request;
}
-
- private function getToken()
- {
- return $this->createMock(TokenInterface::class);
- }
}
diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
index 4b438c2d51fc9..c830359d269f0 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
@@ -111,8 +111,9 @@ protected function extractAttributes(object $object, string $format = null, arra
// properties
foreach ($reflClass->getProperties() as $reflProperty) {
+ $isPublic = $reflProperty->isPublic();
+
if ($checkPropertyInitialization) {
- $isPublic = $reflProperty->isPublic();
if (!$isPublic) {
$reflProperty->setAccessible(true);
}
@@ -120,9 +121,10 @@ protected function extractAttributes(object $object, string $format = null, arra
unset($attributes[$reflProperty->name]);
continue;
}
- if (!$isPublic) {
- continue;
- }
+ }
+
+ if (!$isPublic) {
+ continue;
}
if ($reflProperty->isStatic() || !$this->isAllowedAttribute($object, $reflProperty->name, $format, $context)) {
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/DummyPrivatePropertyWithoutGetter.php b/src/Symfony/Component/Serializer/Tests/Fixtures/DummyPrivatePropertyWithoutGetter.php
new file mode 100644
index 0000000000000..d20832131b29a
--- /dev/null
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/DummyPrivatePropertyWithoutGetter.php
@@ -0,0 +1,23 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Tests\Fixtures;
+
+final class DummyPrivatePropertyWithoutGetter
+{
+ private $foo = 'foo';
+ private $bar = 'bar';
+
+ public function getBar()
+ {
+ return $this->bar;
+ }
+}
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/Features/CallbacksTestTrait.php b/src/Symfony/Component/Serializer/Tests/Normalizer/Features/CallbacksTestTrait.php
index ccb54d9c6fd25..459b01c92408f 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/Features/CallbacksTestTrait.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/Features/CallbacksTestTrait.php
@@ -29,7 +29,7 @@ public function testCallbacks($callbacks, $valueBar, $result)
}
/**
- * @dataProvider provideInvalidCallbacks()
+ * @dataProvider provideInvalidCallbacks
*/
public function testUncallableCallbacks($callbacks)
{
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
index 259a00751818c..f23bedea1fb58 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
@@ -33,6 +33,7 @@
use Symfony\Component\Serializer\SerializerInterface;
use Symfony\Component\Serializer\Tests\Fixtures\Annotations\GroupDummy;
use Symfony\Component\Serializer\Tests\Fixtures\CircularReferenceDummy;
+use Symfony\Component\Serializer\Tests\Fixtures\DummyPrivatePropertyWithoutGetter;
use Symfony\Component\Serializer\Tests\Fixtures\OtherSerializedNameDummy;
use Symfony\Component\Serializer\Tests\Fixtures\Php74Dummy;
use Symfony\Component\Serializer\Tests\Fixtures\Php74DummyPrivate;
@@ -140,6 +141,15 @@ public function testNormalizeObjectWithUninitializedPrivateProperties()
);
}
+ public function testNormalizeObjectWithPrivatePropertyWithoutGetter()
+ {
+ $obj = new DummyPrivatePropertyWithoutGetter();
+ $this->assertEquals(
+ ['bar' => 'bar'],
+ $this->normalizer->normalize($obj, 'any')
+ );
+ }
+
public function testDenormalize()
{
$obj = $this->normalizer->denormalize(
diff --git a/src/Symfony/Component/Uid/BinaryUtil.php b/src/Symfony/Component/Uid/BinaryUtil.php
index 32e7e0dff3c6c..5e9741cbea200 100644
--- a/src/Symfony/Component/Uid/BinaryUtil.php
+++ b/src/Symfony/Component/Uid/BinaryUtil.php
@@ -40,6 +40,8 @@ class BinaryUtil
// 0x01b21dd213814000 is the number of 100-ns intervals between the
// UUID epoch 1582-10-15 00:00:00 and the Unix epoch 1970-01-01 00:00:00.
private const TIME_OFFSET_INT = 0x01b21dd213814000;
+ private const TIME_OFFSET_BIN = "\x01\xb2\x1d\xd2\x13\x81\x40\x00";
+ private const TIME_OFFSET_COM1 = "\xfe\x4d\xe2\x2d\xec\x7e\xbf\xff";
private const TIME_OFFSET_COM2 = "\xfe\x4d\xe2\x2d\xec\x7e\xc0\x00";
public static function toBase(string $bytes, array $map): string
@@ -114,20 +116,24 @@ public static function add(string $a, string $b): string
return $a;
}
+ /**
+ * @param string $time Count of 100-nanosecond intervals since the UUID epoch 1582-10-15 00:00:00 in hexadecimal
+ */
public static function timeToFloat(string $time): float
{
if (\PHP_INT_SIZE >= 8) {
- return (hexdec($time) - self::TIME_OFFSET_INT) / 10000000;
- }
-
- $time = str_pad(hex2bin($time), 8, "\0", \STR_PAD_LEFT);
- $time = self::add($time, self::TIME_OFFSET_COM2);
-
- if ($time >= self::TIME_OFFSET_COM2) {
- $time = -1 * self::toBase($time ^ "\xff\xff\xff\xff\xff\xff\xff\xff", self::BASE10);
+ $time = hexdec($time) - self::TIME_OFFSET_INT;
} else {
- $time[0] = $time[0] & "\x7F";
- $time = self::toBase($time, self::BASE10);
+ $time = str_pad(hex2bin($time), 8, "\0", \STR_PAD_LEFT);
+
+ if (self::TIME_OFFSET_BIN <= $time) {
+ $time = self::add($time, self::TIME_OFFSET_COM2);
+ $time[0] = $time[0] & "\x7F";
+ $time = self::toBase($time, self::BASE10);
+ } else {
+ $time = self::add($time, self::TIME_OFFSET_COM1);
+ $time = '-'.self::toBase($time ^ "\xff\xff\xff\xff\xff\xff\xff\xff", self::BASE10);
+ }
}
return $time / 10000000;
diff --git a/src/Symfony/Component/Uid/Tests/UuidTest.php b/src/Symfony/Component/Uid/Tests/UuidTest.php
index 5369477d3ca3e..6b5b27f3b5001 100644
--- a/src/Symfony/Component/Uid/Tests/UuidTest.php
+++ b/src/Symfony/Component/Uid/Tests/UuidTest.php
@@ -199,4 +199,13 @@ public function testFromStringOnExtendedClassReturnsStatic()
{
$this->assertInstanceOf(CustomUuid::class, CustomUuid::fromString(self::A_UUID_V4));
}
+
+ public function testGetTime()
+ {
+ $this->assertSame(103072857660.6847, ((new UuidV1('ffffffff-ffff-1fff-a456-426655440000'))->getTime()));
+ $this->assertSame(0.0000001, ((new UuidV1('13814001-1dd2-11b2-a456-426655440000'))->getTime()));
+ $this->assertSame(0.0, (new UuidV1('13814000-1dd2-11b2-a456-426655440000'))->getTime());
+ $this->assertSame(-0.0000001, (new UuidV1('13813fff-1dd2-11b2-a456-426655440000'))->getTime());
+ $this->assertSame(-12219292800.0, ((new UuidV1('00000000-0000-1000-a456-426655440000'))->getTime()));
+ }
}
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/FilesLoaderTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Loader/FilesLoaderTest.php
index 68e21606edcab..ea5e947be880b 100644
--- a/src/Symfony/Component/Validator/Tests/Mapping/Loader/FilesLoaderTest.php
+++ b/src/Symfony/Component/Validator/Tests/Mapping/Loader/FilesLoaderTest.php
@@ -21,13 +21,13 @@ class FilesLoaderTest extends TestCase
{
public function testCallsGetFileLoaderInstanceForeachPath()
{
- $loader = $this->getFilesLoader($this->getFileLoader());
+ $loader = $this->getFilesLoader($this->createMock(LoaderInterface::class));
$this->assertEquals(4, $loader->getTimesCalled());
}
public function testCallsActualFileLoaderForMetadata()
{
- $fileLoader = $this->getFileLoader();
+ $fileLoader = $this->createMock(LoaderInterface::class);
$fileLoader->expects($this->exactly(4))
->method('loadClassMetadata');
$loader = $this->getFilesLoader($fileLoader);
@@ -43,9 +43,4 @@ public function getFilesLoader(LoaderInterface $loader)
__DIR__.'/constraint-mapping.txt',
], $loader]);
}
-
- public function getFileLoader()
- {
- return $this->createMock(LoaderInterface::class);
- }
}
diff --git a/src/Symfony/Component/Yaml/Dumper.php b/src/Symfony/Component/Yaml/Dumper.php
index 2de07d023142f..dcb104ccff065 100644
--- a/src/Symfony/Component/Yaml/Dumper.php
+++ b/src/Symfony/Component/Yaml/Dumper.php
@@ -68,7 +68,7 @@ public function dump($input, int $inline = 0, int $indent = 0, int $flags = 0):
$output .= "\n";
}
- if ($inline >= 1 && Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && \is_string($value) && false !== strpos($value, "\n") && false === strpos($value, "\r")) {
+ if (Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && \is_string($value) && false !== strpos($value, "\n") && false === strpos($value, "\r")) {
// If the first line starts with a space character, the spec requires a blockIndicationIndicator
// http://www.yaml.org/spec/1.2/spec.html#id2793979
$blockIndentationIndicator = (' ' === substr($value, 0, 1)) ? (string) $this->indentation : '';
@@ -97,7 +97,7 @@ public function dump($input, int $inline = 0, int $indent = 0, int $flags = 0):
if ($value instanceof TaggedValue) {
$output .= sprintf('%s%s !%s', $prefix, $dumpAsMap ? Inline::dump($key, $flags).':' : '-', $value->getTag());
- if ($inline >= 1 && Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && \is_string($value->getValue()) && false !== strpos($value->getValue(), "\n") && false === strpos($value->getValue(), "\r\n")) {
+ if (Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && \is_string($value->getValue()) && false !== strpos($value->getValue(), "\n") && false === strpos($value->getValue(), "\r\n")) {
// If the first line starts with a space character, the spec requires a blockIndicationIndicator
// http://www.yaml.org/spec/1.2/spec.html#id2793979
$blockIndentationIndicator = (' ' === substr($value->getValue(), 0, 1)) ? (string) $this->indentation : '';
diff --git a/src/Symfony/Contracts/Cache/composer.json b/src/Symfony/Contracts/Cache/composer.json
index f95df70f6496c..6f274f1774d5c 100644
--- a/src/Symfony/Contracts/Cache/composer.json
+++ b/src/Symfony/Contracts/Cache/composer.json
@@ -27,7 +27,6 @@
},
"minimum-stability": "dev",
"extra": {
- "branch-version": "2.3",
"branch-alias": {
"dev-main": "2.3-dev"
},
diff --git a/src/Symfony/Contracts/Deprecation/composer.json b/src/Symfony/Contracts/Deprecation/composer.json
index 27aa491e11d99..88d3055927dea 100644
--- a/src/Symfony/Contracts/Deprecation/composer.json
+++ b/src/Symfony/Contracts/Deprecation/composer.json
@@ -24,7 +24,6 @@
},
"minimum-stability": "dev",
"extra": {
- "branch-version": "2.3",
"branch-alias": {
"dev-main": "2.3-dev"
},
diff --git a/src/Symfony/Contracts/EventDispatcher/composer.json b/src/Symfony/Contracts/EventDispatcher/composer.json
index 36aeed02d3767..8eaf0354fd2d7 100644
--- a/src/Symfony/Contracts/EventDispatcher/composer.json
+++ b/src/Symfony/Contracts/EventDispatcher/composer.json
@@ -27,7 +27,6 @@
},
"minimum-stability": "dev",
"extra": {
- "branch-version": "2.3",
"branch-alias": {
"dev-main": "2.3-dev"
},
diff --git a/src/Symfony/Contracts/HttpClient/composer.json b/src/Symfony/Contracts/HttpClient/composer.json
index 2dc9990e1e886..9ab9eaf76cc7a 100644
--- a/src/Symfony/Contracts/HttpClient/composer.json
+++ b/src/Symfony/Contracts/HttpClient/composer.json
@@ -26,7 +26,6 @@
},
"minimum-stability": "dev",
"extra": {
- "branch-version": "2.3",
"branch-alias": {
"dev-main": "2.3-dev"
},
diff --git a/src/Symfony/Contracts/Service/composer.json b/src/Symfony/Contracts/Service/composer.json
index efbf399d1c900..524f6a6c6c1ec 100644
--- a/src/Symfony/Contracts/Service/composer.json
+++ b/src/Symfony/Contracts/Service/composer.json
@@ -27,7 +27,6 @@
},
"minimum-stability": "dev",
"extra": {
- "branch-version": "2.3",
"branch-alias": {
"dev-main": "2.3-dev"
},
diff --git a/src/Symfony/Contracts/Translation/composer.json b/src/Symfony/Contracts/Translation/composer.json
index 311c38b28c2a9..907d28f0a878e 100644
--- a/src/Symfony/Contracts/Translation/composer.json
+++ b/src/Symfony/Contracts/Translation/composer.json
@@ -26,7 +26,6 @@
},
"minimum-stability": "dev",
"extra": {
- "branch-version": "2.3",
"branch-alias": {
"dev-main": "2.3-dev"
},
diff --git a/src/Symfony/Contracts/composer.json b/src/Symfony/Contracts/composer.json
index eecf32761fb35..4675ba056954b 100644
--- a/src/Symfony/Contracts/composer.json
+++ b/src/Symfony/Contracts/composer.json
@@ -48,7 +48,6 @@
},
"minimum-stability": "dev",
"extra": {
- "branch-version": "2.3",
"branch-alias": {
"dev-main": "2.3-dev"
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy