REFACTO WIP

config/admin/command.yml

@@ -0,0 +1,40 @@
+
+services:
+  _defaults:
+    autowire: true
+    public: false
+
+  Oksydan\IsImageslider\Domain\ImageSlider\CommandHandler\CreateImageSliderHandlerInterface:
+    alias: Oksydan\IsImageslider\Domain\ImageSlider\CommandHandler\CreateImageSliderHandler
+
+  Oksydan\IsImageslider\Domain\ImageSlider\CommandHandler\CreateImageSliderHandler:
+    tags:
+      - name: tactician.handler
+        command: Oksydan\IsImageslider\Domain\ImageSlider\Command\CreateImageSliderCommand
+
+
+  Oksydan\IsImageslider\Domain\ImageSlider\CommandHandler\EditImageSliderHandlerInterface:
+    alias: Oksydan\IsImageslider\Domain\ImageSlider\CommandHandler\EditImageSliderHandler
+
+  Oksydan\IsImageslider\Domain\ImageSlider\CommandHandler\EditImageSliderHandler:
+    tags:
+      - name: tactician.handler
+        command: Oksydan\IsImageslider\Domain\ImageSlider\Command\EditImageSliderCommand
+
+
+  Oksydan\IsImageslider\Domain\ImageSlider\CommandHandler\DeleteImageSliderHandlerInterface:
+    alias: Oksydan\IsImageslider\Domain\ImageSlider\CommandHandler\DeleteImageSliderHandler
+
+  Oksydan\IsImageslider\Domain\ImageSlider\CommandHandler\DeleteImageSliderHandler:
+    tags:
+      - name: tactician.handler
+        command: Oksydan\IsImageslider\Domain\ImageSlider\Command\DeleteImageSliderCommand
+
+
+  Oksydan\IsImageslider\Domain\ImageSlider\CommandHandler\ToggleStatusImageSliderHandlerInterface:
+    alias: Oksydan\IsImageslider\Domain\ImageSlider\CommandHandler\ToggleStatusImageSliderHandler
+
+  Oksydan\IsImageslider\Domain\ImageSlider\CommandHandler\ToggleStatusImageSliderHandler:
+    tags:
+      - name: tactician.handler
+        command: Oksydan\IsImageslider\Domain\ImageSlider\Command\ToggleStatusImageSliderCommand

config/admin/form.yml

@@ -1,43 +1,34 @@
 services:
-  oksydan.is_imageslider.image_slider.configuration:
-    class: 'Oksydan\IsImageslider\Form\DataConfiguration\ImageSliderDataConfiguration'
+  Oksydan\IsImageslider\Form\DataTransformer\Shop\ShopChoiceModelDataTransformer:
+    class: 'Oksydan\IsImageslider\Form\DataTransformer\Shop\ShopChoiceModelDataTransformer'
+    autowire: false
     arguments:
-      - '@prestashop.adapter.legacy.configuration'
-      - '@prestashop.adapter.shop.context'
-      - '@prestashop.adapter.multistore_feature'
+      - '@prestashop.core.admin.shop.repository'
 
-  oksydan.is_imageslider.image_slider_configuration.form_handler:
-    class: 'PrestaShop\PrestaShop\Core\Form\Handler'
+  Oksydan\IsImageslider\Form\EventListener\ImagesliderFormSubscriber:
+    class: 'Oksydan\IsImageslider\Form\EventListener\ImagesliderFormSubscriber'
+    autowire: false
     arguments:
-      - '@form.factory'
-      - '@prestashop.core.hook.dispatcher'
-      - '@Oksydan\IsImageslider\Form\Provider\ImageSliderConfigurationFormDataProvider'
-      - 'Oksydan\IsImageslider\Form\ImageSliderConfigurationType'
-      - 'ConfigurationForm'
-
-
-  Oksydan\IsImageslider\Type\TranslatableFile:
-    class: 'Oksydan\IsImageslider\Type\TranslatableFile'
-    parent: 'form.type.common.translatable'
-    public: true
-    tags:
-      - { name: form.type }
+      - '@prestashop.core.admin.shop.repository'
 
-  oksydan.is_imageslider.provider.image_provider:
-    class: 'Oksydan\IsImageslider\Provider\ImageProvider'
-    public: true
+  Oksydan\IsImageslider\Form\DataTransformer\Lang\LangModeDataTransformer:
+    class: 'Oksydan\IsImageslider\Form\DataTransformer\Lang\LangModeDataTransformer'
+    autowire: false
     arguments:
-      - '%is_imageslider_images_uri%'
+      - '@prestashop.core.admin.lang.repository'
 
-  oksydan.is_imageslider.form.identifiable_object.builder.image_slider_form_builder:
-    class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilder'
-    factory: 'prestashop.core.form.builder.form_builder_factory:create'
+  Oksydan\IsImageslider\Form\Type\Shop\ShopAssociationChoiceTreeType:
+    class: 'Oksydan\IsImageslider\Form\Type\Shop\ShopAssociationChoiceTreeType'
+    autowire: false
     arguments:
-      - 'Oksydan\IsImageslider\Form\ImageSliderType'
-      - '@Oksydan\IsImageslider\Form\Provider\ImageSliderFormDataProvider'
+      $shopTreeChoicesProvider: '@prestashop.adapter.form.choice_provider.shop_tree_choice_provider'
+      $shopChoiceModelDataTransformer: '@Oksydan\IsImageslider\Form\DataTransformer\Shop\ShopChoiceModelDataTransformer'
+    tags:
+      - { name: form.type }
 
-  oksydan.is_imageslider.form.identifiable_object.handler.image_slider_form_handler:
-    class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandler'
-    factory: 'prestashop.core.form.identifiable_object.handler.form_handler_factory:create'
+  oksydan.is_imageslider.image_slider.configuration:
+    class: 'Oksydan\IsImageslider\Form\DataConfiguration\ImageSliderDataConfiguration'
     arguments:
-      - '@Oksydan\IsImageslider\Form\DataHandler\ImageSliderFormDataHandler'
+      - '@prestashop.adapter.legacy.configuration'
+      - '@prestashop.adapter.shop.context'
+      - '@prestashop.adapter.multistore_feature'

config/admin/grid.yml

@@ -1,5 +1,4 @@
 services:
-
   oksydan.is_imageslider.grid.image_slider_grid_factory:
     class: 'PrestaShop\PrestaShop\Core\Grid\GridFactory'
     arguments:
@@ -8,7 +7,6 @@ services:
       - '@prestashop.core.grid.filter.form_factory'
       - '@prestashop.core.hook.dispatcher'
 
-
   oksydan.is_imageslider.grid.data.factory.image_slider_data_factory:
     class: '%prestashop.core.grid.data.factory.doctrine_grid_data_factory%'
     arguments:
@@ -21,4 +19,4 @@ services:
     class: 'Oksydan\IsImageslider\Grid\Data\Factory\ImageSliderGridDataFactory'
     arguments:
       - '@oksydan.is_imageslider.grid.data.factory.image_slider_data_factory'
-      - '@oksydan.is_imageslider.provider.image_provider'
+      - '@Oksydan\IsImageslider\Provider\ImageProvider'

config/admin/services.yml

@@ -2,7 +2,7 @@ imports:
   - { resource: ../common.yml }
   - { resource: ./grid.yml }
   - { resource: ./form.yml }
-
+  - { resource: ./command.yml }
 
 services:
   _defaults:
@@ -29,17 +29,25 @@ services:
   Oksydan\IsImageslider\:
     resource: '../../src/*'
     exclude:
-      - '../../src/{Controller,Falconize}'
+      - '../../src/{Controller,Falconize,Domain}'
+      - '../../src/Form/DataTransformer'
+      - '../../src/Form/EventListener'
+      - '../../src/Form/Type/Shop'
       - '../../src/index.php'
       - '../../src/*/index.php'
       - '../../src/**/index.php'
 
-  Oksydan\IsImageslider\Controller\ImagesliderController:
-    class: Oksydan\IsImageslider\Controller\ImagesliderController
+  Oksydan\IsImageslider\Controller\Admin\ImagesliderController:
+    class: Oksydan\IsImageslider\Controller\Admin\ImagesliderController
     arguments:
       $imagsliderGridFactory: '@oksydan.is_imageslider.grid.image_slider_grid_factory'
-      $imagesliderConfigurationFormHandler: '@oksydan.is_imageslider.image_slider_configuration.form_handler'
-      $imagesliderFormBuilder: '@oksydan.is_imageslider.form.identifiable_object.builder.image_slider_form_builder'
-      $imagesliderFormHandler: '@oksydan.is_imageslider.form.identifiable_object.handler.image_slider_form_handler'
       $gridPresenter: '@prestashop.core.grid.presenter.grid_presenter'
 
+  Oksydan\IsImageslider\Adapter\CommandBusInterface: '@Oksydan\IsImageslider\Adapter\CommandBus'
+  Oksydan\IsImageslider\Adapter\CommandBus:
+    class: Oksydan\IsImageslider\Adapter\CommandBus
+    autowire: false
+    public: false
+    arguments:
+      - '@prestashop.core.command_bus'
+

config/configuration.yml

@@ -1,5 +1,6 @@
 imports:
   - { resource: './database/image_slider.yml' }
+  - { resource: './database/image_slider_image.yml' }
   - { resource: './database/image_slider_lang.yml' }
   - { resource: './database/image_slider_shop.yml' }
   - { resource: './hooks/register.yml' }

config/database/image_slider.yml

@@ -21,6 +21,9 @@ database_tables:
         type: datetime
         notnull: false
         default: null
+      - name: image_to_all_langs
+        type: boolean
+        default: false
+        notnull: true
     primary:
       - id_slide
-

config/database/image_slider_image.yml

@@ -0,0 +1,13 @@
+database_tables:
+  image_slider_image:
+    columns:
+      - name: id_image
+        type: integer
+        length: 11
+        notnull: true
+        autoincrement: true
+      - name: name
+        type: string
+        length: 255
+    primary:
+      - id_image

config/database/image_slider_lang.yml

@@ -16,22 +16,22 @@ database_tables:
       - name: legend
         type: string
         length: 255
-        notnull: true
+        notnull: false
       - name: image
-        type: string
-        length: 255
-        notnull: true
+        type: integer
+        length: 11
+        notnull: false
       - name: image_mobile
-        type: string
-        length: 255
-        notnull: true
+        type: integer
+        length: 11
+        notnull: false
       - name: url
         type: string
         length: 255
         notnull: true
       - name: description
         type: text
-        notnull: true
+        notnull: false
     primary:
       - id_slide
       - id_lang
@@ -45,3 +45,21 @@ database_tables:
           - id_lang
         foreign_columns:
           - id_lang
+
+#      - name: is_imageslider_constraint_image_slider_image_lang
+#        foreign_table: image_slider_image
+#        update: NO ACTION
+#        delete: CASCADE
+#        local_columns:
+#          - image
+#        foreign_columns:
+#          - id_image
+#
+#      - name: is_imageslider_constraint_image_slider_image_mobile_lang
+#        foreign_table: image_slider_image
+#        update: NO ACTION
+#        delete: CASCADE
+#        local_columns:
+#          - image_mobile
+#        foreign_columns:
+#          - id_image

config/routes.yml

@@ -1,42 +1,4 @@
-is_imageslider_controller:
-    path: /is_imageslider/configuration
-    methods: [GET]
-    defaults:
-        _controller: 'Oksydan\IsImageslider\Controller\ImagesliderController::index'
-
-is_imageslider_controller_configuration_save:
-    path: /is_imageslider/configuration
-    methods: [POST, PATCH]
-    defaults:
-        _controller: 'Oksydan\IsImageslider\Controller\ImagesliderController::saveConfiguration'
-
-is_imageslider_controller_create:
-    path: /is_imageslider/imageslide/create
-    methods: [GET, POST]
-    defaults:
-        _controller: 'Oksydan\IsImageslider\Controller\ImagesliderController::create'
-
-is_imageslider_controller_edit:
-    path: /is_imageslider/imageslide/{slideId}/edit
-    methods: [GET, POST]
-    defaults:
-        _controller: 'Oksydan\IsImageslider\Controller\ImagesliderController::edit'
-
-is_imageslider_controller_delete:
-    path: /is_imageslider/imageslide/{slideId}/delete
-    methods: [GET, POST]
-    defaults:
-        _controller: 'Oksydan\IsImageslider\Controller\ImagesliderController::delete'
-
-is_imageslider_controller_toggle_status:
-    path: /is_imageslider/imageslide/{slideId}/toggle
-    methods: [POST]
-    defaults:
-        _controller: 'Oksydan\IsImageslider\Controller\ImagesliderController::toggleStatus'
-
-is_imageslider_controller_update_positions:
-    path: /is_imageslider/imageslide/update_positions
-    methods: [POST]
-    defaults:
-        _controller: 'Oksydan\IsImageslider\Controller\ImagesliderController::updatePositionAction'
-
+is_imageslider:
+  resource: ../src/Controller/Admin/
+  type: annotation
+  prefix: /is_imageslider

is_imageslider.php

@@ -87,7 +87,7 @@ public function uninstall(): bool
 
     public function getContent(): void
     {
-        Tools::redirectAdmin(SymfonyContainer::getInstance()->get('router')->generate('is_imageslider_controller'));
+        Tools::redirectAdmin(SymfonyContainer::getInstance()->get('router')->generate('admin_imageslider_controller_index'));
     }
 
     /**

src/Adapter/CommandBus.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Oksydan\IsImageslider\Adapter;
+
+use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface as CoreCommandBusInterface;
+
+final class CommandBus implements CommandBusInterface
+{
+    private CoreCommandBusInterface $commandBus;
+
+    public function __construct(CoreCommandBusInterface $commandBus)
+    {
+        $this->commandBus = $commandBus;
+    }
+
+    public function handle($command)
+    {
+        $this->commandBus->handle($command);
+    }
+}

src/Adapter/CommandBusInterface.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Oksydan\IsImageslider\Adapter;
+
+interface CommandBusInterface
+{
+    /**
+     * Handle command.
+     *
+     * @param object $command
+     */
+    public function handle($command);
+}