Fix CS

teamneusta · Mar 1, 2024 · e7ffb1d · e7ffb1d
1 parent 3bd1ed7
commit e7ffb1d
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 27 deletions.
diff --git a/src/Converter.php b/src/Converter.php
@@ -21,5 +21,5 @@ interface Converter
      *
      * @throws ConverterException
      */
-    public function convert(object $source, object $ctx = null): object;
+    public function convert(object $source, ?object $ctx = null): object;
 }
diff --git a/src/Converter/GenericConverter.php b/src/Converter/GenericConverter.php
@@ -33,7 +33,7 @@ public function __construct(
      *
      * @return TTarget
      */
-    public function convert(object $source, object $ctx = null): object
+    public function convert(object $source, ?object $ctx = null): object
     {
         $target = $this->factory->create($ctx);
 

diff --git a/src/Converter/StrategicConverter.php b/src/Converter/StrategicConverter.php
@@ -33,7 +33,7 @@ public function __construct(
      *
      * @return TTarget
      */
-    public function convert(object $source, object $ctx = null): object
+    public function convert(object $source, ?object $ctx = null): object
     {
         $selectedConverterKey = $this->selector->selectConverter($source, $ctx);
         if (\array_key_exists($selectedConverterKey, $this->converters)) {

diff --git a/src/Converter/Strategy/ConverterSelector.php b/src/Converter/Strategy/ConverterSelector.php
@@ -14,5 +14,5 @@ interface ConverterSelector
      * @param TSource  $source
      * @param TContext $ctx
      */
-    public function selectConverter(object $source, object $ctx = null): string;
+    public function selectConverter(object $source, ?object $ctx = null): string;
 }
diff --git a/src/Populator.php b/src/Populator.php
@@ -16,5 +16,5 @@ interface Populator
      * @param TSource  $source
      * @param TContext $ctx
      */
-    public function populate(object $target, object $source, object $ctx = null): void;
+    public function populate(object $target, object $source, ?object $ctx = null): void;
 }
diff --git a/src/Populator/ArrayConvertingPopulator.php b/src/Populator/ArrayConvertingPopulator.php
@@ -33,9 +33,9 @@ public function __construct(
         Converter $converter,
         string $sourceArrayPropertyName,
         string $targetPropertyName,
-        string $sourceArrayItemPropertyName = null,
-        PropertyAccessorInterface $arrayItemAccessor = null,
-        PropertyAccessorInterface $accessor = null,
+        ?string $sourceArrayItemPropertyName = null,
+        ?PropertyAccessorInterface $arrayItemAccessor = null,
+        ?PropertyAccessorInterface $accessor = null,
     ) {
         $this->populator = new ArrayPropertyMappingPopulator(
             $targetPropertyName,
@@ -50,7 +50,7 @@ public function __construct(
     /**
      * @throws PopulationException
      */
-    public function populate(object $target, object $source, object $ctx = null): void
+    public function populate(object $target, object $source, ?object $ctx = null): void
     {
         $this->populator->populate($target, $source, $ctx);
     }

diff --git a/src/Populator/ArrayPropertyMappingPopulator.php b/src/Populator/ArrayPropertyMappingPopulator.php
@@ -30,9 +30,9 @@ public function __construct(
         private string $targetProperty,
         private string $sourceArrayProperty,
         private ?string $sourceArrayItemProperty = null,
-        \Closure $mapper = null,
-        PropertyAccessorInterface $arrayItemAccessor = null,
-        PropertyAccessorInterface $accessor = null,
+        ?\Closure $mapper = null,
+        ?PropertyAccessorInterface $arrayItemAccessor = null,
+        ?PropertyAccessorInterface $accessor = null,
     ) {
         $this->mapper = $mapper ?? static fn ($v) => $v;
         $this->arrayItemAccessor = $arrayItemAccessor ?? PropertyAccess::createPropertyAccessor();
@@ -42,7 +42,7 @@ public function __construct(
     /**
      * @throws PopulationException
      */
-    public function populate(object $target, object $source, object $ctx = null): void
+    public function populate(object $target, object $source, ?object $ctx = null): void
     {
         try {
             $unwrappedArray = array_map(

diff --git a/src/Populator/ContextMappingPopulator.php b/src/Populator/ContextMappingPopulator.php
@@ -29,8 +29,8 @@ final class ContextMappingPopulator implements Populator
     public function __construct(
         private string $targetProperty,
         private string $contextProperty,
-        \Closure $mapper = null,
-        PropertyAccessorInterface $accessor = null,
+        ?\Closure $mapper = null,
+        ?PropertyAccessorInterface $accessor = null,
     ) {
         $this->mapper = $mapper ?? static fn ($v) => $v;
         $this->accessor = $accessor ?? PropertyAccess::createPropertyAccessor();
@@ -39,7 +39,7 @@ public function __construct(
     /**
      * @throws PopulationException
      */
-    public function populate(object $target, object $source, object $ctx = null): void
+    public function populate(object $target, object $source, ?object $ctx = null): void
     {
         if (!$ctx || !$ctx->hasKey($this->contextProperty)) {
             return;

diff --git a/src/Populator/ConvertingPopulator.php b/src/Populator/ConvertingPopulator.php
@@ -33,7 +33,7 @@ public function __construct(
         Converter $converter,
         string $sourcePropertyName,
         string $targetPropertyName,
-        PropertyAccessorInterface $accessor = null,
+        ?PropertyAccessorInterface $accessor = null,
     ) {
         $this->populator = new PropertyMappingPopulator(
             $targetPropertyName,
@@ -47,7 +47,7 @@ public function __construct(
     /**
      * @throws PopulationException
      */
-    public function populate(object $target, object $source, object $ctx = null): void
+    public function populate(object $target, object $source, ?object $ctx = null): void
     {
         $this->populator->populate($target, $source, $ctx);
     }

diff --git a/src/Populator/PropertyMappingPopulator.php b/src/Populator/PropertyMappingPopulator.php
@@ -29,8 +29,8 @@ public function __construct(
         private string $targetProperty,
         private string $sourceProperty,
         private mixed $defaultValue = null,
-        \Closure $mapper = null,
-        PropertyAccessorInterface $accessor = null,
+        ?\Closure $mapper = null,
+        ?PropertyAccessorInterface $accessor = null,
     ) {
         $this->mapper = $mapper ?? static fn ($v) => $v;
         $this->accessor = $accessor ?? PropertyAccess::createPropertyAccessor();
@@ -39,7 +39,7 @@ public function __construct(
     /**
      * @throws PopulationException
      */
-    public function populate(object $target, object $source, object $ctx = null): void
+    public function populate(object $target, object $source, ?object $ctx = null): void
     {
         try {
             $value = $this->accessor->getValue($source, $this->sourceProperty) ?? $this->defaultValue;

diff --git a/src/TargetFactory.php b/src/TargetFactory.php
@@ -15,5 +15,5 @@ interface TargetFactory
      *
      * @return TTarget
      */
-    public function create(object $ctx = null): object;
+    public function create(?object $ctx = null): object;
 }
diff --git a/tests/Fixtures/Model/AddressFactory.php b/tests/Fixtures/Model/AddressFactory.php
@@ -12,7 +12,7 @@
  */
 class AddressFactory implements TargetFactory
 {
-    public function create(object $ctx = null): PersonAddress
+    public function create(?object $ctx = null): PersonAddress
     {
         return new PersonAddress();
     }

diff --git a/tests/Fixtures/Model/ContactNumberFactory.php b/tests/Fixtures/Model/ContactNumberFactory.php
@@ -12,7 +12,7 @@
  */
 class ContactNumberFactory implements TargetFactory
 {
-    public function create(object $ctx = null): ContactNumber
+    public function create(?object $ctx = null): ContactNumber
     {
         return new ContactNumber();
     }

diff --git a/tests/Fixtures/Model/PersonFactory.php b/tests/Fixtures/Model/PersonFactory.php
@@ -12,7 +12,7 @@
  */
 class PersonFactory implements TargetFactory
 {
-    public function create(object $ctx = null): Person
+    public function create(?object $ctx = null): Person
     {
         return new Person();
     }

diff --git a/tests/Fixtures/Populator/AddressPopulator.php b/tests/Fixtures/Populator/AddressPopulator.php
@@ -14,7 +14,7 @@
  */
 class AddressPopulator implements Populator
 {
-    public function populate(object $target, object $source, object $ctx = null): void
+    public function populate(object $target, object $source, ?object $ctx = null): void
     {
         $target->setStreet($source->getStreet());
         $target->setStreetNo($source->getStreetNo());

diff --git a/tests/Fixtures/Populator/PersonNamePopulator.php b/tests/Fixtures/Populator/PersonNamePopulator.php
@@ -14,7 +14,7 @@
  */
 class PersonNamePopulator implements Populator
 {
-    public function populate(object $target, object $source, object $ctx = null): void
+    public function populate(object $target, object $source, ?object $ctx = null): void
     {
         $separator = ' ';
         if ($ctx?->hasKey('separator')) {