From 9fa04e7bd4d8f1571b73d05dae3e4fefe9328c19 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 1 Jan 2023 09:32:19 +0100 Subject: [PATCH 1/6] Bump license year to 2023 --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 74cdc2dbf..99757d517 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2018-2022 Fabien Potencier +Copyright (c) 2018-2023 Fabien Potencier Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 35c6c2875ecf8bd919ea3952e8d27a8006962246 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 24 Jan 2023 15:02:24 +0100 Subject: [PATCH 2/6] Update license years (last time) --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 99757d517..7536caeae 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2018-2023 Fabien Potencier +Copyright (c) 2018-present Fabien Potencier Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 43150386406f172b62ecf60990d36dd46f2e524f Mon Sep 17 00:00:00 2001 From: Adrien Roches Date: Wed, 18 Jan 2023 15:05:54 +0100 Subject: [PATCH 3/6] [DependencyInjection] Add missing template notation on ServiceLocator --- ServiceProviderInterface.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ServiceProviderInterface.php b/ServiceProviderInterface.php index a28fd82ea..c05e4bfe7 100644 --- a/ServiceProviderInterface.php +++ b/ServiceProviderInterface.php @@ -19,7 +19,7 @@ * @author Nicolas Grekas * @author Mateusz Sip * - * @template T of mixed + * @template-covariant T of mixed */ interface ServiceProviderInterface extends ContainerInterface { From aee5f59db63978f7785290b94d2f12286b1b590a Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Thu, 16 Feb 2023 11:55:45 +0100 Subject: [PATCH 4/6] [Contracts] Add missing return types --- ResetInterface.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ResetInterface.php b/ResetInterface.php index 1af1075ee..a4f389b01 100644 --- a/ResetInterface.php +++ b/ResetInterface.php @@ -26,5 +26,8 @@ */ interface ResetInterface { + /** + * @return void + */ public function reset(); } From 1a3d2ddc2c06df23e8c13ea99148bae2b8cebd35 Mon Sep 17 00:00:00 2001 From: Evan Shaw Date: Sun, 19 Feb 2023 12:34:59 +1300 Subject: [PATCH 5/6] [Contracts] Fix setting $container before calling parent::setContainer in ServiceSubscriberTrait --- ServiceSubscriberTrait.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ServiceSubscriberTrait.php b/ServiceSubscriberTrait.php index 16e3eb2c1..6c560a427 100644 --- a/ServiceSubscriberTrait.php +++ b/ServiceSubscriberTrait.php @@ -98,12 +98,13 @@ public static function getSubscribedServices(): array */ public function setContainer(ContainerInterface $container) { - $this->container = $container; - + $ret = null; if (method_exists(get_parent_class(self::class) ?: '', __FUNCTION__)) { - return parent::setContainer($container); + $ret = parent::setContainer($container); } - return null; + $this->container = $container; + + return $ret; } } From a8c9cedf55f314f3a186041d19537303766df09a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 1 Mar 2023 11:32:47 +0100 Subject: [PATCH 6/6] Fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 41e054a10..42841a57d 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Symfony Service Contracts A set of abstractions extracted out of the Symfony components. -Can be used to build on semantics that the Symfony components proved useful - and +Can be used to build on semantics that the Symfony components proved useful and that already have battle tested implementations. See https://github.com/symfony/contracts/blob/main/README.md for more information.