Add __invoke for use in callback

src/Date/Formats.php

@@ -8,9 +8,15 @@
 /**
  * @extends Utils\Formats<Formatter>
  */
-class Formats extends Utils\Formats
+class Formats extends Utils\Formats implements FormatsAccessor
 {
 
+	public function get(int|string $key): Formatter
+	{
+		return parent::get($key);
+	}
+
+
 	protected function createDefaultCallback($object = null): callable
 	{
 		return static fn (): DateTimeFormatter => new DateTimeFormatter('Y-m-d H:i:s');

src/Date/FormatsAccessor.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace h4kuna\Format\Date;
+
+interface FormatsAccessor
+{
+	function get(string|int $key): Formatter;
+}

src/Date/Formatter.php

@@ -3,8 +3,9 @@
 namespace h4kuna\Format\Date;
 
 use DateTimeInterface;
+use h4kuna\Format\Utils\Service;
 
-interface Formatter
+interface Formatter extends Service
 {
 	function format(?DateTimeInterface $dateTime): string;
 }

src/Date/Formatters/DateTimeFormatter.php

@@ -49,4 +49,9 @@ public function format(?DateTimeInterface $dateTime): string
 		return $dateTime === null ? $this->emptyValueSpace : $dateTime->format($this->formatSpace);
 	}
 
+	public function __invoke(?DateTimeInterface $dateTime): string
+	{
+		return $this->format($dateTime);
+	}
+
 }

src/Date/Formatters/IntlDateFormatter.php

@@ -53,4 +53,10 @@ public function format(?DateTimeInterface $dateTime): string
 		return $this->nbsp ? Space::nbsp($result) : $result;
 	}
 
+
+	public function __invoke(?DateTimeInterface $dateTime): string
+	{
+		return $this->format($dateTime);
+	}
+
 }

src/Number/Formats.php

@@ -8,8 +8,15 @@
 /**
  * @extends Utils\Formats<NumberFormatter>
  */
-class Formats extends Utils\Formats
+class Formats extends Utils\Formats implements FormatsAccessor
 {
+
+	public function get(int|string $key): Formatter
+	{
+		return parent::get($key);
+	}
+
+
 	protected function createDefaultCallback($object = null): callable
 	{
 		if ($object === null) {

src/Number/FormatsAccessor.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace h4kuna\Format\Number;
+
+interface FormatsAccessor
+{
+	function get(string|int $key): Formatter;
+}

src/Number/Formatter.php

@@ -2,7 +2,9 @@
 
 namespace h4kuna\Format\Number;
 
-interface Formatter
+use h4kuna\Format\Utils\Service;
+
+interface Formatter extends Service
 {
 	function format(string|int|float|null $number): string;
 }

src/Number/Formatters/IntlNumberFormatter.php

@@ -46,4 +46,11 @@ public function format(string|int|float|null $number): string
 
 		return $result;
 	}
+
+
+	public function __invoke(float|int|string|null $number): string
+	{
+		return $this->format($number);
+	}
+
 }

src/Number/Formatters/NumberFormatter.php

@@ -134,4 +134,10 @@ public function format(string|int|float|null $number): string
 		);
 	}
 
+
+	public function __invoke(float|int|string|null $number): string
+	{
+		return $this->format($number);
+	}
+
 }

src/Utils/Formats.php

@@ -35,7 +35,7 @@ public function __construct(
 	 */
 	public function add(string|int $key, $setup): void
 	{
-		if (is_callable($setup)) {
+		if (self::isCallback($setup)) {
 			$this->factories[$key] = $setup;
 			unset($this->formats[$key]);
 		} else {
@@ -58,7 +58,7 @@ public function get(string|int $key)
 		if (isset($this->formats[$key]) === false) {
 			if (isset($this->factories[$key])) {
 				$service = $this->factories[$key];
-				$format = is_callable($service) ? $service($this) : $service;
+				$format = self::isCallback($service) ? $service($this) : $service;
 			} else {
 				$format = $this->getDefault()($key, $this, null);
 			}
@@ -90,14 +90,23 @@ public function setDefault($default): void
 	{
 		if ($this->default !== null) {
 			throw new InvalidStateException('Default format could be setup only onetime.');
-		} elseif (is_callable($default) === false) {
+		} elseif (self::isCallback($default) === false) {
 			$default = $this->createDefaultCallback($default);
 		}
 
 		$this->default = $default;
 	}
 
 
+	/**
+	 * @return ($service is callable ? true : false)
+	 */
+	private static function isCallback(mixed $service): bool
+	{
+		return is_callable($service) && ($service instanceof Service === false);
+	}
+
+
 	/**
 	 * @param T|null $object
 	 * @return defaultCallback

src/Utils/Service.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace h4kuna\Format\Utils;
+
+interface Service
+{
+
+}