clean ups

Command/PopulateCommand.php

@@ -4,11 +4,9 @@ namespace FOS\ElasticaBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Helper\DialogHelper;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Output\Output;
 use FOS\ElasticaBundle\IndexManager;
 use FOS\ElasticaBundle\Provider\ProviderRegistry;
 use FOS\ElasticaBundle\Resetter;

Command/ResetCommand.php

@@ -3,11 +3,9 @@
 namespace FOS\ElasticaBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Output\Output;
 use FOS\ElasticaBundle\IndexManager;
 use FOS\ElasticaBundle\Resetter;
 

Command/SearchCommand.php

@@ -7,7 +7,6 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Output\Output;
 use Elastica\Query;
 use Elastica\Result;
 

Configuration/Search.php

@@ -11,8 +11,6 @@ namespace FOS\ElasticaBundle\Configuration;
  */
 class Search
 {
-
     /** @var string */
     public $repositoryClass;
-
 }

DependencyInjection/FOSElasticaExtension.php

@@ -91,6 +91,7 @@ class FOSElasticaExtension extends Extension
      * @param ContainerBuilder $container A ContainerBuilder instance
      * @param array $clientIdsByName
      * @param $defaultClientName
+     * @param $serializerConfig
      * @throws \InvalidArgumentException
      * @return array
      */
@@ -170,6 +171,7 @@ class FOSElasticaExtension extends Extension
      * @param $indexName
      * @param $indexId
      * @param array $typePrototypeConfig
+     * @param $serializerConfig
      */
     protected function loadTypes(array $types, ContainerBuilder $container, $indexName, $indexId, array $typePrototypeConfig, $serializerConfig)
     {

Doctrine/RepositoryManager.php

@@ -40,5 +40,4 @@ class RepositoryManager extends BaseManager
 
         return parent::getRepository($realEntityName);
     }
-
 }

Finder/TransformedFinder.php

@@ -97,6 +97,7 @@ class TransformedFinder implements PaginatedFinderInterface
     public function createPaginatorAdapter($query)
     {
         $query = Query::create($query);
+
         return new TransformedPaginatorAdapter($this->searchable, $query, $this->transformer);
     }
 }

Manager/RepositoryManager.php

@@ -5,6 +5,7 @@ namespace FOS\ElasticaBundle\Manager;
 use Doctrine\Common\Annotations\Reader;
 use FOS\ElasticaBundle\Finder\FinderInterface;
 use RuntimeException;
+
 /**
  * @author Richard Miller <info@limethinking.co.uk>
  *
@@ -70,11 +71,10 @@ class RepositoryManager implements RepositoryManagerInterface
 
     private function createRepository($entityName)
     {
-        $repositoryName = $this->getRepositoryName($entityName);
-        if (!class_exists($repositoryName)) {
+        if (!class_exists($repositoryName = $this->getRepositoryName($entityName))) {
             throw new RuntimeException(sprintf('%s repository for %s does not exist', $repositoryName, $entityName));
         }
+
         return new $repositoryName($this->entities[$entityName]['finder']);
     }
-
 }

Manager/RepositoryManagerInterface.php

@@ -32,5 +32,4 @@ interface RepositoryManagerInterface
      * @param string $entityName
      */
     public function getRepository($entityName);
-
 }

Paginator/FantaPaginatorAdapter.php

@@ -3,14 +3,13 @@
 namespace FOS\ElasticaBundle\Paginator;
 
 use Pagerfanta\Adapter\AdapterInterface;
-use FOS\ElasticaBundle\Paginator\PaginatorAdapterInterface;
 
 class FantaPaginatorAdapter implements AdapterInterface
 {
     private $adapter;
 
     /**
-     * @param PaginatorAdapterInterface $adapter
+     * @param \FOS\ElasticaBundle\Paginator\PaginatorAdapterInterface $adapter
      */
     public function __construct(PaginatorAdapterInterface $adapter)
     {
@@ -42,7 +41,7 @@ class FantaPaginatorAdapter implements AdapterInterface
     }
 
     /**
-     * Returns an slice of the results.
+     * Returns a slice of the results.
      *
      * @param integer $offset The offset.
      * @param integer $length The length.

Paginator/PaginatorAdapterInterface.php

@@ -2,8 +2,6 @@
 
 namespace FOS\ElasticaBundle\Paginator;
 
-use FOS\ElasticaBundle\Paginator\PartialResultsInterface;
-
 interface PaginatorAdapterInterface
 {
     /**

Paginator/RawPaginatorAdapter.php

@@ -5,9 +5,6 @@ namespace FOS\ElasticaBundle\Paginator;
 use Elastica\SearchableInterface;
 use Elastica\Query;
 use Elastica\ResultSet;
-use FOS\ElasticaBundle\Paginator\PaginatorAdapterInterface;
-use FOS\ElasticaBundle\Paginator\RawPartialResults;
-use FOS\ElasticaBundle\Paginator\PartialResultsInterface;
 use InvalidArgumentException;
 
 /**
@@ -52,6 +49,7 @@ class RawPaginatorAdapter implements PaginatorAdapterInterface
      *
      * @param $offset
      * @param $itemCountPerPage
+     * @throws \InvalidArgumentException
      * @return ResultSet
      */
     protected function getElasticaResults($offset, $itemCountPerPage)

Paginator/RawPartialResults.php

@@ -2,7 +2,6 @@
 
 namespace FOS\ElasticaBundle\Paginator;
 
-use FOS\ElasticaBundle\Paginator\PartialResultsInterface;
 use Elastica\ResultSet;
 use Elastica\Result;
 

Paginator/TransformedPaginatorAdapter.php

@@ -3,7 +3,6 @@
 namespace FOS\ElasticaBundle\Paginator;
 
 use FOS\ElasticaBundle\Transformer\ElasticaToModelTransformerInterface;
-use FOS\ElasticaBundle\Paginator\TransformedPartialResults;
 use Elastica\SearchableInterface;
 use Elastica\Query;
 

Paginator/TransformedPartialResults.php

@@ -3,7 +3,6 @@
 namespace FOS\ElasticaBundle\Paginator;
 
 use FOS\ElasticaBundle\Transformer\ElasticaToModelTransformerInterface;
-use FOS\ElasticaBundle\Paginator\RawPartialResults;
 use Elastica\ResultSet;
 
 /**

Provider/AbstractProvider.php

@@ -3,7 +3,6 @@
 namespace FOS\ElasticaBundle\Provider;
 
 use FOS\ElasticaBundle\Persister\ObjectPersisterInterface;
-use FOS\ElasticaBundle\Provider\ProviderInterface;
 
 abstract class AbstractProvider implements ProviderInterface
 {

Provider/ProviderRegistry.php

@@ -2,8 +2,6 @@
 
 namespace FOS\ElasticaBundle\Provider;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 

Resources/views/Collector/elastica.html.twig

@@ -19,13 +19,13 @@
 {% endblock %}
 
 {% block menu %}
-<span class="label">
-    <span class="icon"><img src="{{ asset('bundles/foselastica/images/elastica.png') }}" alt="" /></span>
-    <strong>Elastica</strong>
-    <span class="count">
-        <span>{{ collector.querycount }}</span>
+    <span class="label">
+        <span class="icon"><img src="{{ asset('bundles/foselastica/images/elastica.png') }}" alt="" /></span>
+        <strong>Elastica</strong>
+        <span class="count">
+            <span>{{ collector.querycount }}</span>
+        </span>
     </span>
-</span>
 {% endblock %}
 
 {% block panel %}

Serializer/Callback.php

@@ -8,9 +8,7 @@ use JMS\Serializer\SerializerInterface;
 class Callback
 {
     protected $serializer;
-
     protected $groups;
-
     protected $version;
 
     public function setSerializer($serializer)

Tests/DataCollector/ElasticaDataCollectorTest.php

@@ -9,7 +9,6 @@ use FOS\ElasticaBundle\DataCollector\ElasticaDataCollector;
  */
 class ElasticaDataCollectorTest extends \PHPUnit_Framework_TestCase
 {
-
     public function testCorrectAmountOfQueries()
     {
         /** @var $requestMock \PHPUnit_Framework_MockObject_MockObject|\Symfony\Component\HttpFoundation\Request */
@@ -93,5 +92,4 @@ class ElasticaDataCollectorTest extends \PHPUnit_Framework_TestCase
         $elasticaDataCollector->collect($requestMock, $responseMock);
         $this->assertEquals(30, $elasticaDataCollector->getTime());
     }
-
 }

Tests/Doctrine/RepositoryManagerTest.php

@@ -156,5 +156,4 @@ class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
         $repository = $manager->getRepository($shortEntityName);
         $this->assertInstanceOf('FOS\ElasticaBundle\Repository', $repository);
     }
-
 }

Tests/Logger/ElasticaLoggerTest.php

@@ -86,5 +86,4 @@ class ElasticaLoggerTest extends \PHPUnit_Framework_TestCase
 
         $elasticaLogger->logQuery($path, $method, $data, $time);
     }
-
 }

Tests/Manager/RepositoryManagerTest.php

@@ -97,5 +97,4 @@ class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
         $manager->addEntity($entityName, $finderMock, 'FOS\ElasticaBundle\Tests\MissingRepository');
         $manager->getRepository('Missing Entity');
     }
-
 }

Tests/RepositoryTest.php

@@ -9,7 +9,6 @@ use FOS\ElasticaBundle\Repository;
  */
 class RepositoryTest extends \PHPUnit_Framework_TestCase
 {
-
     public function testThatFindCallsFindOnFinder()
     {
         $testQuery = 'Test Query';
@@ -75,5 +74,4 @@ class RepositoryTest extends \PHPUnit_Framework_TestCase
         $repository = new Repository($finderMock);
         $repository->findHybrid($testQuery, $testLimit);
     }
-
 }

Tests/Transformer/ElasticaToModelTransformerCollectionTest.php

@@ -119,5 +119,4 @@ class POPO
 
 class POPO2 extends POPO
 {
-
 }

Transformer/ModelToElasticaAutoTransformer.php

@@ -149,5 +149,4 @@ class ModelToElasticaAutoTransformer implements ModelToElasticaTransformerInterf
 
         return $value;
     }
-
 }