Improvements on datetime handling + #38 + #39 (#41)

Author: jeremycr

.gitignore

@@ -3,3 +3,4 @@ composer.lock
 .phpunit.result.cache
 .php_cs.cache
 .php_cs
+.php-cs-fixer.cache

.php_cs.dist .php-cs-fixer.dist.php.php_cs.dist renamed to .php-cs-fixer.dist.php

@@ -2,7 +2,7 @@
 
 $finder = PhpCsFixer\Finder::create()->in(__DIR__.'/src');
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules([
         '@Symfony' => true,
         'declare_strict_types' => true,

composer.json

@@ -53,7 +53,10 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "php-http/discovery": true
+        }
     },
     "extra": {
         "branch-alias": {

src/Controller/DashboardController.php

@@ -12,7 +12,6 @@
 use CodeRhapsodie\EzDataflowBundle\Gateway\ScheduledDataflowGateway;
 use Doctrine\DBAL\Query\QueryBuilder;
 use eZ\Publish\Core\MVC\Symfony\Security\Authorization\Attribute;
-use EzSystems\EzPlatformAdminUi\Notification\NotificationHandlerInterface;
 use EzSystems\EzPlatformAdminUiBundle\Controller\Controller;
 use Pagerfanta\Adapter\DoctrineDbalAdapter;
 use Pagerfanta\Pagerfanta;
@@ -27,15 +26,12 @@ class DashboardController extends Controller
 {
     /** @var JobGateway */
     private $jobGateway;
-    /** @var NotificationHandlerInterface */
-    private $notificationHandler;
     /** @var ScheduledDataflowGateway */
     private $scheduledDataflowGateway;
 
-    public function __construct(JobGateway $jobGateway, NotificationHandlerInterface $notificationHandler, ScheduledDataflowGateway $scheduledDataflowGateway)
+    public function __construct(JobGateway $jobGateway, ScheduledDataflowGateway $scheduledDataflowGateway)
     {
         $this->jobGateway = $jobGateway;
-        $this->notificationHandler = $notificationHandler;
         $this->scheduledDataflowGateway = $scheduledDataflowGateway;
     }
 
@@ -108,9 +104,11 @@ public function getOneshotPage(Request $request): Response
     public function history(Request $request): Response
     {
         $this->denyAccessUnlessGranted(new Attribute('ezdataflow', 'view'));
+        $filter = (int) $request->query->get('filter', JobGateway::FILTER_NONE);
 
         return $this->render('@ezdesign/ezdataflow/Dashboard/history.html.twig', [
-            'pager' => $this->getPager($this->jobGateway->getListQueryForAdmin(), $request),
+            'pager' => $this->getPager($this->jobGateway->getListQueryForAdmin($filter), $request),
+            'filter' => $filter,
         ]);
     }
 
@@ -120,9 +118,11 @@ public function history(Request $request): Response
     public function getHistoryPage(Request $request): Response
     {
         $this->denyAccessUnlessGranted(new Attribute('ezdataflow', 'view'));
+        $filter = (int) $request->query->get('filter', JobGateway::FILTER_NONE);
 
         return $this->render('@ezdesign/ezdataflow/Dashboard/history.html.twig', [
-            'pager' => $this->getPager($this->jobGateway->getListQueryForAdmin(), $request),
+            'pager' => $this->getPager($this->jobGateway->getListQueryForAdmin($filter), $request),
+            'filter' => $filter,
         ]);
     }
 
@@ -143,6 +143,7 @@ private function getPager(QueryBuilder $query, Request $request): Pagerfanta
     {
         $pager = new Pagerfanta(new DoctrineDbalAdapter($query, function ($queryBuilder) {
             return $queryBuilder->select('COUNT(DISTINCT id) AS total_results')
+                ->resetQueryPart('orderBy')
                 ->setMaxResults(1);
         }));
         $pager->setMaxPerPage(20);

src/Controller/JobController.php

@@ -53,10 +53,6 @@ public function displayDetails(int $id): Response
 
     /**
      * @Route("/details/log/{id}", name="coderhapsodie.ezdataflow.job.log")
-     *
-     * @param int $id
-     *
-     * @return Response
      */
     public function displayLog(int $id): Response
     {

src/Controller/ScheduledDataflowController.php

@@ -58,7 +58,6 @@ public function create(Request $request): Response
         if ($form->isSubmitted() && $form->isValid()) {
             /** @var ScheduledDataflow $newWorkflow */
             $newWorkflow = $form->getData();
-
             try {
                 $this->scheduledDataflowGateway->save($newWorkflow);
                 $this->notificationHandler->success($this->translator->trans('coderhapsodie.ezdataflow.workflow.create.success'));

src/Core/FieldComparator/AbstractFieldComparator.php

@@ -26,7 +26,7 @@ public function compare(Field $field, $hash): bool
     }
 
     /**
-     * Returns true if values are equals, false otherwise
+     * Returns true if values are equals, false otherwise.
      */
     abstract protected function compareValues(Value $currentValue, Value $newValue): bool;
 }

src/Exception/InvalidArgumentTypeException.php

@@ -9,8 +9,6 @@ class InvalidArgumentTypeException extends \Exception
     /**
      * @param string|array $expectedTypes
      * @param mixed        $received
-     *
-     * @return InvalidArgumentTypeException
      */
     public static function create($expectedTypes, $received): self
     {

src/Exception/UnknownFieldException.php

@@ -6,9 +6,6 @@
 
 class UnknownFieldException extends \Exception
 {
-    /**
-     * @return UnknownFieldException
-     */
     public static function create(string $fieldIdentifier, string $contentTypeIdentifier): self
     {
         return new self(sprintf(

src/Filter/NotModifiedContentFilter.php

@@ -22,7 +22,6 @@ class NotModifiedContentFilter
     /** @var FieldComparatorInterface */
     private $comparator;
 
-
     public function __construct(ContentService $contentService, FieldComparatorInterface $comparator)
     {
         $this->contentService = $contentService;
@@ -43,20 +42,21 @@ public function __invoke($data)
 
         foreach ($data->getFields() as $identifier => $hash) {
             $field = $content->getField($identifier, $data->getLanguageCode());
-            if ($field === null || !$this->comparator->compare($field, $hash)) {
+            if (null === $field || !$this->comparator->compare($field, $hash)) {
                 // At least one field is different, continue the dataflow.
                 return $data;
             }
         }
 
         // All fields are identical, filter this item out.
         $this->log('info', 'Not modified content skipped', ['id' => $data->getId(), 'remote_id' => $data->getRemoteId()]);
+
         return false;
     }
 
     private function log(string $level, string $message, array $context = [])
     {
-        if ($this->logger === null) {
+        if (null === $this->logger) {
             return;
         }
         $this->logger->log($level, $message, $context);