diff --git a/DependencyInjection/Compiler/RegisterHelperListenerPass.php b/DependencyInjection/Compiler/RegisterHelperListenerPass.php index 7e5557ad..fc3eba89 100644 --- a/DependencyInjection/Compiler/RegisterHelperListenerPass.php +++ b/DependencyInjection/Compiler/RegisterHelperListenerPass.php @@ -26,7 +26,7 @@ class RegisterHelperListenerPass implements CompilerPassInterface { /** @var string[] */ - private static $helpers = [ + private static array $helpers = [ 'api', 'map', 'map.static', @@ -47,7 +47,7 @@ public function process(ContainerBuilder $container): void foreach ($container->findTaggedServiceIds('ivory.google_map.helper.'.$helper.'.listener', true) as $id => $events) { foreach ($events as $event) { - $priority = isset($event['priority']) ? $event['priority'] : 0; + $priority = $event['priority'] ?? 0; if (!isset($event['event'])) { if ($container->getDefinition($id)->hasTag('ivory.google_map.helper.'.$helper.'.subscriber')) { @@ -131,9 +131,9 @@ private function getEventFromTypeDeclaration(ContainerBuilder $container, string */ class ExtractingEventDispatcher extends EventDispatcher implements EventSubscriberInterface { - public $listeners = []; + public array $listeners = []; - public static $aliases = []; + public static array $aliases = []; public static $subscriber; public function addListener(string $eventName, callable|array $listener, int $priority = 0): void diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 47916216..e5528750 100755 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -62,10 +62,7 @@ private function createMapNode(): ArrayNodeDefinition ->end(); } - /** - * @return ArrayNodeDefinition - */ - private function createStaticMapNode() + private function createStaticMapNode(): ArrayNodeDefinition { return $this->createNode('static_map') ->addDefaultsIfNotSet() @@ -127,10 +124,7 @@ private function createBusinessAccountNode(bool $service): ArrayNodeDefinition return $node; } - /** - * @return ArrayNodeDefinition|NodeDefinition - */ - private function createNode(string $name = null, string $type = 'array') + private function createNode(string $name = null, string $type = 'array'): ArrayNodeDefinition|NodeDefinition { return $this->createTreeBuilder($name, $type)->getRootNode(); } diff --git a/DependencyInjection/IvoryGoogleMapExtension.php b/DependencyInjection/IvoryGoogleMapExtension.php index e0a6514f..e081fb39 100644 --- a/DependencyInjection/IvoryGoogleMapExtension.php +++ b/DependencyInjection/IvoryGoogleMapExtension.php @@ -124,9 +124,7 @@ private function loadServicesConfig(array $config, ContainerBuilder $container, } /** - * @param string $service * @param mixed[] $config - * @param bool $http * * @throws Exception */ diff --git a/Twig/ApiExtension.php b/Twig/ApiExtension.php index 588ba187..122c489c 100644 --- a/Twig/ApiExtension.php +++ b/Twig/ApiExtension.php @@ -20,18 +20,8 @@ */ class ApiExtension extends AbstractExtension { - /** - * @var ApiHelper - */ - private $apiHelper; - - /** - * @param ApiHelper $apiHelper - */ - public function __construct(ApiHelper $apiHelper) - { - $this->apiHelper = $apiHelper; - } + public function __construct(private ApiHelper $apiHelper) + {} /** * {@inheritdoc} @@ -49,17 +39,12 @@ public function getFunctions(): array /** * @param object[] $objects - * - * @return string */ public function render(array $objects): string { return $this->apiHelper->render($objects); } - /** - * {@inheritdoc} - */ public function getName(): string { return 'ivory_google_api'; diff --git a/Twig/MapExtension.php b/Twig/MapExtension.php index bea0e660..531f0df8 100644 --- a/Twig/MapExtension.php +++ b/Twig/MapExtension.php @@ -21,14 +21,8 @@ */ class MapExtension extends AbstractExtension { - /** - * @var MapHelper - */ - private $mapHelper; + private MapHelper $mapHelper; - /** - * @param MapHelper $mapHelper - */ public function __construct(MapHelper $mapHelper) { $this->mapHelper = $mapHelper; @@ -49,10 +43,7 @@ public function getFunctions(): array } /** - * @param Map $map * @param string[] $attributes - * - * @return string */ public function render(Map $map, array $attributes = []): string { @@ -62,10 +53,7 @@ public function render(Map $map, array $attributes = []): string } /** - * @param Map $map * @param string[] $attributes - * - * @return string */ public function renderHtml(Map $map, array $attributes = []): string { @@ -74,29 +62,16 @@ public function renderHtml(Map $map, array $attributes = []): string return $this->mapHelper->renderHtml($map); } - /** - * @param Map $map - * - * @return string - */ public function renderStylesheet(Map $map): string { return $this->mapHelper->renderStylesheet($map); } - /** - * @param Map $map - * - * @return string - */ public function renderJavascript(Map $map): string { return $this->mapHelper->renderJavascript($map); } - /** - * {@inheritdoc} - */ public function getName(): string { return 'ivory_google_map'; diff --git a/Twig/PlaceAutocompleteExtension.php b/Twig/PlaceAutocompleteExtension.php index 04079695..ac751230 100644 --- a/Twig/PlaceAutocompleteExtension.php +++ b/Twig/PlaceAutocompleteExtension.php @@ -21,18 +21,8 @@ */ class PlaceAutocompleteExtension extends AbstractExtension { - /** - * @var PlaceAutocompleteHelper - */ - private $placeAutocompleteHelper; - - /** - * @param PlaceAutocompleteHelper $placeAutocompleteHelper - */ - public function __construct(PlaceAutocompleteHelper $placeAutocompleteHelper) - { - $this->placeAutocompleteHelper = $placeAutocompleteHelper; - } + public function __construct(private PlaceAutocompleteHelper $placeAutocompleteHelper) + {} /** * {@inheritdoc} @@ -49,10 +39,7 @@ public function getFunctions(): array } /** - * @param Autocomplete $autocomplete * @param string[] $attributes - * - * @return string */ public function render(Autocomplete $autocomplete, array $attributes = []): string { @@ -62,10 +49,7 @@ public function render(Autocomplete $autocomplete, array $attributes = []): stri } /** - * @param Autocomplete $autocomplete * @param string[] $attributes - * - * @return string */ public function renderHtml(Autocomplete $autocomplete, array $attributes = []): string { @@ -74,11 +58,6 @@ public function renderHtml(Autocomplete $autocomplete, array $attributes = []): return $this->placeAutocompleteHelper->renderHtml($autocomplete); } - /** - * @param Autocomplete $autocomplete - * - * @return string - */ public function renderJavascript(Autocomplete $autocomplete): string { return $this->placeAutocompleteHelper->renderJavascript($autocomplete); diff --git a/Twig/StaticMapExtension.php b/Twig/StaticMapExtension.php index f0ab5fb9..822aa965 100644 --- a/Twig/StaticMapExtension.php +++ b/Twig/StaticMapExtension.php @@ -21,18 +21,8 @@ */ class StaticMapExtension extends AbstractExtension { - /** - * @var StaticMapHelper - */ - private $staticMapHelper; - - /** - * @param StaticMapHelper $staticMapHelper - */ - public function __construct(StaticMapHelper $staticMapHelper) - { - $this->staticMapHelper = $staticMapHelper; - } + public function __construct(private StaticMapHelper $staticMapHelper) + {} /** * {@inheritdoc} @@ -58,6 +48,9 @@ public function getName(): string return 'ivory_google_map_static'; } + /** + * @return string[] + */ private function getMapping(): array { return ['ivory_google_map_static' => 'render'];