sf5 compatibility

feat: drop support for php < 7.2, add support for symfony 6, drop support for symfony < 4.4, bump dependencies, fix restrict public services in phpunit, add php 8.0, 8.1, 8.2 to the travis ci tests php ^8.0, sf5 & sf6, fix replaced IvoryJsonBuilder, Fixed removed XML support fix services and config tree strict dependencies for sf5
Prezent · Feb 19, 2024 · 5277256 · 5277256
1 parent 450abf7
commit 5277256
Show file tree

Hide file tree

Showing 43 changed files with 210 additions and 357 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@
 # PHPUnit
 /build
 /phpunit.xml
+/.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,9 @@ dist: xenial
 
 php:
     - '7.4'
-#    - '8.0'
+    - '8.0'
+    - '8.1'
+    - '8.2'
 
 branches:
     only:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -39,7 +39,7 @@ order to set up the project.
 
 When you're on the new branch with the dependencies, code as much as you want and when the fix is ready, don't commit
 it immediately. Before, you will need to add tests and update the doc. For the tests, everything is tested with
-[PHPUnit](http://phpunit.de/) and the doc is in the markdown format under the `Resources/doc` directory.
+[PHPUnit](https://phpunit.de/) and the doc is in the markdown format under the `Resources/doc` directory.
 
 Then, when you have fixed the bug, tested it and documented it, you can commit and push it with the following commands:
 

diff --git a/DependencyInjection/Compiler/CleanTemplatingPass.php b/DependencyInjection/Compiler/CleanTemplatingPass.php
@@ -22,7 +22,7 @@ class CleanTemplatingPass implements CompilerPassInterface
     /**
      * {@inheritdoc}
      */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!$container->hasDefinition('templating.engine.php')) {
             $container->removeDefinition('ivory.google_map.templating.api');

diff --git a/DependencyInjection/Compiler/PublicForTestsCompilerPass.php b/DependencyInjection/Compiler/PublicForTestsCompilerPass.php
@@ -9,18 +9,20 @@
 
 class PublicForTestsCompilerPass implements CompilerPassInterface
 {
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!$this->isPHPUnit()) {
             return;
         }
 
         foreach ($container->getDefinitions() as $definition) {
-            $definition->setPublic(true);
-        }
 
-        foreach ($container->getAliases() as $definition) {
-            $definition->setPublic(true);
+            if(str_contains($definition->getClass(), 'Ivory\GoogleMapBundle') ||
+               str_contains($definition->getClass(), 'Ivory\GoogleMap')  ||
+               str_contains($definition->getClass(), 'Ivory\Serializer'))
+            {
+             $definition->setPublic(true);
+            }
         }
     }
 

diff --git a/DependencyInjection/Compiler/RegisterControlRendererPass.php b/DependencyInjection/Compiler/RegisterControlRendererPass.php
@@ -23,7 +23,7 @@ class RegisterControlRendererPass implements CompilerPassInterface
     /**
      * {@inheritdoc}
      */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         $controlManagerRenderer = $container->getDefinition('ivory.google_map.helper.renderer.control.manager');
 

diff --git a/DependencyInjection/Compiler/RegisterExtendableRendererPass.php b/DependencyInjection/Compiler/RegisterExtendableRendererPass.php
@@ -23,7 +23,7 @@ class RegisterExtendableRendererPass implements CompilerPassInterface
     /**
      * {@inheritdoc}
      */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         $tag = 'ivory.google_map.helper.renderer.extendable';
         $extendableRenderer = $container->getDefinition('ivory.google_map.helper.renderer.overlay.extendable');

diff --git a/DependencyInjection/Compiler/RegisterFormResourcePass.php b/DependencyInjection/Compiler/RegisterFormResourcePass.php
@@ -22,7 +22,7 @@ class RegisterFormResourcePass implements CompilerPassInterface
     /**
      * {@inheritdoc}
      */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if ($container->hasParameter($parameter = 'templating.helper.form.resources')) {
             $container->setParameter(

diff --git a/DependencyInjection/Compiler/RegisterHelperListenerPass.php b/DependencyInjection/Compiler/RegisterHelperListenerPass.php
@@ -11,11 +11,8 @@
 
 namespace Ivory\GoogleMapBundle\DependencyInjection\Compiler;
 
-use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher;
 use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass;
 
 /**
@@ -38,9 +35,6 @@ class RegisterHelperListenerPass implements CompilerPassInterface
      */
     private $passes = [];
 
-    /**
-     * {@inheritdoc}
-     */
     public function __construct()
     {
         foreach (self::$helpers as $helper) {
@@ -55,17 +49,8 @@ public function __construct()
     /**
      * {@inheritdoc}
      */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
-        if (!class_exists(ServiceClosureArgument::class)) {
-            foreach (self::$helpers as $helper) {
-                $container
-                    ->getDefinition('ivory.google_map.helper.'.$helper.'.event_dispatcher')
-                    ->setClass(ContainerAwareEventDispatcher::class)
-                    ->addArgument(new Reference('service_container'));
-            }
-        }
-
         foreach ($this->passes as $pass) {
             $pass->process($container);
         }

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -24,7 +24,7 @@ class Configuration implements ConfigurationInterface
     /**
      * {@inheritdoc}
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = $this->createTreeBuilder('ivory_google_map');
         $children = $treeBuilder->getRootNode()
@@ -51,10 +51,7 @@ public function getConfigTreeBuilder()
         return $treeBuilder;
     }
 
-    /**
-     * @return ArrayNodeDefinition
-     */
-    private function createMapNode()
+    private function createMapNode(): ArrayNodeDefinition
     {
         return $this->createNode('map')
             ->addDefaultsIfNotSet()
@@ -78,13 +75,7 @@ private function createStaticMapNode()
             ->end();
     }
 
-    /**
-     * @param string $service
-     * @param bool   $http
-     *
-     * @return ArrayNodeDefinition
-     */
-    private function createServiceNode($service, $http)
+    private function createServiceNode(string $service, bool $http): ArrayNodeDefinition
     {
         $node = $this->createNode($service);
         $children = $node
@@ -116,12 +107,7 @@ private function createServiceNode($service, $http)
         return $node;
     }
 
-    /**
-     * @param bool $service
-     *
-     * @return ArrayNodeDefinition
-     */
-    private function createBusinessAccountNode($service)
+    private function createBusinessAccountNode(bool $service): ArrayNodeDefinition
     {
         $node = $this->createNode('business_account');
         $clientIdNode = $node->children()
@@ -142,22 +128,14 @@ private function createBusinessAccountNode($service)
     }
 
     /**
-     * @param string $name
-     * @param string $type
-     *
      * @return ArrayNodeDefinition|NodeDefinition
      */
     private function createNode(string $name = null, string $type = 'array')
     {
         return $this->createTreeBuilder($name, $type)->getRootNode();
     }
 
-    /**
-     * @param string $name
-     * @param string $type
-     * @return TreeBuilder
-     */
-    private function createTreeBuilder(string $name = null, string $type = 'array')
+    private function createTreeBuilder(string $name = null, string $type = 'array'): TreeBuilder
     {
         return new TreeBuilder($name, $type);
     }

diff --git a/DependencyInjection/IvoryGoogleMapExtension.php b/DependencyInjection/IvoryGoogleMapExtension.php
@@ -29,9 +29,9 @@ class IvoryGoogleMapExtension extends ConfigurableExtension
     /**
      * {@inheritdoc}
      */
-    protected function loadInternal(array $config, ContainerBuilder $container)
+    protected function loadInternal(array $mergedConfig, ContainerBuilder $container): void
     {
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
 
         $resources = [
             'form',
@@ -45,18 +45,18 @@ protected function loadInternal(array $config, ContainerBuilder $container)
         ];
 
         foreach ($resources as $resource) {
-            $loader->load($resource.'.xml');
+            $loader->load($resource . '.xml');
         }
 
-        $this->loadMapConfig($config['map'], $container);
-        $this->loadStaticMapConfig($config['static_map'], $container);
-        $this->loadServicesConfig($config, $container, $loader);
+        $this->loadMapConfig($mergedConfig['map'], $container);
+        $this->loadStaticMapConfig($mergedConfig['static_map'], $container);
+        $this->loadServicesConfig($mergedConfig, $container, $loader);
     }
 
     /**
      * @param mixed[] $config
      */
-    private function loadMapConfig(array $config, ContainerBuilder $container)
+    private function loadMapConfig(array $config, ContainerBuilder $container): void
     {
         $container
             ->getDefinition('ivory.google_map.helper.renderer.loader')
@@ -78,7 +78,7 @@ private function loadMapConfig(array $config, ContainerBuilder $container)
     /**
      * @param mixed[] $config
      */
-    private function loadStaticMapConfig(array $config, ContainerBuilder $container)
+    private function loadStaticMapConfig(array $config, ContainerBuilder $container): void
     {
         if (isset($config['api_key'])) {
             $container
@@ -100,67 +100,51 @@ private function loadStaticMapConfig(array $config, ContainerBuilder $container)
     /**
      * @param mixed[] $config
      */
-    private function loadServicesConfig(array $config, ContainerBuilder $container, LoaderInterface $loader)
+    private function loadServicesConfig(array $config, ContainerBuilder $container, LoaderInterface $loader): void
     {
         $services = [
-            'direction'          => true,
-            'distance_matrix'    => true,
-            'elevation'          => true,
-            'geocoder'           => true,
+            'direction' => true,
+            'distance_matrix' => true,
+            'elevation' => true,
+            'geocoder' => true,
             'place_autocomplete' => true,
-            'place_detail'       => true,
-            'place_photo'        => false,
-            'place_search'       => true,
-            'time_zone'          => true,
+            'place_detail' => true,
+            'place_photo' => false,
+            'place_search' => true,
+            'time_zone' => true,
         ];
 
-        $serializerLoaded = false;
-        $loadSerializer = function() use ($container, $loader) {
-            $loader->load('service/serializer.xml');
-
-            if ($container->hasParameter('kernel.project_dir')) {
-                $container
-                    ->getDefinition('ivory.google_map.serializer.loader')
-                    ->replaceArgument(0, '%kernel.project_dir%/vendor/ivory/google-map/src/Service/Serializer');
-            }
-        };
-
         foreach ($services as $service => $http) {
             if (!isset($config[$service])) {
                 continue;
             }
 
-            if ($http && !$serializerLoaded) {
-                $loadSerializer();
-                $serializerLoaded = true;
-            }
-
             $this->loadServiceConfig($service, $config[$service], $container, $loader, $http);
         }
     }
 
     /**
-     * @param string  $service
+     * @param string $service
      * @param mixed[] $config
-     * @param bool    $http
+     * @param bool $http
      *
      * @throws Exception
      */
     private function loadServiceConfig(
-        string $service,
-        array $config,
+        string           $service,
+        array            $config,
         ContainerBuilder $container,
-        LoaderInterface $loader,
-        $http = true
-    ) {
-        $loader->load('service/'.$service.'.xml');
-        $definition = $container->getDefinition($serviceName = 'ivory.google_map.'.$service);
+        LoaderInterface  $loader,
+                         $http = true
+    ): void
+    {
+        $loader->load('service/' . $service . '.xml');
+        $definition = $container->getDefinition($serviceName = 'ivory.google_map.' . $service);
 
         if ($http) {
             $definition
                 ->addArgument(new Reference($config['client']))
-                ->addArgument(new Reference($config['message_factory']))
-                ->addArgument(new Reference('ivory.serializer'));
+                ->addArgument(new Reference($config['message_factory']));
         }
 
         if ($http && isset($config['format'])) {
@@ -175,7 +159,7 @@ private function loadServiceConfig(
             $businessAccountConfig = $config['business_account'];
 
             $container->setDefinition(
-                $businessAccountName = $serviceName.'.business_account',
+                $businessAccountName = $serviceName . '.business_account',
                 new Definition(BusinessAccount::class, [
                     $businessAccountConfig['client_id'],
                     $businessAccountConfig['secret'],

diff --git a/Form/Type/PlaceAutocompleteType.php b/Form/Type/PlaceAutocompleteType.php
@@ -28,7 +28,7 @@ class PlaceAutocompleteType extends AbstractType
     /**
      * {@inheritdoc}
      */
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $autocomplete = new Autocomplete();
 
@@ -63,7 +63,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     /**
      * {@inheritdoc}
      */
-    public function finishView(FormView $view, FormInterface $form, array $options)
+    public function finishView(FormView $view, FormInterface $form, array $options): void
     {
         $autocomplete = $form->getConfig()->getAttribute('autocomplete');
         $autocomplete->setInputId($view->vars['id']);
@@ -77,7 +77,7 @@ public function finishView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver
             ->setDefaults([
@@ -107,23 +107,20 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * {@inheritdoc}
      */
-    public function getParent()
+    public function getParent(): string
     {
         return method_exists(AbstractType::class, 'getBlockPrefix') ? TextType::class : 'text';
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getBlockPrefix()
+    public function getBlockPrefix(): string
     {
         return 'place_autocomplete';
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
+    public function getName(): string
     {
         return $this->getBlockPrefix();
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,9 @@ dist: xenial @@
     php:
         - '7.4'
-    #    - '8.0'
+        - '8.0'
+        - '8.1'
+        - '8.2'
     branches:
         only:
@@ Expand Down @@