Add types declarations

Author: ker0x

.gitattributes

@@ -11,5 +11,6 @@
 /phpspec.ci.yml   export-ignore
 /phpspec.yml.dist export-ignore
 /phpunit.xml.dist export-ignore
+/rector.php       export-ignore
 /spec/            export-ignore
 /Tests/           export-ignore

composer.json

@@ -59,6 +59,7 @@
     "php-http/curl-client": "^2.2",
     "php-http/message": "^1.13",
     "phpstan/phpstan": "^1.9.2",
+    "rector/rector": "^0.18.3",
     "symfony/cache": "^4.4 || ^5.0 || ^6.0",
     "symfony/config": "^4.4 || ^5.0 || ^6.0",
     "symfony/phpunit-bridge": "^5.2 || ^6.0",
@@ -83,7 +84,8 @@
   },
   "config": {
     "allow-plugins": {
-      "symfony/flex": true
+      "symfony/flex": true,
+      "php-http/discovery": true
     },
     "sort-packages": true
   },

rector.php

@@ -0,0 +1,16 @@
+<?php
+
+use Rector\Config\RectorConfig;
+use Rector\Set\ValueObject\SetList;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->paths([
+        __DIR__.'/src',
+        __DIR__.'/tests',
+    ]);
+
+    $rectorConfig->sets([
+        SetList::PHP_74,
+        SetList::TYPE_DECLARATION,
+    ]);
+};

src/BazingaGeocoderBundle.php

@@ -23,12 +23,7 @@
  */
 class BazingaGeocoderBundle extends Bundle
 {
-    /**
-     * {@inheritdoc}
-     *
-     * @return void
-     */
-    public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container): void
     {
         parent::build($container);
 
@@ -37,9 +32,6 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new FactoryValidatorPass());
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getPath(): string
     {
         return \dirname(__DIR__);

src/Command/GeocodeCommand.php

@@ -34,12 +34,7 @@ public function __construct(ProviderAggregator $geocoder)
         parent::__construct();
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return void
-     */
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('geocoder:geocode')
@@ -57,12 +52,7 @@ protected function configure()
             );
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return int
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         if ($input->getOption('provider')) {
             $this->geocoder->using($input->getOption('provider'));

src/DataCollector/GeocoderDataCollector.php

@@ -34,22 +34,14 @@ public function __construct()
         $this->data['providers'] = [];
     }
 
-    /**
-     * @return void
-     */
-    public function reset()
+    public function reset(): void
     {
         $this->instances = [];
         $this->data['queries'] = [];
         $this->data['providers'] = [];
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return void
-     */
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null): void
     {
         if (!empty($this->data['queries'])) {
             // To avoid collection more that once.
@@ -103,23 +95,15 @@ public function getProviders(): array
      */
     public function getProviderQueries(string $provider): array
     {
-        return array_filter($this->data['queries'], static function ($data) use ($provider) {
-            return $data['providerName'] === $provider;
-        });
+        return array_filter($this->data['queries'], static fn ($data): bool => $data['providerName'] === $provider);
     }
 
-    /**
-     * @return void
-     */
-    public function addInstance(ProfilingPlugin $instance)
+    public function addInstance(ProfilingPlugin $instance): void
     {
         $this->instances[] = $instance;
         $this->data['providers'][] = $instance->getName();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getName(): string
     {
         return 'geocoder';

src/DependencyInjection/BazingaGeocoderExtension.php

@@ -41,10 +41,8 @@ class BazingaGeocoderExtension extends Extension
 {
     /**
      * @param array<mixed, mixed> $configs
-     *
-     * @return void
      */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $processor = new Processor();
         $configuration = $this->getConfiguration($configs, $container);
@@ -78,10 +76,8 @@ public function load(array $configs, ContainerBuilder $container)
 
     /**
      * @param array<mixed, mixed> $config
-     *
-     * @return void
      */
-    private function loadProviders(ContainerBuilder $container, array $config)
+    private function loadProviders(ContainerBuilder $container, array $config): void
     {
         foreach ($config['providers'] as $providerName => $providerConfig) {
             try {
@@ -181,7 +177,7 @@ public function configureProviderPlugins(ContainerBuilder $container, array $con
                 ->addTag('bazinga_geocoder.profiling_plugin');
         }
 
-        return array_map(static fn (string $id) => new Reference($id), $plugins);
+        return array_map(static fn (string $id): Reference => new Reference($id), $plugins);
     }
 
     /**
@@ -213,9 +209,6 @@ private function findReferences(array $options): array
         return $options;
     }
 
-    /**
-     * @param mixed $factoryClass
-     */
     private function implementsProviderFactory($factoryClass): bool
     {
         if (false === $interfaces = class_implements($factoryClass)) {

src/DependencyInjection/Compiler/AddProvidersPass.php

@@ -25,10 +25,8 @@ class AddProvidersPass implements CompilerPassInterface
     /**
      * Get all providers based on their tag (`bazinga_geocoder.provider`) and
      * register them.
-     *
-     * @return void
      */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!$container->hasDefinition(ProviderAggregator::class)) {
             return;

src/DependencyInjection/Compiler/FactoryValidatorPass.php

@@ -26,14 +26,9 @@ class FactoryValidatorPass implements CompilerPassInterface
     /**
      * @var string[]
      */
-    private static $factoryServiceIds = [];
+    private static array $factoryServiceIds = [];
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return void
-     */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         foreach (self::$factoryServiceIds as $id) {
             if (!$container->hasAlias($id) && !$container->hasDefinition($id)) {
@@ -42,12 +37,7 @@ public function process(ContainerBuilder $container)
         }
     }
 
-    /**
-     * @param string $factoryServiceId
-     *
-     * @return void
-     */
-    public static function addFactoryServiceId($factoryServiceId)
+    public static function addFactoryServiceId(string $factoryServiceId): void
     {
         self::$factoryServiceIds[] = $factoryServiceId;
     }

src/DependencyInjection/Compiler/ProfilerPass.php

@@ -24,12 +24,7 @@
  */
 class ProfilerPass implements CompilerPassInterface
 {
-    /**
-     * {@inheritdoc}
-     *
-     * @return void
-     */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!$container->hasDefinition(GeocoderDataCollector::class)) {
             return;