Merge pull request #869 from ongr-io/6.0-dev

6.0 major version release

Author: einorler

.github/ISSUE_TEMPLATE.md

@@ -1,9 +1,13 @@
 <!-- Please describe your problem/feature request here. -->
 
 <!--
-If you are creating a problem issue don't forget to include your code snippet that 
-we could recreate problem. Please include:
-    - Your PHP version
+If you are creating an issue because you got some error or smth, 
+  don't forget to include your code snippet that 
+  we could help us to recreate the problem.
+
+  Please include:
+    - PHP version
     - Elasticsearch version
     - Bundle version
+    - Symfony version
 -->

.gitignore

@@ -2,5 +2,7 @@
 /Tests/app/cache/
 /Tests/app/logs/
 /Tests/app/build/
+/var/cache/test
 /phpunit.xml
 /composer.lock
+/coverage.clover

.travis.yml

@@ -1,33 +1,26 @@
 sudo: false
 language: php
 php:
-  - 5.6
-  - 7.0
   - 7.1
   - 7.2
+  - 7.3
 env:
   global:
-    - ES_VERSION=5.6.8 ES_DOWNLOAD_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz
+    - ES_VERSION=6.2.3 ES_DOWNLOAD_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz
   matrix:
-    - SYMFONY="~2.8"
-    - SYMFONY="~3.0"
-    - SYMFONY="~3.1"
-    - SYMFONY="~3.2"
-    - SYMFONY="~3.3"
     - SYMFONY="~3.4"
+    - SYMFONY="^4.1"
 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 require --no-update symfony/framework-bundle:${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
-  - vendor/bin/phpcs -p --standard=PSR2 --ignore=vendor/,Tests/app/ ./
+  - vendor/bin/phpcs -p --standard=PSR2 --ignore=vendor/,Tests/app/,var/cache ./
 after_script:
   - travis_retry php vendor/bin/coveralls

Annotation/Object.php renamed to Annotation/AbstractAnnotation.php

@@ -11,7 +11,12 @@
 
 namespace ONGR\ElasticsearchBundle\Annotation;
 
-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');
+abstract class AbstractAnnotation
+{
+    public $settings = [];
+
+    public function getSettings(): array
+    {
+        return $this->settings;
+    }
 }

Annotation/Document.php

@@ -11,16 +11,14 @@
 
 namespace ONGR\ElasticsearchBundle\Annotation;
 
-use ONGR\ElasticsearchBundle\Mapping\Caser;
-
 /**
- * Annotation for property which points to inner object.
- *
  * @Annotation
  * @Target("PROPERTY")
  */
-final class Embedded
+final class Embedded extends AbstractAnnotation implements PropertiesAwareInterface
 {
+    use NameAwareTrait;
+
     /**
      * Inner object class name.
      *
@@ -29,54 +27,4 @@ final class Embedded
      * @Doctrine\Common\Annotations\Annotation\Required
      */
     public $class;
-
-    /**
-     * Name of the type field. Defaults to normalized property name.
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * Defines if related value will store a single object or an array of objects
-     *
-     * If this value is set to true, in the result ObjectIterator will be provided,
-     * otherwise you will get single object.
-     *
-     * @var bool Object or ObjectIterator
-     */
-    public $multiple;
-
-    /**
-     * In this field you can define options.
-     *
-     * @var array
-     */
-    public $options;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function dump(array $exclude = [])
-    {
-        $array = array_diff_key(
-            array_filter(
-                get_object_vars($this),
-                function ($value) {
-                    return $value || is_bool($value);
-                }
-            ),
-            array_flip(array_merge(['class', 'name', 'multiple'], $exclude))
-        );
-
-        return array_combine(
-            array_map(
-                function ($key) {
-                    return Caser::snake($key);
-                },
-                array_keys($array)
-            ),
-            array_values($array)
-        );
-    }
 }

Annotation/Embedded.php

@@ -17,23 +17,12 @@
  * @Annotation
  * @Target("PROPERTY")
  */
-final class Id implements MetaField
+final class Id extends AbstractAnnotation implements MetaFieldInterface, PropertiesAwareInterface
 {
     const NAME = '_id';
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
+    public function getName(): ?string
     {
         return self::NAME;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSettings()
-    {
-        return [];
-    }
 }

Annotation/HashMap.php

@@ -0,0 +1,53 @@
+<?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;
+
+use Doctrine\Common\Annotations\Annotation\Attributes;
+
+/**
+ * Annotation to mark a class as an Elasticsearch index.
+ *
+ * @Annotation
+ * @Target("CLASS")
+ */
+final class Index extends AbstractAnnotation
+{
+    /**
+     * Index alias name. By default the index name will be created with the timestamp appended to the alias.
+     */
+    public $alias;
+
+    /**
+     * Index alias name. By default the index name will be created with the timestamp appended to the alias.
+     */
+    public $hosts = [
+        '127.0.0.1:9200'
+    ];
+
+    public $numberOfShards = 5;
+
+    public $numberOfReplicas = 1;
+
+    /**
+     * We strongly recommend to not use this parameter in the index annotation. By default it will be set as `_doc`
+     * type name. Eventually it will be removed.
+     *
+     * @deprecated will be removed in v7 since there will be no more types in the indexes.
+     */
+    public $typeName = '_doc';
+
+    /**
+     * You can select one of your indexes to be default. Useful for cli commands when you don't
+     *   need to define an alias name. If default is not set the first index found will be set as default one.
+     */
+    public $default = false;
+}

Annotation/Id.php

@@ -14,19 +14,6 @@
 /**
  * All meta-field annotations must implement this interface.
  */
-interface MetaField
+interface MetaFieldInterface
 {
-    /**
-     * Returns meta-field name.
-     *
-     * @return string
-     */
-    public function getName();
-
-    /**
-     * Returns meta-field settings.
-     *
-     * @return array
-     */
-    public function getSettings();
 }