Ibexa 4 support (#42)

* bump PHP version

* update PHPUnit config

.github/workflows/php.yml

@@ -0,0 +1,55 @@
+name: PHP Composer
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version: [7.4, 8.0, 8.1, 8.2]
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Setup PHP ${{ matrix.php-version }}
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php-version }}
+        extensions: xdebug
+    - name: PHP Version
+      run: php -v
+
+    - name: PHP Lint
+      run: find . -type f -name '*.php' -exec php -l {} \; | (! grep -v "No syntax errors detected" )
+
+    - name: Validate composer.json and composer.lock
+      run: composer validate --strict
+
+    - name: Cache Composer packages
+      id: composer-cache
+      uses: actions/cache@v2
+      with:
+        path: vendor
+        key: ${{ runner.os }}-php${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-php${{ matrix.php-version }}-
+
+    - name: Install dependencies
+      run: composer update --prefer-dist --no-progress --no-scripts
+
+    - name: PHPUnit
+      run: php -d xdebug.mode=coverage vendor/bin/phpunit --log-junit junit.xml
+
+    - name: Publish Unit Test Results
+      uses: EnricoMi/publish-unit-test-result-action@v1
+      if: always()
+      with:
+        files: junit.xml

.gitignore

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

.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,

CHANGELOG.md

@@ -1,3 +1,28 @@
+# Version 4.0.0
+
+* Add compatibility with Ibexa 4.0+ and drop compatibility for eZPlatform 2 and Ibexa 3 
+
+# Version 3.2.0
+
+* Fixed History page pagination is hidden by footer on Ibexa 3.3 #38
+* Added filter on history page to filter out jobs with 0 items
+* Date and times will now be displayed using the user defined timezone, and stored using php timezone 
+
+# Version 3.1.0
+
+* Allow `LocationCreateStruct` objects inside the `$locations` argument of `ContentCreateStructure` to have more control over the created locations.
+
+# Version 3.0.1
+
+* Bump minimum PHP version to PHP 7.3 like code-rhapsodie/dataflow-bundle dependency.
+* Allow PHP 8.x.
+* Add GitHub Action to run tests.
+
+# Version 3.0.0
+
+* Add compatibility with Ibexa Content 3.3
+* Add compatibility with Symfony 5.x
+
 # Version 2.3.0
 
 * Added a button to display exceptions / log in a modal

README.md

@@ -1,7 +1,7 @@
 # Code Rhapsodie eZ Dataflow Bundle
 
-EzDataflowBundle is a bundle integrating [Code Rhapsodie Dataflow bundle](https://github.com/code-rhapsodie/dataflow-bundle) into eZ Platfom 2.0+.
-Dataflows can be piloted from an interface integrated in eZ Platform backoffice.
+EzDataflowBundle is a bundle integrating [Code Rhapsodie Dataflow bundle](https://github.com/code-rhapsodie/dataflow-bundle) into Ibexa 4.0+.
+Dataflows can be piloted from an interface integrated into the Ibexa backoffice.
 EzDataflow bundle is intended to manage content imports from external data sources.
 
 > Note: before using this bundle, please read the [Code Rhapsodie Dataflow bundle documentation](https://github.com/code-rhapsodie/dataflow-bundle/blob/master/README.md).
@@ -28,9 +28,7 @@ $ composer require code-rhapsodie/ezdataflow-bundle
 
 > Note: The loading order between the Dataflow bundle and Ez Dataflow bundle is important. Dataflow must be loaded first.
 
-#### Symfony 4 (new tree)
-
-For Symfony 4, add those two lines in the `config/bundles.php` file:
+Add those two lines in the `config/bundles.php` file:
 
 ```php
 <?php
@@ -43,29 +41,10 @@ return [
 ];
 ```
 
-#### Symfony 3.4 (old tree)
-
-For Symfony 3.4, add those two lines in the `app/AppKernel.php` file:
-
-```php
-<?php
-// app/AppKernel.php
-
-public function registerBundles()
-{
-    $bundles = [
-        // ...
-        new CodeRhapsodie\DataflowBundle\CodeRhapsodieDataflowBundle(),
-        new CodeRhapsodie\EzDataflowBundle\CodeRhapsodieEzDataflowBundle(),
-        // ...
-    ];
-}
-```
-
 ### Step 3: Import bundle routing file
 
 ```yaml
-# app/config/routing.yml or config/routing.yaml
+# config/routing/ezdataflow.yaml
 
 _cr.dataflow:
     resource: '@CodeRhapsodieEzDataflowBundle/Resources/config/routing.yaml'
@@ -84,7 +63,7 @@ Please refer to the [Code-Rhapsodie Dataflow Bundle Queue section](https://githu
 By default, the `ContentWriter` will publish contents using the `admin` user. If you want to use another user (with sufficient permissions), you can configure it like this:
 
 ```yaml
-# app/config/config.yml or config/packages/code_rhapsodie_ez_dataflow.yaml
+# config/packages/code_rhapsodie_ez_dataflow.yaml
 
 code_rhapsodie_ez_dataflow:
     # Integer values are assumed to be user ids, non-integer values are assumed to be user logins
@@ -97,7 +76,7 @@ Before using the admin UI to manage your dataflows, you need to define them. Ple
 
 ## Use the ContentWriter
 
-To add or update eZ Platform contents, you can use the `CodeRhapsodie\EzDataflowBundle\Writer\ContentWriter` writer.
+To add or update Ibexa contents, you can use the `CodeRhapsodie\EzDataflowBundle\Writer\ContentWriter` writer.
 
 ### Step 1: Inject the dependencies and add the writer
 
@@ -133,7 +112,7 @@ class MyDataflowType extends AbstractDataflowType
 
 ### Step 2: Add a step for prepare the content
 
-To process eZ Platform content into your Dataflow, you need to transform the data into `ContentCreateStructure` or `ContentUpdateStructure` objects.
+To process Ibexa contents into your Dataflow, you need to transform the data into `ContentCreateStructure` or `ContentUpdateStructure` objects.
 in order to respectively create or update contents.
 
 But, in order to determine if the content already exists or not, you first need to look up for it.
@@ -141,19 +120,19 @@ But, in order to determine if the content already exists or not, you first need
 One way is to use the remote id to search for the content.
 
 In the following example, the remote id pattern is `article-<id>` with the `<id>` replaced by the data id provided by the reader.
-To check if the content exists or not, I use the service `ContentService` provided by eZ Platform.
+To check if the content exists or not, I use the service `ContentService` provided by Ibexa.
 
 The step is added as an anonymous function and has 3 types of return values:
 
 * When the step returns `false`, the data is dropped.
-* When the step returns a `ContentCreateStructure`, the data will be saved into a new eZ Platform content.
-* When the step returns a `ContentUpdateStructure`, the existing eZ Platform content will be updated by overwriting all defined fields in the data.
+* When the step returns a `ContentCreateStructure`, the data will be saved into a new Ibexa content.
+* When the step returns a `ContentUpdateStructure`, the existing Ibexa content will be updated by overwriting all defined fields in the data.
 
 For the new content, you must provide one or more "parent location id" as the 3rd argument of the `ContentCreateStructure` constructor.
 
 In this example, I have added a new folder to store all articles.
 
-To get the location id of the parent eZ Platform content, go to the admin UI and select the future parent content, click on the details tabs, and read the "Location id" like this:
+To get the location id of the parent Ibexa content, go to the admin UI and select the future parent content, click on the details tabs, and read the "Location id" like this:
 
 ![parent folder](src/Resources/doc/dest_folder.jpg)
 
@@ -272,7 +251,7 @@ If you want to add support for a field type, simply create your own comparator.
 <?php
 
 use CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\AbstractFieldComparator;
-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Core\FieldType\Value;
 //[...]
 
 class MyFieldComparator extends AbstractFieldComparator
@@ -298,7 +277,7 @@ class MyFieldComparator extends AbstractFieldComparator
 
 ## Access to the eZ Dataflow UI
 
-You can access the eZ Dataflow administration UI from your eZ Platform admin back-office.
+You can access the eZ Dataflow administration UI from your Ibexa admin back-office.
 
 ![Admin menu](src/Resources/doc/ez_dataflow_admin_menu.jpg)
 

composer.json

@@ -1,8 +1,8 @@
 {
     "name": "code-rhapsodie/ezdataflow-bundle",
-    "description": "Import/export bundle for eZ Platform based on Code-Rhapsodie Dataflow",
+    "description": "Import/export bundle for Ibexa based on Code-Rhapsodie Dataflow",
     "type": "symfony-bundle",
-    "keywords": ["dataflow", "import", "export", "data processing", "ez publish", "ez platform"],
+    "keywords": ["dataflow", "import", "export", "data processing", "ibexa"],
     "license": "MIT",
     "authors": [
         {
@@ -41,23 +41,29 @@
         }
     },
     "require": {
-        "php": "^7.1",
-        "code-rhapsodie/dataflow-bundle": "^2.1 || dev-master",
-        "ezsystems/ezplatform-admin-ui": "^1.0",
-        "ezsystems/ezpublish-kernel": "^7.0"
+        "php": "^7.4||^8.0",
+        "code-rhapsodie/dataflow-bundle": "^3.0",
+        "http-interop/http-factory-guzzle": "^1.2",
+        "ibexa/admin-ui": "^4.0",
+        "ibexa/core": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7||^8",
-        "doctrine/dbal": "^2.0"
+        "doctrine/dbal": "^2.0|^3.0",
+        "phpunit/phpunit": "^7||^8||^9"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "php-http/discovery": true
+        }
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.x-dev",
+            "dev-master": "4.x-dev",
+            "dev-v3.x": "3.x-dev",
+            "dev-v2.x": "2.x-dev",
             "dev-v1.x": "1.x-dev"
         }
     }

phpunit.xml

@@ -1,32 +1,21 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
-
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- http://www.phpunit.de/manual/current/en/appendixes.configuration.html -->
-<phpunit
-        backupGlobals="false"
-        backupStaticAttributes="false"
-        bootstrap="tests/bootstrap.php"
-        convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
-        colors="false"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-    <testsuites>
-        <testsuite name="EzDataflow tests suite">
-            <directory suffix="Test.php">./tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./src/</directory>
-            <exclude>
-                <directory>tests/</directory>
-                <directory>vendor/</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="tests/bootstrap.php" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" colors="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory>./src/</directory>
+    </include>
+    <exclude>
+      <directory>tests/</directory>
+      <directory>vendor/</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <ini name="error_reporting" value="-1"/>
+  </php>
+  <testsuites>
+    <testsuite name="EzDataflow tests suite">
+      <directory suffix="Test.php">./tests</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

src/CodeRhapsodieEzDataflowBundle.php

@@ -7,7 +7,7 @@ namespace CodeRhapsodie\EzDataflowBundle;
 use CodeRhapsodie\EzDataflowBundle\DependencyInjection\CodeRhapsodieEzDataflowExtension;
 use CodeRhapsodie\EzDataflowBundle\DependencyInjection\Compiler\FieldComparatorCompilerPass;
 use CodeRhapsodie\EzDataflowBundle\Security\PolicyProvider;
-use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\EzPublishCoreExtension;
+use Ibexa\Bundle\Core\DependencyInjection\IbexaCoreExtension;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
@@ -26,8 +26,8 @@ class CodeRhapsodieEzDataflowBundle extends Bundle
 
         $container->addCompilerPass(new FieldComparatorCompilerPass());
 
-        /** @var EzPublishCoreExtension $eZExtension */
-        $eZExtension = $container->getExtension('ezpublish');
-        $eZExtension->addPolicyProvider(new PolicyProvider());
+        /** @var IbexaCoreExtension $ibexaExtension */
+        $ibexaExtension = $container->getExtension('ibexa');
+        $ibexaExtension->addPolicyProvider(new PolicyProvider());
     }
 }

src/Controller/DashboardController.php

@@ -4,17 +4,16 @@ declare(strict_types=1);
 
 namespace CodeRhapsodie\EzDataflowBundle\Controller;
 
+use CodeRhapsodie\DataflowBundle\Entity\Job;
+use CodeRhapsodie\DataflowBundle\Entity\ScheduledDataflow;
 use CodeRhapsodie\EzDataflowBundle\Form\CreateOneshotType;
 use CodeRhapsodie\EzDataflowBundle\Form\CreateScheduledType;
 use CodeRhapsodie\EzDataflowBundle\Gateway\JobGateway;
 use CodeRhapsodie\EzDataflowBundle\Gateway\ScheduledDataflowGateway;
-use CodeRhapsodie\DataflowBundle\Entity\Job;
-use CodeRhapsodie\DataflowBundle\Entity\ScheduledDataflow;
 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 Ibexa\Contracts\AdminUi\Controller\Controller;
+use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute;
+use Pagerfanta\Doctrine\DBAL\QueryAdapter;
 use Pagerfanta\Pagerfanta;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -25,30 +24,25 @@ use Symfony\Component\Routing\Annotation\Route;
  */
 class DashboardController extends Controller
 {
-    /** @var JobGateway */
+    /** @var \CodeRhapsodie\EzDataflowBundle\Gateway\JobGateway */
     private $jobGateway;
-    /** @var NotificationHandlerInterface */
-    private $notificationHandler;
-    /** @var ScheduledDataflowGateway */
+    /** @var \CodeRhapsodie\EzDataflowBundle\Gateway\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;
     }
 
     /**
      * @Route("/", name="coderhapsodie.ezdataflow.main")
-     *
-     * @return Response
      */
     public function main(): Response
     {
         $this->denyAccessUnlessGranted(new Attribute('ezdataflow', 'view'));
 
-        return $this->render('@ezdesign/ezdataflow/Dashboard/main.html.twig');
+        return $this->render('@ibexadesign/ezdataflow/Dashboard/main.html.twig');
     }
 
     public function repeating(Request $request): Response
@@ -61,7 +55,7 @@ class DashboardController extends Controller
             'action' => $this->generateUrl('coderhapsodie.ezdataflow.workflow.create'),
         ]);
 
-        return $this->render('@ezdesign/ezdataflow/Dashboard/repeating.html.twig', [
+        return $this->render('@ibexadesign/ezdataflow/Dashboard/repeating.html.twig', [
             'pager' => $this->getPager($this->scheduledDataflowGateway->getListQueryForAdmin(), $request),
             'form' => $form->createView(),
         ]);
@@ -69,16 +63,12 @@ class DashboardController extends Controller
 
     /**
      * @Route("/repeating", name="coderhapsodie.ezdataflow.repeating")
-     *
-     * @param Request $request
-     *
-     * @return Response
      */
     public function getRepeatingPage(Request $request): Response
     {
         $this->denyAccessUnlessGranted(new Attribute('ezdataflow', 'view'));
 
-        return $this->render('@ezdesign/ezdataflow/Dashboard/repeating.html.twig', [
+        return $this->render('@ibexadesign/ezdataflow/Dashboard/repeating.html.twig', [
             'pager' => $this->getPager($this->scheduledDataflowGateway->getListQueryForAdmin(), $request),
         ]);
     }
@@ -93,7 +83,7 @@ class DashboardController extends Controller
             'action' => $this->generateUrl('coderhapsodie.ezdataflow.job.create'),
         ]);
 
-        return $this->render('@ezdesign/ezdataflow/Dashboard/oneshot.html.twig', [
+        return $this->render('@ibexadesign/ezdataflow/Dashboard/oneshot.html.twig', [
             'pager' => $this->getPager($this->jobGateway->getOneshotListQueryForAdmin(), $request),
             'form' => $form->createView(),
         ]);
@@ -101,16 +91,12 @@ class DashboardController extends Controller
 
     /**
      * @Route("/oneshot", name="coderhapsodie.ezdataflow.oneshot")
-     *
-     * @param Request $request
-     *
-     * @return Response
      */
     public function getOneshotPage(Request $request): Response
     {
         $this->denyAccessUnlessGranted(new Attribute('ezdataflow', 'view'));
 
-        return $this->render('@ezdesign/ezdataflow/Dashboard/oneshot.html.twig', [
+        return $this->render('@ibexadesign/ezdataflow/Dashboard/oneshot.html.twig', [
             'pager' => $this->getPager($this->jobGateway->getOneshotListQueryForAdmin(), $request),
         ]);
     }
@@ -118,41 +104,36 @@ class DashboardController extends Controller
     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),
+        return $this->render('@ibexadesign/ezdataflow/Dashboard/history.html.twig', [
+            'pager' => $this->getPager($this->jobGateway->getListQueryForAdmin($filter), $request),
+            'filter' => $filter,
         ]);
     }
 
     /**
      * @Route("/history", name="coderhapsodie.ezdataflow.history")
-     *
-     * @param Request $request
-     *
-     * @return 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),
+        return $this->render('@ibexadesign/ezdataflow/Dashboard/history.html.twig', [
+            'pager' => $this->getPager($this->jobGateway->getListQueryForAdmin($filter), $request),
+            'filter' => $filter,
         ]);
     }
 
     /**
      * @Route("/history/schedule/{id}", name="coderhapsodie.ezdataflow.history.workflow")
-     *
-     * @param Request $request
-     * @param int     $id
-     *
-     * @return Response
      */
     public function getHistoryForScheduled(Request $request, int $id): Response
     {
         $this->denyAccessUnlessGranted(new Attribute('ezdataflow', 'view'));
 
-        return $this->render('@ezdesign/ezdataflow/Dashboard/schedule_history.html.twig', [
+        return $this->render('@ibexadesign/ezdataflow/Dashboard/schedule_history.html.twig', [
             'id' => $id,
             'pager' => $this->getPager($this->jobGateway->getListQueryForScheduleAdmin($id), $request),
         ]);
@@ -160,8 +141,9 @@ class DashboardController extends Controller
 
     private function getPager(QueryBuilder $query, Request $request): Pagerfanta
     {
-        $pager = new Pagerfanta(new DoctrineDbalAdapter($query, function ($queryBuilder) {
+        $pager = new Pagerfanta(new QueryAdapter($query, function ($queryBuilder) {
             return $queryBuilder->select('COUNT(DISTINCT id) AS total_results')
+                ->resetQueryPart('orderBy')
                 ->setMaxResults(1);
         }));
         $pager->setMaxPerPage(20);

src/Controller/JobController.php

@@ -7,26 +7,26 @@ namespace CodeRhapsodie\EzDataflowBundle\Controller;
 use CodeRhapsodie\DataflowBundle\Entity\Job;
 use CodeRhapsodie\EzDataflowBundle\Form\CreateOneshotType;
 use CodeRhapsodie\EzDataflowBundle\Gateway\JobGateway;
-use eZ\Publish\Core\MVC\Symfony\Security\Authorization\Attribute;
-use EzSystems\EzPlatformAdminUi\Notification\NotificationHandlerInterface;
-use EzSystems\EzPlatformAdminUiBundle\Controller\Controller;
+use Ibexa\Contracts\AdminUi\Controller\Controller;
+use Ibexa\Contracts\AdminUi\Notification\NotificationHandlerInterface;
+use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * @Route("/ezdataflow/job")
  */
 class JobController extends Controller
 {
-    /** @var JobGateway */
+    /** @var \CodeRhapsodie\EzDataflowBundle\Gateway\JobGateway */
     private $jobGateway;
-    /** @var NotificationHandlerInterface */
+    /** @var \Ibexa\Contracts\AdminUi\Notification\NotificationHandlerInterface */
     private $notificationHandler;
-    /** @var TranslatorInterface */
+    /** @var \Symfony\Contracts\Translation\TranslatorInterface */
     private $translator;
 
     public function __construct(
@@ -41,26 +41,18 @@ class JobController extends Controller
 
     /**
      * @Route("/details/{id}", name="coderhapsodie.ezdataflow.job.details")
-     *
-     * @param int $id
-     *
-     * @return Response
      */
     public function displayDetails(int $id): Response
     {
         $this->denyAccessUnlessGranted(new Attribute('ezdataflow', 'view'));
 
-        return $this->render('@ezdesign/ezdataflow/Item/details.html.twig', [
+        return $this->render('@ibexadesign/ezdataflow/Item/details.html.twig', [
             'item' => $this->jobGateway->find($id),
         ]);
     }
 
     /**
      * @Route("/details/log/{id}", name="coderhapsodie.ezdataflow.job.log")
-     *
-     * @param int $id
-     *
-     * @return Response
      */
     public function displayLog(int $id): Response
     {
@@ -70,17 +62,13 @@ class JobController extends Controller
             return preg_replace('~#\d+~', "\n$0", $line);
         }, $item->getExceptions());
 
-        return $this->render('@ezdesign/ezdataflow/Item/log.html.twig', [
+        return $this->render('@ibexadesign/ezdataflow/Item/log.html.twig', [
             'log' => $log,
         ]);
     }
 
     /**
      * @Route("/create", name="coderhapsodie.ezdataflow.job.create", methods={"POST"})
-     *
-     * @param Request $request
-     *
-     * @return Response
      */
     public function create(Request $request): Response
     {
@@ -90,7 +78,7 @@ class JobController extends Controller
         $form = $this->createForm(CreateOneshotType::class, $newOneshot);
         $form->handleRequest($request);
         if ($form->isSubmitted() && $form->isValid()) {
-            /** @var Job $newOneshot */
+            /** @var \CodeRhapsodie\DataflowBundle\Entity\Job $newOneshot */
             $newOneshot = $form->getData();
             $newOneshot->setStatus(Job::STATUS_PENDING);
 
@@ -109,7 +97,7 @@ class JobController extends Controller
         }
 
         return new JsonResponse([
-            'form' => $this->renderView('@ezdesign/ezdataflow/parts/schedule_form.html.twig', [
+            'form' => $this->renderView('@ibexadesign/ezdataflow/parts/form_modal.html.twig', [
                 'form' => $form->createView(),
                 'type_action' => 'new',
                 'mode' => 'oneshot',

src/Controller/ScheduledDataflowController.php

@@ -4,37 +4,36 @@ declare(strict_types=1);
 
 namespace CodeRhapsodie\EzDataflowBundle\Controller;
 
+use CodeRhapsodie\DataflowBundle\Entity\ScheduledDataflow;
 use CodeRhapsodie\EzDataflowBundle\Form\CreateScheduledType;
 use CodeRhapsodie\EzDataflowBundle\Form\UpdateScheduledType;
 use CodeRhapsodie\EzDataflowBundle\Gateway\ScheduledDataflowGateway;
-use CodeRhapsodie\EzDataflowBundle\Gateway\JobGateway;
-use CodeRhapsodie\DataflowBundle\Entity\ScheduledDataflow;
-use eZ\Publish\Core\MVC\Symfony\Security\Authorization\Attribute;
-use EzSystems\EzPlatformAdminUi\Notification\NotificationHandlerInterface;
-use EzSystems\EzPlatformAdminUiBundle\Controller\Controller;
+use Ibexa\Contracts\AdminUi\Controller\Controller;
+use Ibexa\Contracts\AdminUi\Notification\NotificationHandlerInterface;
+use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * @Route("/ezdataflow/scheduled_workflow")
  */
 class ScheduledDataflowController extends Controller
 {
-    /** @var JobGateway */
-    private $jobGateway;
-    /** @var NotificationHandlerInterface */
+    /** @var \Ibexa\Contracts\AdminUi\Notification\NotificationHandlerInterface */
     private $notificationHandler;
-    /** @var ScheduledDataflowGateway */
+    /** @var \CodeRhapsodie\EzDataflowBundle\Gateway\ScheduledDataflowGateway */
     private $scheduledDataflowGateway;
-    /** @var TranslatorInterface */
+    /** @var \Symfony\Contracts\Translation\TranslatorInterface */
     private $translator;
 
-    public function __construct(JobGateway $jobGateway, NotificationHandlerInterface $notificationHandler, ScheduledDataflowGateway $scheduledDataflowGateway, TranslatorInterface $translator)
-    {
-        $this->jobGateway = $jobGateway;
+    public function __construct(
+        NotificationHandlerInterface $notificationHandler,
+        ScheduledDataflowGateway $scheduledDataflowGateway,
+        TranslatorInterface $translator
+    ) {
         $this->notificationHandler = $notificationHandler;
         $this->scheduledDataflowGateway = $scheduledDataflowGateway;
         $this->translator = $translator;
@@ -42,10 +41,6 @@ class ScheduledDataflowController extends Controller
 
     /**
      * @Route("/create", name="coderhapsodie.ezdataflow.workflow.create", methods={"POST"})
-     *
-     * @param Request $request
-     *
-     * @return Response
      */
     public function create(Request $request): Response
     {
@@ -56,21 +51,21 @@ class ScheduledDataflowController extends Controller
 
         $form->handleRequest($request);
         if ($form->isSubmitted() && $form->isValid()) {
-            /** @var ScheduledDataflow $newWorkflow */
+            /** @var \CodeRhapsodie\DataflowBundle\Entity\ScheduledDataflow $newWorkflow */
             $newWorkflow = $form->getData();
-
             try {
                 $this->scheduledDataflowGateway->save($newWorkflow);
                 $this->notificationHandler->success($this->translator->trans('coderhapsodie.ezdataflow.workflow.create.success'));
             } catch (\Exception $e) {
-                $this->notificationHandler->error($this->translator->trans('coderhapsodie.ezdataflow.workflow.create.error', ['message' => $e->getMessage()]));
+                $this->notificationHandler->error($this->translator->trans('coderhapsodie.ezdataflow.workflow.create.error',
+                    ['message' => $e->getMessage()]));
             }
 
             return new JsonResponse(['redirect' => $this->generateUrl('coderhapsodie.ezdataflow.main')]);
         }
 
         return new JsonResponse([
-            'form' => $this->renderView('@ezdesign/ezdataflow/parts/schedule_form.html.twig', [
+            'form' => $this->renderView('@ibexadesign/ezdataflow/parts/form_modal.html.twig', [
                 'form' => $form->createView(),
                 'type_action' => 'new',
             ]),
@@ -79,10 +74,6 @@ class ScheduledDataflowController extends Controller
 
     /**
      * @Route("/{id}/delete", name="coderhapsodie.ezdataflow.workflow.delete", methods={"post"})
-     *
-     * @param int $id
-     *
-     * @return Response
      */
     public function delete(int $id): Response
     {
@@ -91,22 +82,16 @@ class ScheduledDataflowController extends Controller
         try {
             $this->scheduledDataflowGateway->delete($id);
             $this->notificationHandler->success($this->translator->trans('coderhapsodie.ezdataflow.workflow.delete.success'));
-
-            return new JsonResponse(['code' => 200]);
         } catch (\Exception $e) {
-            $this->notificationHandler->error($this->translator->trans('coderhapsodie.ezdataflow.workflow.delete.error', ['message' => $e->getMessage()]));
-
-            return new JsonResponse(['code' => $e->getCode()]);
+            $this->notificationHandler->error($this->translator->trans('coderhapsodie.ezdataflow.workflow.delete.error',
+                ['message' => $e->getMessage()]));
         }
+
+        return $this->redirectToRoute('coderhapsodie.ezdataflow.main');
     }
 
     /**
      * @Route("/{id}/edit", name="coderhapsodie.ezdataflow.workflow.edit")
-     *
-     * @param Request $request
-     * @param int     $id
-     *
-     * @return Response
      */
     public function edit(Request $request, int $id): Response
     {
@@ -116,21 +101,22 @@ class ScheduledDataflowController extends Controller
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
-            /** @var ScheduledDataflow $editDataflow */
+            /** @var \CodeRhapsodie\DataflowBundle\Entity\ScheduledDataflow $editDataflow */
             $editDataflow = $form->getData();
 
             try {
                 $this->scheduledDataflowGateway->save($editDataflow);
                 $this->notificationHandler->success($this->translator->trans('coderhapsodie.ezdataflow.workflow.edit.success'));
             } catch (\Exception $e) {
-                $this->notificationHandler->error($this->translator->trans('coderhapsodie.ezdataflow.workflow.edit.error', ['message' => $e->getMessage()]));
+                $this->notificationHandler->error($this->translator->trans('coderhapsodie.ezdataflow.workflow.edit.error',
+                    ['message' => $e->getMessage()]));
             }
 
             return new JsonResponse(['redirect' => $this->generateUrl('coderhapsodie.ezdataflow.main')]);
         }
 
         return new JsonResponse([
-            'form' => $this->renderView('@ezdesign/ezdataflow/parts/schedule_form.html.twig', [
+            'form' => $this->renderView('@ibexadesign/ezdataflow/parts/form_modal.html.twig', [
                 'form' => $form->createView(),
                 'type_action' => 'edit',
             ]),
@@ -139,10 +125,6 @@ class ScheduledDataflowController extends Controller
 
     /**
      * @Route("/{id}/enable", name="coderhapsodie.ezdataflow.workflow.enable")
-     *
-     * @param int $id
-     *
-     * @return Response
      */
     public function enableDataflow(int $id): Response
     {
@@ -153,26 +135,10 @@ class ScheduledDataflowController extends Controller
         return $this->redirectToRoute('coderhapsodie.ezdataflow.main');
     }
 
-    /**
-     * @Route("/{id}/disable", name="coderhapsodie.ezdataflow.workflow.disable")
-     *
-     * @param int $id
-     *
-     * @return Response
-     */
-    public function disableDataflow(int $id): Response
-    {
-        $this->denyAccessUnlessGranted(new Attribute('ezdataflow', 'edit'));
-
-        $this->changeDataflowStatus($id, false);
-
-        return $this->redirectToRoute('coderhapsodie.ezdataflow.main');
-    }
-
     private function changeDataflowStatus(int $id, bool $status)
     {
         try {
-            /** @var ScheduledDataflow $workflow */
+            /** @var \CodeRhapsodie\DataflowBundle\Entity\ScheduledDataflow $workflow */
             $workflow = $this->scheduledDataflowGateway->find($id);
             $workflow->setEnabled($status);
             $this->scheduledDataflowGateway->save($workflow);
@@ -182,4 +148,16 @@ class ScheduledDataflowController extends Controller
             $this->notificationHandler->error(sprintf('An error occured : "%s".', $e->getMessage()));
         }
     }
+
+    /**
+     * @Route("/{id}/disable", name="coderhapsodie.ezdataflow.workflow.disable")
+     */
+    public function disableDataflow(int $id): Response
+    {
+        $this->denyAccessUnlessGranted(new Attribute('ezdataflow', 'edit'));
+
+        $this->changeDataflowStatus($id, false);
+
+        return $this->redirectToRoute('coderhapsodie.ezdataflow.main');
+    }
 }

src/Core/Content/ContentCreator.php

@@ -7,23 +7,23 @@ namespace CodeRhapsodie\EzDataflowBundle\Core\Content;
 use CodeRhapsodie\EzDataflowBundle\Core\Field\ContentStructFieldFillerInterface;
 use CodeRhapsodie\EzDataflowBundle\Matcher\LocationMatcherInterface;
 use CodeRhapsodie\EzDataflowBundle\Model\ContentCreateStructure;
-use eZ\Publish\API\Repository\ContentService;
-use eZ\Publish\API\Repository\ContentTypeService;
-use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\API\Repository\Values\Content\LocationCreateStruct;
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\LocationCreateStruct;
 
 class ContentCreator implements ContentCreatorInterface
 {
-    /** @var ContentService */
+    /** @var \Ibexa\Contracts\Core\Repository\ContentService */
     private $contentService;
 
-    /** @var ContentTypeService */
+    /** @var \Ibexa\Contracts\Core\Repository\ContentTypeService */
     private $contentTypeService;
 
-    /** @var ContentStructFieldFillerInterface */
+    /** @var \CodeRhapsodie\EzDataflowBundle\Core\Field\ContentStructFieldFillerInterface */
     private $filler;
 
-    /** @var LocationMatcherInterface */
+    /** @var \CodeRhapsodie\EzDataflowBundle\Matcher\LocationMatcherInterface */
     private $matcher;
 
     public function __construct(ContentService $contentService, ContentTypeService $contentTypeService, ContentStructFieldFillerInterface $filler, LocationMatcherInterface $matcher)
@@ -35,16 +35,12 @@ class ContentCreator implements ContentCreatorInterface
     }
 
     /**
-     * @param ContentCreateStructure $structure
-     *
-     * @return Content
-     *
-     * @throws \eZ\Publish\API\Repository\Exceptions\BadStateException
-     * @throws \eZ\Publish\API\Repository\Exceptions\ContentFieldValidationException
-     * @throws \eZ\Publish\API\Repository\Exceptions\ContentValidationException
-     * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
-     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
-     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\BadStateException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\ContentFieldValidationException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\ContentValidationException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
      */
     public function createFromStructure(ContentCreateStructure $structure): Content
     {
@@ -58,17 +54,21 @@ class ContentCreator implements ContentCreatorInterface
     }
 
     /**
-     * @param array $locations
-     *
-     * @return LocationCreateStruct[]
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\LocationCreateStruct[]
      */
     private function getLocationCreateStructs(array $locations): array
     {
         $locationCreateStructs = [];
 
-        foreach ($locations as $locationOrIdOrRemoteId) {
+        foreach ($locations as $locationOrIdOrRemoteIdOrStruct) {
+            if ($locationOrIdOrRemoteIdOrStruct instanceof LocationCreateStruct) {
+                $locationCreateStructs[] = $locationOrIdOrRemoteIdOrStruct;
+
+                continue;
+            }
+
             $locationCreateStructs[] = new LocationCreateStruct([
-                'parentLocationId' => $this->matcher->matchLocation($locationOrIdOrRemoteId)->id,
+                'parentLocationId' => $this->matcher->matchLocation($locationOrIdOrRemoteIdOrStruct)->id,
             ]);
         }
 

src/Core/Content/ContentCreatorInterface.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace CodeRhapsodie\EzDataflowBundle\Core\Content;
 
 use CodeRhapsodie\EzDataflowBundle\Model\ContentCreateStructure;
-use eZ\Publish\API\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
 
 interface ContentCreatorInterface
 {

src/Core/Content/ContentUpdater.php

@@ -7,19 +7,19 @@ namespace CodeRhapsodie\EzDataflowBundle\Core\Content;
 use CodeRhapsodie\EzDataflowBundle\Core\Field\ContentStructFieldFillerInterface;
 use CodeRhapsodie\EzDataflowBundle\Exception\NoMatchFoundException;
 use CodeRhapsodie\EzDataflowBundle\Model\ContentUpdateStructure;
-use eZ\Publish\API\Repository\ContentService;
-use eZ\Publish\API\Repository\ContentTypeService;
-use eZ\Publish\API\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
 
 class ContentUpdater implements ContentUpdaterInterface
 {
-    /** @var ContentService */
+    /** @var \Ibexa\Contracts\Core\Repository\ContentService */
     private $contentService;
 
-    /** @var ContentTypeService */
+    /** @var \Ibexa\Contracts\Core\Repository\ContentTypeService */
     private $contentTypeService;
 
-    /** @var ContentStructFieldFillerInterface */
+    /** @var \CodeRhapsodie\EzDataflowBundle\Core\Field\ContentStructFieldFillerInterface */
     private $filler;
 
     public function __construct(ContentService $contentService, ContentTypeService $contentTypeService, ContentStructFieldFillerInterface $filler)
@@ -30,17 +30,13 @@ class ContentUpdater implements ContentUpdaterInterface
     }
 
     /**
-     * @param ContentUpdateStructure $structure
-     *
-     * @return Content
-     *
-     * @throws NoMatchFoundException
-     * @throws \eZ\Publish\API\Repository\Exceptions\BadStateException
-     * @throws \eZ\Publish\API\Repository\Exceptions\ContentFieldValidationException
-     * @throws \eZ\Publish\API\Repository\Exceptions\ContentValidationException
-     * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
-     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
-     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
+     * @throws \CodeRhapsodie\EzDataflowBundle\Exception\NoMatchFoundException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\BadStateException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\ContentFieldValidationException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\ContentValidationException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
      */
     public function updateFromStructure(ContentUpdateStructure $structure): Content
     {

src/Core/Content/ContentUpdaterInterface.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace CodeRhapsodie\EzDataflowBundle\Core\Content;
 
 use CodeRhapsodie\EzDataflowBundle\Model\ContentUpdateStructure;
-use eZ\Publish\API\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
 
 interface ContentUpdaterInterface
 {

src/Core/Field/ContentStructFieldFiller.php

@@ -6,9 +6,9 @@ namespace CodeRhapsodie\EzDataflowBundle\Core\Field;
 
 use CodeRhapsodie\EzDataflowBundle\Exception\UnknownFieldException;
 use CodeRhapsodie\EzDataflowBundle\Exception\UnsupportedFieldTypeException;
-use eZ\Publish\API\Repository\Values\Content\ContentStruct;
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\FieldType\Value;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentStruct;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
 
 class ContentStructFieldFiller implements ContentStructFieldFillerInterface
 {
@@ -17,8 +17,6 @@ class ContentStructFieldFiller implements ContentStructFieldFillerInterface
 
     /**
      * ContentStructFieldFiller constructor.
-     *
-     * @param iterable $fieldValueCreators
      */
     public function __construct(iterable $fieldValueCreators)
     {
@@ -28,8 +26,8 @@ class ContentStructFieldFiller implements ContentStructFieldFillerInterface
     /**
      * {@inheritdoc}
      *
-     * @throws UnknownFieldException
-     * @throws UnsupportedFieldTypeException
+     * @throws \CodeRhapsodie\EzDataflowBundle\Exception\UnknownFieldException
+     * @throws \CodeRhapsodie\EzDataflowBundle\Exception\UnsupportedFieldTypeException
      */
     public function fillFields(ContentType $contentType, ContentStruct $contentStruct, array $fieldHashes): void
     {
@@ -47,12 +45,9 @@ class ContentStructFieldFiller implements ContentStructFieldFillerInterface
     }
 
     /**
-     * @param string $fieldTypeIdentifier
-     * @param mixed  $hash
+     * @param mixed $hash
      *
-     * @return Value
-     *
-     * @throws UnsupportedFieldTypeException
+     * @throws \CodeRhapsodie\EzDataflowBundle\Exception\UnsupportedFieldTypeException
      */
     private function createFieldValue(string $fieldTypeIdentifier, $hash): Value
     {

src/Core/Field/ContentStructFieldFillerInterface.php

@@ -4,15 +4,10 @@ declare(strict_types=1);
 
 namespace CodeRhapsodie\EzDataflowBundle\Core\Field;
 
-use eZ\Publish\API\Repository\Values\Content\ContentStruct;
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentStruct;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
 
 interface ContentStructFieldFillerInterface
 {
-    /**
-     * @param ContentType   $contentType
-     * @param ContentStruct $contentStruct
-     * @param array         $fieldHashes
-     */
     public function fillFields(ContentType $contentType, ContentStruct $contentStruct, array $fieldHashes): void;
 }

src/Core/Field/DefaultFieldValueCreator.php

@@ -4,13 +4,12 @@ declare(strict_types=1);
 
 namespace CodeRhapsodie\EzDataflowBundle\Core\Field;
 
-use eZ\Publish\API\Repository\FieldType;
-use eZ\Publish\API\Repository\FieldTypeService;
-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\FieldType\Value;
+use Ibexa\Contracts\Core\Repository\FieldTypeService;
 
 class DefaultFieldValueCreator implements FieldValueCreatorInterface
 {
-    /** @var FieldTypeService */
+    /** @var \Ibexa\Contracts\Core\Repository\FieldTypeService */
     private $fieldTypeService;
 
     public function __construct(FieldTypeService $fieldTypeService)

src/Core/Field/FieldValueCreatorInterface.php

@@ -4,22 +4,14 @@ declare(strict_types=1);
 
 namespace CodeRhapsodie\EzDataflowBundle\Core\Field;
 
-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\FieldType\Value;
 
 interface FieldValueCreatorInterface
 {
-    /**
-     * @param string $fieldTypeIdentifier
-     *
-     * @return bool
-     */
     public function supports(string $fieldTypeIdentifier): bool;
 
     /**
-     * @param string $fieldTypeIdentifier
-     * @param mixed  $hash
-     *
-     * @return Value
+     * @param mixed $hash
      */
     public function createValue(string $fieldTypeIdentifier, $hash): Value;
 }

src/Core/FieldComparator/AbstractFieldComparator.php

@@ -4,13 +4,13 @@ declare(strict_types=1);
 
 namespace CodeRhapsodie\EzDataflowBundle\Core\FieldComparator;
 
-use eZ\Publish\API\Repository\FieldTypeService;
-use eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\FieldType\Value;
+use Ibexa\Contracts\Core\Repository\FieldTypeService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
 
 abstract class AbstractFieldComparator implements FieldComparatorInterface
 {
-    /** @var FieldTypeService */
+    /** @var \Ibexa\Contracts\Core\Repository\FieldTypeService */
     private $fieldTypeService;
 
     public function __construct(FieldTypeService $fieldTypeService)
@@ -26,7 +26,7 @@ abstract class AbstractFieldComparator implements FieldComparatorInterface
     }
 
     /**
-     * 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/Core/FieldComparator/DelegatorFieldComparator.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace CodeRhapsodie\EzDataflowBundle\Core\FieldComparator;
 
-use eZ\Publish\API\Repository\Values\Content\Field;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
 
 class DelegatorFieldComparator implements FieldComparatorInterface
 {

src/Core/FieldComparator/FieldComparatorInterface.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace CodeRhapsodie\EzDataflowBundle\Core\FieldComparator;
 
-use eZ\Publish\API\Repository\Values\Content\Field;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
 
 interface FieldComparatorInterface
 {

src/Core/FieldComparator/MapLocationFieldComparator.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace CodeRhapsodie\EzDataflowBundle\Core\FieldComparator;
 
-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\FieldType\Value;
 
 class MapLocationFieldComparator extends AbstractFieldComparator
 {

src/Core/FieldComparator/MatrixFieldComparator.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace CodeRhapsodie\EzDataflowBundle\Core\FieldComparator;
 
-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\FieldType\Value;
 
 class MatrixFieldComparator extends AbstractFieldComparator
 {

src/Core/FieldComparator/NovaSEOMetasFieldComparator.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace CodeRhapsodie\EzDataflowBundle\Core\FieldComparator;
 
-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\FieldType\Value;
 
 class NovaSEOMetasFieldComparator extends AbstractFieldComparator
 {

src/Core/FieldComparator/SimpleFieldComparator.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace CodeRhapsodie\EzDataflowBundle\Core\FieldComparator;
 
-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\FieldType\Value;
 
 class SimpleFieldComparator extends AbstractFieldComparator
 {

src/Core/FieldComparator/UrlFieldComparator.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace CodeRhapsodie\EzDataflowBundle\Core\FieldComparator;
 
-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\FieldType\Value;
 
 class UrlFieldComparator extends AbstractFieldComparator
 {

src/DependencyInjection/Configuration.php

@@ -16,13 +16,7 @@ class Configuration implements ConfigurationInterface
     {
         $treeBuilder = new TreeBuilder('code_rhapsodie_ez_dataflow');
 
-        if (method_exists($treeBuilder, 'getRootNode')) {
-            $rootNode = $treeBuilder->getRootNode();
-        } else {
-            // BC for symfony/config < 4.2
-            $rootNode = $treeBuilder->root('code_rhapsodie_ez_dataflow');
-        }
-
+        $rootNode = $treeBuilder->getRootNode();
         $rootNode
             ->children()
                 ->scalarNode('admin_login_or_id')

src/EventSubscriber/MenuSubscriber.php

@@ -4,9 +4,8 @@ declare(strict_types=1);
 
 namespace CodeRhapsodie\EzDataflowBundle\EventSubscriber;
 
-use EzSystems\EzPlatformAdminUi\Menu\Event\ConfigureMenuEvent;
-use EzSystems\EzPlatformAdminUi\Menu\MainMenuBuilder;
-use Knp\Menu\ItemInterface;
+use Ibexa\AdminUi\Menu\Event\ConfigureMenuEvent;
+use Ibexa\AdminUi\Menu\MainMenuBuilder;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 class MenuSubscriber implements EventSubscriberInterface
@@ -21,7 +20,7 @@ class MenuSubscriber implements EventSubscriberInterface
 
     public function onConfigureMenu(ConfigureMenuEvent $event)
     {
-        /** @var ItemInterface $menu */
+        /** @var \Knp\Menu\ItemInterface $menu */
         $menu = $event->getMenu();
         if (!isset($menu[MainMenuBuilder::ITEM_ADMIN])) {
             return;

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,12 +6,6 @@ namespace CodeRhapsodie\EzDataflowBundle\Exception;
 
 class UnknownFieldException extends \Exception
 {
-    /**
-     * @param string $fieldIdentifier
-     * @param string $contentTypeIdentifier
-     *
-     * @return UnknownFieldException
-     */
     public static function create(string $fieldIdentifier, string $contentTypeIdentifier): self
     {
         return new self(sprintf(

src/Factory/ContentStructureFactory.php

@@ -5,22 +5,19 @@ declare(strict_types=1);
 namespace CodeRhapsodie\EzDataflowBundle\Factory;
 
 use CodeRhapsodie\EzDataflowBundle\Model\ContentCreateStructure;
-use CodeRhapsodie\EzDataflowBundle\Model\ContentStructure;
 use CodeRhapsodie\EzDataflowBundle\Model\ContentUpdateStructure;
-use eZ\Publish\API\Repository\ContentService;
-use eZ\Publish\API\Repository\Exceptions\NotFoundException;
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
 
 final class ContentStructureFactory implements ContentStructureFactoryInterface
 {
     /**
-     * @var ContentService
+     * @var \Ibexa\Contracts\Core\Repository\ContentService
      */
     private $contentService;
 
     /**
      * ContentStructureFactory constructor.
-     *
-     * @param ContentService $contentService
      */
     public function __construct(ContentService $contentService)
     {
@@ -28,17 +25,13 @@ final class ContentStructureFactory implements ContentStructureFactoryInterface
     }
 
     /**
-     * @param array  $data
-     * @param string $remoteId
-     * @param string $language
-     * @param string $contentType
-     * @param mixed  $parentLocations
-     * @param int    $mode            One of the constant ContentStructureFactoryInterface::MODE_*
+     * @param mixed $parentLocations
+     * @param int   $mode            One of the constant ContentStructureFactoryInterface::MODE_*
      *
-     * @return false|ContentStructure
+     * @return false|\CodeRhapsodie\EzDataflowBundle\Model\ContentStructure
      *
      * @throws \CodeRhapsodie\EzDataflowBundle\Exception\InvalidArgumentTypeException
-     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
      */
     public function transform(array $data, string $remoteId, string $language, string $contentType, $parentLocations, int $mode = ContentStructureFactoryInterface::MODE_INSERT_OR_UPDATE)
     {
@@ -53,7 +46,7 @@ final class ContentStructureFactory implements ContentStructureFactoryInterface
             // The content doesn't exist yet, so it will be created.
         }
 
-        if ($mode === static::MODE_UPDATE_ONLY) {
+        if (self::MODE_UPDATE_ONLY === $mode) {
             return false;
         }
 

src/Factory/ContentStructureFactoryInterface.php

@@ -11,10 +11,6 @@ interface ContentStructureFactoryInterface
     public const MODE_UPDATE_ONLY = 3;
 
     /**
-     * @param array      $data
-     * @param string     $remoteId
-     * @param string     $language
-     * @param string     $contentType
      * @param int|string $parentLocations Int for location id or string for remote location id
      * @param int        $mode            ContentStructureFactoryInterface
      *

src/Filter/NotModifiedContentFilter.php

@@ -6,7 +6,7 @@ namespace CodeRhapsodie\EzDataflowBundle\Filter;
 
 use CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\FieldComparatorInterface;
 use CodeRhapsodie\EzDataflowBundle\Model\ContentUpdateStructure;
-use eZ\Publish\API\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\ContentService;
 use Psr\Log\LoggerAwareTrait;
 
 /**
@@ -16,13 +16,12 @@ class NotModifiedContentFilter
 {
     use LoggerAwareTrait;
 
-    /** @var ContentService */
+    /** @var \Ibexa\Contracts\Core\Repository\ContentService */
     private $contentService;
 
-    /** @var FieldComparatorInterface */
+    /** @var \CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\FieldComparatorInterface */
     private $comparator;
 
-
     public function __construct(ContentService $contentService, FieldComparatorInterface $comparator)
     {
         $this->contentService = $contentService;
@@ -43,7 +42,7 @@ class NotModifiedContentFilter
 
         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;
             }
@@ -51,12 +50,13 @@ class NotModifiedContentFilter
 
         // 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);

src/Form/CreateOneshotType.php

@@ -6,7 +6,6 @@ namespace CodeRhapsodie\EzDataflowBundle\Form;
 
 use CodeRhapsodie\DataflowBundle\Entity\Job;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -30,7 +29,7 @@ class CreateOneshotType extends AbstractType
                     'placeholder' => 'coderhapsodie.dataflow.options.placeholder',
                 ],
             ])
-            ->add('requestedDate', DateTimeType::class, [
+            ->add('requestedDate', UserTimezoneAwareDateTimeType::class, [
                 'label' => 'coderhapsodie.dataflow.requestedDate',
                 'years' => range(date('Y'), date('Y') + 5),
             ])

src/Form/CreateScheduledType.php

@@ -7,7 +7,6 @@ namespace CodeRhapsodie\EzDataflowBundle\Form;
 use CodeRhapsodie\DataflowBundle\Entity\ScheduledDataflow;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -38,7 +37,7 @@ class CreateScheduledType extends AbstractType
                 ],
                 'label' => 'coderhapsodie.dataflow.frequency',
             ])
-            ->add('next', DateTimeType::class, [
+            ->add('next', UserTimezoneAwareDateTimeType::class, [
                 'years' => range(date('Y'), date('Y') + 5),
                 'label' => 'coderhapsodie.dataflow.create.next',
             ])

src/Form/DataflowTypeChoiceType.php

@@ -11,7 +11,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class DataflowTypeChoiceType extends AbstractType
 {
-    /** @var DataflowTypeRegistryInterface */
+    /** @var \CodeRhapsodie\DataflowBundle\Registry\DataflowTypeRegistryInterface */
     private $registry;
 
     public function __construct(DataflowTypeRegistryInterface $registry)

src/Form/UpdateScheduledType.php

@@ -6,7 +6,6 @@ namespace CodeRhapsodie\EzDataflowBundle\Form;
 
 use CodeRhapsodie\DataflowBundle\Entity\ScheduledDataflow;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -32,7 +31,7 @@ class UpdateScheduledType extends AbstractType
                 ],
                 'label' => 'coderhapsodie.dataflow.frequency',
             ])
-            ->add('next', DateTimeType::class, [
+            ->add('next', UserTimezoneAwareDateTimeType::class, [
                 'years' => range(date('Y'), date('Y') + 5),
                 'label' => 'coderhapsodie.dataflow.update.next',
             ])

src/Form/UserTimezoneAwareDateTimeTransformer.php

@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CodeRhapsodie\EzDataflowBundle\Form;
+
+use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
+use Ibexa\Contracts\Core\Repository\UserPreferenceService;
+use Symfony\Component\Form\DataTransformerInterface;
+
+class UserTimezoneAwareDateTimeTransformer implements DataTransformerInterface
+{
+    /** @var \Ibexa\Contracts\Core\Repository\UserPreferenceService */
+    private $userPreferenceService;
+
+    public function __construct(UserPreferenceService $userPreferenceService)
+    {
+        $this->userPreferenceService = $userPreferenceService;
+    }
+
+    public function transform($value)
+    {
+        if (!$value instanceof \DateTimeInterface) {
+            return $value;
+        }
+
+        return (new \DateTime('now', $this->userTimezone()))->setTimestamp($value->getTimestamp());
+    }
+
+    public function reverseTransform($value)
+    {
+        if (!$value instanceof \DateTimeInterface) {
+            return $value;
+        }
+
+        $dateTimeWithUserTimeZone = new \DateTime($value->format('Y-m-d H:i:s'), $this->userTimezone());
+
+        return (new \DateTime())->setTimestamp($dateTimeWithUserTimeZone->getTimestamp());
+    }
+
+    private function userTimezone(): \DateTimeZone
+    {
+        try {
+            $tz = $this->userPreferenceService->getUserPreference('timezone')->value ?? 'UTC';
+        } catch (NotFoundException $e) {
+            $tz = 'UTC';
+        }
+
+        return new \DateTimeZone($tz);
+    }
+}

src/Form/UserTimezoneAwareDateTimeType.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CodeRhapsodie\EzDataflowBundle\Form;
+
+use Ibexa\Contracts\Core\Repository\UserPreferenceService;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class UserTimezoneAwareDateTimeType extends AbstractType
+{
+    /** @var \Ibexa\Contracts\Core\Repository\UserPreferenceService */
+    private $userPreferenceService;
+
+    public function __construct(UserPreferenceService $userPreferenceService)
+    {
+        $this->userPreferenceService = $userPreferenceService;
+    }
+
+    public function getParent()
+    {
+        return DateTimeType::class;
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->addModelTransformer(new UserTimezoneAwareDateTimeTransformer($this->userPreferenceService));
+    }
+}

src/Gateway/JobGateway.php

@@ -10,7 +10,10 @@ use Doctrine\DBAL\Query\QueryBuilder;
 
 final class JobGateway
 {
-    /** @var JobRepository */
+    public const FILTER_NONE = 0;
+    public const FILTER_NON_EMPTY = 1;
+
+    /** @var \CodeRhapsodie\DataflowBundle\Repository\JobRepository */
     private $jobRepository;
 
     public function __construct(JobRepository $jobRepository)
@@ -30,10 +33,17 @@ final class JobGateway
             ->addOrderBy('i.requested_date', 'DESC');
     }
 
-    public function getListQueryForAdmin(): QueryBuilder
+    public function getListQueryForAdmin(int $filter): QueryBuilder
     {
-        return $this->jobRepository->createQueryBuilder('w')
-            ->addOrderBy('w.requested_date', 'DESC');
+        $qb = $this->jobRepository->createQueryBuilder('w')
+            ->addOrderBy('w.requested_date', 'DESC')
+        ;
+
+        if (self::FILTER_NON_EMPTY === $filter) {
+            $qb->andWhere('w.count > 0');
+        }
+
+        return $qb;
     }
 
     public function getListQueryForScheduleAdmin(int $id): QueryBuilder
@@ -44,9 +54,6 @@ final class JobGateway
             ->addOrderBy('w.requested_date', 'DESC');
     }
 
-    /**
-     * @param Job $job
-     */
     public function save(Job $job)
     {
         $this->jobRepository->save($job);

src/Gateway/ScheduledDataflowGateway.php

@@ -10,7 +10,7 @@ use Doctrine\DBAL\Query\QueryBuilder;
 
 final class ScheduledDataflowGateway
 {
-    /** @var ScheduledDataflowRepository */
+    /** @var \CodeRhapsodie\DataflowBundle\Repository\ScheduledDataflowRepository */
     private $scheduledDataflowRepository;
 
     public function __construct(ScheduledDataflowRepository $scheduledDataflowRepository)
@@ -29,17 +29,12 @@ final class ScheduledDataflowGateway
             ->addOrderBy('s.label', 'ASC');
     }
 
-    /**
-     * @param ScheduledDataflow $scheduledDataflow
-     */
     public function save(ScheduledDataflow $scheduledDataflow)
     {
         $this->scheduledDataflowRepository->save($scheduledDataflow);
     }
 
     /**
-     * @param int $id
-     *
      * @throws \Throwable
      */
     public function delete(int $id): void

src/Matcher/LocationMatcher.php

@@ -5,13 +5,13 @@ declare(strict_types=1);
 namespace CodeRhapsodie\EzDataflowBundle\Matcher;
 
 use CodeRhapsodie\EzDataflowBundle\Exception\NoMatchFoundException;
-use eZ\Publish\API\Repository\Exceptions\NotFoundException;
-use eZ\Publish\API\Repository\LocationService;
-use eZ\Publish\API\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
+use Ibexa\Contracts\Core\Repository\LocationService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location;
 
 class LocationMatcher implements LocationMatcherInterface
 {
-    /** @var LocationService */
+    /** @var \Ibexa\Contracts\Core\Repository\LocationService */
     private $locationService;
 
     public function __construct(LocationService $locationService)
@@ -22,10 +22,8 @@ class LocationMatcher implements LocationMatcherInterface
     /**
      * @param mixed $valueToMatch
      *
-     * @return Location
-     *
-     * @throws NoMatchFoundException
-     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
+     * @throws \CodeRhapsodie\EzDataflowBundle\Exception\NoMatchFoundException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
      */
     public function matchLocation($valueToMatch): Location
     {

src/Matcher/LocationMatcherInterface.php

@@ -4,14 +4,12 @@ declare(strict_types=1);
 
 namespace CodeRhapsodie\EzDataflowBundle\Matcher;
 
-use eZ\Publish\API\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location;
 
 interface LocationMatcherInterface
 {
     /**
      * @param mixed $valueToMatch
-     *
-     * @return Location
      */
     public function matchLocation($valueToMatch): Location;
 }

src/Model/ContentCreateStructure.php

@@ -5,7 +5,8 @@ declare(strict_types=1);
 namespace CodeRhapsodie\EzDataflowBundle\Model;
 
 use CodeRhapsodie\EzDataflowBundle\Exception\InvalidArgumentTypeException;
-use eZ\Publish\API\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\Content\LocationCreateStruct;
 
 class ContentCreateStructure extends ContentStructure
 {
@@ -18,19 +19,16 @@ class ContentCreateStructure extends ContentStructure
     /**
      * ContentCreateStructure constructor.
      *
-     * @param string      $contentTypeIdentifier
-     * @param string      $languageCode
-     * @param array       $locations
-     *                                           A location can be any of the following:
-     *                                           <ul>
-     *                                           <li>an integer, the id of the Location object</li>
-     *                                           <li>a string, the remote id of the Location object</li>
-     *                                           <li>a Location object</li>
-     *                                           </ul>
-     * @param array       $fields
-     * @param string|null $remoteId
+     * @param array $locations
+     *                         A location can be any of the following:
+     *                         <ul>
+     *                         <li>an integer, the id of the Location object</li>
+     *                         <li>a string, the remote id of the Location object</li>
+     *                         <li>a Location object</li>
+     *                         <li>a LocationCreateStruct object</li>
+     *                         </ul>
      *
-     * @throws InvalidArgumentTypeException
+     * @throws \CodeRhapsodie\EzDataflowBundle\Exception\InvalidArgumentTypeException
      */
     public function __construct(string $contentTypeIdentifier, string $languageCode, array $locations, array $fields, ?string $remoteId = null)
     {
@@ -41,35 +39,28 @@ class ContentCreateStructure extends ContentStructure
         $this->remoteId = $remoteId;
     }
 
-    /**
-     * @return string
-     */
     public function getContentTypeIdentifier(): string
     {
         return $this->contentTypeIdentifier;
     }
 
-    /**
-     * @return array
-     */
     public function getLocations(): array
     {
         return $this->locations;
     }
 
     /**
-     * @param array $locations
-     *
-     * @throws InvalidArgumentTypeException
+     * @throws \CodeRhapsodie\EzDataflowBundle\Exception\InvalidArgumentTypeException
      */
     private function setLocations(array $locations)
     {
-        foreach ($locations as $locationOrIdOrRemoteId) {
-            if (!is_int($locationOrIdOrRemoteId)
-                && !is_string($locationOrIdOrRemoteId)
-                && !$locationOrIdOrRemoteId instanceof Location
+        foreach ($locations as $locationOrIdOrRemoteIdOrStruct) {
+            if (!is_int($locationOrIdOrRemoteIdOrStruct)
+                && !is_string($locationOrIdOrRemoteIdOrStruct)
+                && !$locationOrIdOrRemoteIdOrStruct instanceof Location
+                && !$locationOrIdOrRemoteIdOrStruct instanceof LocationCreateStruct
             ) {
-                throw InvalidArgumentTypeException::create(['int', 'string', Location::class], $locationOrIdOrRemoteId);
+                throw InvalidArgumentTypeException::create(['int', 'string', Location::class, LocationCreateStruct::class], $locationOrIdOrRemoteIdOrStruct);
             }
         }
 

src/Model/ContentStructure.php

@@ -15,25 +15,16 @@ abstract class ContentStructure
     /** @var array */
     protected $fields;
 
-    /**
-     * @return string|null
-     */
     public function getRemoteId(): ?string
     {
         return $this->remoteId;
     }
 
-    /**
-     * @return string
-     */
     public function getLanguageCode(): string
     {
         return $this->languageCode;
     }
 
-    /**
-     * @return array
-     */
     public function getFields(): array
     {
         return $this->fields;

src/Model/ContentUpdateStructure.php

@@ -15,13 +15,6 @@ class ContentUpdateStructure extends ContentStructure
         $this->fields = $fields;
     }
 
-    /**
-     * @param int    $id
-     * @param string $languageCode
-     * @param array  $fields
-     *
-     * @return ContentUpdateStructure
-     */
     public static function createForContentId(int $id, string $languageCode, array $fields): self
     {
         $struct = new self($languageCode, $fields);
@@ -30,13 +23,6 @@ class ContentUpdateStructure extends ContentStructure
         return $struct;
     }
 
-    /**
-     * @param string $remoteId
-     * @param string $languageCode
-     * @param array  $fields
-     *
-     * @return ContentUpdateStructure
-     */
     public static function createForContentRemoteId(string $remoteId, string $languageCode, array $fields): self
     {
         $struct = new self($languageCode, $fields);
@@ -45,9 +31,6 @@ class ContentUpdateStructure extends ContentStructure
         return $struct;
     }
 
-    /**
-     * @return int|null
-     */
     public function getId(): ?int
     {
         return $this->id;

src/Resources/config/services.yaml

@@ -5,29 +5,42 @@ services:
     _defaults:
         public: false
 
-    coderhapsodie.dataflow.connection: "@ezpublish.persistence.connection"
+    coderhapsodie.dataflow.connection: "@ibexa.persistence.connection"
 
     CodeRhapsodie\EzDataflowBundle\Controller\DashboardController:
         public: true
+        tags:
+            - { name: controller.service_arguments }
         arguments:
             $jobGateway: '@CodeRhapsodie\EzDataflowBundle\Gateway\JobGateway'
-            $notificationHandler: '@EzSystems\EzPlatformAdminUi\Notification\NotificationHandlerInterface'
             $scheduledDataflowGateway: '@CodeRhapsodie\EzDataflowBundle\Gateway\ScheduledDataflowGateway'
+        calls:
+            - ['setContainer', ['@service_container']]
+            - ['performAccessCheck', []]
 
     CodeRhapsodie\EzDataflowBundle\Controller\ScheduledDataflowController:
         public: true
+        tags:
+            - { name: controller.service_arguments }
         arguments:
-            $jobGateway: '@CodeRhapsodie\EzDataflowBundle\Gateway\JobGateway'
-            $notificationHandler: '@EzSystems\EzPlatformAdminUi\Notification\NotificationHandlerInterface'
+            $notificationHandler: '@Ibexa\Contracts\AdminUi\Notification\NotificationHandlerInterface'
             $scheduledDataflowGateway: '@CodeRhapsodie\EzDataflowBundle\Gateway\ScheduledDataflowGateway'
             $translator: '@translator'
+        calls:
+            - [ 'setContainer', [ '@service_container' ] ]
+            - [ 'performAccessCheck', [ ] ]
 
     CodeRhapsodie\EzDataflowBundle\Controller\JobController:
         public: true
+        tags:
+            - { name: controller.service_arguments }
         arguments:
             $jobGateway: '@CodeRhapsodie\EzDataflowBundle\Gateway\JobGateway'
-            $notificationHandler: '@EzSystems\EzPlatformAdminUi\Notification\NotificationHandlerInterface'
+            $notificationHandler: '@Ibexa\Contracts\AdminUi\Notification\NotificationHandlerInterface'
             $translator: '@translator'
+        calls:
+            - [ 'setContainer', [ '@service_container' ] ]
+            - [ 'performAccessCheck', [ ] ]
 
     CodeRhapsodie\EzDataflowBundle\Writer\RepositoryWriter:
         abstract: true
@@ -44,23 +57,23 @@ services:
     CodeRhapsodie\EzDataflowBundle\UserSwitcher\UserSwitcherInterface: '@CodeRhapsodie\EzDataflowBundle\UserSwitcher\UserSwitcher'
     CodeRhapsodie\EzDataflowBundle\UserSwitcher\UserSwitcher:
         arguments:
-            $permissionResolver: '@eZ\Publish\API\Repository\PermissionResolver'
-            $userService: '@eZ\Publish\API\Repository\UserService'
+            $permissionResolver: '@Ibexa\Contracts\Core\Repository\PermissionResolver'
+            $userService: '@Ibexa\Contracts\Core\Repository\UserService'
             $adminLoginOrId: '%coderhapsodie.ezdataflow.admin_login_or_id%'
 
     CodeRhapsodie\EzDataflowBundle\Core\Content\ContentCreatorInterface: '@CodeRhapsodie\EzDataflowBundle\Core\Content\ContentCreator'
     CodeRhapsodie\EzDataflowBundle\Core\Content\ContentCreator:
         arguments:
-            $contentService: '@eZ\Publish\API\Repository\ContentService'
-            $contentTypeService: '@eZ\Publish\API\Repository\ContentTypeService'
+            $contentService: '@Ibexa\Contracts\Core\Repository\ContentService'
+            $contentTypeService: '@Ibexa\Contracts\Core\Repository\ContentTypeService'
             $filler: '@CodeRhapsodie\EzDataflowBundle\Core\Field\ContentStructFieldFillerInterface'
             $matcher: '@CodeRhapsodie\EzDataflowBundle\Matcher\LocationMatcherInterface'
 
     CodeRhapsodie\EzDataflowBundle\Core\Content\ContentUpdaterInterface: '@CodeRhapsodie\EzDataflowBundle\Core\Content\ContentUpdater'
     CodeRhapsodie\EzDataflowBundle\Core\Content\ContentUpdater:
         arguments:
-            $contentService: '@eZ\Publish\API\Repository\ContentService'
-            $contentTypeService: '@eZ\Publish\API\Repository\ContentTypeService'
+            $contentService: '@Ibexa\Contracts\Core\Repository\ContentService'
+            $contentTypeService: '@Ibexa\Contracts\Core\Repository\ContentTypeService'
             $filler: '@CodeRhapsodie\EzDataflowBundle\Core\Field\ContentStructFieldFillerInterface'
 
     CodeRhapsodie\EzDataflowBundle\Core\Field\ContentStructFieldFillerInterface: '@CodeRhapsodie\EzDataflowBundle\Core\Field\ContentStructFieldFiller'
@@ -71,11 +84,11 @@ services:
     CodeRhapsodie\EzDataflowBundle\Matcher\LocationMatcherInterface: '@CodeRhapsodie\EzDataflowBundle\Matcher\LocationMatcher'
     CodeRhapsodie\EzDataflowBundle\Matcher\LocationMatcher:
         arguments:
-            $locationService: '@eZ\Publish\API\Repository\LocationService'
+            $locationService: '@Ibexa\Contracts\Core\Repository\LocationService'
 
     CodeRhapsodie\EzDataflowBundle\Core\Field\DefaultFieldValueCreator:
         arguments:
-            $fieldTypeService: '@eZ\Publish\API\Repository\FieldTypeService'
+            $fieldTypeService: '@Ibexa\Contracts\Core\Repository\FieldTypeService'
         tags:
             - { name: 'coderhapsodie.ezdataflow.field_value_creator', priority: -1000 }
 
@@ -86,7 +99,7 @@ services:
 
     CodeRhapsodie\EzDataflowBundle\Factory\ContentStructureFactory:
         arguments:
-            $contentService: '@eZ\Publish\API\Repository\ContentService'
+            $contentService: '@Ibexa\Contracts\Core\Repository\ContentService'
 
     CodeRhapsodie\EzDataflowBundle\Form\DataflowTypeChoiceType:
         arguments:
@@ -102,6 +115,11 @@ services:
     CodeRhapsodie\EzDataflowBundle\Form\CreateOneshotType:
         tags: ['form.type']
 
+    CodeRhapsodie\EzDataflowBundle\Form\UserTimezoneAwareDateTimeType:
+        arguments:
+            $userPreferenceService: '@Ibexa\Contracts\Core\Repository\UserPreferenceService'
+        tags: ['form.type']
+
     CodeRhapsodie\EzDataflowBundle\Gateway\ScheduledDataflowGateway:
         arguments:
             $scheduledDataflowRepository: '@CodeRhapsodie\DataflowBundle\Repository\ScheduledDataflowRepository'
@@ -111,26 +129,33 @@ services:
             $jobRepository: '@CodeRhapsodie\DataflowBundle\Repository\JobRepository'
 
     CodeRhapsodie\EzDataflowBundle\Tab\RepeatingTab:
-        parent: EzSystems\EzPlatformAdminUi\Tab\AbstractTab
+        parent: Ibexa\Contracts\AdminUi\Tab\AbstractTab
         public: false
+        arguments:
+            $httpKernelRuntime: '@twig.runtime.httpkernel'
         tags:
-            - {name: ezplatform.tab, group: coderhapsodie-ezdataflow}
+            - {name: ibexa.admin_ui.tab, group: coderhapsodie-ezdataflow}
 
     CodeRhapsodie\EzDataflowBundle\Tab\OneshotTab:
-        parent: EzSystems\EzPlatformAdminUi\Tab\AbstractTab
+        parent: Ibexa\Contracts\AdminUi\Tab\AbstractTab
         public: false
+        arguments:
+            $httpKernelRuntime: '@twig.runtime.httpkernel'
         tags:
-            - {name: ezplatform.tab, group: coderhapsodie-ezdataflow}
+            - {name: ibexa.admin_ui.tab, group: coderhapsodie-ezdataflow}
 
     CodeRhapsodie\EzDataflowBundle\Tab\HistoryTab:
-        parent: EzSystems\EzPlatformAdminUi\Tab\AbstractTab
+        parent: Ibexa\Contracts\AdminUi\Tab\AbstractTab
         public: false
+        arguments:
+            $httpKernelRuntime: '@twig.runtime.httpkernel'
         tags:
-            - {name: ezplatform.tab, group: coderhapsodie-ezdataflow}
+            - {name: ibexa.admin_ui.tab, group: coderhapsodie-ezdataflow}
+
 
     CodeRhapsodie\EzDataflowBundle\Filter\NotModifiedContentFilter:
         arguments:
-            $contentService: '@eZ\Publish\API\Repository\ContentService'
+            $contentService: '@Ibexa\Contracts\Core\Repository\ContentService'
             $comparator: '@CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\FieldComparatorInterface'
 
     CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\FieldComparatorInterface: '@CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\DelegatorFieldComparator'
@@ -138,5 +163,15 @@ services:
 
     CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\AbstractFieldComparator:
         arguments:
-            $fieldTypeService: '@eZ\Publish\API\Repository\FieldTypeService'
+            $fieldTypeService: '@Ibexa\Contracts\Core\Repository\FieldTypeService'
         abstract: true
+
+    _cr.admin_tabs.ezdataflow_group:
+        parent: Ibexa\AdminUi\Component\TabsComponent
+        autowire: true
+        autoconfigure: false
+        public: false
+        arguments:
+            $groupIdentifier: 'coderhapsodie-ezdataflow'
+        tags:
+            - { name: ibexa.admin_ui.component, group: 'coderhapsodie-ezdataflow' }

src/Resources/translations/menu.en.yaml

@@ -0,0 +1 @@
+coderhapsodie.ezdataflow: eZ Dataflow

src/Resources/translations/menu.fr.yaml

@@ -0,0 +1 @@
+coderhapsodie.ezdataflow: eZ Dataflow

src/Resources/translations/messages.en.yaml

@@ -21,10 +21,15 @@ coderhapsodie.ezdataflow.history.list.title: 'Executions list'
 coderhapsodie.ezdataflow.history.list.name: Name
 coderhapsodie.ezdataflow.history.list.request: 'Requested on'
 coderhapsodie.ezdataflow.history.list.count: 'Items count'
+coderhapsodie.ezdataflow.history.list.error_count: 'Errors count'
 coderhapsodie.ezdataflow.history.list.start: 'Started on'
 coderhapsodie.ezdataflow.history.list.end: 'Finished on'
 coderhapsodie.ezdataflow.history.list.view: 'View details'
 coderhapsodie.ezdataflow.history.list.status: Status
+coderhapsodie.ezdataflow.history.filter.label: Filter results
+coderhapsodie.ezdataflow.history.filter.none: All results
+coderhapsodie.ezdataflow.history.filter.non_empty_only: Only non empty
+coderhapsodie.ezdataflow.history.filter.with_error_only: Only with errors
 coderhapsodie.ezdataflow.job.status.pending: Pending
 coderhapsodie.ezdataflow.job.status.running: Running
 coderhapsodie.ezdataflow.job.status.complete: Completed

src/Resources/translations/messages.fr.yaml

@@ -21,10 +21,15 @@ coderhapsodie.ezdataflow.history.list.title: 'Liste des exécutions'
 coderhapsodie.ezdataflow.history.list.name: Nom
 coderhapsodie.ezdataflow.history.list.request: 'Demandé le'
 coderhapsodie.ezdataflow.history.list.count: 'Nombre d''objets'
+coderhapsodie.ezdataflow.history.list.error_count: 'Nombre d''erreurs'
 coderhapsodie.ezdataflow.history.list.start: 'Commencé le'
 coderhapsodie.ezdataflow.history.list.end: 'Terminé le'
 coderhapsodie.ezdataflow.history.list.view: 'Voir le détail'
 coderhapsodie.ezdataflow.history.list.status: État
+coderhapsodie.ezdataflow.history.filter.label: Filtrer les résultats
+coderhapsodie.ezdataflow.history.filter.none: Tous les résultats
+coderhapsodie.ezdataflow.history.filter.non_empty_only: Seulement non vides
+coderhapsodie.ezdataflow.history.filter.with_error_only: Seulement avec erreurs
 coderhapsodie.ezdataflow.job.status.pending: 'En attente'
 coderhapsodie.ezdataflow.job.status.running: 'En cours'
 coderhapsodie.ezdataflow.job.status.complete: Terminé

src/Resources/views/themes/admin/ezdataflow/Dashboard/history.html.twig

@@ -1,7 +1,60 @@
-<h2>{{ 'coderhapsodie.ezdataflow.history.title'|trans }}</h2>
+{%- block content -%}
+    {% set choices = [
+        {
+            'value': 0,
+            'label': 'coderhapsodie.ezdataflow.history.filter.none'|trans,
+        },
+        {
+            'value': 1,
+            'label': 'coderhapsodie.ezdataflow.history.filter.non_empty_only'|trans,
+        },
+    ] %}
 
-<div class="ez-table-header">
-    <div class="ez-table-header__headline">{{ 'coderhapsodie.ezdataflow.history.list.title'|trans }}</div>
-</div>
+    {% set source %}
+        <select id="ezdataflow_history_filter" class="form-control ibexa-input">
+            {% for choice in choices %}
+                <option value="{{ choice.value }}">
+                    {{ choice.label }}
+                </option>
+            {% endfor %}
+        </select>
+    {% endset %}
 
-{% include '@ezdesign/ezdataflow/parts/tab/job_list.html.twig' with {identifier: 'ezdataflow_history_results', paginate_route: 'coderhapsodie.ezdataflow.history'} %}
+    {% set actions %}
+        {{ include('@ibexadesign/ui/component/dropdown/dropdown.html.twig', {
+            source: source,
+            choices: choices,
+            value: filter,
+        }) }}
+    {% endset %}
+
+    {{ include('@ibexadesign/ezdataflow/parts/tab/job_list.html.twig', {
+        identifier: 'ezdataflow_history_results',
+        paginate_route: 'coderhapsodie.ezdataflow.history',
+        paginate_params: {'filter': filter},
+        headline: 'coderhapsodie.ezdataflow.history.title'|trans,
+        actions: actions
+    }) }}
+
+    <script>
+        document.addEventListener('DOMContentLoaded', function () {
+            // Manage ajax pagination
+            document.getElementById('ezdataflow_history_filter').addEventListener('change', function (e) {
+                e.preventDefault();
+                const loading = document.getElementById('loading_ezdataflow_history_results');
+                const results = document.getElementById('ezdataflow_history_results').querySelector('.ibexa-table');
+                loading.hidden = false;
+                results.innerHTML = '';
+                fetch('{{ path('coderhapsodie.ezdataflow.history') }}?filter=' + this.value)
+                    .then((r) => r.text())
+                    .then((content) => {
+                        const node = document.createElement('div');
+                        node.innerHTML = content;
+                        results.innerHTML = node.querySelector('#ezdataflow_history_results .ibexa-table').innerHTML;
+                        loading.hidden = true;
+                    })
+                ;
+            });
+        })
+    </script>
+{%- endblock -%}

src/Resources/views/themes/admin/ezdataflow/Dashboard/main.html.twig

@@ -1,78 +1,101 @@
-{% extends "@ezdesign/layout.html.twig" %}
+{% extends "@ibexadesign/ui/layout.html.twig" %}
+
+{% block body_class %}ibexa-ezdataflow{% endblock %}
 
 {% block breadcrumbs %}
-    {% include '@ezdesign/parts/breadcrumbs.html.twig' with { items: [
+    {% include '@ibexadesign/ui/breadcrumbs.html.twig' with { items: [
         { value: 'breadcrumb.admin'|trans(domain='messages')|desc('Admin') },
         { value: 'coderhapsodie.ezdataflow'|trans|desc('EzDataflow') }
     ]} %}
 {% endblock %}
 
-{% block page_title %}
-    {% include '@ezdesign/parts/page_title.html.twig' with {
+{% block header %}
+    {% include '@ibexadesign/ui/page_title.html.twig' with {
         title: 'coderhapsodie.ezdataflow'|trans|desc('EzDataflow'),
-        iconName: 'workflow'
     } %}
 {% endblock %}
 
 {% block content %}
-    {{ ez_platform_tabs('coderhapsodie-ezdataflow', {}, '@ezdesign/ezdataflow/parts/tab/ezdataflow.html.twig') }}
+    {{ ibexa_render_component_group('coderhapsodie-ezdataflow', {'filter': app.request.query.get('filter', 0)}) }}
 
-    <div class="modal fade ez-modal show" id="ez-modal--history-details" tabindex="-1" role="dialog" aria-modal="true">
-        <div class="modal-dialog" role="document" style="max-width: 90%">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h3 class="modal-title">{{ 'coderhapsodie.ezdataflow.workflow.history.title'|trans }}</h3>
-                    <button type="button" class="close" aria-label="Close">
-                        <svg class="ez-icon ez-icon--medium" aria-hidden="true">
-                            <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                                 xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#discard"></use>
-                        </svg>
-                    </button>
-                </div>
-                <div class="modal-body" id="modal_content-details"></div>
-            </div>
-        </div>
-    </div>
+    {% embed '@ibexadesign/ui/component/modal/modal.html.twig' with {
+        id: 'modal-history-details',
+        attr_dialog: {'style': 'max-width: 75vw;'},
+        title: 'coderhapsodie.ezdataflow.history.job.title'|trans,
+    } %}
+        {% block body_content '' %}
+    {% endembed %}
+
+    {% embed '@ibexadesign/ui/component/modal/modal.html.twig' with {
+        id: 'modal-history-log',
+        attr_dialog: {'style': 'max-width: 75vw;'},
+        title: 'coderhapsodie.ezdataflow.workflow.log.title'|trans,
+    } %}
+        {% block body_content '' %}
+    {% endembed %}
+
+    {% embed '@ibexadesign/ui/component/modal/modal.html.twig' with {
+        id: 'modal-history',
+        attr_dialog: {'style': 'max-width: 75vw;'},
+        title: 'coderhapsodie.ezdataflow.workflow.history.title'|trans,
+    } %}
+        {% block body_content '' %}
+    {% endembed %}
 
     <script>
+        document.addEventListener('DOMContentLoaded', () => {
+            const bindModalLinks = (modalId, linkSelector) => {
+                const modal = document.getElementById(modalId);
+                const modalBody = modal.querySelector('.modal-body');
+                document.addEventListener('click', (e) => {
+                    const link = e.target.closest(linkSelector);
+                    if (link) {
+                        e.preventDefault();
+                        modalBody.innerHTML = '';
+                        fetch(link.href)
+                            .then((r) => r.text())
+                            .then((content) => {
+                                modalBody.innerHTML = content;
+                            })
+                        ;
 
-        (function ($) {
-            $(document).ready(function ($) {
-                $('#ez-modal--history-details').modal({keyboard: false, show: false});
-                $('.history-details-aware').delegate('.modal-history-details', 'click', function (e) {
-                    e.preventDefault();
-                    $('#modal_content-details').html('');
-                    $('#ez-modal--history-details h3').html("{{ 'coderhapsodie.ezdataflow.workflow.history.title'|trans }}");
-                    if ($(this).hasClass('modal-history-log')) {
-                        $('#ez-modal--history-details h3').html("{{ 'coderhapsodie.ezdataflow.workflow.log.title'|trans }}");
+                        return;
                     }
-                    $('#ez-modal--history-details').modal('show');
-                    $.ajax(this.href, {
-                        success: function (result) {
-                            $('#modal_content-details').html(result);
-                        }
-                    });
-                });
-                $('#ez-modal--history-details .close').click(function () {
-                    $('#ez-modal--history-details').modal('hide');
-                });
-                $(document).ready(function () {
-                    if (window.location.hash && window.location.hash === '#oneshot') {
-                        $('#ez-tab-list-coderhapsodie-ezdataflow li a').removeClass('active');
-                        $('#ez-tab-list-content-coderhapsodie-ezdataflow .tab-pane').removeClass('active');
+                })
+            }
+            bindModalLinks('modal-history-details', '.modal-history-details');
+            bindModalLinks('modal-history-log', '.modal-history-log');
+            bindModalLinks('modal-history', '.modal-history');
 
-                        $('#ez-tab-list-coderhapsodie-ezdataflow li a:eq(1)').addClass('active');
-                        $('#ez-tab-list-content-coderhapsodie-ezdataflow .tab-pane:eq(1)').addClass('active');
-                    }
-                    if (window.location.hash && window.location.hash === '#history') {
-                        $('#ez-tab-list-coderhapsodie-ezdataflow li a').removeClass('active');
-                        $('#ez-tab-list-content-coderhapsodie-ezdataflow .tab-pane').removeClass('active');
-
-                        $('#ez-tab-list-coderhapsodie-ezdataflow li a:eq(2)').addClass('active');
-                        $('#ez-tab-list-content-coderhapsodie-ezdataflow .tab-pane:eq(2)').addClass('active');
-                    }
-                });
-            });
-        })(jQuery);
+            const labels = document.getElementById('ibexa-tab-label-coderhapsodie-ezdataflow-code-rhapsodie-ezdataflow-repeating')
+                .closest('ul').querySelectorAll('li.ibexa-tabs__tab');
+            const tabs = document.getElementById('ibexa-tab-coderhapsodie-ezdataflow-code-rhapsodie-ezdataflow-repeating')
+                .closest('.tab-content').querySelectorAll('.tab-pane');
+            if (window.location.hash && window.location.hash === '#oneshot') {
+                labels.forEach((link) => link.classList.remove('active'));
+                tabs.forEach((tab) => tab.classList.remove('active'));
+                document.getElementById('ibexa-tab-label-coderhapsodie-ezdataflow-code-rhapsodie-ezdataflow-oneshot')
+                    .closest('li.ibexa-tabs__tab').classList.add('active');
+                document.getElementById('ibexa-tab-coderhapsodie-ezdataflow-code-rhapsodie-ezdataflow-oneshot')
+                    .closest('.tab-pane').classList.add('active');
+            }
+            if (window.location.hash && window.location.hash === '#history') {
+                labels.forEach((link) => link.classList.remove('active'));
+                tabs.forEach((tab) => tab.classList.remove('active'));
+                document.getElementById('ibexa-tab-label-coderhapsodie-ezdataflow-code-rhapsodie-ezdataflow-history')
+                    .closest('li.ibexa-tabs__tab').classList.add('active');
+                document.getElementById('ibexa-tab-coderhapsodie-ezdataflow-code-rhapsodie-ezdataflow-history')
+                    .closest('.tab-pane').classList.add('active');
+            }
+        });
     </script>
 {% endblock %}
+
+{% block stylesheets %}
+    {{ parent() }}
+    <style>
+        .ezdataflow-date .ibexa-dropdown {
+            min-width: 0;
+        }
+    </style>
+{% endblock %}

src/Resources/views/themes/admin/ezdataflow/Dashboard/oneshot.html.twig

@@ -1,59 +1,57 @@
-<h2>{{ 'coderhapsodie.ezdataflow.oneshot.title'|trans }}</h2>
-
-<div class="ez-table-header">
-    <div class="ez-table-header__headline">{{ 'coderhapsodie.ezdataflow.oneshot.list.title'|trans }}</div>
-    <div>
-        <button type="button" class="btn btn-primary btn-modal-launcher" data-toggle="modal"
-                data-target="#ez-modal--new-oneshot">
-            <svg class="ez-icon ez-icon--medium ez-icon--light ez-icon-create">
-                <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                     xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#create"></use>
+{%- block content -%}
+    {% set actions %}
+        <button
+            type="button"
+            class="btn ibexa-btn ibexa-btn--tertiary ibexa-btn--small"
+            data-bs-toggle="modal"
+            data-bs-target="#modal-new-oneshot"
+        >
+            <svg class="ibexa-icon ibexa-icon--small ibexa-icon--create">
+                <use xlink:href="{{ ibexa_icon_path('create') }}"></use>
             </svg>
+            <span class="ibexa-btn__label">
+                {{ 'coderhapsodie.ezdataflow.workflow.new.submit'|trans|desc('Create') }}
+            </span>
         </button>
-    </div>
-</div>
+    {% endset %}
 
-{{ include('@ezdesign/ezdataflow/parts/tab/job_list.html.twig', {identifier: 'ezdataflow_oneshot_history', paginate_route: 'coderhapsodie.ezdataflow.oneshot'}) }}
+    {{ include('@ibexadesign/ezdataflow/parts/tab/job_list.html.twig', {
+        identifier: 'ezdataflow_oneshot_history',
+        paginate_route: 'coderhapsodie.ezdataflow.oneshot',
+        headline: 'coderhapsodie.ezdataflow.oneshot.title'|trans,
+        actions: actions,
+    }) }}
 
-{% if form is defined %}
-    {% form_theme form 'bootstrap_3_layout.html.twig' %}
-    <div class="modal fade ez-modal show" id="ez-modal--new-oneshot" tabindex="-1" role="dialog" aria-modal="true">
-        <div class="modal-dialog" role="document">
-            {{ include('@ezdesign/ezdataflow/parts/schedule_form.html.twig', {mode: 'oneshot'}) }}
-        </div>
-    </div>
+    {% if form is defined %}
+        {{ include('@ibexadesign/ezdataflow/parts/form_modal.html.twig', {
+            'id': 'modal-new-oneshot',
+            'form': form,
+            'mode': 'oneshot'
+        }) }}
+    {% endif %}
 
     <script>
-
-        (function ($) {
-            $(document).ready(function ($) {
-                $('#ez-modal--new-oneshot').on('submit', 'form', function (e) {
-                    e.preventDefault();
-                    url = $(this).attr('action');
-                    data = new FormData(this);
-                    $.ajax({
-                        'type': 'POST',
-                        'url': url,
-                        'data': data,
-                        processData: false,
-                        contentType: false,
-                        success: function (result) {
-                            if (result.redirect) {
-                                if (window.location.href === result.redirect) {
-                                    document.location.reload();
-                                }
-                                window.location = result.redirect;
-                                return;
-                            }
-
-                            let obj = $(result.form).find('.modal-body');
-                            $('#ez-modal--new-oneshot .modal-body').html($(obj).html());
+        document.addEventListener('DOMContentLoaded', () => {
+            document.querySelector('#modal-new-oneshot form').addEventListener('submit', function (e) {
+                e.preventDefault();
+                url = this.getAttribute('action');
+                data = new FormData(this);
+                fetch(url, {
+                    'method': 'post',
+                    'body': data,
+                })
+                    .then((r) => r.json())
+                    .then((result) => {
+                        if (result.redirect) {
+                            window.location = result.redirect;
+                            return;
                         }
-                    });
-                });
+                        const node = document.createElement('div');
+                        node.innerHTML = result.form;
+                        document.querySelector('#modal-new-oneshot .form-fields').innerHTML = node.querySelector('.form-fields').innerHTML;
+                    })
+                ;
             });
-        })(jQuery);
+        });
     </script>
-
-
-{% endif %}
+{%- endblock -%}

src/Resources/views/themes/admin/ezdataflow/Dashboard/repeating.html.twig

@@ -1,184 +1,158 @@
-<h2>{{ 'coderhapsodie.ezdataflow.repeating.title'|trans }}</h2>
+{%- block content -%}
 
-<div class="ez-table-header">
-    <div class="ez-table-header__headline">{{ 'coderhapsodie.ezdataflow.workflow.list.title'|trans }}</div>
-    <div>
-        <button type="button" class="btn btn-primary btn-modal-launcher" data-toggle="modal"
-                data-target="#ez-modal--new-scheduled">
-            <svg class="ez-icon ez-icon--medium ez-icon--light ez-icon-create">
-                <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                     xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#create"></use>
-            </svg>
-        </button>
-    </div>
-</div>
+    {{ include('@ibexadesign/ezdataflow/parts/tab/schedule_list.html.twig', {
+        identifier: 'ezdataflow_schedule_results',
+        paginate_route: 'coderhapsodie.ezdataflow.repeating'
+    }) }}
 
-{{ include('@ezdesign/ezdataflow/parts/tab/schedule_list.html.twig', {identifier: 'ezdataflow_schedule_results', paginate_route: 'coderhapsodie.ezdataflow.repeating'}) }}
+    {{ include('@ibexadesign/ezdataflow/parts/form_modal.html.twig', {
+        'id': 'modal-new-scheduled',
+        'form': form
+    }) }}
 
-{% if form is defined %}
-    {% form_theme form 'bootstrap_3_layout.html.twig' %}
-    <div class="modal fade ez-modal show" id="ez-modal--new-scheduled" tabindex="-1" role="dialog" aria-modal="true">
-        <div class="modal-dialog" role="document">
-            {{ include('@ezdesign/ezdataflow/parts/schedule_form.html.twig') }}
-        </div>
-    </div>
+    {% embed '@ibexadesign/ui/component/modal/modal.html.twig' with {
+        id: 'modal-edit-scheduled',
+        title: 'coderhapsodie.ezdataflow.workflow.repeating.edit.title'|trans,
+    } %}
+        {% block body_content %}
+            <form action="" method="post">
+                <div class="form-fields"></div>
+                <button id="modal-edit-submit" type="submit" hidden />
+            </form>
+        {% endblock %}
+        {% block footer_content %}
+            <button type="button" class="btn ibexa-btn ibexa-btn--primary ibexa-btn--trigger" data-click="#modal-edit-submit">
+                {{ 'coderhapsodie.ezdataflow.workflow.edit.submit'|trans }}
+            </button>
+            <button class="btn ibexa-btn ibexa-btn--secondary" data-bs-dismiss="modal">
+                {{ 'coderhapsodie.ezdataflow.workflow.new.cancel'|trans }}
+            </button>
+        {% endblock %}
+    {% endembed %}
 
-    <!-- Modal -->
-    <div class="modal fade ez-modal ez-modal--delete-workflow show" id="ez-modal--delete-workflow" tabindex="-1"
-         role="dialog">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <svg class="ez-icon ez-icon--medium" aria-hidden="true">
-                            <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                                 xlink:href="../../ez-icons.svg#discard"></use>
-                        </svg>
-                    </button>
-                </div>
-                <div class="modal-body">
-                    <p class="font-weight-bold" id="delete-modal--workflow-name"></p>
-                    <p class="ez-modal-body__main">{{ 'coderhapsodie.ezdataflow.workflow.delete'|trans }}</p>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-dark"
-                            data-dismiss="modal">{{ 'coderhapsodie.ezdataflow.workflow.new.cancel'|trans }}</button>
-                    <button type="button" class="btn btn-danger font-weight-bold"
-                            id="ez-modal--delete-workflow-confirm">{{ 'coderhapsodie.ezdataflow.workflow.list.delete'|trans }}</button>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="modal fade ez-modal show" id="ez-modal--history" tabindex="-1" role="dialog" aria-modal="true">
-        <div class="modal-dialog" role="document" style="max-width: 80%">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h3 class="modal-title">{{ 'coderhapsodie.ezdataflow.workflow.history.title'|trans }}</h3>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <svg class="ez-icon ez-icon--medium" aria-hidden="true">
-                            <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                                 xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#discard"></use>
-                        </svg>
-                    </button>
-                </div>
-                <div class="modal-body history-details-aware" id="modal_content"></div>
-            </div>
-        </div>
-    </div>
-
-    <div class="modal fade ez-modal show" id="ez-modal--edit-scheduled" tabindex="-1" role="dialog" aria-modal="true">
-        <div class="modal-dialog" role="document">
-            <div id="schedule_edit"></div>
-        </div>
-    </div>
+    {% embed '@ibexadesign/ui/component/modal/modal.html.twig' with {
+        id: 'modal-delete-confirm',
+        title: 'coderhapsodie.ezdataflow.workflow.delete'|trans,
+    } %}
+        {% block body_content %}
+            <form action="" method="post">
+                <div class="item-name"></div>
+                <button id="modal-delete-submit" type="submit" hidden />
+            </form>
+        {% endblock %}
+        {% block footer_content %}
+            <button type="button" class="btn ibexa-btn ibexa-btn--primary ibexa-btn--trigger" data-click="#modal-delete-submit">
+                {{ 'coderhapsodie.ezdataflow.workflow.list.delete'|trans }}
+            </button>
+            <button class="btn ibexa-btn ibexa-btn--secondary" data-bs-dismiss="modal">
+                {{ 'coderhapsodie.ezdataflow.workflow.new.cancel'|trans }}
+            </button>
+        {% endblock %}
+    {% endembed %}
 
     <script>
-        (function ($) {
-            $(document).ready(function ($) {
-                $('#ez-modal--history').modal({keyboard: false, show: false});
-                $('.modal-history').each(function (index, elem) {
-                    $(elem).click(function (e) {
-                        e.preventDefault();
-                        $('#modal_content').html('');
-                        $('#ez-modal--history').modal('show');
-                        $.ajax(elem.href, {
-                            success: function (result) {
-                                $('#modal_content').html(result);
-                            }
-                        });
-                    });
-                });
-                $('#ez-modal--history .close').click(function () {
-                    $('#ez-modal--history').modal('hide');
-                });
+        document.addEventListener('DOMContentLoaded', () => {
+            // $('#ez-modal--edit-scheduled').modal({keyboard: true, show: false});
+            // $('.modal-edit').each(function (index, elem) {
+            //     $(elem).click(function (e) {
+            //         e.preventDefault();
+            //         $('#schedule_edit').html('');
+            //         $('#ez-modal--edit-scheduled').modal('show');
+            //         $.ajax(elem.href, {
+            //             success: function (result) {
+            //                 if (result.redirect) {
+            //                     if (window.location.href === result.redirect) {
+            //                         window.location.reload();
+            //                     }
+            //                     window.location = result.redirect;
+            //                     window.location.reload();
+            //                     return;
+            //                 }
+            //
+            //                 $('#schedule_edit').html(result.form);
+            //             }
+            //         });
+            //     });
+            // });
+            //
+            // $('#ez-modal--edit-scheduled').on('submit', 'form', function (e) {
+            //     e.preventDefault();
+            //     url = $(this).attr('action');
+            //     data = new FormData(this);
+            //     $.ajax({
+            //         'type': 'POST',
+            //         'url': url,
+            //         'data': data,
+            //         processData: false,
+            //         contentType: false,
+            //         success: function (result) {
+            //             if (result.redirect) {
+            //                 window.location = result.redirect;
+            //                 return;
+            //             }
+            //
+            //             $('#schedule_edit').html(result.form);
+            //         }
+            //     });
+            // });
 
-                $('#ez-modal--delete-workflow').modal({keyboard: true, show: false});
-                $('.modal-delete').each(function (index, elem) {
-                    $(elem).click(function (e) {
-                        e.preventDefault();
-                        $('#delete-modal--workflow-name').html($(elem).data('name'));
-                        $('#ez-modal--delete-workflow').modal('show');
-                        $('#ez-modal--delete-workflow-confirm').data('target', $(elem).data('path'));
-                    });
-                });
-                $('#ez-modal--delete-workflow-confirm').click(function () {
-                    let target = $(this).data('target');
-                    if (target && target !== '') {
-                        $.ajax(target, {
-                            method: 'POST',
-                            complete: function () {
-                                $('#ez-modal--delete-workflow').modal('hide');
-                                window.location.reload();
-                            }
-                        });
-                    }
-                });
-
-                $('#ez-modal--edit-scheduled').modal({keyboard: true, show: false});
-                $('.modal-edit').each(function (index, elem) {
-                    $(elem).click(function (e) {
-                        e.preventDefault();
-                        $('#schedule_edit').html('');
-                        $('#ez-modal--edit-scheduled').modal('show');
-                        $.ajax(elem.href, {
-                            success: function (result) {
-                                if (result.redirect) {
-                                    if (window.location.href === result.redirect) {
-                                        document.location.reload();
-                                    }
-                                    window.location = result.redirect;
-                                    return;
-                                }
-
-                                $('#schedule_edit').html(result.form);
-                            }
-                        });
-                    });
-                });
-
-                $('#ez-modal--edit-scheduled').on('submit', 'form', function (e) {
+            const bindFormSubmit = (modalId) => {
+                document.querySelector('#'+modalId+' form').addEventListener('submit', function (e) {
                     e.preventDefault();
-                    url = $(this).attr('action');
+                    url = this.getAttribute('action');
                     data = new FormData(this);
-                    $.ajax({
-                        'type': 'POST',
-                        'url': url,
-                        'data': data,
-                        processData: false,
-                        contentType: false,
-                        success: function (result) {
+                    fetch(url, {
+                        'method': 'post',
+                        'body': data,
+                    })
+                        .then((r) => r.json())
+                        .then((result) => {
                             if (result.redirect) {
                                 window.location = result.redirect;
                                 return;
                             }
-
-                            $('#schedule_edit').html(result.form);
-                        }
-                    });
+                            const node = document.createElement('div');
+                            node.innerHTML = result.form;
+                            document.querySelector('#'+modalId+' .form-fields').innerHTML = node.querySelector('.form-fields').innerHTML;
+                        })
+                    ;
                 });
+            };
+            bindFormSubmit('modal-new-scheduled');
+            bindFormSubmit('modal-edit-scheduled');
 
-                $('#ez-modal--new-scheduled form').on('submit', function (e) {
+            const editModal = document.getElementById('modal-edit-scheduled')
+            document.addEventListener('click', (e) => {
+                const link = e.target.closest('.modal-edit');
+                if (link) {
                     e.preventDefault();
-                    url = $(this).attr('action');
-                    data = new FormData(this);
-                    $.ajax({
-                        'type': 'POST',
-                        'url': url,
-                        'data': data,
-                        processData: false,
-                        contentType: false,
-                        success: function (result) {
-                            if (result.redirect) {
-                                window.location = result.redirect;
-                                return;
-                            }
-                            let obj = $(result.form).find('.modal-body');
-                            $('#ez-modal--new-scheduled .modal-body').html($(obj).html());
-                        }
-                    });
-                });
-            });
-        })(jQuery);
+                    fetch(link.href, {
+                        'method': 'post'
+                    })
+                        .then((r) => r.json())
+                        .then((result) => {
+                            const node = document.createElement('div');
+                            node.innerHTML = result.form;
+                            editModal.querySelector('form').action = link.href;
+                            editModal.querySelector('.form-fields').innerHTML = node.querySelector('.form-fields').innerHTML;
+                        })
+                    ;
+
+                    return;
+                }
+            })
+
+            const deleteModal = document.getElementById('modal-delete-confirm')
+            document.addEventListener('click', (e) => {
+                const link = e.target.closest('.modal-delete');
+                if (link) {
+                    e.preventDefault();
+                    deleteModal.querySelector('.item-name').textContent = link.dataset.name;
+                    deleteModal.querySelector('form').action = link.href;
+
+                    return;
+                }
+            })
+        });
     </script>
-{% endif %}
+{%- endblock -%}

src/Resources/views/themes/admin/ezdataflow/Dashboard/schedule_history.html.twig

@@ -1,7 +1,5 @@
-<h2>{{ 'coderhapsodie.ezdataflow.history.title'|trans }}</h2>
-
-<div class="ez-table-header">
-    <div class="ez-table-header__headline">{{ 'coderhapsodie.ezdataflow.history.list.title'|trans }}</div>
-</div>
-
-{% include '@ezdesign/ezdataflow/parts/tab/job_list.html.twig' with {identifier: 'ezdataflow_schedule_history_results', paginate_route: 'coderhapsodie.ezdataflow.history.workflow', paginate_params: {id: id}} %}
+{% include '@ibexadesign/ezdataflow/parts/tab/job_list.html.twig' with {
+    identifier: 'ezdataflow_schedule_history_results',
+    paginate_route: 'coderhapsodie.ezdataflow.history.workflow',
+    paginate_params: {id: id}
+} %}

src/Resources/views/themes/admin/ezdataflow/Item/details.html.twig

@@ -1,4 +1,4 @@
-{% import '@ezdesign/ezdataflow/macros.twig' as macros %}
+{% import '@ibexadesign/ezdataflow/macros.twig' as macros %}
 
 {% block content %}
     <div class="container ez-main-container history-details-aware">
@@ -20,7 +20,7 @@
             </tr>
             <tr>
                 <td>{{ 'coderhapsodie.ezdataflow.history.details.request'|trans }}</td>
-                <td>{{ item.requestedDate|date('d/m/Y H:i:s') }}</td>
+                <td>{{ date(item.requestedDate)|ibexa_short_datetime }}</td>
             </tr>
             <tr>
                 <td>{{ 'coderhapsodie.ezdataflow.history.details.status'|trans }}</td>
@@ -28,11 +28,11 @@
             </tr>
             <tr>
                 <td>{{ 'coderhapsodie.ezdataflow.history.details.start'|trans }}</td>
-                <td>{{ item.startTime|date('d/m/Y H:i:s') }}</td>
+                <td>{{ item.startTime ? date(item.startTime)|ibexa_short_datetime : '—' }}</td>
             </tr>
             <tr>
                 <td>{{ 'coderhapsodie.ezdataflow.history.details.end'|trans }}</td>
-                <td>{{ item.endTime|date('d/m/Y H:i:s') }}</td>
+                <td>{{ item.endTime ? date(item.endTime)|ibexa_short_datetime : '—' }}</td>
             </tr>
             <tr>
                 <td>{{ 'coderhapsodie.ezdataflow.history.details.count'|trans }}</td>

src/Resources/views/themes/admin/ezdataflow/form_theme.html.twig

@@ -0,0 +1,10 @@
+{% extends '@ibexadesign/ui/form_fields.html.twig' %}
+
+{%- block checkbox_widget -%}
+    {{ block('toggle_widget') }}
+{%- endblock -%}
+
+{% block datetime_widget -%}
+    {% set attr = attr|merge({class: (attr.class|default('') ~ ' ezdataflow-date')|trim}) %}
+    {{ parent() }}
+{%- endblock datetime_widget %}

src/Resources/views/themes/admin/ezdataflow/parts/form_modal.html.twig

@@ -0,0 +1,23 @@
+{% form_theme form '@ibexadesign/ezdataflow/form_theme.html.twig' %}
+
+{% embed '@ibexadesign/ui/component/modal/modal.html.twig' with {
+    id: id ?? '',
+    title: ('coderhapsodie.ezdataflow.workflow.'~(mode|default('repeating'))~'.'~(type_action|default('new'))~'.title')|trans,
+} %}
+    {% block body_content %}
+        {{ form_start(form) }}
+            <div class="form-fields">
+                {{ form_widget(form) }}
+            </div>
+            <button type="submit" hidden id="{{ id ~ '-submit' }}"></button>
+        {{ form_end(form) }}
+    {% endblock %}
+    {% block footer_content %}
+        <button class="btn ibexa-btn ibexa-btn--primary ibexa-btn--trigger" data-click="#{{ id ~ '-submit' }}">
+            {{ ('coderhapsodie.ezdataflow.workflow.'~(type_action|default('new'))~'.submit')|trans }}
+        </button>
+        <button type="button" class="btn ibexa-btn ibexa-btn--secondary" data-bs-dismiss="modal">
+            {{ 'coderhapsodie.ezdataflow.workflow.new.cancel'|trans }}
+        </button>
+    {% endblock %}
+{% endembed %}

src/Resources/views/themes/admin/ezdataflow/parts/schedule_form.html.twig

@@ -1,24 +0,0 @@
-{% form_theme form 'bootstrap_3_layout.html.twig' %}
-
-{{ form_start(form) }}
-<div class="modal-content">
-    <div class="modal-header">
-        <h3 class="modal-title">{{ ('coderhapsodie.ezdataflow.workflow.'~(mode|default('repeating'))~'.'~(type_action|default('new'))~'.title')|trans }}</h3>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-            <svg class="ez-icon ez-icon--medium" aria-hidden="true">
-                <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                     xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#discard"></use>
-            </svg>
-        </button>
-    </div>
-    <div class="modal-body">
-        {{ form_widget(form) }}
-    </div>
-    <div class="modal-footer justify-content-center">
-        <button type="button" class="btn btn-dark"
-                data-dismiss="modal">{{ 'coderhapsodie.ezdataflow.workflow.new.cancel'|trans }}</button>
-        <button type="submit"
-                class="btn btn-primary font-weight-bold">{{ ('coderhapsodie.ezdataflow.workflow.'~(type_action|default('new'))~'.submit')|trans }}</button>
-    </div>
-</div>
-{{ form_end(form) }}

src/Resources/views/themes/admin/ezdataflow/parts/tab/ezdataflow.html.twig

@@ -1,27 +0,0 @@
-<div class="row ez-header pt-3">
-    <div class="container">
-        <ul class="nav nav-tabs ez-tabs nav-tabs-{{ group }} px-4" role="tablist" id="ez-tab-list-{{ group }}">
-            {% for tab in tabs %}
-                {% set id = group ~ '-' ~ tab.identifier %}
-                {% set active = loop.first %}
-                <li class="nav-item">
-                    <a class="nav-link{% if active %} active{% endif %}" id="ez-tab-label-{{ group }}"
-                       data-toggle="tab" href="#ez-tab-{{ id }}" role="tab" aria-controls="ez-tab-{{ id }}"
-                       aria-expanded="{{ active }}">{{ tab.name }}</a>
-                </li>
-            {% endfor %}
-        </ul>
-    </div>
-</div>
-<div class="tab-content container mt-4 px-5" id="ez-tab-list-content-{{ group }}">
-    {% for tab in tabs %}
-        {% set id = group ~ '-' ~ tab.identifier %}
-        {% set active = loop.first %}
-
-        <div class="tab-pane{% if active %} active{% endif %}" id="ez-tab-{{ id }}" role="tabpanel"
-             aria-labelledby="ez-tab-label-{{ group }}">
-            {{ tab.view|raw }}
-        </div>
-    {% endfor %}
-</div>
-

src/Resources/views/themes/admin/ezdataflow/parts/tab/job_list.html.twig

@@ -1,84 +1,117 @@
 {% set id = identifier|default('ezdataflow_history_results') %}
 
-{% import '@ezdesign/ezdataflow/macros.twig' as macros %}
+{% import '@ibexadesign/ezdataflow/macros.twig' as macros %}
 
-<div id="loading_{{ id }}" class="text-center d-none">
+<div id="loading_{{ id }}" class="text-center" hidden>
     <svg class="ez-icon ez-icon--extra-large">
         <use xmlns:xlink="http://www.w3.org/1999/xlink"
-             xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#spinner"></use>
+             xlink:href="{{ ibexa_icon_path('spinner') }}"></use>
     </svg>
 </div>
 
 <div id="{{ id }}" class="history-details-aware">
-    {% if pager.currentPageResults|length %}
-        <table class="table">
-            <thead>
-            <tr>
-                <th>{{ 'coderhapsodie.ezdataflow.history.list.name'|trans }}</th>
-                <th>{{ 'coderhapsodie.ezdataflow.history.list.request'|trans }}</th>
-                <th>{{ 'coderhapsodie.ezdataflow.history.list.count'|trans }}</th>
-                <th>{{ 'coderhapsodie.ezdataflow.history.list.start'|trans }}</th>
-                <th>{{ 'coderhapsodie.ezdataflow.history.list.end'|trans }}</th>
-                <th>{{ 'coderhapsodie.ezdataflow.history.list.status'|trans }}</th>
-                <th></th>
-            </tr>
-            </thead>
-            <tbody>
-            {% for job in pager.currentPageResults %}
-                <tr>
-                    <td>{{ job.label }}</td>
-                    <td>{{ job.requested_date|date('d/m/Y H:i:s') }}</td>
-                    <td>{{ job.count|default('-') }}</td>
-                    <td>{{ job.start_time ? job.start_time|date('d/m/Y H:i:s') : '-' }}</td>
-                    <td>{{ job.end_time ? job.end_time|date('d/m/Y H:i:s') : '-' }}</td>
-                    <td>{{ macros.translateStatus(job.status) }}</td>
-                    <td class="ez-table__cell ez-table__cell--has-action-btns text-right">
-                        <a href="{{ path('coderhapsodie.ezdataflow.job.details', {id: job.id}) }}"
-                           class="btn btn-icon mx-2 modal-history-details"
-                           title="{{ 'coderhapsodie.ezdataflow.history.list.view'|trans }}">
-                            <svg class="ez-icon ez-icon--small-medium">
-                                <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                                     xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#about-info"></use>
-                            </svg>
-                        </a>
-                        <a href="{{ path('coderhapsodie.ezdataflow.job.log', {id: job.id}) }}"
-                           class="btn btn-icon mx-2 modal-history-details modal-history-log"
-                           title="{{ 'coderhapsodie.ezdataflow.history.details.log'|trans }}">
-                            <svg class="ez-icon ez-icon--small-medium">
-                                <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                                     xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#article"></use>
-                            </svg>
-                        </a>
-                    </td>
-                </tr>
-            {% endfor %}
-            </tbody>
-        </table>
-    {% else %}
-        <p class="ez-table-no-content">{{ 'coderhapsodie.ezdataflow.history.list.empty'|trans }}</p>
-    {% endif %}
+
+    {% set body_rows = [] %}
+
+    {% for job in pager.currentPageResults %}
+        {% set body_row_cols = [] %}
+        {% set body_row_cols = body_row_cols|merge([
+            {content: job.label},
+            {content: date(job.requested_date)|ibexa_short_datetime},
+            {content: job.count|default('—')},
+            {content: job.start_time ? date(job.start_time)|ibexa_short_datetime : '—'},
+            {content: job.end_time ? date(job.end_time)|ibexa_short_datetime : '—'},
+            {content: macros.translateStatus(job.status)},
+        ]) %}
+
+        {% set col_raw %}
+            <a href="{{ path('coderhapsodie.ezdataflow.job.details', {id: job.id}) }}"
+               class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text modal-history-details"
+               title="{{ 'coderhapsodie.ezdataflow.history.list.view'|trans }}"
+               data-bs-toggle="modal"
+               data-bs-target="#modal-history-details"
+            >
+                <svg class="ibexa-icon ibexa-icon--small ibexa-icon--about-info">
+                    <use xlink:href="{{ ibexa_icon_path('about-info') }}"></use>
+                </svg>
+            </a>
+            <a href="{{ path('coderhapsodie.ezdataflow.job.log', {id: job.id}) }}"
+               class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text modal-history-log"
+               data-bs-toggle="modal"
+               data-bs-target="#modal-history-log"
+               title="{{ 'coderhapsodie.ezdataflow.history.details.log'|trans }}"
+            >
+                <svg class="ibexa-icon ibexa-icon--small ibexa-icon--article">
+                    <use xlink:href="{{ ibexa_icon_path('article') }}"></use>
+                </svg>
+            </a>
+        {% endset %}
+        {% set body_row_cols = body_row_cols|merge([{
+            has_action_btns: true,
+            content: col_raw,
+            raw: true,
+        }]) %}
+
+        {% set body_rows = body_rows|merge([{ cols: body_row_cols }]) %}
+    {% endfor %}
+
+    {% embed '@ibexadesign/ui/component/table/table.html.twig' with {
+        headline: headline ?? null,
+        head_cols: [
+            { content: 'coderhapsodie.ezdataflow.history.list.name'|trans },
+            { content: 'coderhapsodie.ezdataflow.history.list.request'|trans },
+            { content: 'coderhapsodie.ezdataflow.history.list.count'|trans },
+            { content: 'coderhapsodie.ezdataflow.history.list.start'|trans },
+            { content: 'coderhapsodie.ezdataflow.history.list.end'|trans },
+            { content: 'coderhapsodie.ezdataflow.history.list.status'|trans },
+            { },
+        ],
+        body_rows,
+        empty_table_info_text: 'coderhapsodie.ezdataflow.history.list.empty'|trans,
+    } %}
+        {% block header %}
+            {% embed '@ibexadesign/ui/component/table/table_header.html.twig' %}
+                {% block actions %}
+                    {{ actions ?? '' }}
+                {% endblock %}
+            {% endembed %}
+        {% endblock %}
+    {% endembed %}
 
     {% if pager.haveToPaginate %}
-        <div class="ez-pagination justify-content-center align-items-center ez-pagination__spacing">
-            {{ pagerfanta(pager, 'ez', {routeName: paginate_route, routeParams: paginate_params|default({})}) }}
-        </div>
+        {% include '@ibexadesign/ui/pagination.html.twig' with {
+            'pager': pager,
+            'paginaton_params': {
+                'routeName': paginate_route,
+                'routeParams': paginate_params|default({})
+            }
+        } %}
     {% endif %}
 </div>
 
 <script>
+    document.addEventListener('DOMContentLoaded', () => {
+        // Manage ajax pagination
+        const display = document.getElementById('{{ id }}');
+        display.addEventListener('click', (e) => {
+            const link = e.target.closest('.ibexa-pagination a');
+            if (!link) {
+                return;
+            }
 
-    (function ($) {
-        $(document).ready(function ($) {
-            // Manage ajax pagination
-            $('#{{ id }}').delegate('.ez-pagination a', 'click', function (e) {
-                e.preventDefault();
-                $('#loading_{{ id }}').removeClass('d-none');
-                $('#{{ id }}')
-                    .html('')
-                    .load(this.href + ' #{{ id }}>*', null, function () {
-                        $('#loading_{{ id }}').addClass('d-none');
-                    });
-            });
+            const loader = document.getElementById('loading_{{ id }}');
+            e.preventDefault();
+            loader.hidden = false;
+            display.innerHTML = '';
+            fetch(link.href)
+                .then((r) => r.text())
+                .then((content) => {
+                    const node = document.createElement('div');
+                    node.innerHTML = content;
+                    display.innerHTML = node.querySelector('#{{ id }}').innerHTML;
+                    loader.hidden = true;
+                })
+            ;
         });
-    })(jQuery);
+    });
 </script>

src/Resources/views/themes/admin/ezdataflow/parts/tab/schedule_list.html.twig

@@ -1,106 +1,152 @@
 {% set id = identifier|default('ezdataflow_schedule_results') %}
 
-<div id="loading_{{ id }}" class="text-center d-none">
+<div id="loading_{{ id }}" class="text-center" hidden>
     <svg class="ez-icon ez-icon--extra-large">
         <use xmlns:xlink="http://www.w3.org/1999/xlink"
-             xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#spinner"></use>
+             xlink:href="{{ ibexa_icon_path('spinner') }}"></use>
     </svg>
 </div>
 
 <div id="{{ id }}" class="history-details-aware">
-    {% if pager.currentPageResults|length %}
-        <table class="table">
-            <thead>
-            <tr>
-                <th>{{ 'coderhapsodie.ezdataflow.workflow.list.name'|trans }}</th>
-                <th>{{ 'coderhapsodie.ezdataflow.workflow.list.frequency'|trans }}</th>
-                <th>{{ 'coderhapsodie.ezdataflow.workflow.list.next_execution'|trans }}</th>
-                <th>{{ 'coderhapsodie.ezdataflow.workflow.list.enabled'|trans }}</th>
-                <th></th>
-            </tr>
-            </thead>
-            <tbody>
-            {% for item in pager.currentPageResults %}
-                <tr>
-                    <td>{{ item.label }}</td>
-                    <td>{{ item.frequency }}</td>
-                    <td>{{ item.next|date('d/m/Y H:i:s') }}</td>
-                    <td>{{ ('coderhapsodie.ezdataflow.' ~ (item.enabled ? 'yes' : 'no'))|trans }}</td>
-                    <td class="ez-table__cell ez-table__cell--has-action-btns text-right">
-                        <a href="{{ path('coderhapsodie.ezdataflow.history.workflow', {id: item.id}) }}"
-                           class="btn btn-icon mx-2 modal-history"
-                           title="{{ 'coderhapsodie.ezdataflow.workflow.list.history'|trans }}">
-                            <svg class="ez-icon ez-icon--small-medium">
-                                <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                                     xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#history"></use>
-                            </svg>
-                        </a>
-                        <a href="{{ path('coderhapsodie.ezdataflow.workflow.edit', {id: item.id}) }}" type="button"
-                           class="btn btn-icon mx-2 modal-edit"
-                           title="{{ 'coderhapsodie.ezdataflow.workflow.list.edit'|trans }}">
-                            <svg class="ez-icon ez-icon--small-medium ez-icon-edit">
-                                <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                                     xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#edit"></use>
-                            </svg>
-                        </a>
-                        {% if item.enabled %}
-                            <a href="{{ path('coderhapsodie.ezdataflow.workflow.disable', {id: item.id}) }}"
-                               class="btn btn-icon mx-2"
-                               title="{{ 'coderhapsodie.ezdataflow.workflow.list.disable'|trans }}">
-                                <svg class="ez-icon ez-icon--small-medium" style="fill: #f7d000;">
-                                    <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                                         xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#logout"></use>
-                                </svg>
-                            </a>
-                        {% else %}
-                            <a href="{{ path('coderhapsodie.ezdataflow.workflow.enable', {id: item.id}) }}"
-                               class="btn btn-icon mx-2"
-                               title="{{ 'coderhapsodie.ezdataflow.workflow.list.enable'|trans }}">
-                                <svg class="ez-icon ez-icon--small-medium" style="fill: #00825c;">
-                                    <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                                         xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#approved"></use>
-                                </svg>
-                            </a>
-                        {% endif %}
-                        <button type="button" class="btn btn-icon mx-2 ez-btn--content-trash modal-delete"
-                                data-name="{{ item.label }}"
-                                data-path="{{ path('coderhapsodie.ezdataflow.workflow.delete', {id: item.id}) }}"
-                                title="{{ 'coderhapsodie.ezdataflow.workflow.list.delete'|trans }}">
-                            <svg class="ez-icon ez-icon--small-medium ez-icon-trash">
-                                <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                                     xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#trash"></use>
-                            </svg>
-                        </button>
-                    </td>
-                </tr>
-            {% endfor %}
-            </tbody>
-        </table>
-    {% else %}
-        <p class="ez-table-no-content">{{ 'coderhapsodie.ezdataflow.workflow.list.empty'|trans }}</p>
-    {% endif %}
+    {% set body_rows = [] %}
+
+    {% for item in pager.currentPageResults %}
+        {% set body_row_cols = [] %}
+        {% set body_row_cols = body_row_cols|merge([
+            {content: item.label},
+            {content: item.frequency},
+            {content: date(item.next)|ibexa_short_datetime},
+            {content: ('coderhapsodie.ezdataflow.' ~ (item.enabled ? 'yes' : 'no'))|trans},
+        ]) %}
+
+        {% set col_raw %}
+            <a href="{{ path('coderhapsodie.ezdataflow.history.workflow', {id: item.id}) }}"
+               class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text modal-history"
+               title="{{ 'coderhapsodie.ezdataflow.workflow.list.history'|trans }}"
+               data-bs-toggle="modal"
+               data-bs-target="#modal-history"
+            >
+                <svg class="ibexa-icon ibexa-icon--small ibexa-icon--history">
+                    <use xlink:href="{{ ibexa_icon_path('history') }}"></use>
+                </svg>
+            </a>
+            <a href="{{ path('coderhapsodie.ezdataflow.workflow.edit', {id: item.id}) }}"
+               class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text modal-edit"
+               title="{{ 'coderhapsodie.ezdataflow.workflow.list.edit'|trans }}"
+               data-bs-toggle="modal"
+               data-bs-target="#modal-edit-scheduled"
+            >
+                <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
+                    <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
+                </svg>
+            </a>
+            {% if item.enabled %}
+                <a href="{{ path('coderhapsodie.ezdataflow.workflow.disable', {id: item.id}) }}"
+                   class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text"
+                   title="{{ 'coderhapsodie.ezdataflow.workflow.list.disable'|trans }}"
+                >
+                    <svg class="ibexa-icon ibexa-icon--small ibexa-icon--logout" style="fill: #f7d000;">
+                        <use xlink:href="{{ ibexa_icon_path('logout') }}"></use>
+                    </svg>
+                </a>
+            {% else %}
+                <a href="{{ path('coderhapsodie.ezdataflow.workflow.enable', {id: item.id}) }}"
+                   class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text"
+                   title="{{ 'coderhapsodie.ezdataflow.workflow.list.enable'|trans }}"
+                >
+                    <svg class="ibexa-icon ibexa-icon--small ibexa-icon--logout" style="fill: #00825c;">
+                        <use xlink:href="{{ ibexa_icon_path('approved') }}"></use>
+                    </svg>
+                </a>
+            {% endif %}
+            <a href="{{ path('coderhapsodie.ezdataflow.workflow.delete', {id: item.id}) }}"
+               class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text modal-delete"
+               title="{{ 'coderhapsodie.ezdataflow.workflow.list.delete'|trans }}"
+               data-name="{{ item.label }}"
+               data-bs-toggle="modal"
+               data-bs-target="#modal-delete-confirm"
+            >
+                <svg class="ibexa-icon ibexa-icon--small ibexa-icon--trash">
+                    <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
+                </svg>
+            </a>
+        {% endset %}
+        {% set body_row_cols = body_row_cols|merge([{
+            has_action_btns: true,
+            content: col_raw,
+            raw: true,
+        }]) %}
+
+        {% set body_rows = body_rows|merge([{ cols: body_row_cols }]) %}
+    {% endfor %}
+
+    {% embed '@ibexadesign/ui/component/table/table.html.twig' with {
+        headline: 'coderhapsodie.ezdataflow.workflow.list.title'|trans,
+        head_cols: [
+            { content: 'coderhapsodie.ezdataflow.workflow.list.name'|trans },
+            { content: 'coderhapsodie.ezdataflow.workflow.list.frequency'|trans },
+            { content: 'coderhapsodie.ezdataflow.workflow.list.next_execution'|trans },
+            { content: 'coderhapsodie.ezdataflow.workflow.list.enabled'|trans },
+            { },
+        ],
+        body_rows,
+        empty_table_info_text: 'coderhapsodie.ezdataflow.workflow.list.empty'|trans,
+    } %}
+        {% block header %}
+            {% embed '@ibexadesign/ui/component/table/table_header.html.twig' %}
+                {% block actions %}
+                    <button
+                        type="button"
+                        class="btn ibexa-btn ibexa-btn--tertiary ibexa-btn--small"
+                        data-bs-toggle="modal"
+                        data-bs-target="#modal-new-scheduled"
+                    >
+                        <svg class="ibexa-icon ibexa-icon--small ibexa-icon--create">
+                            <use xlink:href="{{ ibexa_icon_path('create') }}"></use>
+                        </svg>
+                        <span class="ibexa-btn__label">
+                            {{ 'coderhapsodie.ezdataflow.workflow.new.submit'|trans|desc('Create') }}
+                        </span>
+                    </button>
+                {% endblock %}
+            {% endembed %}
+        {% endblock %}
+    {% endembed %}
 
     {% if pager.haveToPaginate %}
-        <div class="ez-pagination justify-content-center align-items-center ez-pagination__spacing">
-            {{ pagerfanta(pager, 'ez', {routeName: paginate_route, routeParams: paginate_params|default({})}) }}
-        </div>
+        {% include '@ibexadesign/ui/pagination.html.twig' with {
+            'pager': pager,
+            'paginaton_params': {
+                'routeName': paginate_route,
+                'routeParams': paginate_params|default({})
+            }
+        } %}
     {% endif %}
 </div>
 
 <script>
+    document.addEventListener('DOMContentLoaded', () => {
+        // Manage ajax pagination
+        const display = document.getElementById('{{ id }}');
+        display.addEventListener('click', (e) => {
+            const link = e.target.closest('.ibexa-pagination a');
+            if (!link) {
+                return;
+            }
 
-    (function ($) {
-        $(document).ready(function ($) {
-            // Manage ajax pagination
-            $('#{{ id }}').delegate('.ez-pagination a', 'click', function (e) {
-                e.preventDefault();
-                $('#loading_{{ id }}').removeClass('d-none');
-                $('#{{ id }}')
-                    .html('')
-                    .load(this.href + ' #{{ id }}>*', null, function () {
-                        $('#loading_{{ id }}').addClass('d-none');
-                    });
-            });
+            const loader = document.getElementById('loading_{{ id }}');
+            e.preventDefault();
+            loader.hidden = false;
+            display.innerHTML = '';
+            fetch(link.href)
+                .then((r) => r.text())
+                .then((content) => {
+                    const node = document.createElement('div');
+                    node.innerHTML = content;
+                    display.innerHTML = node.querySelector('#{{ id }}').innerHTML;
+                    loader.hidden = true;
+                })
+            ;
         });
-    })(jQuery);
+    });
 </script>

src/Security/PolicyProvider.php

@@ -4,8 +4,8 @@ declare(strict_types=1);
 
 namespace CodeRhapsodie\EzDataflowBundle\Security;
 
-use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Security\PolicyProvider\PolicyProviderInterface;
-use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Security\PolicyProvider\YamlPolicyProvider;
+use Ibexa\Bundle\Core\DependencyInjection\Security\PolicyProvider\PolicyProviderInterface;
+use Ibexa\Bundle\Core\DependencyInjection\Security\PolicyProvider\YamlPolicyProvider;
 
 class PolicyProvider extends YamlPolicyProvider implements PolicyProviderInterface
 {

src/Tab/HistoryTab.php

@@ -5,8 +5,8 @@ declare(strict_types=1);
 namespace CodeRhapsodie\EzDataflowBundle\Tab;
 
 use CodeRhapsodie\EzDataflowBundle\Controller\DashboardController;
-use EzSystems\EzPlatformAdminUi\Tab\AbstractControllerBasedTab;
-use EzSystems\EzPlatformAdminUi\Tab\OrderedTabInterface;
+use Ibexa\Contracts\AdminUi\Tab\AbstractControllerBasedTab;
+use Ibexa\Contracts\AdminUi\Tab\OrderedTabInterface;
 use Symfony\Component\HttpKernel\Controller\ControllerReference;
 
 class HistoryTab extends AbstractControllerBasedTab implements OrderedTabInterface
@@ -16,7 +16,7 @@ class HistoryTab extends AbstractControllerBasedTab implements OrderedTabInterfa
      */
     public function getControllerReference(array $parameters): ControllerReference
     {
-        return new ControllerReference(DashboardController::class.'::history');
+        return new ControllerReference(DashboardController::class.'::history', [], $parameters);
     }
 
     /**

src/Tab/OneshotTab.php

@@ -5,8 +5,8 @@ declare(strict_types=1);
 namespace CodeRhapsodie\EzDataflowBundle\Tab;
 
 use CodeRhapsodie\EzDataflowBundle\Controller\DashboardController;
-use EzSystems\EzPlatformAdminUi\Tab\AbstractControllerBasedTab;
-use EzSystems\EzPlatformAdminUi\Tab\OrderedTabInterface;
+use Ibexa\Contracts\AdminUi\Tab\AbstractControllerBasedTab;
+use Ibexa\Contracts\AdminUi\Tab\OrderedTabInterface;
 use Symfony\Component\HttpKernel\Controller\ControllerReference;
 
 class OneshotTab extends AbstractControllerBasedTab implements OrderedTabInterface

src/Tab/RepeatingTab.php

@@ -5,8 +5,8 @@ declare(strict_types=1);
 namespace CodeRhapsodie\EzDataflowBundle\Tab;
 
 use CodeRhapsodie\EzDataflowBundle\Controller\DashboardController;
-use EzSystems\EzPlatformAdminUi\Tab\AbstractControllerBasedTab;
-use EzSystems\EzPlatformAdminUi\Tab\OrderedTabInterface;
+use Ibexa\Contracts\AdminUi\Tab\AbstractControllerBasedTab;
+use Ibexa\Contracts\AdminUi\Tab\OrderedTabInterface;
 use Symfony\Component\HttpKernel\Controller\ControllerReference;
 
 class RepeatingTab extends AbstractControllerBasedTab implements OrderedTabInterface

src/UserSwitcher/UserSwitcher.php

@@ -4,22 +4,21 @@ declare(strict_types=1);
 
 namespace CodeRhapsodie\EzDataflowBundle\UserSwitcher;
 
-use eZ\Publish\API\Repository\PermissionResolver;
-use eZ\Publish\API\Repository\UserService;
-use eZ\Publish\API\Repository\Values\User\UserReference;
+use Ibexa\Contracts\Core\Repository\PermissionResolver;
+use Ibexa\Contracts\Core\Repository\UserService;
 
 class UserSwitcher implements UserSwitcherInterface
 {
-    /** @var PermissionResolver */
+    /** @var \Ibexa\Contracts\Core\Repository\PermissionResolver */
     private $permissionResolver;
 
-    /** @var UserService */
+    /** @var \Ibexa\Contracts\Core\Repository\UserService */
     private $userService;
 
     /** @var string|int */
     private $adminLoginOrId;
 
-    /** @var UserReference[] */
+    /** @var \Ibexa\Contracts\Core\Repository\Values\User\UserReference[] */
     private $userStack;
 
     public function __construct(PermissionResolver $permissionResolver, UserService $userService, $adminLoginOrId)

src/UserSwitcher/UserSwitcherAwareTrait.php

@@ -9,9 +9,6 @@ trait UserSwitcherAwareTrait
     /** @var UserSwitcherInterface */
     protected $userSwitcher;
 
-    /**
-     * @param UserSwitcherInterface $userSwitcher
-     */
     public function setUserSwitcher(UserSwitcherInterface $userSwitcher): void
     {
         $this->userSwitcher = $userSwitcher;

src/Writer/ContentWriter.php

@@ -10,17 +10,16 @@ use CodeRhapsodie\EzDataflowBundle\Core\Content\ContentUpdaterInterface;
 use CodeRhapsodie\EzDataflowBundle\Model\ContentCreateStructure;
 use CodeRhapsodie\EzDataflowBundle\Model\ContentStructure;
 use CodeRhapsodie\EzDataflowBundle\Model\ContentUpdateStructure;
-
 use Psr\Log\LoggerAwareTrait;
 
 class ContentWriter extends RepositoryWriter implements DelegateWriterInterface
 {
     use LoggerAwareTrait;
 
-    /** @var ContentCreatorInterface */
+    /** @var \CodeRhapsodie\EzDataflowBundle\Core\Content\ContentCreatorInterface */
     private $creator;
 
-    /** @var ContentUpdaterInterface */
+    /** @var \CodeRhapsodie\EzDataflowBundle\Core\Content\ContentUpdaterInterface */
     private $updater;
 
     public function __construct(ContentCreatorInterface $creator, ContentUpdaterInterface $updater)
@@ -30,26 +29,29 @@ class ContentWriter extends RepositoryWriter implements DelegateWriterInterface
     }
 
     /**
-     * @param ContentStructure $item
+     * @param \CodeRhapsodie\EzDataflowBundle\Model\ContentStructure $item
      */
     public function write($item)
     {
         if (!$item instanceof ContentStructure) {
-            $this->log('warning', "Data is not a ContentStucture");
+            $this->log('warning', 'Data is not a ContentStucture');
+
             return;
         }
 
         if ($item instanceof ContentCreateStructure) {
             $this->log('info', 'Save content', [
                 'content_type' => $item->getContentTypeIdentifier(),
-                'content_location' => $item->getLocations()
+                'content_location' => $item->getLocations(),
             ]);
-            return $this->creator->createFromStructure($item);
+            $this->creator->createFromStructure($item);
+
+            return;
         }
 
         if ($item instanceof ContentUpdateStructure) {
             $this->log('info', 'Update content', ['id' => $item->getId(), 'remote_id' => $item->getRemoteId()]);
-            return $this->updater->updateFromStructure($item);
+            $this->updater->updateFromStructure($item);
         }
     }
 
@@ -63,7 +65,7 @@ class ContentWriter extends RepositoryWriter implements DelegateWriterInterface
 
     private function log(string $level, string $message, array $context = [])
     {
-        if ($this->logger === null) {
+        if (null === $this->logger) {
             return;
         }
         $this->logger->log($level, $message, $context);

src/Writer/RepositoryWriter.php

@@ -4,9 +4,9 @@ declare(strict_types=1);
 
 namespace CodeRhapsodie\EzDataflowBundle\Writer;
 
+use CodeRhapsodie\DataflowBundle\DataflowType\Writer\WriterInterface;
 use CodeRhapsodie\EzDataflowBundle\UserSwitcher\UserSwitcherAwareInterface;
 use CodeRhapsodie\EzDataflowBundle\UserSwitcher\UserSwitcherAwareTrait;
-use CodeRhapsodie\DataflowBundle\DataflowType\Writer\WriterInterface;
 
 abstract class RepositoryWriter implements WriterInterface, UserSwitcherAwareInterface
 {

tests/Core/FieldComparator/DelegatorFieldComparatorTest.php

@@ -4,12 +4,12 @@ namespace CodeRhapsodie\EzDataflowBundle\Tests\Core\FieldComparator;
 
 use CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\DelegatorFieldComparator;
 use CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\FieldComparatorInterface;
-use eZ\Publish\API\Repository\Values\Content\Field;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
 use PHPUnit\Framework\TestCase;
 
 class DelegatorFieldComparatorTest extends TestCase
 {
-    /** @var DelegatorFieldComparator */
+    /** @var \CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\DelegatorFieldComparator */
     private $delegatorFieldComparator;
 
     protected function setUp(): void

tests/Filter/NotModifiedContentFilterTest.php

@@ -7,21 +7,21 @@ namespace CodeRhapsodie\EzDataflowBundle\Tests\Filter;
 use CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\FieldComparatorInterface;
 use CodeRhapsodie\EzDataflowBundle\Filter\NotModifiedContentFilter;
 use CodeRhapsodie\EzDataflowBundle\Model\ContentUpdateStructure;
-use eZ\Publish\API\Repository\ContentService;
-use eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Core\Repository\Values\Content\Content;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class NotModifiedContentFilterTest extends TestCase
 {
-    /** @var ContentService|MockObject */
+    /** @var \Ibexa\Contracts\Core\Repository\ContentService|\PHPUnit\Framework\MockObject\MockObject */
     private $contentServiceMock;
 
-    /** @var FieldComparatorInterface|MockObject */
+    /** @var \CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\FieldComparatorInterface|\PHPUnit\Framework\MockObject\MockObject */
     private $comparatorMock;
 
-    /** @var NotModifiedContentFilter */
+    /** @var \CodeRhapsodie\EzDataflowBundle\Filter\NotModifiedContentFilter */
     private $notModifiedContentFilter;
 
     protected function setUp(): void