Style fix

refugis · Apr 6, 2020 · 87779df · 87779df
1 parent bd08c69
commit 87779df
Show file tree

Hide file tree

Showing 34 changed files with 61 additions and 66 deletions.
diff --git a/src/Builder.php b/src/Builder.php
@@ -3,13 +3,13 @@
 namespace Refugis\ODM\Elastica;
 
 use Elastica\Client;
+use ProxyManager\Factory\LazyLoadingGhostFactory;
+use Psr\Log\LoggerInterface;
 use Refugis\ODM\Elastica\Collection\Database;
 use Refugis\ODM\Elastica\Metadata\Loader;
 use Refugis\ODM\Elastica\Metadata\MetadataFactory;
 use Refugis\ODM\Elastica\Type\TypeInterface;
 use Refugis\ODM\Elastica\Type\TypeManager;
-use ProxyManager\Factory\LazyLoadingGhostFactory;
-use Psr\Log\LoggerInterface;
 
 final class Builder
 {

diff --git a/src/Collection/CollectionInterface.php b/src/Collection/CollectionInterface.php
@@ -96,7 +96,7 @@ public function delete(string $id): void;
      *      for the limitations of this method and the available parameters.
      *
      * @param Query\AbstractQuery $query
-     * @param array $params
+     * @param array               $params
      */
     public function deleteByQuery(Query\AbstractQuery $query, array $params = []): void;
 

diff --git a/src/Configuration.php b/src/Configuration.php
@@ -2,15 +2,15 @@
 
 namespace Refugis\ODM\Elastica;
 
+use Kcs\Metadata\Factory\MetadataFactoryInterface;
+use ProxyManager\Factory\LazyLoadingGhostFactory;
+use Psr\Cache\CacheItemPoolInterface;
 use Refugis\ODM\Elastica\Exception\InvalidDocumentRepositoryException;
 use Refugis\ODM\Elastica\Repository\DefaultRepositoryFactory;
 use Refugis\ODM\Elastica\Repository\DocumentRepository;
 use Refugis\ODM\Elastica\Repository\DocumentRepositoryInterface;
 use Refugis\ODM\Elastica\Repository\RepositoryFactoryInterface;
 use Refugis\ODM\Elastica\Type\TypeManager;
-use Kcs\Metadata\Factory\MetadataFactoryInterface;
-use ProxyManager\Factory\LazyLoadingGhostFactory;
-use Psr\Cache\CacheItemPoolInterface;
 
 final class Configuration
 {

diff --git a/src/DocumentManager.php b/src/DocumentManager.php
@@ -4,6 +4,11 @@
 
 use Doctrine\Common\EventManager;
 use Elastica\Query;
+use Kcs\Metadata\Factory\MetadataFactoryInterface;
+use ProxyManager\Factory\LazyLoadingGhostFactory;
+use ProxyManager\Proxy\LazyLoadingInterface;
+use ProxyManager\Proxy\ProxyInterface;
+use Psr\Cache\CacheItemPoolInterface;
 use Refugis\ODM\Elastica\Collection\CollectionInterface;
 use Refugis\ODM\Elastica\Collection\DatabaseInterface;
 use Refugis\ODM\Elastica\Hydrator\HydratorInterface;
@@ -16,11 +21,6 @@
 use Refugis\ODM\Elastica\Search\Search;
 use Refugis\ODM\Elastica\Type\TypeManager;
 use Refugis\ODM\Elastica\Util\ClassUtil;
-use Kcs\Metadata\Factory\MetadataFactoryInterface;
-use ProxyManager\Factory\LazyLoadingGhostFactory;
-use ProxyManager\Proxy\LazyLoadingInterface;
-use ProxyManager\Proxy\ProxyInterface;
-use Psr\Cache\CacheItemPoolInterface;
 
 class DocumentManager implements DocumentManagerInterface
 {

diff --git a/src/DocumentManagerInterface.php b/src/DocumentManagerInterface.php
@@ -4,13 +4,13 @@
 
 use Doctrine\Common\EventManager;
 use Doctrine\Common\Persistence\ObjectManager;
+use ProxyManager\Factory\LazyLoadingGhostFactory;
+use Psr\Cache\CacheItemPoolInterface;
 use Refugis\ODM\Elastica\Collection\CollectionInterface;
 use Refugis\ODM\Elastica\Collection\DatabaseInterface;
 use Refugis\ODM\Elastica\Hydrator\HydratorInterface;
 use Refugis\ODM\Elastica\Search\Search;
 use Refugis\ODM\Elastica\Type\TypeManager;
-use ProxyManager\Factory\LazyLoadingGhostFactory;
-use Psr\Cache\CacheItemPoolInterface;
 
 interface DocumentManagerInterface extends ObjectManager
 {

diff --git a/src/Geotools/Coordinate/Coordinate.php b/src/Geotools/Coordinate/Coordinate.php
@@ -126,7 +126,7 @@ public function getLongitude(): float
     public function setFromString($coordinates)
     {
         if (! \is_string($coordinates)) {
-            throw new \InvalidArgumentException('The given coordinates should be a string !');
+            throw new \InvalidArgumentException('The given coordinates should be a string!');
         }
 
         $inDecimalDegree = $this->toDecimalDegrees($coordinates);
@@ -199,9 +199,7 @@ private function toDecimalDegrees($coordinates)
             ];
         }
 
-        throw new \InvalidArgumentException(
-            'It should be a valid and acceptable ways to write geographic coordinates !'
-        );
+        throw new \InvalidArgumentException('It should be a valid and acceptable ways to write geographic coordinates !');
     }
 
     /**

diff --git a/src/Hydrator/Internal/ProxyInstantiator.php b/src/Hydrator/Internal/ProxyInstantiator.php
@@ -3,10 +3,10 @@
 namespace Refugis\ODM\Elastica\Hydrator\Internal;
 
 use Doctrine\Instantiator\InstantiatorInterface;
+use ProxyManager\Proxy\GhostObjectInterface;
 use Refugis\ODM\Elastica\DocumentManagerInterface;
 use Refugis\ODM\Elastica\Metadata\DocumentMetadata;
 use Refugis\ODM\Elastica\Metadata\FieldMetadata;
-use ProxyManager\Proxy\GhostObjectInterface;
 
 class ProxyInstantiator implements InstantiatorInterface
 {

diff --git a/src/Id/AssignedIdGenerator.php b/src/Id/AssignedIdGenerator.php
@@ -19,10 +19,7 @@ public function generate(DocumentManagerInterface $dm, $document)
         $id = $class->getSingleIdentifier($document);
 
         if (null === $id) {
-            throw new InvalidIdentifierException(
-                'Document of type "'.$class->name.'" is missing an assigned ID.'.
-                'NONE generator strategy requires the ID field to be populated before persist is called.'
-            );
+            throw new InvalidIdentifierException('Document of type "'.$class->name.'" is missing an assigned ID.'.'NONE generator strategy requires the ID field to be populated before persist is called.');
         }
 
         return $id;

diff --git a/src/Metadata/Loader/AnnotationLoader.php b/src/Metadata/Loader/AnnotationLoader.php
@@ -2,12 +2,12 @@
 
 namespace Refugis\ODM\Elastica\Metadata\Loader;
 
-use Refugis\ODM\Elastica\Annotation\Document;
-use Refugis\ODM\Elastica\Metadata\FieldMetadata;
 use Kcs\ClassFinder\Finder\RecursiveFinder;
 use Kcs\Metadata\ClassMetadataInterface;
 use Kcs\Metadata\Loader\AnnotationProcessorLoader;
 use Kcs\Metadata\Loader\Processor\ProcessorFactoryInterface;
+use Refugis\ODM\Elastica\Annotation\Document;
+use Refugis\ODM\Elastica\Metadata\FieldMetadata;
 
 class AnnotationLoader extends AnnotationProcessorLoader implements LoaderInterface
 {

diff --git a/src/Metadata/MetadataFactory.php b/src/Metadata/MetadataFactory.php
@@ -4,10 +4,10 @@
 
 use Doctrine\Common\EventManager;
 use Doctrine\Common\Persistence\Mapping\ClassMetadataFactory;
-use Refugis\ODM\Elastica\Metadata\Loader\LoaderInterface;
 use Kcs\Metadata\ClassMetadataInterface;
 use Kcs\Metadata\Exception\InvalidMetadataException;
 use Kcs\Metadata\Factory\AbstractMetadataFactory;
+use Refugis\ODM\Elastica\Metadata\Loader\LoaderInterface;
 
 class MetadataFactory extends AbstractMetadataFactory implements ClassMetadataFactory
 {

diff --git a/src/Metadata/Processor/DocumentIdProcessor.php b/src/Metadata/Processor/DocumentIdProcessor.php
@@ -2,12 +2,12 @@
 
 namespace Refugis\ODM\Elastica\Metadata\Processor;
 
-use Refugis\ODM\Elastica\Annotation\DocumentId;
-use Refugis\ODM\Elastica\Metadata\DocumentMetadata;
-use Refugis\ODM\Elastica\Metadata\FieldMetadata;
 use Kcs\Metadata\Loader\Processor\Annotation\Processor;
 use Kcs\Metadata\Loader\Processor\ProcessorInterface;
 use Kcs\Metadata\MetadataInterface;
+use Refugis\ODM\Elastica\Annotation\DocumentId;
+use Refugis\ODM\Elastica\Metadata\DocumentMetadata;
+use Refugis\ODM\Elastica\Metadata\FieldMetadata;
 
 /**
  * @Processor(annotation=DocumentId::class)

diff --git a/src/Metadata/Processor/DocumentProcessor.php b/src/Metadata/Processor/DocumentProcessor.php
@@ -2,11 +2,11 @@
 
 namespace Refugis\ODM\Elastica\Metadata\Processor;
 
-use Refugis\ODM\Elastica\Annotation\Document;
-use Refugis\ODM\Elastica\Metadata\DocumentMetadata;
 use Kcs\Metadata\Loader\Processor\Annotation\Processor;
 use Kcs\Metadata\Loader\Processor\ProcessorInterface;
 use Kcs\Metadata\MetadataInterface;
+use Refugis\ODM\Elastica\Annotation\Document;
+use Refugis\ODM\Elastica\Metadata\DocumentMetadata;
 
 /**
  * @Processor(annotation=Document::class)

diff --git a/src/Metadata/Processor/FieldProcessor.php b/src/Metadata/Processor/FieldProcessor.php
@@ -2,11 +2,11 @@
 
 namespace Refugis\ODM\Elastica\Metadata\Processor;
 
-use Refugis\ODM\Elastica\Annotation\Field;
-use Refugis\ODM\Elastica\Metadata\FieldMetadata;
 use Kcs\Metadata\Loader\Processor\Annotation\Processor;
 use Kcs\Metadata\Loader\Processor\ProcessorInterface;
 use Kcs\Metadata\MetadataInterface;
+use Refugis\ODM\Elastica\Annotation\Field;
+use Refugis\ODM\Elastica\Metadata\FieldMetadata;
 
 /**
  * @Processor(annotation=Field::class)

diff --git a/src/Metadata/Processor/IndexNameProcessor.php b/src/Metadata/Processor/IndexNameProcessor.php
@@ -2,11 +2,11 @@
 
 namespace Refugis\ODM\Elastica\Metadata\Processor;
 
-use Refugis\ODM\Elastica\Annotation\IndexName;
-use Refugis\ODM\Elastica\Metadata\FieldMetadata;
 use Kcs\Metadata\Loader\Processor\Annotation\Processor;
 use Kcs\Metadata\Loader\Processor\ProcessorInterface;
 use Kcs\Metadata\MetadataInterface;
+use Refugis\ODM\Elastica\Annotation\IndexName;
+use Refugis\ODM\Elastica\Metadata\FieldMetadata;
 
 /**
  * @Processor(annotation=IndexName::class)

diff --git a/src/Metadata/Processor/IndexProcessor.php b/src/Metadata/Processor/IndexProcessor.php
@@ -2,11 +2,11 @@
 
 namespace Refugis\ODM\Elastica\Metadata\Processor;
 
-use Refugis\ODM\Elastica\Annotation\Index;
-use Refugis\ODM\Elastica\Metadata\DocumentMetadata;
 use Kcs\Metadata\Loader\Processor\Annotation\Processor;
 use Kcs\Metadata\Loader\Processor\ProcessorInterface;
 use Kcs\Metadata\MetadataInterface;
+use Refugis\ODM\Elastica\Annotation\Index;
+use Refugis\ODM\Elastica\Metadata\DocumentMetadata;
 
 /**
  * @Processor(annotation=Index::class)

diff --git a/src/Metadata/Processor/SettingProcessor.php b/src/Metadata/Processor/SettingProcessor.php
@@ -2,11 +2,11 @@
 
 namespace Refugis\ODM\Elastica\Metadata\Processor;
 
-use Refugis\ODM\Elastica\Annotation\Setting;
-use Refugis\ODM\Elastica\Metadata\DocumentMetadata;
 use Kcs\Metadata\Loader\Processor\Annotation\Processor;
 use Kcs\Metadata\Loader\Processor\ProcessorInterface;
 use Kcs\Metadata\MetadataInterface;
+use Refugis\ODM\Elastica\Annotation\Setting;
+use Refugis\ODM\Elastica\Metadata\DocumentMetadata;
 
 /**
  * @Processor(annotation=Setting::class)

diff --git a/src/Metadata/Processor/TypeNameProcessor.php b/src/Metadata/Processor/TypeNameProcessor.php
@@ -2,11 +2,11 @@
 
 namespace Refugis\ODM\Elastica\Metadata\Processor;
 
-use Refugis\ODM\Elastica\Annotation\TypeName;
-use Refugis\ODM\Elastica\Metadata\FieldMetadata;
 use Kcs\Metadata\Loader\Processor\Annotation\Processor;
 use Kcs\Metadata\Loader\Processor\ProcessorInterface;
 use Kcs\Metadata\MetadataInterface;
+use Refugis\ODM\Elastica\Annotation\TypeName;
+use Refugis\ODM\Elastica\Metadata\FieldMetadata;
 
 /**
  * @Processor(annotation=TypeName::class)

diff --git a/src/UnitOfWork.php b/src/UnitOfWork.php
@@ -6,6 +6,7 @@
 use Doctrine\Common\EventManager;
 use Doctrine\Common\Persistence\ObjectManagerAware;
 use Elastica\Document;
+use ProxyManager\Proxy\LazyLoadingInterface;
 use Refugis\ODM\Elastica\Events\LifecycleEventManager;
 use Refugis\ODM\Elastica\Events\PreFlushEventArgs;
 use Refugis\ODM\Elastica\Exception\IndexNotFoundException;
@@ -18,7 +19,6 @@
 use Refugis\ODM\Elastica\Metadata\FieldMetadata;
 use Refugis\ODM\Elastica\Persister\DocumentPersister;
 use Refugis\ODM\Elastica\Util\ClassUtil;
-use ProxyManager\Proxy\LazyLoadingInterface;
 
 final class UnitOfWork
 {

diff --git a/tests/Collection/CollectionTest.php b/tests/Collection/CollectionTest.php
@@ -10,6 +10,8 @@
 use Elastica\Search as ElasticaSearch;
 use Elastica\Type;
 use Elasticsearch\Endpoints;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Prophecy\ObjectProphecy;
 use Refugis\ODM\Elastica\Collection\Collection;
 use Refugis\ODM\Elastica\Collection\CollectionInterface;
 use Refugis\ODM\Elastica\DocumentManagerInterface;
@@ -19,8 +21,6 @@
 use Refugis\ODM\Elastica\Tests\Fixtures\Document\FooNoAutoCreate;
 use Refugis\ODM\Elastica\Tests\Traits\DocumentManagerTestTrait;
 use Refugis\ODM\Elastica\Tests\Traits\FixturesTestTrait;
-use PHPUnit\Framework\TestCase;
-use Prophecy\Prophecy\ObjectProphecy;
 
 class CollectionTest extends TestCase
 {

diff --git a/tests/Collection/DatabaseTest.php b/tests/Collection/DatabaseTest.php
@@ -4,10 +4,10 @@
 
 use Elastica\Client;
 use Elastica\Index;
-use Refugis\ODM\Elastica\Collection\Database;
-use Refugis\ODM\Elastica\Metadata\DocumentMetadata;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
+use Refugis\ODM\Elastica\Collection\Database;
+use Refugis\ODM\Elastica\Metadata\DocumentMetadata;
 
 class DatabaseTest extends TestCase
 {

diff --git a/tests/Command/DropSchemaCommandTest.php b/tests/Command/DropSchemaCommandTest.php
@@ -2,10 +2,10 @@
 
 namespace Refugis\ODM\Elastica\Tests\Command;
 
+use PHPUnit\Framework\TestCase;
 use Refugis\ODM\Elastica\Command\DropSchemaCommand;
 use Refugis\ODM\Elastica\Tests\Traits\DocumentManagerTestTrait;
 use Refugis\ODM\Elastica\Tests\Traits\FixturesTestTrait;
-use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Tester\CommandTester;
 
 class DropSchemaCommandTest extends TestCase

diff --git a/tests/DocumentManagerTest.php b/tests/DocumentManagerTest.php
@@ -4,6 +4,8 @@
 
 use Elastica\Index;
 use Elastica\Type;
+use PHPUnit\Framework\TestCase;
+use ProxyManager\Proxy\ProxyInterface;
 use Refugis\ODM\Elastica\DocumentManager;
 use Refugis\ODM\Elastica\Geotools\Coordinate\Coordinate;
 use Refugis\ODM\Elastica\Tests\Fixtures\Document\Foo;
@@ -12,8 +14,6 @@
 use Refugis\ODM\Elastica\Tests\Traits\DocumentManagerTestTrait;
 use Refugis\ODM\Elastica\Tests\Traits\FixturesTestTrait;
 use Refugis\ODM\Elastica\VarDumper\VarDumperTestTrait;
-use PHPUnit\Framework\TestCase;
-use ProxyManager\Proxy\ProxyInterface;
 
 /**
  * @group functional

diff --git a/tests/Hydrator/ObjectHydratorTest.php b/tests/Hydrator/ObjectHydratorTest.php
@@ -9,6 +9,10 @@
 use Elastica\Response;
 use Elastica\Result;
 use Elastica\ResultSet;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\Prophecy\ObjectProphecy;
+use ProxyManager\Factory\LazyLoadingGhostFactory;
 use Refugis\ODM\Elastica\DocumentManagerInterface;
 use Refugis\ODM\Elastica\Hydrator\ObjectHydrator;
 use Refugis\ODM\Elastica\Metadata\DocumentMetadata;
@@ -17,10 +21,6 @@
 use Refugis\ODM\Elastica\Type\StringType;
 use Refugis\ODM\Elastica\Type\TypeManager;
 use Refugis\ODM\Elastica\UnitOfWork;
-use PHPUnit\Framework\TestCase;
-use Prophecy\Argument;
-use Prophecy\Prophecy\ObjectProphecy;
-use ProxyManager\Factory\LazyLoadingGhostFactory;
 
 class ObjectHydratorTest extends TestCase
 {

diff --git a/tests/Internal/DocumentGraphTest.php b/tests/Internal/DocumentGraphTest.php
@@ -2,11 +2,11 @@
 
 namespace Refugis\ODM\Elastica\Tests\Internal;
 
+use PHPUnit\Framework\TestCase;
 use Refugis\ODM\Elastica\Internal\DocumentGraph;
 use Refugis\ODM\Elastica\Internal\DocumentGraphEdge;
 use Refugis\ODM\Elastica\Internal\DocumentGraphNode;
 use Refugis\ODM\Elastica\Tests\Fixtures\Document\Foo;
-use PHPUnit\Framework\TestCase;
 
 class DocumentGraphTest extends TestCase
 {

diff --git a/tests/Metadata/Processor/DocumentIdProcessorTest.php b/tests/Metadata/Processor/DocumentIdProcessorTest.php
@@ -2,13 +2,13 @@
 
 namespace Refugis\ODM\Elastica\Tests\Metadata\Processor;
 
+use PHPUnit\Framework\TestCase;
+use Prophecy\Prophecy\ObjectProphecy;
 use Refugis\ODM\Elastica\Annotation\DocumentId;
 use Refugis\ODM\Elastica\Metadata\DocumentMetadata;
 use Refugis\ODM\Elastica\Metadata\FieldMetadata;
 use Refugis\ODM\Elastica\Metadata\Processor\DocumentIdProcessor;
 use Refugis\ODM\Elastica\Tests\Fixtures\Document\Foo;
-use PHPUnit\Framework\TestCase;
-use Prophecy\Prophecy\ObjectProphecy;
 
 class DocumentIdProcessorTest extends TestCase
 {

diff --git a/tests/Metadata/Processor/IndexProcessorTest.php b/tests/Metadata/Processor/IndexProcessorTest.php
@@ -3,6 +3,7 @@
 namespace Refugis\ODM\Elastica\Tests\Metadata\Processor;
 
 use Elastica\Type\Mapping;
+use PHPUnit\Framework\TestCase;
 use Refugis\ODM\Elastica\Annotation\Analyzer;
 use Refugis\ODM\Elastica\Annotation\Filter;
 use Refugis\ODM\Elastica\Annotation\Index;
@@ -11,7 +12,6 @@
 use Refugis\ODM\Elastica\Metadata\Processor\IndexProcessor;
 use Refugis\ODM\Elastica\Tests\Fixtures\Document\Foo;
 use Refugis\ODM\Elastica\Tests\Traits\DocumentManagerTestTrait;
-use PHPUnit\Framework\TestCase;
 
 class IndexProcessorTest extends TestCase
 {