symfony
diff --git a/‎src/Symfony/Component/AutoMapper/Attributes/MapIf.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/AutoMapper/Attributes/MapIf.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/AutoMapper/Attributes/MapIf.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/AutoMapper/Attributes/MapIf.php
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/AutoMapper/Attributes/MapTo.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/AutoMapper/Attributes/MapTo.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/AutoMapper/Attributes/MapTo.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/AutoMapper/Attributes/MapTo.php
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/AutoMapper/Attributes/MapWith.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/AutoMapper/Attributes/MapWith.php
+3-3Lines changed: 3 additions & 3 deletions b/‎src/Symfony/Component/AutoMapper/Attributes/MapWith.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/AutoMapper/Attributes/MapWith.php
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎src/Symfony/Component/AutoMapper/AutoMapper.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/AutoMapper/AutoMapper.php
+6-3Lines changed: 6 additions & 3 deletions b/‎src/Symfony/Component/AutoMapper/AutoMapper.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/AutoMapper/AutoMapper.php
+6-3Lines changed: 6 additions & 3 deletions
@@ -14,9 +14,9 @@
 final class MapIf
 {
     /**
-     * @param callable $if
+     * @param string|callable(mixed $value, object $object): bool  $if
      */
-    public function __construct(public mixed $if)
+    public function __construct(public readonly string|callable $if)
     {
     }
 }
@@ -5,15 +5,15 @@
 use Attribute;
 
 /**
- * Configure a class or a property to map to.
+ * Configures a class or a property to map to.
  *
  * @experimental
  * @author Antoine Bluchet <soyuka@gmail.com>
  */
 #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY)]
 final class MapTo
 {
-    public function __construct(public string $to)
+    public function __construct(public readonly string $to)
     {
     }
 }
@@ -5,7 +5,7 @@
 use Attribute;
 
 /**
- * Transform the mapped value with a funtion.
+ * Transforms the mapped value with a function.
  *
  * @experimental
  * @author Antoine Bluchet <soyuka@gmail.com>
@@ -14,9 +14,9 @@
 final class MapWith
 {
     /**
-     * @param callable $with
+     * @param string|callable(mixed $value, object $object): bool $with
      */
-    public function __construct(public mixed $with)
+    public function __construct(public readonly callable|string $with)
     {
     }
 }
@@ -17,7 +17,7 @@
  */
 final class AutoMapper implements AutoMapperInterface
 {
-    public function __construct(private ?PropertyAccessorInterface $propertyAccessor = null, private ?ContainerInterface $serviceLocator = null)
+    public function __construct(private readonly ?PropertyAccessorInterface $propertyAccessor = null, private readonly ?ContainerInterface $serviceLocator = null)
     {
     }
 
@@ -47,6 +47,9 @@ public function map(object $object, object|string|null $to = null): mixed
         }
 
         foreach ($refl->getProperties() as $property) {
+          if ($property->isStatic() {
+            continue;
+          }
             $propertyName = $property->getName();
             $mapTo = $this->getAttribute($property, MapTo::class)?->to ?? $propertyName;
             if (!$toRefl->hasProperty($mapTo)) {
@@ -64,7 +67,7 @@ public function map(object $object, object|string|null $to = null): mixed
                 $value = $this->call($mapWith, $value, $object);
             }
 
-            if (is_object($value) && $to = $this->getAttribute(new \ReflectionClass(get_class($value)), MapTo::class)?->to) {
+            if (is_object($value) && $to = $this->getAttribute(new \ReflectionClass($value), MapTo::class)?->to) {
                 $value = $this->map($value, $to);
             }
 
@@ -99,7 +102,7 @@ private function call(callable $fn, mixed $value, object $object): mixed
 
     private function getCallable(string|callable|null $fn): ?callable
     {
-        if ($this->serviceLocator && is_string($fn) && $this->serviceLocator->has($fn)) {
+        if ($this->serviceLocator && is_string($fn)) {
             return $this->serviceLocator->get($fn);
         }
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@`
`14`	`14`	`final class MapIf`
`15`	`15`	`{`
`16`	`16`	`/**`
`17`		`- * @param callable $if`
	`17`	`+ * @param string\|callable(mixed $value, object $object): bool $if`
`18`	`18`	`*/`
`19`		`- public function __construct(public mixed $if)`
	`19`	`+ public function __construct(public readonly string\|callable $if)`
`20`	`20`	`{`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,15 @@`
`5`	`5`	`use Attribute;`
`6`	`6`
`7`	`7`	`/**`
`8`		`- * Configure a class or a property to map to.`
	`8`	`+ * Configures a class or a property to map to.`
`9`	`9`	`*`
`10`	`10`	`* @experimental`
`11`	`11`	`* @author Antoine Bluchet <soyuka@gmail.com>`
`12`	`12`	`*/`
`13`	`13`	`#[Attribute(Attribute::TARGET_CLASS \| Attribute::TARGET_PROPERTY)]`
`14`	`14`	`final class MapTo`
`15`	`15`	`{`
`16`		`- public function __construct(public string $to)`
	`16`	`+ public function __construct(public readonly string $to)`
`17`	`17`	`{`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`use Attribute;`
`6`	`6`
`7`	`7`	`/**`
`8`		`- * Transform the mapped value with a funtion.`
	`8`	`+ * Transforms the mapped value with a function.`
`9`	`9`	`*`
`10`	`10`	`* @experimental`
`11`	`11`	`* @author Antoine Bluchet <soyuka@gmail.com>`
`@@ -14,9 +14,9 @@`
`14`	`14`	`final class MapWith`
`15`	`15`	`{`
`16`	`16`	`/**`
`17`		`- * @param callable $with`
	`17`	`+ * @param string\|callable(mixed $value, object $object): bool $with`
`18`	`18`	`*/`
`19`		`- public function __construct(public mixed $with)`
	`19`	`+ public function __construct(public readonly callable\|string $with)`
`20`	`20`	`{`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`*/`
`18`	`18`	`final class AutoMapper implements AutoMapperInterface`
`19`	`19`	`{`
`20`		`- public function __construct(private ?PropertyAccessorInterface $propertyAccessor = null, private ?ContainerInterface $serviceLocator = null)`
	`20`	`+ public function __construct(private readonly ?PropertyAccessorInterface $propertyAccessor = null, private readonly ?ContainerInterface $serviceLocator = null)`
`21`	`21`	`{`
`22`	`22`	`}`
`23`	`23`
`@@ -47,6 +47,9 @@ public function map(object $object, object\|string\|null $to = null): mixed`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`foreach ($refl->getProperties() as $property) {`
	`50`	`+ if ($property->isStatic() {`
	`51`	`+ continue;`
	`52`	`+ }`
`50`	`53`	`$propertyName = $property->getName();`
`51`	`54`	`$mapTo = $this->getAttribute($property, MapTo::class)?->to ?? $propertyName;`
`52`	`55`	`if (!$toRefl->hasProperty($mapTo)) {`
`@@ -64,7 +67,7 @@ public function map(object $object, object\|string\|null $to = null): mixed`
`64`	`67`	`$value = $this->call($mapWith, $value, $object);`
`65`	`68`	`}`
`66`	`69`
`67`		`- if (is_object($value) && $to = $this->getAttribute(new \ReflectionClass(get_class($value)), MapTo::class)?->to) {`
	`70`	`+ if (is_object($value) && $to = $this->getAttribute(new \ReflectionClass($value), MapTo::class)?->to) {`
`68`	`71`	`$value = $this->map($value, $to);`
`69`	`72`	`}`
`70`	`73`
`@@ -99,7 +102,7 @@ private function call(callable $fn, mixed $value, object $object): mixed`
`99`	`102`
`100`	`103`	`private function getCallable(string\|callable\|null $fn): ?callable`
`101`	`104`	`{`
`102`		`- if ($this->serviceLocator && is_string($fn) && $this->serviceLocator->has($fn)) {`
	`105`	`+ if ($this->serviceLocator && is_string($fn)) {`
`103`	`106`	`return $this->serviceLocator->get($fn);`
`104`	`107`	`}`
`105`	`108`