IBX-1431: Fixed incorrect merge of ezsystems/ezplatform-design-engine…

… changes The support for phpstorm semantic configuration for Twig auto-completion helper has been dropped via ezsystems/ezplatform-design-engine#40 however due to rebranding changes was not merged properly into the upstream In v4.0 that deprecated configuration is dropped along with its service container parameters
ibexa · Jan 27, 2022 · b376b7f · b376b7f
1 parent f2e7164
commit b376b7f
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 80 deletions.
diff --git a/src/bundle/DependencyInjection/Compiler/PHPStormPass.php b/src/bundle/DependencyInjection/Compiler/PHPStormPass.php
diff --git a/src/bundle/DependencyInjection/Configuration.php b/src/bundle/DependencyInjection/Configuration.php
@@ -43,16 +43,6 @@ public function getConfigTreeBuilder()
                     ->info('If set to true, assets path won\'t be pre-resolved at compile time.')
                     ->defaultValue('%kernel.debug%')
                 ->end()
-                ->arrayNode('phpstorm')
-                    ->addDefaultsIfNotSet()
-                    ->children()
-                        ->booleanNode('enabled')->defaultValue('%kernel.debug%')->info('Activates PHPStorm support')->end()
-                        ->scalarNode('twig_config_path')
-                            ->info('Path where to store PHPStorm configuration file for additional Twig namespaces (ide-twig.json).')
-                            ->defaultValue('%kernel.project_dir%')
-                        ->end()
-                    ->end()
-                ->end()
             ->end();
 
         return $treeBuilder;

diff --git a/src/bundle/DependencyInjection/IbexaDesignEngineExtension.php b/src/bundle/DependencyInjection/IbexaDesignEngineExtension.php
@@ -47,10 +47,6 @@ private function configureDesigns(array $config, ConfigurationProcessor $process
         $container->setParameter('ezdesign.templates_override_paths', $config['templates_override_paths']);
         $container->setParameter('ezdesign.templates_path_map', $config['templates_theme_paths']);
         $container->setParameter('ezdesign.asset_resolution.disabled', $config['disable_assets_pre_resolution']);
-
-        // PHPStorm settings
-        $container->setParameter('ezdesign.phpstorm.enabled', $config['phpstorm']['enabled']);
-        $container->setParameter('ezdesign.phpstorm.twig_config_path', $config['phpstorm']['twig_config_path']);
     }
 }
 

diff --git a/src/bundle/IbexaDesignEngineBundle.php b/src/bundle/IbexaDesignEngineBundle.php
@@ -8,7 +8,6 @@
 
 use Ibexa\Bundle\DesignEngine\DependencyInjection\Compiler\AssetPathResolutionPass;
 use Ibexa\Bundle\DesignEngine\DependencyInjection\Compiler\AssetThemePass;
-use Ibexa\Bundle\DesignEngine\DependencyInjection\Compiler\PHPStormPass;
 use Ibexa\Bundle\DesignEngine\DependencyInjection\Compiler\TwigThemePass;
 use Ibexa\Bundle\DesignEngine\DependencyInjection\DesignConfigParser;
 use Ibexa\Bundle\DesignEngine\DependencyInjection\IbexaDesignEngineExtension;
@@ -30,7 +29,6 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new TwigThemePass());
         $container->addCompilerPass(new AssetThemePass(), PassConfig::TYPE_OPTIMIZE);
         $container->addCompilerPass(new AssetPathResolutionPass(), PassConfig::TYPE_OPTIMIZE);
-        $container->addCompilerPass(new PHPStormPass(), PassConfig::TYPE_OPTIMIZE);
     }
 
     public function getContainerExtension()

diff --git a/src/bundle/Resources/config/services.yaml b/src/bundle/Resources/config/services.yaml
@@ -7,7 +7,6 @@ parameters:
     ezdesign.assets_override_paths: []
     ezdesign.asset_resolved_paths: {}
     ezdesign.asset_resolution.disabled: '%kernel.debug%'
-    ezdesign.phpstorm.enabled: true
 
 services:
     Ibexa\DesignEngine\Templating\ThemeTemplateNameResolver: