enclosure js code into anonymous function (#28)

* encosure js code into annonymous function

CHANGELOG.md

@@ -1,13 +1,3 @@
-# Version 2.2.0
-* added `NotModifiedContentFilter` and a bunch of `FieldComparator` classes
-
-# version 2.1.0
-* contentWriter return created content
-
-# version 2.0.1
-
-* Enclosure js code into anonymous function
-
 # version 2.0.0
 
 * Update to use Dataflow v2.0+

README.md

@@ -178,7 +178,7 @@ class MyDataflowType extends AbstractDataflowType
     /**
      * @var ContentStructureFactory
      */
-    private $contentStructureFactory;
+    private contentStructureFactory;
 
     public function __construct(ContentWriter $contentWriter, ContentStructureFactory $contentStructureFactory)
     {
@@ -213,83 +213,6 @@ class MyDataflowType extends AbstractDataflowType
 
 This example uses `ContentStructureFactory` to check if the content exists and returns the adequate `ContentStrucure` to pass to the content writer.
 
-## Use the NotModifiedContentFilter
-
-When updating contents, you might want to ignore contents where the update would not result in any actual changes in fields values. In that case, you can add the `NotModifiedContentFilter` as one of your steps.
-
-```php
-// In your DataflowType
-public function __construct(NotModifiedContentFilter $notModifiedContentFilter)
-{
-    $this->notModifiedContentFilter = $notModifiedContentFilter;
-}
-
-//[...]
-protected function buildDataflow(DataflowBuilder $builder, array $options): void
-{
-    //[...]
-    $builder->addStep($this->notModifiedContentFilter);
-    //[...]
-}
-```
-
-This filter compares each field value in the `ContentUpdateStructure` received to the fields values in the existing content object. If all values are identical, this filter will return `false`, otherwise, the `ContentUpdateStructure` will be returned as is.
-
-Not all field types are supported by this filter. Il a field type is not supported, values will be assumed different. If your dataflow is dealing with content types containing unsupported field types, it is better to simply not use the `NotModifiedContentFilter` to prevent unnecessary overhead. 
-
-### Supported field types
-- ezstring
-- ezauthor
-- ezboolean
-- ezcountry
-- ezdate
-- ezdatetime
-- ezemail
-- ezfloat
-- ezisbn
-- ezobjectrelation
-- ezobjectrelationlist
-- ezkeyword
-- ezselection
-- eztext
-- eztime
-- eztags
-- novaseometas
-- ezurl
-- ezmatrix
-- ezgmaplocation
-- ezrichtext
-
-### Add custom field comparator
-
-If you want to add support for a field type, simply create your own comparator.
-
-```php
-<?php
-
-use CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\AbstractFieldComparator;
-use eZ\Publish\Core\FieldType\Value;
-//[...]
-
-class MyFieldComparator extends AbstractFieldComparator
-{
-    //[...]
-    protected function compareValues(Value $currentValue, Value $newValue): bool
-    {
-        // Return true if values are identical, false if values are different.
-    }
-}
-
-```
-
-```yaml
-# Service declaration
-    App\FieldComparator\MyFieldComparator:
-        parent: 'CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\AbstractFieldComparator'
-        tags:
-            - { name: 'coderhapsodie.ezdataflow.field_comparator', fieldType: 'my_field_type_identifier' }
-```
-
 # Admin UI
 
 ## Access to the eZ Dataflow UI
@@ -379,10 +302,6 @@ Go to the eZ Dataflow admin UI and click on the "Oneshot" tab. Click on the "+"
 
 Finally, click on the "Create" button.
 
-# Rights
-
-If a non-administrator user needs read-only access to the dataflow interface, add the `Setup / Administrate` and `eZ Dataflow / View` policies in one of their roles.
-
 # Issues and feature requests
 
 Please report issues and request features at https://github.com/code-rhapsodie/ezdataflow-bundle/issues.
@@ -396,3 +315,4 @@ already.
 # License
 
 This package is licensed under the [MIT license](LICENSE).
+

composer.json

@@ -41,8 +41,7 @@
         }
     },
     "require": {
-        "php": "^7.1",
-        "code-rhapsodie/dataflow-bundle": "^2.1 || dev-master",
+        "code-rhapsodie/dataflow-bundle": "^2.0 || dev-master",
         "ezsystems/ezplatform-admin-ui": "^1.0",
         "ezsystems/ezpublish-kernel": "^7.0"
     },

phpunit.xml

@@ -4,7 +4,7 @@
 <phpunit
         backupGlobals="false"
         backupStaticAttributes="false"
-        bootstrap="tests/bootstrap.php"
+        bootstrap="Tests/bootstrap.php"
         convertErrorsToExceptions="true"
         convertNoticesToExceptions="true"
         convertWarningsToExceptions="true"
@@ -14,16 +14,16 @@
         <ini name="error_reporting" value="-1" />
     </php>
     <testsuites>
-        <testsuite name="EzDataflow tests suite">
-            <directory suffix="Test.php">./tests</directory>
+        <testsuite name="Port tests suite">
+            <directory suffix="Test.php">./Tests</directory>
         </testsuite>
     </testsuites>
 
     <filter>
         <whitelist>
-            <directory>./src/</directory>
+            <directory>./</directory>
             <exclude>
-                <directory>tests/</directory>
+                <directory>Tests/</directory>
                 <directory>vendor/</directory>
             </exclude>
         </whitelist>

src/CodeRhapsodieEzDataflowBundle.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 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 Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -24,8 +23,6 @@ class CodeRhapsodieEzDataflowBundle extends Bundle
     {
         parent::build($container);
 
-        $container->addCompilerPass(new FieldComparatorCompilerPass());
-
         /** @var EzPublishCoreExtension $eZExtension */
         $eZExtension = $container->getExtension('ezpublish');
         $eZExtension->addPolicyProvider(new PolicyProvider());

src/Core/Field/DefaultFieldValueCreator.php

@@ -13,6 +13,9 @@ class DefaultFieldValueCreator implements FieldValueCreatorInterface
     /** @var FieldTypeService */
     private $fieldTypeService;
 
+    /** @var FieldType[] */
+    private $fieldTypes = [];
+
     public function __construct(FieldTypeService $fieldTypeService)
     {
         $this->fieldTypeService = $fieldTypeService;
@@ -25,6 +28,22 @@ class DefaultFieldValueCreator implements FieldValueCreatorInterface
 
     public function createValue(string $fieldTypeIdentifier, $hash): Value
     {
-        return $this->fieldTypeService->getFieldType($fieldTypeIdentifier)->fromHash($hash);
+        return $this->getFieldType($fieldTypeIdentifier)->fromHash($hash);
+    }
+
+    /**
+     * @param string $fieldTypeIdentifier
+     *
+     * @return FieldType
+     *
+     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
+     */
+    private function getFieldType(string $fieldTypeIdentifier): FieldType
+    {
+        if (!isset($this->fieldTypes[$fieldTypeIdentifier])) {
+            $this->fieldTypes[$fieldTypeIdentifier] = $this->fieldTypeService->getFieldType($fieldTypeIdentifier);
+        }
+
+        return $this->fieldTypes[$fieldTypeIdentifier];
     }
 }

src/Core/FieldComparator/AbstractFieldComparator.php

@@ -1,32 +0,0 @@
-<?php
-
-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;
-
-abstract class AbstractFieldComparator implements FieldComparatorInterface
-{
-    /** @var FieldTypeService */
-    private $fieldTypeService;
-
-    public function __construct(FieldTypeService $fieldTypeService)
-    {
-        $this->fieldTypeService = $fieldTypeService;
-    }
-
-    public function compare(Field $field, $hash): bool
-    {
-        $newValue = $this->fieldTypeService->getFieldType($field->fieldTypeIdentifier)->fromHash($hash);
-
-        return $this->compareValues($field->value, $newValue);
-    }
-
-    /**
-     * Returns true if values are equals, false otherwise
-     */
-    abstract protected function compareValues(Value $currentValue, Value $newValue): bool;
-}

src/Core/FieldComparator/DelegatorFieldComparator.php

@@ -1,36 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace CodeRhapsodie\EzDataflowBundle\Core\FieldComparator;
-
-use eZ\Publish\API\Repository\Values\Content\Field;
-
-class DelegatorFieldComparator implements FieldComparatorInterface
-{
-    /** @var FieldComparatorInterface[] */
-    private $delegates;
-
-    /**
-     * FieldComparator constructor.
-     */
-    public function __construct()
-    {
-        $this->delegates = [];
-    }
-
-    public function compare(Field $field, $hash): bool
-    {
-        if (isset($this->delegates[$field->fieldTypeIdentifier])) {
-            return $this->delegates[$field->fieldTypeIdentifier]->compare($field, $hash);
-        }
-
-        // No comparator to handle this field type, we assume the value is different.
-        return false;
-    }
-
-    public function registerDelegateFieldComparator(FieldComparatorInterface $typedFieldComparator, string $fieldTypeIdentifier): void
-    {
-        $this->delegates[$fieldTypeIdentifier] = $typedFieldComparator;
-    }
-}

src/Core/FieldComparator/FieldComparatorInterface.php

@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace CodeRhapsodie\EzDataflowBundle\Core\FieldComparator;
-
-use eZ\Publish\API\Repository\Values\Content\Field;
-
-interface FieldComparatorInterface
-{
-    /**
-     * @return bool true if identical, false otherwise
-     */
-    public function compare(Field $field, $hash): bool;
-}

src/Core/FieldComparator/MapLocationFieldComparator.php

@@ -1,18 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace CodeRhapsodie\EzDataflowBundle\Core\FieldComparator;
-
-use eZ\Publish\Core\FieldType\Value;
-
-class MapLocationFieldComparator extends AbstractFieldComparator
-{
-    protected function compareValues(Value $currentValue, Value $newValue): bool
-    {
-        return (string) $currentValue === (string) $newValue
-            && (float) $currentValue->longitude === (float) $newValue->longitude
-            && (float) $currentValue->latitude === (float) $newValue->latitude
-        ;
-    }
-}

src/Core/FieldComparator/MatrixFieldComparator.php

@@ -1,29 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace CodeRhapsodie\EzDataflowBundle\Core\FieldComparator;
-
-use eZ\Publish\Core\FieldType\Value;
-
-class MatrixFieldComparator extends AbstractFieldComparator
-{
-    protected function compareValues(Value $currentValue, Value $newValue): bool
-    {
-        if (count($currentValue->rows) !== count($newValue->rows)) {
-            return false;
-        }
-
-        foreach ($newValue->rows as $index => $row) {
-            if (count($currentValue->rows[$index]->getCells()) !== count($row->getCells())) {
-                return false;
-            }
-
-            if (!empty(array_diff_assoc($currentValue->rows[$index]->getCells(), $row->getCells()))) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-}

src/Core/FieldComparator/NovaSEOMetasFieldComparator.php

@@ -1,26 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace CodeRhapsodie\EzDataflowBundle\Core\FieldComparator;
-
-use eZ\Publish\Core\FieldType\Value;
-
-class NovaSEOMetasFieldComparator extends AbstractFieldComparator
-{
-    protected function compareValues(Value $currentValue, Value $newValue): bool
-    {
-        $map = [];
-        foreach ($currentValue->metas as $meta) {
-            $map[$meta->getName()] = $meta->getContent();
-        }
-
-        foreach ($newValue->metas as $meta) {
-            if (!isset($map[$meta->getName()]) || $map[$meta->getName()] !== $meta->getContent()) {
-                return false;
-            }
-        }
-
-        return count($currentValue->metas) === count($newValue->metas);
-    }
-}

src/Core/FieldComparator/SimpleFieldComparator.php

@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace CodeRhapsodie\EzDataflowBundle\Core\FieldComparator;
-
-use eZ\Publish\Core\FieldType\Value;
-
-class SimpleFieldComparator extends AbstractFieldComparator
-{
-    protected function compareValues(Value $currentValue, Value $newValue): bool
-    {
-        return (string) $currentValue === (string) $newValue;
-    }
-}

src/Core/FieldComparator/UrlFieldComparator.php

@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace CodeRhapsodie\EzDataflowBundle\Core\FieldComparator;
-
-use eZ\Publish\Core\FieldType\Value;
-
-class UrlFieldComparator extends AbstractFieldComparator
-{
-    protected function compareValues(Value $currentValue, Value $newValue): bool
-    {
-        return $currentValue->link === $newValue->link && $currentValue->text === $newValue->text;
-    }
-}

src/DependencyInjection/Compiler/FieldComparatorCompilerPass.php

@@ -1,35 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace CodeRhapsodie\EzDataflowBundle\DependencyInjection\Compiler;
-
-use CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\DelegatorFieldComparator;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
-
-class FieldComparatorCompilerPass implements CompilerPassInterface
-{
-    public function process(ContainerBuilder $container)
-    {
-        if (!$container->has(DelegatorFieldComparator::class)) {
-            return;
-        }
-
-        $delegatorDef = $container->findDefinition(DelegatorFieldComparator::class);
-
-        foreach ($container->findTaggedServiceIds('coderhapsodie.ezdataflow.field_comparator') as $id => $tags) {
-            foreach ($tags as $attributes) {
-                if (!isset($attributes['fieldType'])) {
-                    throw new \InvalidArgumentException(sprintf('Service "%s" must define the "fieldType" attribute on "coderhapsodie.ezdataflow.field_comparator" tags.', $id));
-                }
-
-                $delegatorDef->addMethodCall(
-                    'registerDelegateFieldComparator',
-                    [new Reference($id), $attributes['fieldType']]
-                );
-            }
-        }
-    }
-}

src/Filter/NotModifiedContentFilter.php

@@ -1,51 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace CodeRhapsodie\EzDataflowBundle\Filter;
-
-use CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\FieldComparatorInterface;
-use CodeRhapsodie\EzDataflowBundle\Model\ContentUpdateStructure;
-use eZ\Publish\API\Repository\ContentService;
-
-/**
- * Filters ContentUpdateStructure that would not result in any actual changes in the content.
- */
-class NotModifiedContentFilter
-{
-    /** @var ContentService */
-    private $contentService;
-
-    /** @var FieldComparatorInterface */
-    private $comparator;
-
-    public function __construct(ContentService $contentService, FieldComparatorInterface $comparator)
-    {
-        $this->contentService = $contentService;
-        $this->comparator = $comparator;
-    }
-
-    public function __invoke($data)
-    {
-        if (!$data instanceof ContentUpdateStructure) {
-            return $data;
-        }
-
-        if ($data->getId()) {
-            $content = $this->contentService->loadContent($data->getId(), [$data->getLanguageCode()]);
-        } else {
-            $content = $this->contentService->loadContentByRemoteId($data->getRemoteId(), [$data->getLanguageCode()]);
-        }
-
-        foreach ($data->getFields() as $identifier => $hash) {
-            $field = $content->getField($identifier, $data->getLanguageCode());
-            if ($field === null || !$this->comparator->compare($field, $hash)) {
-                // At least one field is different, continue the dataflow.
-                return $data;
-            }
-        }
-
-        // All fields are identical, filter this item out.
-        return false;
-    }
-}

src/Resources/config/services.yaml

@@ -1,6 +1,3 @@
-imports:
-    - { resource: services/comparators.yaml }
-
 services:
     _defaults:
         public: false
@@ -127,16 +124,3 @@ services:
         public: false
         tags:
             - {name: ezplatform.tab, group: coderhapsodie-ezdataflow}
-
-    CodeRhapsodie\EzDataflowBundle\Filter\NotModifiedContentFilter:
-        arguments:
-            $contentService: '@eZ\Publish\API\Repository\ContentService'
-            $comparator: '@CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\FieldComparatorInterface'
-
-    CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\FieldComparatorInterface: '@CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\DelegatorFieldComparator'
-    CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\DelegatorFieldComparator:
-
-    CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\AbstractFieldComparator:
-        arguments:
-            $fieldTypeService: '@eZ\Publish\API\Repository\FieldTypeService'
-        abstract: true

src/Resources/config/services/comparators.yaml

@@ -1,42 +0,0 @@
-services:
-    CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\SimpleFieldComparator:
-        parent: 'CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\AbstractFieldComparator'
-        tags:
-            - { name: 'coderhapsodie.ezdataflow.field_comparator', fieldType: 'ezauthor' }
-            - { name: 'coderhapsodie.ezdataflow.field_comparator', fieldType: 'ezboolean' }
-            - { name: 'coderhapsodie.ezdataflow.field_comparator', fieldType: 'ezcountry' }
-            - { name: 'coderhapsodie.ezdataflow.field_comparator', fieldType: 'ezdate' }
-            - { name: 'coderhapsodie.ezdataflow.field_comparator', fieldType: 'ezdatetime' }
-            - { name: 'coderhapsodie.ezdataflow.field_comparator', fieldType: 'ezemail' }
-            - { name: 'coderhapsodie.ezdataflow.field_comparator', fieldType: 'ezfloat' }
-            - { name: 'coderhapsodie.ezdataflow.field_comparator', fieldType: 'ezinteger' }
-            - { name: 'coderhapsodie.ezdataflow.field_comparator', fieldType: 'ezisbn' }
-            - { name: 'coderhapsodie.ezdataflow.field_comparator', fieldType: 'ezkeyword' }
-            - { name: 'coderhapsodie.ezdataflow.field_comparator', fieldType: 'ezobjectrelation' }
-            - { name: 'coderhapsodie.ezdataflow.field_comparator', fieldType: 'ezobjectrelationlist' }
-            - { name: 'coderhapsodie.ezdataflow.field_comparator', fieldType: 'ezrichtext' }
-            - { name: 'coderhapsodie.ezdataflow.field_comparator', fieldType: 'ezselection' }
-            - { name: 'coderhapsodie.ezdataflow.field_comparator', fieldType: 'eztext' }
-            - { name: 'coderhapsodie.ezdataflow.field_comparator', fieldType: 'ezstring' }
-            - { name: 'coderhapsodie.ezdataflow.field_comparator', fieldType: 'eztime' }
-            - { name: 'coderhapsodie.ezdataflow.field_comparator', fieldType: 'eztags' }
-
-    CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\UrlFieldComparator:
-        parent: 'CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\AbstractFieldComparator'
-        tags:
-            - { name: 'coderhapsodie.ezdataflow.field_comparator', fieldType: 'ezurl' }
-
-    CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\NovaSEOMetasFieldComparator:
-        parent: 'CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\AbstractFieldComparator'
-        tags:
-            - { name: 'coderhapsodie.ezdataflow.field_comparator', fieldType: 'novaseometas' }
-
-    CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\MatrixFieldComparator:
-        parent: 'CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\AbstractFieldComparator'
-        tags:
-            - { name: 'coderhapsodie.ezdataflow.field_comparator', fieldType: 'ezmatrix' }
-
-    CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\MapLocationFieldComparator:
-        parent: 'CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\AbstractFieldComparator'
-        tags:
-            - { name: 'coderhapsodie.ezdataflow.field_comparator', fieldType: 'ezgmaplocation' }

src/Resources/translations/messages.fr.yaml

@@ -49,15 +49,15 @@ coderhapsodie.ezdataflow.workflow.history.title: 'Historique des exécutions'
 coderhapsodie.ezdataflow.workflow.list.delete: Supprimer
 coderhapsodie.ezdataflow.workflow.delete: 'Êtes-vous sûr de vouloir supprimer ce dataflow ?'
 coderhapsodie.ezdataflow.workflow.create.success: 'La programmation du dataflow a bien été ajoutée.'
-coderhapsodie.ezdataflow.workflow.create.error: 'Une erreur est survenue lors de l''ajout de la programmation du dataflow : "%message%".'
-coderhapsodie.ezdataflow.workflow.delete.success: 'La programmation du dataflow a bien été supprimée.'
+coderhapsodie.ezdataflow.workflow.create.error: 'Une erreur est survenue lors de l''ajout de la programamtion du dataflow : "%message%".'
+coderhapsodie.ezdataflow.workflow.delete.success: 'La programmation du dataflow a bien été supprimé.'
 coderhapsodie.ezdataflow.workflow.delete.error: 'Une erreur est survenue lors de la suppression de la programmation du dataflow : "%message%".'
 coderhapsodie.ezdataflow.workflow.oneshot.new.title: 'Nouvelle exécution ponctuelle'
 coderhapsodie.ezdataflow.job.create.success: 'Votre exécution a bien été ajoutée.'
 coderhapsodie.ezdataflow.job.create.error: 'Une erreur est survenue lors de l''ajout de l''exécution : "%message%".'
-coderhapsodie.dataflow.label: 'Nom de la programmation du dataflow'
+coderhapsodie.dataflow.label: 'Nom de la programamtion du dataflow'
 coderhapsodie.dataflow.oneshot.label: 'Nom de l''exécution ponctuelle du dataflow'
-coderhapsodie.dataflow.dataflowType: 'Dataflow à exécuter'
+coderhapsodie.dataflow.dataflowType: 'Dataflow a exécuter'
 coderhapsodie.dataflow.options: 'Options passées au dataflow (YAML)'
 coderhapsodie.dataflow.options.title: 'Entrez les options comme un tableau clé/valeur YAML'
 coderhapsodie.dataflow.options.placeholder: "option1: valeur1\noption2: valeur2\n"
@@ -70,6 +70,6 @@ coderhapsodie.dataflow.create.enabled: 'Activé ?'
 coderhapsodie.ezdataflow.workflow.repeating.edit.title: "Édition de la programmation d'un dataflow"
 coderhapsodie.ezdataflow.workflow.edit.submit: Sauvegarder
 coderhapsodie.dataflow.update.next: 'Prochaine exécution'
-coderhapsodie.ezdataflow.workflow.edit.success: 'La programmation du dataflow a été mise à jour avec succès.'
+coderhapsodie.ezdataflow.workflow.edit.success: 'La programmation du dataflow a été mis à jour avec succès.'
 coderhapsodie.ezdataflow.workflow.edit.error: 'Une erreur est survenue lors de la modification de la programmation du dataflow : "%message%".'
 coderhapsodie.ezdataflow.notfound: 'Les données demandées sont introuvables'

src/Writer/ContentWriter.php

@@ -4,14 +4,14 @@ declare(strict_types=1);
 
 namespace CodeRhapsodie\EzDataflowBundle\Writer;
 
-use CodeRhapsodie\DataflowBundle\DataflowType\Writer\DelegateWriterInterface;
 use CodeRhapsodie\EzDataflowBundle\Core\Content\ContentCreatorInterface;
 use CodeRhapsodie\EzDataflowBundle\Core\Content\ContentUpdaterInterface;
 use CodeRhapsodie\EzDataflowBundle\Model\ContentCreateStructure;
 use CodeRhapsodie\EzDataflowBundle\Model\ContentStructure;
 use CodeRhapsodie\EzDataflowBundle\Model\ContentUpdateStructure;
+use CodeRhapsodie\DataflowBundle\DataflowType\Writer\WriterInterface;
 
-class ContentWriter extends RepositoryWriter implements DelegateWriterInterface
+class ContentWriter extends RepositoryWriter implements WriterInterface
 {
     /** @var ContentCreatorInterface */
     private $creator;
@@ -35,19 +35,11 @@ class ContentWriter extends RepositoryWriter implements DelegateWriterInterface
         }
 
         if ($item instanceof ContentCreateStructure) {
-            return $this->creator->createFromStructure($item);
+            $this->creator->createFromStructure($item);
         }
 
         if ($item instanceof ContentUpdateStructure) {
-            return $this->updater->updateFromStructure($item);
+            $this->updater->updateFromStructure($item);
         }
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($item): bool
-    {
-        return $item instanceof ContentStructure;
-    }
 }

tests/Core/FieldComparator/DelegatorFieldComparatorTest.php

@@ -1,49 +0,0 @@
-<?php
-
-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 PHPUnit\Framework\TestCase;
-
-class DelegatorFieldComparatorTest extends TestCase
-{
-    /** @var DelegatorFieldComparator */
-    private $delegatorFieldComparator;
-
-    protected function setUp(): void
-    {
-        $type1FieldComparatorMock = $this->createMock(FieldComparatorInterface::class);
-        $type1FieldComparatorMock->method('compare')->willReturnCallback(function (Field $field, $hash) {
-            return $hash === 'rightValue1';
-        });
-        $type2FieldComparatorMock = $this->createMock(FieldComparatorInterface::class);
-        $type2FieldComparatorMock->method('compare')->willReturnCallback(function (Field $field, $hash) {
-            return $hash === 'rightValue2';
-        });
-        $this->delegatorFieldComparator = new DelegatorFieldComparator();
-        $this->delegatorFieldComparator->registerDelegateFieldComparator($type1FieldComparatorMock, 'type1');
-        $this->delegatorFieldComparator->registerDelegateFieldComparator($type2FieldComparatorMock, 'type2');
-    }
-
-    /**
-     * @dataProvider fieldProvider
-     */
-    public function testField(string $type, bool $expected, $hash)
-    {
-        $field = new Field(['fieldTypeIdentifier' => $type]);
-        $return = $this->delegatorFieldComparator->compare($field, $hash);
-
-        $this->assertSame($expected, $return);
-    }
-
-    public function fieldProvider(): iterable
-    {
-        yield ['type1', true, 'rightValue1'];
-        yield ['type1', false, 'wrongValue'];
-        yield ['type2', true, 'rightValue2'];
-        yield ['type2', false, 'wrongValue'];
-        yield ['otherType', false, 'rightValue1'];
-    }
-}

tests/Filter/NotModifiedContentFilterTest.php

@@ -1,138 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-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 PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
-
-class NotModifiedContentFilterTest extends TestCase
-{
-    /** @var ContentService|MockObject */
-    private $contentServiceMock;
-
-    /** @var FieldComparatorInterface|MockObject */
-    private $comparatorMock;
-
-    /** @var NotModifiedContentFilter */
-    private $notModifiedContentFilter;
-
-    protected function setUp(): void
-    {
-        $this->contentServiceMock = $this->createMock(ContentService::class);
-        $this->comparatorMock = $this->createMock(FieldComparatorInterface::class);
-        $this->notModifiedContentFilter = new NotModifiedContentFilter($this->contentServiceMock, $this->comparatorMock);
-    }
-
-    public function testNotContentUpdateStructure()
-    {
-        $data = 'notAStruct';
-        $returnValue = ($this->notModifiedContentFilter)($data);
-
-        $this->assertSame($data, $returnValue);
-    }
-
-    public function testIdenticalContent()
-    {
-        $id = 10;
-        $field1 = 'field1';
-        $value1 = 'value1';
-        $field2 = 'field2';
-        $value2 = 'value2';
-        $contentField1 = new Field();
-        $contentField2 = new Field();
-        $data = ContentUpdateStructure::createForContentId($id, 'lang', [
-            $field1 => $value1,
-            $field2 => $value2,
-        ]);
-        $content = $this->createMock(Content::class);
-
-        $content
-            ->expects($this->exactly(2))
-            ->method('getField')
-            ->withConsecutive([$field1], [$field2])
-            ->willReturnOnConsecutiveCalls($contentField1, $contentField2)
-        ;
-        $this->contentServiceMock
-            ->expects($this->once())
-            ->method('loadContent')
-            ->with($id)
-            ->willReturn($content)
-        ;
-        $this->comparatorMock
-            ->expects($this->exactly(2))
-            ->method('compare')
-            ->withConsecutive([$contentField1, $value1], [$contentField2, $value2])
-            ->willReturn(true)
-        ;
-
-        $return = ($this->notModifiedContentFilter)($data);
-
-        $this->assertFalse($return);
-    }
-
-    public function testDifferentContent()
-    {
-        $id = 10;
-        $field1 = 'field1';
-        $value1 = 'value1';
-        $field2 = 'field2';
-        $value2 = 'value2';
-        $field3 = 'field3';
-        $value3 = 'value3';
-        $contentField1 = new Field();
-        $contentField2 = new Field();
-        $data = ContentUpdateStructure::createForContentId($id, 'lang', [
-            $field1 => $value1,
-            $field2 => $value2,
-            $field3 => $value3,
-        ]);
-        $content = $this->createMock(Content::class);
-
-        $content
-            ->expects($this->exactly(2))
-            ->method('getField')
-            ->withConsecutive([$field1], [$field2])
-            ->willReturnOnConsecutiveCalls($contentField1, $contentField2)
-        ;
-        $this->contentServiceMock
-            ->expects($this->once())
-            ->method('loadContent')
-            ->with($id)
-            ->willReturn($content)
-        ;
-        $this->comparatorMock
-            ->expects($this->exactly(2))
-            ->method('compare')
-            ->withConsecutive([$contentField1, $value1], [$contentField2, $value2])
-            ->willReturnOnConsecutiveCalls(true, false)
-        ;
-
-        $return = ($this->notModifiedContentFilter)($data);
-
-        $this->assertSame($data, $return);
-    }
-
-    public function testLoadEmptyByRemoteId()
-    {
-        $remoteId = 'abc';
-        $data = ContentUpdateStructure::createForContentRemoteId($remoteId, 'lang', []);
-
-        $this->contentServiceMock
-            ->expects($this->once())
-            ->method('loadContentByRemoteId')
-            ->with($remoteId)
-            ->willReturn(new Content())
-        ;
-        $return = ($this->notModifiedContentFilter)($data);
-
-        $this->assertFalse($return);
-    }
-}

tests/bootstrap.php

@@ -1,11 +0,0 @@
-<?php
-
-// Skip autoloading if already done by phpunit alias (including from meta repo if this is vendor)
-if (defined('PHPUNIT_COMPOSER_INSTALL')) {
-    return;
-}
-$autoloadFile = __DIR__ . '/../vendor/autoload.php';
-if (!file_exists($autoloadFile)) {
-    throw new RuntimeException('Install dependencies to run test suite.');
-}
-require_once $autoloadFile;