Merge pull request #1667 from XWB/cleanup2

Some more cleanup

Author: XWB

.php_cs.dist

@@ -22,6 +22,7 @@ return PhpCsFixer\Config::create()
         'ordered_imports' => true,
         'phpdoc_no_empty_return' => false,
         'ternary_to_null_coalescing' => true,
+        'nullable_type_declaration_for_default_null_value' => true,
     ])
     ->setUsingCache(true)
     ->setFinder(

src/DataCollector/ElasticaDataCollector.php

@@ -30,7 +30,7 @@ public function __construct(ElasticaLogger $logger)
         $this->logger = $logger;
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null)
     {
         $this->data['nb_queries'] = $this->logger->getNbQueries();
         $this->data['queries'] = $this->logger->getQueries();

src/Doctrine/Listener.php

@@ -80,7 +80,7 @@ public function __construct(
         ObjectPersisterInterface $objectPersister,
         IndexableInterface $indexable,
         array $config = [],
-        LoggerInterface $logger = null
+        ?LoggerInterface $logger = null
     ) {
         $this->config = array_merge([
             'identifier' => 'id',

src/Doctrine/RepositoryManager.php

@@ -47,7 +47,7 @@ public function __construct(ManagerRegistry $managerRegistry, RepositoryManagerI
     /**
      * {@inheritdoc}
      */
-    public function addIndex(string $indexName, FinderInterface $finder, string $repositoryName = null): void
+    public function addIndex(string $indexName, FinderInterface $finder, ?string $repositoryName = null): void
     {
         throw new \LogicException(__METHOD__.' should not be called. Call addIndex on the main repository manager');
     }

src/Elastica/Client.php

@@ -104,7 +104,7 @@ public function getIndexTemplate($name): IndexTemplate
     /**
      * Sets a stopwatch instance for debugging purposes.
      */
-    public function setStopwatch(?Stopwatch $stopwatch = null)
+    public function setStopwatch(?Stopwatch $stopwatch = null): void
     {
         $this->stopwatch = $stopwatch;
     }

src/Elastica/Index.php

@@ -37,7 +37,7 @@ public function getOriginalName(): string
      * While it's technically a regular setter for name property, it's specifically named overrideName, but not setName
      * since it's used for a very specific case and normally should not be used
      */
-    public function overrideName(string $name)
+    public function overrideName(string $name): void
     {
         $this->originalName = $this->_name;
         $this->_name = $name;

src/Finder/FinderInterface.php

@@ -16,8 +16,8 @@ interface FinderInterface
     /**
      * Searches for query results within a given limit.
      *
-     * @param mixed    $query   Can be a string, an array or an \Elastica\Query object
-     * @param int|null $limit   How many results to get
+     * @param mixed    $query Can be a string, an array or an \Elastica\Query object
+     * @param int|null $limit How many results to get
      *
      * @return array results
      */

src/Finder/PaginatedFinderInterface.php

@@ -23,7 +23,7 @@ interface PaginatedFinderInterface extends FinderInterface
     /**
      * Searches for query results and returns them wrapped in a paginator.
      *
-     * @param mixed $query   Can be a string, an array or an \Elastica\Query object
+     * @param mixed $query Can be a string, an array or an \Elastica\Query object
      *
      * @return Pagerfanta paginated results
      */

src/Manager/RepositoryManagerInterface.php

@@ -25,21 +25,19 @@ interface RepositoryManagerInterface
     /**
      * Adds index name and its finder.
      * Custom repository class name can also be added.
-     *
-     * @param string $indexName      The type name in "index/type" format
-     * @param string $repositoryName
      */
-    public function addIndex(string $indexName, FinderInterface $finder, string $repositoryName = null): void;
+    public function addIndex(string $indexName, FinderInterface $finder, ?string $repositoryName = null): void;
 
     /**
      * Return repository for entity.
      *
      * Returns custom repository if one specified otherwise
      * returns a basic repository.
-     *
-     * @param $indexName
      */
     public function getRepository(string $indexName): Repository;
 
+    /**
+     * Check whether a repository exists for the index.
+     */
     public function hasRepository(string $indexName): bool;
 }

src/Paginator/FantaPaginatorAdapter.php

@@ -17,9 +17,6 @@ class FantaPaginatorAdapter implements AdapterInterface
 {
     private $adapter;
 
-    /**
-     * @param \FOS\ElasticaBundle\Paginator\PaginatorAdapterInterface $adapter
-     */
     public function __construct(PaginatorAdapterInterface $adapter)
     {
         $this->adapter = $adapter;