Merge branch 'master' into v0.9

Author: Simonas Šerlinskas

Annotation/MultiField.php

@@ -11,8 +11,6 @@
 
 namespace ONGR\ElasticsearchBundle\Annotation;
 
-use Doctrine\Common\Annotations\Annotation\Required;
-
 /**
  * Annotation that can be used to define multi-field parameters.
  *

Annotation/Property.php

@@ -11,8 +11,6 @@
 
 namespace ONGR\ElasticsearchBundle\Annotation;
 
-use Doctrine\Common\Annotations\Annotation\Required;
-
 /**
  * Annotation used to check mapping type during the parsing process.
  *
@@ -124,4 +122,9 @@ final class Property extends AbstractProperty
      * @var string
      */
     public $geohashPrecision;
+
+    /**
+     * @var string
+     */
+    public $format;
 }

Annotation/Suggester/AbstractSuggesterProperty.php

@@ -11,7 +11,6 @@
 
 namespace ONGR\ElasticsearchBundle\Annotation\Suggester;
 
-use Doctrine\Common\Annotations\Annotation\Required;
 use ONGR\ElasticsearchBundle\Annotation\AbstractProperty;
 
 /**

Annotation/Suggester/Context/AbstractContext.php

@@ -11,7 +11,6 @@
 
 namespace ONGR\ElasticsearchBundle\Annotation\Suggester\Context;
 
-use Doctrine\Common\Annotations\Annotation\Required;
 use ONGR\ElasticsearchBundle\Mapping\DumperInterface;
 
 /**

Client/Connection.php

@@ -185,11 +185,11 @@ public function flush()
      *
      * @param array $params Parameters.
      *
-     * $params = [
-     *   'index' => 'index_name',
-     *   'type' => 'document_type',
-     *   'id' => 'id',
-     *   ];.
+     *                      $params = [
+     *                      'index' => 'index_name',
+     *                      'type' => 'document_type',
+     *                      'id' => 'id',
+     *                      ];.
      *
      * @return array
      */

Command/AbstractManagerAwareCommand.php

@@ -11,7 +11,6 @@
 
 namespace ONGR\ElasticsearchBundle\Command;
 
-use ONGR\ElasticsearchBundle\Client\Connection;
 use ONGR\ElasticsearchBundle\ORM\Manager;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputOption;

Command/CacheClearCommand.php

@@ -12,7 +12,6 @@
 namespace ONGR\ElasticsearchBundle\Command;
 
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**

Command/IndexDropCommand.php

@@ -11,7 +11,6 @@
 
 namespace ONGR\ElasticsearchBundle\Command;
 
-use ONGR\ElasticsearchBundle\ORM\Manager;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;

Command/TypeUpdateCommand.php

@@ -11,8 +11,6 @@
 
 namespace ONGR\ElasticsearchBundle\Command;
 
-use ONGR\ElasticsearchBundle\Mapping\MetadataCollector;
-use ONGR\ElasticsearchBundle\ORM\Manager;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;

Command/WarmerDeleteCommand.php

@@ -13,7 +13,6 @@
 
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**