Merge remote-tracking branch 'remotes/origin/6.2' into es7_support

# Conflicts:
#	.travis.yml
#	composer.json

Author: saimaz

.travis.yml

@@ -4,12 +4,17 @@ php:
   - 7.1
   - 7.2
   - 7.3
+  - 7.4
 env:
   global:
     - ES_VERSION=7.5.2 ES_DOWNLOAD_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz
   matrix:
-    - SYMFONY="~3.4"
     - SYMFONY="^4.4"
+    - SYMFONY="^5.0"
+jobs:
+  exclude:
+    - php: 7.1
+      env: SYMFONY="^5.0"
 install:
   - wget ${ES_DOWNLOAD_URL}
   - tar -xzf elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz

Command/AbstractIndexServiceAwareCommand.php

@@ -14,12 +14,22 @@
 use ONGR\ElasticsearchBundle\DependencyInjection\Configuration;
 use ONGR\ElasticsearchBundle\Service\IndexService;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\DependencyInjection\Container;
 
-abstract class AbstractIndexServiceAwareCommand extends ContainerAwareCommand
+abstract class AbstractIndexServiceAwareCommand extends Command
 {
+    private $container;
+
     const INDEX_OPTION = 'index';
 
+    public function __construct(Container $container)
+    {
+        $this->container = $container;
+        parent::__construct();
+    }
+
     protected function configure()
     {
         $this->addOption(
@@ -32,19 +42,24 @@ protected function configure()
 
     protected function getIndex($name): IndexService
     {
-        $name = $name ?? $this->getContainer()->getParameter(Configuration::ONGR_DEFAULT_INDEX);
-        $indexes = $this->getContainer()->getParameter(Configuration::ONGR_INDEXES);
+        $name = $name ?? $this->container->getParameter(Configuration::ONGR_DEFAULT_INDEX);
+        $indexes = $this->container->getParameter(Configuration::ONGR_INDEXES);
 
-        if (isset($indexes[$name]) && $this->getContainer()->has($indexes[$name])) {
-            return $this->getContainer()->get($indexes[$name]);
+        if (isset($indexes[$name]) && $this->container->has($indexes[$name])) {
+            return $this->container->get($indexes[$name]);
         }
 
         throw new \RuntimeException(
             sprintf(
                 'There is no index under `%s` name found. Available options: `%s`.',
                 $name,
-                implode('`, `', array_keys($this->getContainer()->getParameter(Configuration::ONGR_INDEXES)))
+                implode('`, `', array_keys($this->container->getParameter(Configuration::ONGR_INDEXES)))
             )
         );
     }
+
+    public function getContainer(): Container
+    {
+        return $this->container;
+    }
 }

Command/CacheClearCommand.php

@@ -46,5 +46,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $index->getIndexName()
             )
         );
+
+        return 0;
     }
 }