Updated dependencies to Symfony 4

ezsystems · Jun 10, 2019 · 26ee97a · 26ee97a
1 parent e1a55e5
commit 26ee97a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/bundle/DependencyInjection/EzSystemsEzPlatformSolrSearchEngineExtension.php b/bundle/DependencyInjection/EzSystemsEzPlatformSolrSearchEngineExtension.php
@@ -12,7 +12,7 @@
 
 use EzSystems\EzPlatformSolrSearchEngine\FieldMapper\BoostFactorProvider;
 use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -167,7 +167,7 @@ private function configureSearchServices(ContainerBuilder $container, $connectio
         $alias = $this->getAlias();
 
         // Endpoint resolver
-        $endpointResolverDefinition = new DefinitionDecorator(self::ENDPOINT_RESOLVER_ID);
+        $endpointResolverDefinition = new ChildDefinition(self::ENDPOINT_RESOLVER_ID);
         $endpointResolverDefinition->replaceArgument(0, $connectionParams['entry_endpoints']);
         $endpointResolverDefinition->replaceArgument(1, $connectionParams['mapping']['translations']);
         $endpointResolverDefinition->replaceArgument(2, $connectionParams['mapping']['default']);
@@ -176,13 +176,13 @@ private function configureSearchServices(ContainerBuilder $container, $connectio
         $container->setDefinition($endpointResolverId, $endpointResolverDefinition);
 
         // Core filter
-        $coreFilterDefinition = new DefinitionDecorator(self::CORE_FILTER_ID);
+        $coreFilterDefinition = new ChildDefinition(self::CORE_FILTER_ID);
         $coreFilterDefinition->replaceArgument(0, new Reference($endpointResolverId));
         $coreFilterId = "$alias.connection.$connectionName.core_filter_id";
         $container->setDefinition($coreFilterId, $coreFilterDefinition);
 
         // Gateway
-        $gatewayDefinition = new DefinitionDecorator(self::GATEWAY_ID);
+        $gatewayDefinition = new ChildDefinition(self::GATEWAY_ID);
         $gatewayDefinition->replaceArgument(1, new Reference($endpointResolverId));
         $gatewayId = "$alias.connection.$connectionName.gateway_id";
         $container->setDefinition($gatewayId, $gatewayDefinition);

diff --git a/composer.json b/composer.json
@@ -15,11 +15,16 @@
     "require": {
         "php": "^7.3",
         "ezsystems/ezpublish-kernel": "^8.0@dev",
-        "netgen/query-translator": "^1.0.2"
+        "netgen/query-translator": "^1.0.2",
+        "symfony/http-kernel": "^4.3",
+        "symfony/dependency-injection": "^4.3",
+        "symfony/console": "^4.3",
+        "symfony/config": "^4.3",
+        "symfony/framework-bundle": "^4.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7||^7.5",
-        "matthiasnoback/symfony-dependency-injection-test": "~1.0||~3.1"
+        "phpunit/phpunit": "^8.1",
+        "matthiasnoback/symfony-dependency-injection-test": "^4.0"
     },
     "autoload": {
         "psr-4": {