Cleaned code.

src/Api/Adapter/OaiPmhRepositoryTokenAdapter.php

@@ -77,21 +77,22 @@ class OaiPmhRepositoryTokenAdapter extends AbstractEntityAdapter
     {
         $isOldOmeka = \Omeka\Module::VERSION < 2;
         $alias = $isOldOmeka ? \Omeka\Entity\Item::class : 'omeka_root';
+        $expr = $qb->expr();
 
         if (isset($query['id'])) {
-            $qb->andWhere($qb->expr()->eq(
+            $qb->andWhere($expr->eq(
                 $alias . '.id',
                 $this->createNamedParameter($qb, $query['id']))
             );
         }
         if (isset($query['verb'])) {
-            $qb->andWhere($qb->expr()->eq(
+            $qb->andWhere($expr->eq(
                 $alias . '.verb',
                 $this->createNamedParameter($qb, $query['verb']))
             );
         }
         if (isset($query['expired']) && $query['expired']) {
-            $qb->andWhere($qb->expr()->lte(
+            $qb->andWhere($expr->lte(
                 $alias . '.expiration',
                 $this->createNamedParameter($qb, (new DateTime)->format(DateTime::ATOM))
             ));

src/Form/ConfigForm.php

@@ -264,6 +264,7 @@ class ConfigForm extends Form implements TranslatorAwareInterface
     public function setMetadataFormats(array $metadataFormats)
     {
         $this->metadataFormats = $metadataFormats;
+        return $this;
     }
 
     /**
@@ -280,6 +281,7 @@ class ConfigForm extends Form implements TranslatorAwareInterface
     public function setOaiSetFormats(array $oaiSetFormats)
     {
         $this->oaiSetFormats = $oaiSetFormats;
+        return $this;
     }
 
     /**

src/OaiPmh/ResponseGenerator.php

@@ -633,6 +633,7 @@ class ResponseGenerator extends AbstractXmlGenerator
         $qb->select($alias);
 
         $query = new ArrayObject;
+        $expr = $qb->expr();
 
         // Public/private is automatically managed for anonymous requests.
 
@@ -672,28 +673,28 @@ class ResponseGenerator extends AbstractXmlGenerator
         $itemAdapter->buildQuery($qb, $query->getArrayCopy());
 
         if ($from) {
-            $qb->andWhere($qb->expr()->orX(
-                $qb->expr()->andX(
-                    $qb->expr()->isNotNull($alias . '.modified'),
-                    $qb->expr()->gte($alias . '.modified', ':from_1')
+            $qb->andWhere($expr->orX(
+                $expr->andX(
+                    $expr->isNotNull($alias . '.modified'),
+                    $expr->gte($alias . '.modified', ':from_1')
                 ),
-                $qb->expr()->andX(
-                    $qb->expr()->isNull($alias . '.modified'),
-                    $qb->expr()->gte($alias . '.created', ':from_2')
+                $expr->andX(
+                    $expr->isNull($alias . '.modified'),
+                    $expr->gte($alias . '.created', ':from_2')
                 )
             ));
             $qb->setParameter('from_1', $from);
             $qb->setParameter('from_2', $from);
         }
         if ($until) {
-            $qb->andWhere($qb->expr()->orX(
-                $qb->expr()->andX(
-                    $qb->expr()->isNotNull($alias . '.modified'),
-                    $qb->expr()->lte($alias . '.modified', ':until_1')
+            $qb->andWhere($expr->orX(
+                $expr->andX(
+                    $expr->isNotNull($alias . '.modified'),
+                    $expr->lte($alias . '.modified', ':until_1')
                 ),
-                $qb->expr()->andX(
-                    $qb->expr()->isNull($alias . '.modified'),
-                    $qb->expr()->lte($alias . '.created', ':until_2')
+                $expr->andX(
+                    $expr->isNull($alias . '.modified'),
+                    $expr->lte($alias . '.created', ':until_2')
                 )
             ));
             $qb->setParameter('until_1', $until);

src/Service/Controller/RequestControllerFactory.php

@@ -2,20 +2,19 @@
 /**
  * @author Julian Maurice <julian.maurice@biblibre.com>
  * @copyright BibLibre, 2016
+ * @copyright Daniel Berthereau, 2019
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
  */
 namespace OaiPmhRepository\Service\Controller;
 
 use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\FactoryInterface;
 use OaiPmhRepository\Controller\RequestController;
+use Zend\ServiceManager\Factory\FactoryInterface;
 
 class RequestControllerFactory implements FactoryInterface
 {
     public function __invoke(ContainerInterface $services, $requestedNamed, array $options = null)
     {
-        $controller = new RequestController($services);
-
-        return $controller;
+        return new RequestController($services);
     }
 }

src/Service/Form/ConfigFormFactory.php

@@ -15,9 +15,10 @@ class ConfigFormFactory implements FactoryInterface
         $metadataFormatManager = $services->get(MetadataFormatManager::class);
         $oaiSetManager = $services->get(OaiSetManager::class);
         $form = new ConfigForm(null, $options);
-        $form->setTranslator($translator);
-        $form->setMetadataFormats($metadataFormatManager->getRegisteredNames());
-        $form->setOaiSetFormats($oaiSetManager->getRegisteredNames());
+        $form
+            ->setTranslator($translator)
+            ->setMetadataFormats($metadataFormatManager->getRegisteredNames())
+            ->setOaiSetFormats($oaiSetManager->getRegisteredNames());
         return $form;
     }
 }