Merge pull request #5 from NicolasBarbey/main

Thelia 2.5 compatibility
thelia-modules · Oct 7, 2021 · 713369b · 713369b
2 parents 14f6c80 + 1edbe00
commit 713369b
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 14 deletions.
diff --git a/AdminIncludes/module_configuration.html b/AdminIncludes/module_configuration.html
@@ -37,7 +37,7 @@
 
                                             {form_error form=$form field="invoice"}
                                                 <br />
-                                                <span class="error">{$message}</span>
+                                                <span class="error">{$message|default:null}</span>
                                             {/form_error}
                                             <input type="text" {if $required}aria-required="true" required{/if} placeholder="{$label}" id="{$label_attr.for}" name="{$name}" value="{$value}" class="form-control" />
                                         </label>

diff --git a/Config/config.xml b/Config/config.xml
@@ -23,9 +23,9 @@
         -->
     </commands>
 
-    <services>
+    <!--<services>
         <service id="invoiceRef.listener" class="InvoiceRef\EventListeners\OrderListener">
             <tag name="kernel.event_subscriber"/>
         </service>
-    </services>
+    </services>-->
 </config>
diff --git a/Config/module.xml b/Config/module.xml
@@ -13,12 +13,12 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>1.1.1</version>
+    <version>2.0.0</version>
     <author>
         <name>Manuel Raynaud</name>
         <email>[email protected]</email>
     </author>
     <type>classic</type>
-    <thelia>2.1.0</thelia>
+    <thelia>2.5.0</thelia>
     <stability>prod</stability>
 </module>
diff --git a/Config/routing.xml b/Config/routing.xml
@@ -28,8 +28,8 @@
     </route>
     -->
 
-    <route id="invoiceRef.configuration" path="/admin/module/InvoiceRef/configure" methods="post">
+    <!--<route id="invoiceRef.configuration" path="/admin/module/InvoiceRef/configure" methods="post">
         <default key="_controller">InvoiceRef\Controller\ConfigurationController::configureAction</default>
-    </route>
+    </route>-->
 
 </routes>
diff --git a/Config/schema.xml b/Config/schema.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<database defaultIdMethod="native" name="thelia" namespace="InvoiceRef\Model">
+<database defaultIdMethod="native" name="TheliaMain" namespace="InvoiceRef\Model">
     <!--
     See propel documentation on http://propelorm.org for all information about schema file
     -->

diff --git a/Controller/ConfigurationController.php b/Controller/ConfigurationController.php
@@ -35,7 +35,7 @@ public function configureAction()
             return $response;
         }
 
-        $form = new ConfigurationForm($this->getRequest());
+        $form = $this->createForm(ConfigurationForm::getName());
 
         $response = $error_msg = $e = null;
 

diff --git a/EventListeners/OrderListener.php b/EventListeners/OrderListener.php
@@ -14,7 +14,9 @@
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Lock\Factory;
+use Symfony\Component\Lock\LockFactory;
 use Symfony\Component\Lock\Store\FlockStore;
+use Symfony\Component\Lock\Store\SemaphoreStore;
 use Thelia\Core\Event\Order\OrderEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Model\ConfigQuery;
@@ -35,8 +37,8 @@ public function implementInvoice(OrderEvent $event)
         $order = $event->getOrder();
 
         if ($order->isPaid() && null === $order->getInvoiceRef()) {
-            // Protect genration against concurrent executions
-            $flockFactory = new Factory(new FlockStore());
+            $store = new SemaphoreStore();
+            $flockFactory = new LockFactory($store);
 
             $lock = $flockFactory->createLock('invoice-ref-generation');
 

diff --git a/Form/ConfigurationForm.php b/Form/ConfigurationForm.php
@@ -13,6 +13,7 @@
 namespace InvoiceRef\Form;
 
 use InvoiceRef\InvoiceRef;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Thelia\Core\Translation\Translator;
 use Thelia\Form\BaseForm;
@@ -49,7 +50,7 @@ class ConfigurationForm extends BaseForm
     protected function buildForm()
     {
         $this->formBuilder
-            ->add('invoice', 'text', [
+            ->add('invoice', TextType::class, [
                 'constraints' => [
                     new NotBlank()
                 ],
@@ -64,7 +65,7 @@ protected function buildForm()
     /**
      * @return string the name of you form. This name must be unique
      */
-    public function getName()
+    public static function getName()
     {
         return 'invoiceref_config';
     }

diff --git a/InvoiceRef.php b/InvoiceRef.php
@@ -14,6 +14,7 @@
 
 use Propel\Runtime\ActiveQuery\Criteria;
 use Propel\Runtime\Connection\ConnectionInterface;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ServicesConfigurator;
 use Thelia\Model\ConfigQuery;
 use Thelia\Model\OrderQuery;
 use Thelia\Module\BaseModule;
@@ -22,7 +23,7 @@ class InvoiceRef extends BaseModule
 {
     const DOMAIN_NAME = "invoiceref";
 
-    public function postActivation(ConnectionInterface $con = null)
+    public function postActivation(ConnectionInterface $con = null): void
     {
         if (null === ConfigQuery::read('invoiceRef', null)) {
             if (null !== $lastOderPaid = OrderQuery::create()
@@ -38,4 +39,12 @@ public function postActivation(ConnectionInterface $con = null)
             }
         }
     }
+
+    public static function configureServices(ServicesConfigurator $servicesConfigurator): void
+    {
+        $servicesConfigurator->load(self::getModuleCode().'\\', __DIR__)
+            ->exclude([THELIA_MODULE_DIR . ucfirst(self::getModuleCode()). "/I18n/*"])
+            ->autowire(true)
+            ->autoconfigure(true);
+    }
 }