PHP7.2 compatibility. BC compatible. (#852)

* 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

* 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.

Author: makasim

.travis.yml

@@ -15,16 +15,16 @@ env:
     - SYMFONY="~3.2"
     - SYMFONY="~3.3"
     - SYMFONY="~3.4"
-    - SYMFONY="~3.5"
-    - SYMFONY="~3.6"
 install:
   - wget ${ES_DOWNLOAD_URL}
   - tar -xzf elasticsearch-${ES_VERSION}.tar.gz
   - ./elasticsearch-${ES_VERSION}/bin/elasticsearch -d
 before_script:
+  - echo 'memory_limit=-1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
   - composer require --no-update symfony/symfony:${SYMFONY}
   - composer config -g github-oauth.github.com $GITHUB_COMPOSER_AUTH
   - composer install --no-interaction --prefer-dist
+
 script:
   - wget -q --waitretry=1 --retry-connrefused -T 10 -O - http://127.0.0.1:9200
   - vendor/bin/phpunit --coverage-clover=coverage.clover

Annotation/Object.php

@@ -11,36 +11,7 @@
 
 namespace ONGR\ElasticsearchBundle\Annotation;
 
-/**
- * Annotation to mark a class as an object during the parsing process.
- *
- * `Object` name as class name is forbidden in PHP 7 but we never create this
- *  class as object and only use it for annotation definition.
- *
- * @Annotation
- * @Target("CLASS")
- *
- * @deprecated Object is reserved word in PHP 7.2, it will be changed to ObjectType class
- */
-final class Object
-{
-    const NAME = 'object';
-
-    /**
-     * In this field you can define options.
-     *
-     * @var array
-     */
-    public $options = [];
-
-    /**
-     * {@inheritdoc}
-     */
-    public function dump(array $exclude = [])
-    {
-        return array_diff_key(
-            $this->options,
-            $exclude
-        );
-    }
+if (version_compare(PHP_VERSION, '7.2.0') < 0) {
+    class_alias('ONGR\ElasticsearchBundle\Annotation\ObjectType', 'ONGR\ElasticsearchBundle\Annotation\Object', false);
+    class_exists('ONGR\ElasticsearchBundle\Annotation\ObjectType');
 }

Annotation/ObjectType.php

@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of the ONGR package.
+ *
+ * (c) NFQ Technologies UAB <info@nfq.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ONGR\ElasticsearchBundle\Annotation;
+
+/**
+ * Annotation to mark a class as an object during the parsing process.
+ *
+ * `Object` name as class name is forbidden in PHP 7 but we never create this
+ *  class as object and only use it for annotation definition.
+ *
+ * @Annotation
+ * @Target("CLASS")
+ *
+ * @deprecated Object is reserved word in PHP 7.2, it will be changed to ObjectType class
+ */
+final class ObjectType
+{
+    const NAME = 'object';
+
+    /**
+     * In this field you can define options.
+     *
+     * @var array
+     */
+    public $options = [];
+
+    /**
+     * {@inheritdoc}
+     */
+    public function dump(array $exclude = [])
+    {
+        return array_diff_key(
+            $this->options,
+            $exclude
+        );
+    }
+}

DependencyInjection/ONGRElasticsearchExtension.php

@@ -18,6 +18,8 @@
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
  * This is the class that loads and manages bundle configuration.
@@ -34,6 +36,11 @@ public function load(array $configs, ContainerBuilder $container)
 
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
         $loader->load('services.yml');
+
+        if (Kernel::MAJOR_VERSION >= 4) {
+            $loader->load('services4.yaml');
+        }
+
         $config['cache'] = isset($config['cache']) ?
             $config['cache'] : !$container->getParameter('kernel.debug');
         $config['profiler'] = isset($config['profiler']) ?

Mapping/DocumentParser.php

@@ -30,7 +30,7 @@ class DocumentParser
     const PROPERTY_ANNOTATION = 'ONGR\ElasticsearchBundle\Annotation\Property';
     const EMBEDDED_ANNOTATION = 'ONGR\ElasticsearchBundle\Annotation\Embedded';
     const DOCUMENT_ANNOTATION = 'ONGR\ElasticsearchBundle\Annotation\Document';
-    const OBJECT_ANNOTATION = 'ONGR\ElasticsearchBundle\Annotation\Object';
+    const OBJECT_ANNOTATION = 'ONGR\ElasticsearchBundle\Annotation\ObjectType';
     const NESTED_ANNOTATION = 'ONGR\ElasticsearchBundle\Annotation\Nested';
 
     // Meta fields
@@ -398,7 +398,7 @@ private function registerAnnotations()
             'Document',
             'Property',
             'Embedded',
-            'Object',
+            'ObjectType',
             'Nested',
             'Id',
             'ParentDocument',
@@ -410,6 +410,10 @@ private function registerAnnotations()
         foreach ($annotations as $annotation) {
             AnnotationRegistry::registerFile(__DIR__ . "/../Annotation/{$annotation}.php");
         }
+
+        if (version_compare(PHP_VERSION, '7.2.0') < 0) {
+            AnnotationRegistry::registerFile(__DIR__ . "/../Annotation/Object.php");
+        }
     }
 
     /**
@@ -595,7 +599,7 @@ private function getObjectMapping($className, $directory)
             default:
                 throw new \LogicException(
                     sprintf(
-                        '%s should have @Object or @Nested annotation to be used as embeddable object.',
+                        '%s should have @ObjectType or @Nested annotation to be used as embeddable object.',
                         $className
                     )
                 );

Resources/config/services.yml

@@ -2,11 +2,6 @@ parameters:
     es.logging.path: "%kernel.logs_dir%/elasticsearch_%kernel.environment%.log"
 
 services:
-    ONGR\ElasticsearchBundle\Command\:
-        resource: '../../Command'
-        tags:
-            - { name: console.command }
-
     es.export:
         class: ONGR\ElasticsearchBundle\Service\ExportService
 

Resources/config/services4.yaml

@@ -0,0 +1,5 @@
+services:
+    ONGR\ElasticsearchBundle\Command\:
+        resource: '../../Command'
+        tags:
+            - { name: console.command }

Resources/doc/mapping.md

@@ -275,7 +275,7 @@ namespace AppBundle\Document;
 use ONGR\ElasticsearchBundle\Annotation as ES;
 
 /**
- * @ES\Object
+ * @ES\ObjectType
  */
 class CategoryObject
 {
@@ -399,7 +399,7 @@ namespace AppBundle\Document;
 use ONGR\ElasticsearchBundle\Annotation as ES;
 
 /**
- * @ES\Object
+ * @ES\ObjectType
  */
 class VariantObject
 {

Result/Converter.php

@@ -13,7 +13,7 @@
 
 use Doctrine\Common\Collections\Collection;
 use ONGR\ElasticsearchBundle\Annotation\Nested;
-use ONGR\ElasticsearchBundle\Annotation\Object;
+use ONGR\ElasticsearchBundle\Annotation\ObjectType;
 use ONGR\ElasticsearchBundle\Mapping\MetadataCollector;
 use ONGR\ElasticsearchBundle\Service\Manager;
 
@@ -104,7 +104,7 @@ public function assignArrayToObject(array $array, $object, array $aliases)
                             $value = new \DateTime($value);
                         }
                         break;
-                    case Object::NAME:
+                    case ObjectType::NAME:
                     case Nested::NAME:
                         if ($aliases[$name]['multiple']) {
                             $value = new ObjectIterator($this, $value, $aliases[$name]);

Tests/app/fixture/TestBundle/Document/CategoryObject.php

@@ -16,7 +16,7 @@
 /**
  * Category object for testing.
  *
- * @ES\Object
+ * @ES\ObjectType
  */
 class CategoryObject
 {