From 0f17ac92eba581c1b8d7d2e5b27e73b737940a92 Mon Sep 17 00:00:00 2001 From: Luka Dschaak Date: Tue, 5 Dec 2023 22:07:28 +0100 Subject: [PATCH 1/2] refactor: change order of template annotations (BC) --- src/Converter.php | 2 +- src/Populator.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Converter.php b/src/Converter.php index c3750d0..40df4d9 100644 --- a/src/Converter.php +++ b/src/Converter.php @@ -7,8 +7,8 @@ use Neusta\ConverterBundle\Exception\ConverterException; /** - * @template TSource of object * @template TTarget of object + * @template TSource of object * @template TContext of object|null */ interface Converter diff --git a/src/Populator.php b/src/Populator.php index 0978f68..2f0bf4b 100644 --- a/src/Populator.php +++ b/src/Populator.php @@ -5,8 +5,8 @@ namespace Neusta\ConverterBundle; /** - * @template TSource of object * @template TTarget of object + * @template TSource of object * @template TContext of object|null */ interface Populator From f1a28890a337f4023a9517efc9dc924449e6967b Mon Sep 17 00:00:00 2001 From: Luka Dschaak Date: Tue, 5 Dec 2023 22:11:50 +0100 Subject: [PATCH 2/2] fix: adapt GenericConverter and StrategicConverter --- src/Converter/GenericConverter.php | 4 ++-- src/Converter/StrategicConverter.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Converter/GenericConverter.php b/src/Converter/GenericConverter.php index da15bfd..ef77a4b 100644 --- a/src/Converter/GenericConverter.php +++ b/src/Converter/GenericConverter.php @@ -9,8 +9,8 @@ use Neusta\ConverterBundle\TargetFactory; /** - * @template TSource of object * @template TTarget of object + * @template TSource of object * @template TContext of object|null * * @implements Converter @@ -19,7 +19,7 @@ final class GenericConverter implements Converter { /** * @param TargetFactory $factory - * @param array> $populators + * @param array> $populators */ public function __construct( private TargetFactory $factory, diff --git a/src/Converter/StrategicConverter.php b/src/Converter/StrategicConverter.php index 21695f7..3a74373 100644 --- a/src/Converter/StrategicConverter.php +++ b/src/Converter/StrategicConverter.php @@ -9,8 +9,8 @@ use Neusta\ConverterBundle\Exception\ConverterException; /** - * @template TSource of object * @template TTarget of object + * @template TSource of object * @template TContext of object|null * * @implements Converter @@ -18,7 +18,7 @@ final class StrategicConverter implements Converter { /** - * @param array> $converters + * @param array> $converters * @param ConverterSelector $selector */ public function __construct(