Adding PHP7 syntax (#160)

* Adding PHP7 syntax

* Fixed tests

Author: Nyholm

BazingaGeocoderBundle.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the BazingaGeocoderBundle package.
  * For the full copyright and license information, please view the LICENSE

Command/GeocodeCommand.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the BazingaGeocoderBundle package.
  * For the full copyright and license information, please view the LICENSE
@@ -80,7 +82,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
     }
 
-    private function humanize($text)
+    private function humanize(string $text): string
     {
         $text = preg_replace('/([A-Z][a-z]+)|([A-Z][A-Z]+)|([^A-Za-z ]+)/', ' \1', $text);
 

DataCollector/GeocoderDataCollector.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the BazingaGeocoderBundle package.
  * For the full copyright and license information, please view the LICENSE
@@ -64,7 +66,7 @@ public function getQueries(): array
      *
      * @return float
      */
-    public function getTotalDuration()
+    public function getTotalDuration(): float
     {
         $time = 0;
         foreach ($this->data['queries'] as $command) {
@@ -87,7 +89,7 @@ public function getProviders(): array
      *
      * @return array
      */
-    public function getProviderQueries($provider): array
+    public function getProviderQueries(string $provider): array
     {
         return array_filter($this->data['queries'], function ($data) use ($provider) {
             return $data['providerName'] === $provider;
@@ -106,7 +108,7 @@ public function addInstance(ProfilingPlugin $instance)
     /**
      * {@inheritdoc}
      */
-    public function getName()
+    public function getName(): string
     {
         return 'geocoder';
     }

DependencyInjection/BazingaGeocoderExtension.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the BazingaGeocoderBundle package.
  * For the full copyright and license information, please view the LICENSE
@@ -61,7 +63,7 @@ private function loadProviders(ContainerBuilder $container, array $config)
         foreach ($config['providers'] as $providerName => $providerConfig) {
             $factoryService = $container->getDefinition($providerConfig['factory']);
             $factoryClass = $factoryService->getClass() ?: $providerConfig['factory'];
-            if (!class_implements($factoryClass, ProviderFactoryInterface::class)) {
+            if (!$this->implementsPoviderFactory($factoryClass)) {
                 throw new \LogicException(sprintf('Provider factory "%s" must implement ProviderFactoryInterface', $providerConfig['factory']));
             }
             $factoryClass::validate($providerConfig['options'], $providerName);
@@ -198,16 +200,30 @@ public function getConfiguration(array $config, ContainerBuilder $container)
      *
      * @return array
      */
-    private function findReferences(array $options)
+    private function findReferences(array $options): array
     {
         foreach ($options as $key => $value) {
             if (is_array($value)) {
                 $options[$key] = $this->findReferences($value);
-            } elseif (substr($key, -8) === '_service' || strpos($value, '@') === 0 || $key === 'service') {
+            } elseif (substr((string) $key, -8) === '_service' || strpos((string) $value, '@') === 0 || $key === 'service') {
                 $options[$key] = new Reference(ltrim($value, '@'));
             }
         }
 
         return $options;
     }
+
+    /**
+     * @param mixed $factoryClass
+     *
+     * @return bool
+     */
+    private function implementsPoviderFactory($factoryClass): bool
+    {
+        if (false === $interfaces = class_implements($factoryClass)) {
+            return false;
+        }
+
+        return in_array(ProviderFactoryInterface::class, $interfaces);
+    }
 }

DependencyInjection/Compiler/AddProvidersPass.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the BazingaGeocoderBundle package.
  * For the full copyright and license information, please view the LICENSE

DependencyInjection/Compiler/ProfilerPass.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the BazingaGeocoderBundle package.
  * For the full copyright and license information, please view the LICENSE

DependencyInjection/Configuration.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the BazingaGeocoderBundle package.
  * For the full copyright and license information, please view the LICENSE

Doctrine/ORM/GeocoderListener.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the BazingaGeocoderBundle package.
  * For the full copyright and license information, please view the LICENSE

Mapping/Annotations/Address.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the BazingaGeocoderBundle package.
  * For the full copyright and license information, please view the LICENSE

Mapping/Annotations/Geocodeable.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the BazingaGeocoderBundle package.
  * For the full copyright and license information, please view the LICENSE