Symfony 4 support. BC compatible (#853)

makasim · saimaz · commit 41a1adffb1e9 · 2018-10-25T08:56:26.000+03:00
* PHP7.2 compatibility. BC compatible.

* fix cs

* set unlimited memory_limit

* add memory limit before composer.

* debug

* fix

* fix tests on sf2

* travis. remove php -i

* Add Symfony4 support. BC compatible.

* fix typo.

* fix ES endpoint in tests.

* remove 3.5, 3.6 symfony from travis matrix.

* use yaml extension for sf4 config.

* trigger travis

* trigger travis.

* fix tests.

* fix tests.

* fix cs
diff --git a/Command/CacheClearCommand.php b/Command/CacheClearCommand.php
@@ -20,6 +20,8 @@
  */
 class CacheClearCommand extends AbstractManagerAwareCommand
 {
+    public static $defaultName = 'ongr:es:cache:clear';
+
     /**
      * {@inheritdoc}
      */
@@ -28,7 +30,7 @@ protected function configure()
         parent::configure();
 
         $this
-            ->setName('ongr:es:cache:clear')
+            ->setName(static::$defaultName)
             ->setDescription('Clears elasticsearch client cache.');
     }
 
diff --git a/Command/DocumentGenerateCommand.php b/Command/DocumentGenerateCommand.php
@@ -22,6 +22,8 @@
 
 class DocumentGenerateCommand extends AbstractManagerAwareCommand
 {
+    public static $defaultName = 'ongr:es:document:generate';
+
     /**
      * @var QuestionHelper
      */
@@ -45,7 +47,7 @@ protected function configure()
         parent::configure();
 
         $this
-            ->setName('ongr:es:document:generate')
+            ->setName(static::$defaultName)
             ->setDescription('Generates a new Elasticsearch document inside a bundle');
     }
 
diff --git a/Command/IndexCreateCommand.php b/Command/IndexCreateCommand.php
@@ -22,6 +22,8 @@
  */
 class IndexCreateCommand extends AbstractManagerAwareCommand
 {
+    public static $defaultName = 'ongr:es:index:create';
+
     /**
      * {@inheritdoc}
      */
@@ -30,7 +32,7 @@ protected function configure()
         parent::configure();
 
         $this
-            ->setName('ongr:es:index:create')
+            ->setName(static::$defaultName)
             ->setDescription('Creates elasticsearch index.')
             ->addOption('time', 't', InputOption::VALUE_NONE, 'Adds date suffix to the new index name')
             ->addOption(
diff --git a/Command/IndexDropCommand.php b/Command/IndexDropCommand.php
@@ -21,6 +21,9 @@
  */
 class IndexDropCommand extends AbstractManagerAwareCommand
 {
+    public static $defaultName = 'ongr:es:index:drop';
+
+
     /**
      * {@inheritdoc}
      */
@@ -29,7 +32,7 @@ protected function configure()
         parent::configure();
 
         $this
-            ->setName('ongr:es:index:drop')
+            ->setName(static::$defaultName)
             ->setDescription('Drops elasticsearch index.')
             ->addOption(
                 'force',
diff --git a/Command/IndexExportCommand.php b/Command/IndexExportCommand.php
@@ -23,6 +23,8 @@
  */
 class IndexExportCommand extends AbstractManagerAwareCommand
 {
+    public static $defaultName = 'ongr:es:index:export';
+
     /**
      * {@inheritdoc}
      */
@@ -31,7 +33,7 @@ protected function configure()
         parent::configure();
 
         $this
-            ->setName('ongr:es:index:export')
+            ->setName(static::$defaultName)
             ->setDescription('Exports data from elasticsearch index.')
             ->addArgument(
                 'filename',
diff --git a/Command/IndexImportCommand.php b/Command/IndexImportCommand.php
@@ -23,6 +23,8 @@
  */
 class IndexImportCommand extends AbstractManagerAwareCommand
 {
+    public static $defaultName = 'ongr:es:index:import';
+
     /**
      * {@inheritdoc}
      */
@@ -31,7 +33,7 @@ protected function configure()
         parent::configure();
 
         $this
-            ->setName('ongr:es:index:import')
+            ->setName(static::$defaultName)
             ->setDescription('Imports data to elasticsearch index.')
             ->addArgument(
                 'filename',
diff --git a/DependencyInjection/Compiler/MappingPass.php b/DependencyInjection/Compiler/MappingPass.php
@@ -15,6 +15,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\HttpKernel\Kernel;
 
 /**
  * Compiles elastic search data.
@@ -44,6 +45,7 @@ public function process(ContainerBuilder $container)
                     $manager,
                 ]
             );
+            $managerDefinition->setPublic(true);
             $managerDefinition->setFactory(
                 [
                     new Reference('es.manager_factory'),
@@ -56,6 +58,12 @@ public function process(ContainerBuilder $container)
             // Make es.manager.default as es.manager service.
             if ($managerName === 'default') {
                 $container->setAlias('es.manager', 'es.manager.default');
+
+                if (Kernel::MAJOR_VERSION >= 4) {
+                    $container->getAlias('es.manager')
+                        ->setPublic(true)
+                    ;
+                }
             }
 
             $mappings = $collector->getMappings($manager['mappings']);
@@ -66,6 +74,7 @@ public function process(ContainerBuilder $container)
                     'ONGR\ElasticsearchBundle\Service\Repository',
                     [$repositoryDetails['namespace']]
                 );
+                $repositoryDefinition->setPublic(true);
 
                 if (isset($repositoryDetails['directory_name']) && $managerName == 'default') {
                     $container->get('es.document_finder')->setDocumentDir($repositoryDetails['directory_name']);
diff --git a/DependencyInjection/ONGRElasticsearchExtension.php b/DependencyInjection/ONGRElasticsearchExtension.php
@@ -64,6 +64,7 @@ public function load(array $configs, ContainerBuilder $container)
                 new Reference('debug.stopwatch', ContainerInterface::NULL_ON_INVALID_REFERENCE)
             ]
         );
+        $definition->setPublic(true);
         $container->setDefinition('es.manager_factory', $definition);
     }
 }
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -3,69 +3,81 @@ parameters:
 
 services:
     es.export:
-        class: ONGR\ElasticsearchBundle\Service\ExportService
+        class: 'ONGR\ElasticsearchBundle\Service\ExportService'
+        public: true
 
     es.import:
-        class: ONGR\ElasticsearchBundle\Service\ImportService
+        class: 'ONGR\ElasticsearchBundle\Service\ImportService'
+        public: true
 
     es.client.index_suffix_finder:
-        class: ONGR\ElasticsearchBundle\Service\IndexSuffixFinder
+        class: 'ONGR\ElasticsearchBundle\Service\IndexSuffixFinder'
+        public: true
 
     es.cache_engine:
-        class: Doctrine\Common\Cache\FilesystemCache
+        class: 'Doctrine\Common\Cache\FilesystemCache'
+        public: true
         arguments: ["%kernel.cache_dir%/ongr/elasticsearch", ".ongr.data"]
 
     es.annotations.cached_reader:
-        class: Doctrine\Common\Annotations\CachedReader
+        class: 'Doctrine\Common\Annotations\CachedReader'
+        public: true
         arguments: ["@annotations.reader", "@es.cache_engine", "%kernel.debug%"]
 
     es.document_finder:
-        class: ONGR\ElasticsearchBundle\Mapping\DocumentFinder
+        class: 'ONGR\ElasticsearchBundle\Mapping\DocumentFinder'
+        public: true
         arguments: ["%kernel.bundles%"]
-        public: false
 
     es.document_parser:
-        class: ONGR\ElasticsearchBundle\Mapping\DocumentParser
+        class: 'ONGR\ElasticsearchBundle\Mapping\DocumentParser'
+        public: true
         arguments: ["@es.annotations.cached_reader", "@es.document_finder"]
-        public: false
 
     es.metadata_collector:
-        class: ONGR\ElasticsearchBundle\Mapping\MetadataCollector
+        class: 'ONGR\ElasticsearchBundle\Mapping\MetadataCollector'
+        public: true
         arguments: ["@es.document_finder", "@es.document_parser", "@es.cache_engine"]
         calls:
             - [setEnableCache, ["%es.cache%"]]
 
     es.logger.collection_handler:
-        class: ONGR\ElasticsearchBundle\Profiler\Handler\CollectionHandler
+        class: 'ONGR\ElasticsearchBundle\Profiler\Handler\CollectionHandler'
         public: false
 
     es.tracer:
-        class: Monolog\Logger
+        class: 'Monolog\Logger'
+        public: true
         arguments: ['ongr']
         calls:
-            - [pushHandler, ["@es.logger.collection_handler"]]
+            - ['pushHandler', ["@es.logger.collection_handler"]]
 
     es.profiler:
-        class: ONGR\ElasticsearchBundle\Profiler\ElasticsearchProfiler
+        class: 'ONGR\ElasticsearchBundle\Profiler\ElasticsearchProfiler'
+        public: true
         calls:
-            - [setManagers, ["%es.managers%"]]
-            - [addLogger, ["@es.tracer"]]
+            - ['setManagers', ["%es.managers%"]]
+            - ['addLogger', ["@es.tracer"]]
         tags:
-            - {name: data_collector, template: "@ONGRElasticsearch/Profiler/profiler.html.twig", id: ongr.profiler}
+            - { name: 'data_collector', template: "@ONGRElasticsearch/Profiler/profiler.html.twig", id: 'ongr.profiler' }
 
     es.result_converter:
-        class: ONGR\ElasticsearchBundle\Result\Converter
+        class: 'ONGR\ElasticsearchBundle\Result\Converter'
+        public: true
         arguments: ["@es.metadata_collector"]
 
     es.terminate_listener:
-        class: ONGR\ElasticsearchBundle\EventListener\TerminateListener
+        class: 'ONGR\ElasticsearchBundle\EventListener\TerminateListener'
+        public: true
         arguments: ["@service_container", "%es.managers%"]
         tags:
-            - { name: kernel.event_listener, event: kernel.terminate }
+            - { name: 'kernel.event_listener', event: 'kernel.terminate' }
 
     es.generator.document:
-        class: ONGR\ElasticsearchBundle\Generator\DocumentGenerator
+        class: 'ONGR\ElasticsearchBundle\Generator\DocumentGenerator'
+        public: true
 
     es.generate:
-        class: ONGR\ElasticsearchBundle\Service\GenerateService
+        class: 'ONGR\ElasticsearchBundle\Service\GenerateService'
+        public: true
         arguments: ["@es.generator.document", "@filesystem"]
diff --git a/Resources/config/services4.yaml b/Resources/config/services4.yaml
@@ -1,5 +1,6 @@
 services:
     ONGR\ElasticsearchBundle\Command\:
         resource: '../../Command'
+        public: true
         tags:
             - { name: console.command }
diff --git a/Test/AbstractElasticsearchTestCase.php b/Test/AbstractElasticsearchTestCase.php
@@ -11,9 +11,8 @@
 
 namespace ONGR\ElasticsearchBundle\Test;
 
-use Elasticsearch\Common\Exceptions\ElasticsearchException;
 use ONGR\ElasticsearchBundle\Service\Manager;
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use ONGR\ElasticsearchBundle\Tests\WebTestCase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -29,13 +28,14 @@ abstract class AbstractElasticsearchTestCase extends WebTestCase
     /**
      * @var ContainerInterface
      */
-    private $container;
+    private static $container;
 
     /**
      * {@inheritdoc}
      */
     protected function setUp()
     {
+        self::$container = null;
         foreach ($this->getDataArray() as $manager => $data) {
             // Create index and populate data
             $this->getManager($manager);
@@ -165,19 +165,18 @@ protected function tearDown()
     /**
      * Returns service container.
      *
-     * @param bool  $reinitialize  Force kernel reinitialization.
      * @param array $kernelOptions Options used passed to kernel if it needs to be initialized.
      *
      * @return ContainerInterface
      */
-    protected function getContainer($reinitialize = false, $kernelOptions = [])
+    protected function getContainer($kernelOptions = [])
     {
-        if ($this->container === null || $reinitialize) {
-            static::bootKernel($kernelOptions);
-            $this->container = static::$kernel->getContainer();
+        if (null === self::$container) {
+            self::bootKernel($kernelOptions);
+            self::$container = static::$kernel->getContainer();
         }
 
-        return $this->container;
+        return self::$container;
     }
 
     /**
diff --git a/Tests/Functional/Command/GenerateDocumentCommandTest.php b/Tests/Functional/Command/GenerateDocumentCommandTest.php
@@ -3,7 +3,7 @@
 namespace ONGR\ElasticsearchBundle\Tests\Functional\Command;
 
 use ONGR\ElasticsearchBundle\Command\DocumentGenerateCommand;
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use ONGR\ElasticsearchBundle\Tests\WebTestCase;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 
diff --git a/Tests/Functional/DependencyInjection/ElasticsearchExtensionTest.php b/Tests/Functional/DependencyInjection/ElasticsearchExtensionTest.php
@@ -11,7 +11,7 @@
 
 namespace ONGR\ElasticsearchBundle\Tests\Functional\DependencyInjection;
 
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use ONGR\ElasticsearchBundle\Tests\WebTestCase;
 
 class ElasticsearchExtensionTest extends WebTestCase
 {
diff --git a/Tests/Functional/Mapping/DocumentFinderTest.php b/Tests/Functional/Mapping/DocumentFinderTest.php
@@ -12,7 +12,7 @@
 namespace ONGR\ElasticsearchBundle\Tests\Functional\Mapping;
 
 use ONGR\ElasticsearchBundle\Mapping\DocumentFinder;
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use ONGR\ElasticsearchBundle\Tests\WebTestCase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 class DocumentFinderTest extends WebTestCase
diff --git a/Tests/Functional/Mapping/MetadataCollectorTest.php b/Tests/Functional/Mapping/MetadataCollectorTest.php
@@ -12,7 +12,7 @@
 namespace ONGR\ElasticsearchBundle\Tests\Functional\Mapping;
 
 use ONGR\ElasticsearchBundle\Mapping\MetadataCollector;
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use ONGR\ElasticsearchBundle\Tests\WebTestCase;
 
 class MetadataCollectorTest extends WebTestCase
 {
diff --git a/Tests/Unit/DependencyInjection/Compiler/MappingPassTest.php b/Tests/Unit/DependencyInjection/Compiler/MappingPassTest.php
@@ -12,6 +12,7 @@
 namespace ONGR\ElasticsearchBundle\Tests\Unit\DependencyInjection\Compiler;
 
 use ONGR\ElasticsearchBundle\DependencyInjection\Compiler\MappingPass;
+use Symfony\Component\DependencyInjection\Alias;
 
 /**
  * Unit tests for MappingPass.
@@ -103,6 +104,15 @@ function ($parameter) use ($metadataCollectorMock) {
             )
             ->willReturn(null);
 
+        $containerMock
+            ->expects($this->exactly(1))
+            ->method('setAlias')
+            ->withConsecutive(
+                [$this->equalTo('es.manager')],
+                [$this->equalTo('es.manager.default')]
+            )
+            ->willReturn(new Alias('es.manager', 'es.manager.default'));
+
         return $containerMock;
     }
 
diff --git a/Tests/WebTestCase.php b/Tests/WebTestCase.php
@@ -0,0 +1,12 @@
+<?php
+namespace ONGR\ElasticsearchBundle\Tests;
+
+class WebTestCase extends \Symfony\Bundle\FrameworkBundle\Test\WebTestCase
+{
+    public static function getKernelClass()
+    {
+        require_once __DIR__.'/app/AppKernel.php';
+
+        return \AppKernel::class;
+    }
+}
diff --git a/composer.json b/composer.json

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@`
`22`	`22`
`23`	`23`	`class DocumentGenerateCommand extends AbstractManagerAwareCommand`
`24`	`24`	`{`
	`25`	`+ public static $defaultName = 'ongr:es:document:generate';`
	`26`	`+`
`25`	`27`	`/**`
`26`	`28`	`* @var QuestionHelper`
`27`	`29`	`*/`
`@@ -45,7 +47,7 @@ protected function configure()`
`45`	`47`	`parent::configure();`
`46`	`48`
`47`	`49`	`$this`
`48`		`- ->setName('ongr:es:document:generate')`
	`50`	`+ ->setName(static::$defaultName)`
`49`	`51`	`->setDescription('Generates a new Elasticsearch document inside a bundle');`
`50`	`52`	`}`
`51`	`53`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ public function load(array $configs, ContainerBuilder $container)`
`64`	`64`	`new Reference('debug.stopwatch', ContainerInterface::NULL_ON_INVALID_REFERENCE)`
`65`	`65`	`]`
`66`	`66`	`);`
	`67`	`+ $definition->setPublic(true);`
`67`	`68`	`$container->setDefinition('es.manager_factory', $definition);`
`68`	`69`	`}`
`69`	`70`	`}`