diff --git a/src/Api/Adapter/OaiPmhRepositoryTokenAdapter.php b/src/Api/Adapter/OaiPmhRepositoryTokenAdapter.php index 209ca3c223ead78b62ac38da4041648f6389fba5..94e4c3721c909505664396611d9435f6637f66f2 100644 --- a/src/Api/Adapter/OaiPmhRepositoryTokenAdapter.php +++ b/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)) )); diff --git a/src/Form/ConfigForm.php b/src/Form/ConfigForm.php index 6340c984f81f138f6e330aa42a4ed7722b956e5b..18d97085c1b82c08467722a90baea92dc4ffa1c7 100644 --- a/src/Form/ConfigForm.php +++ b/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; } /** diff --git a/src/OaiPmh/ResponseGenerator.php b/src/OaiPmh/ResponseGenerator.php index b1feaed6d56bff55bf3b676e007aa2dbab7d2efe..55e971e0e762ea2b878ffec9dde065f52835f526 100644 --- a/src/OaiPmh/ResponseGenerator.php +++ b/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); diff --git a/src/Service/Controller/RequestControllerFactory.php b/src/Service/Controller/RequestControllerFactory.php index 7bae1f31533ffcb710ff008bfb4a1bf5fd935267..e18923fd43debe5d11dc53031b868105acb8a7f6 100644 --- a/src/Service/Controller/RequestControllerFactory.php +++ b/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); } } diff --git a/src/Service/Form/ConfigFormFactory.php b/src/Service/Form/ConfigFormFactory.php index 2faf37d089187beef8262555fceb498530bc81e0..8ef63c7cb98f1a3b1bcc3dca6d49d7eaaeeb48b7 100644 --- a/src/Service/Form/ConfigFormFactory.php +++ b/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; } }