Revert unnecessary changes from merge action

jolelievre · Nov 13, 2024 · 3623b78 · 3623b78
1 parent c366945
commit 3623b78
Show file tree

Hide file tree

Showing 11 changed files with 82 additions and 123 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -42,7 +42,7 @@ jobs:
         run: COMPOSER_PROCESS_TIMEOUT=600 composer install --ansi --prefer-dist --no-interaction --no-progress
 
       - name: Run PHPCSFixer
-        run: ./vendor/bin/php-cs-fixer fix --dry-run --diff --path-mode=intersection
+        run: ./vendor/bin/php-cs-fixer fix --dry-run --diff
 
       - name: Run ergebnis/composer-normalize
         run: composer normalize --dry-run --no-check-lock

diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
@@ -1295,52 +1295,6 @@ Changelog for PrestaShop 9
   - Refactoring:
     - #36882: Comment search process (by @Hlavtox)
 
-####################################
-#   v8.2.0 - (2024-09-23)
-####################################
-- Back Office:
-  - Improvement:
-    - #36171: Remove email "Preview" from BO section "Statutes" (by @ShaiMagal)
-    - #36386: Fix typo in pack wording that doesn't make sense (by @Hlavtox)
-    - #36172: Input type "number" is not styled properly (by @ShaiMagal)
-    - #36714: Order modules on translation page alphabetically (by @Hlavtox)
-    - #36936: Remove redirection on cms exception (by @Hlavtox)
-  - Bug fix:
-    - #36457: Fix: Pass correct language ID to getAttributesName instead of hardcoded 1 (by @mouleeg)
-    - #36454: Prevent creating duplicate customers in some scenarios (by @Hlavtox)
-    - #36287: Fix issue with Product Customizations (by @Codencode)
-    - #36802: Fix: Error occurs when navigating new admin controllers with empty quick access links (by @Codencode)
-    - #36639: Check override conflicts at module install (by @ludoviccardinale & @matthieu-rolland)
-    - #36895: Update AdminCartsController.php (by @Codencode)
-    - #36914: Added management of the 'addedByModule' field in the "CustomizationField" object (by @Codencode)
-- Front Office:
-  - Improvement:
-    - #36359: Match URLs with a trailing slash (by @Hlavtox)
-    - #36451: Enhance TemplateVarShop Function with Shop Group ID for Improved Multi-Shop Support (by @ChronoBrake)
-  - Bug fix:
-    - #36454: Prevent creating duplicate customers in some scenarios (by @Hlavtox)
-    - #36521: Handle hook prefix to allow dashboard module to be saved (by @PrestaEdit)
-    - #36664: Use attribute public name instead of private name in URL anchors (by @maxldn5)
-    - #36834: Fix: problems with product customizations issue 1 (by @Codencode)
-    - #36905: Fix: Cart.php class method _deleteCustomization not deleting all image files from same customization but only first (by @Codencode)
-- Core:
-  - Improvement:
-    - #36398: Updated PrestaShop Packages (by @github-actions)
-    - #36417: Updated PrestaShop Packages (by @github-actions)
-    - #36576: Mail - Reply-To can be the same as the To address (spam indicator - negative points) (by @ShaiMagal)
-    - #36764: Version number 8.2.0 (by @matks)
-    - #36657: Add hook for assigning general purpose variables before the core does it (by @matthieu-rolland)
-    - #36575: Migrate lazy array improvements and cart presenter decoupling from develop to 8.2.x (by @matthieu-rolland)
-    - #36955: Use basename on user given filename in legacy uploadcontroller (by @matthieu-rolland)
-    - #36972: Update default catalog 8.2.x (by @ps-jarvis)
-  - Bug fix:
-    - #36662: Cast OrderProductForViewing - location to string for Memcached (by @ShaiMagal)
-    - #36840: Use PHP constants for doctrine config (by @matks)
-    - #36875: Add attr_stringify_fetches to PDO init config to avoid BC Break (by @fox-john)
-    - #36689: Can't transformToCustomer while password max length is shorter than default 16 length (by @ShaiMagal)
-  - Refactoring:
-    - #36882: Comment search process (by @Hlavtox)
-
 ####################################
 #   v8.1.7 - (2024-06-14)
 ####################################

diff --git a/tests/Resources/modules_tests/override/classes/Cart.php b/tests/Resources/modules_tests/override/classes/Cart.php
@@ -2,8 +2,6 @@
 
 class Cart extends CartCore
 {
-    public const BOTH = 999;
-
     /*
     * module: pscsx32412
     * date: 2018-12-26 14:14:05
@@ -71,7 +69,7 @@ public function delete()
 			WHERE `id_cart` = ' . (int) $this->id
         );
         if (!Db::getInstance()->execute('DELETE FROM `' . _DB_PREFIX_ . 'cart_rule` WHERE `id_cart` = ' . (int) $this->id)
-         || !Db::getInstance()->execute('DELETE FROM `' . _DB_PREFIX_ . 'cart_product` WHERE `id_cart` = ' . (int) $this->id)) {
+            || !Db::getInstance()->execute('DELETE FROM `' . _DB_PREFIX_ . 'cart_product` WHERE `id_cart` = ' . (int) $this->id)) {
             return false;
         }
 

diff --git a/translations/default/ModulesBlockreassuranceAdmin.xlf b/translations/default/ModulesBlockreassuranceAdmin.xlf
@@ -151,6 +151,15 @@ Comment: Confirm uninstall</note>
       </trans-unit>
     </body>
   </file>
+  <file original="modules/blockreassurance/views/templates/admin/tabs/content/config_elements/cms.tpl" source-language="en-US" target-language="en" datatype="plaintext">
+    <body>
+      <trans-unit id="87d49200bfc48e0bcfd3bae27d5616f3">
+        <source>CMS Page</source>
+        <target>CMS Page</target>
+        <note>Line: 24</note>
+      </trans-unit>
+    </body>
+  </file>
   <file original="modules/blockreassurance/views/templates/admin/tabs/content/config_elements/description.tpl" source-language="en-US" target-language="en" datatype="plaintext">
     <body>
       <trans-unit id="0ba3309bf076bf416d0bb498fdfcb77f">
@@ -236,11 +245,6 @@ Comment: Confirm uninstall</note>
   </file>
   <file original="modules/blockreassurance/views/templates/admin/tabs/content/listing.tpl" source-language="en-US" target-language="en" datatype="plaintext">
     <body>
-      <trans-unit id="87d49200bfc48e0bcfd3bae27d5616f3">
-        <source>CMS Page</source>
-        <target>CMS Page</target>
-        <note>Line: 81</note>
-      </trans-unit>
       <trans-unit id="2fbc962c5748d8e3fb7ada6598049a67">
         <source>Block Content</source>
         <target>Block Content</target>
@@ -266,16 +270,6 @@ Comment: Confirm uninstall</note>
         <target>We recommend 3 blocks at maximum.</target>
         <note>Line: 118</note>
       </trans-unit>
-      <trans-unit id="6adf97f83acf6453d4a6a4b1070f3754">
-        <source>None</source>
-        <target>None</target>
-        <note>Line: 77</note>
-      </trans-unit>
-      <trans-unit id="334c4a4c42fdb79d7ebc3e73b517e6f8">
-        <source>none</source>
-        <target>none</target>
-        <note>Line: 57</note>
-      </trans-unit>
     </body>
   </file>
   <file original="modules/blockreassurance/views/templates/admin/tabs/display.tpl" source-language="en-US" target-language="en" datatype="plaintext">
@@ -308,6 +302,11 @@ Comment: Confirm uninstall</note>
   </file>
   <file original="modules/blockreassurance/views/templates/admin/tabs/display/global.tpl" source-language="en-US" target-language="en" datatype="plaintext">
     <body>
+      <trans-unit id="6adf97f83acf6453d4a6a4b1070f3754">
+        <source>None</source>
+        <target>None</target>
+        <note>Line: 93</note>
+      </trans-unit>
       <trans-unit id="23b5440c1d192315a80d4c47a0a6a777">
         <source>Header position on all pages</source>
         <target>Header position on all pages</target>
@@ -342,6 +341,11 @@ Comment: Confirm uninstall</note>
   </file>
   <file original="modules/blockreassurance/views/templates/admin/tabs/display/product.tpl" source-language="en-US" target-language="en" datatype="plaintext">
     <body>
+      <trans-unit id="334c4a4c42fdb79d7ebc3e73b517e6f8">
+        <source>none</source>
+        <target>none</target>
+        <note>Line: 41</note>
+      </trans-unit>
       <trans-unit id="3f01481a13daed04a03caaa1a28ab49f">
         <source>Main column</source>
         <target>Main column</target>

diff --git a/translations/default/ModulesEmailsubscriptionShop.xlf b/translations/default/ModulesEmailsubscriptionShop.xlf
@@ -68,7 +68,7 @@
       </trans-unit>
     </body>
   </file>
-  <file original="modules/ps_emailsubscription/views/templates/hook/ps_emailsubscription-column.tpl" source-language="en-US" target-language="en" datatype="plaintext">
+  <file original="modules/ps_emailsubscription/views/templates/hook/ps_emailsubscription.tpl" source-language="en-US" target-language="en" datatype="plaintext">
     <body>
       <trans-unit id="ffb7e666a70151215b4c55c6268d7d72">
         <source>Newsletter</source>

diff --git a/translations/default/ModulesLinklistAdmin.xlf b/translations/default/ModulesLinklistAdmin.xlf
@@ -30,11 +30,6 @@
         <target>ID</target>
         <note>Line: 91</note>
       </trans-unit>
-      <trans-unit id="83ef1503b3bd9858cc923a74e5f9e917">
-        <source>Name of the block</source>
-        <target>Name of the block</target>
-        <note>Line: 98</note>
-      </trans-unit>
     </body>
   </file>
   <file original="modules/ps_linklist/src/Form/Type/CustomUrlType.php" source-language="en-US" target-language="en" datatype="plaintext">
@@ -53,6 +48,11 @@
   </file>
   <file original="modules/ps_linklist/src/Form/Type/LinkBlockType.php" source-language="en-US" target-language="en" datatype="plaintext">
     <body>
+      <trans-unit id="83ef1503b3bd9858cc923a74e5f9e917">
+        <source>Name of the block</source>
+        <target>Name of the block</target>
+        <note>Line: 114</note>
+      </trans-unit>
       <trans-unit id="220b3899aa8f180e5e2f3238c7d873d3">
         <source>Name of the block cannot be longer than %limit% characters</source>
         <target>Name of the block cannot be longer than %limit% characters</target>

diff --git a/translations/default/ModulesProductcommentsAdmin.xlf b/translations/default/ModulesProductcommentsAdmin.xlf
@@ -1,24 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file original="modules/productcomments/ProductCommentCriterion.php" source-language="en-US" target-language="en" datatype="plaintext">
-    <body>
-      <trans-unit id="a09ed6c60eb3213939cecb4c580813cd">
-        <source>Valid for the entire catalog</source>
-        <target>Valid for the entire catalog</target>
-        <note>Line: 300</note>
-      </trans-unit>
-      <trans-unit id="467366059d7d7c743a4d0971363a8d66">
-        <source>Restricted to some categories</source>
-        <target>Restricted to some categories</target>
-        <note>Line: 301</note>
-      </trans-unit>
-      <trans-unit id="772911becd336c843ab09a1d4b4f66c0">
-        <source>Restricted to some products</source>
-        <target>Restricted to some products</target>
-        <note>Line: 302</note>
-      </trans-unit>
-    </body>
-  </file>
   <file original="modules/productcomments/productcomments.php" source-language="en-US" target-language="en" datatype="plaintext">
     <body>
       <trans-unit id="b91c4e8b229a399a3bc911d352524a9b">
@@ -263,6 +244,25 @@ Comment: retro compat 1.5</note>
       </trans-unit>
     </body>
   </file>
+  <file original="modules/productcomments/src/Repository/ProductCommentCriterionRepository.php" source-language="en-US" target-language="en" datatype="plaintext">
+    <body>
+      <trans-unit id="a09ed6c60eb3213939cecb4c580813cd">
+        <source>Valid for the entire catalog</source>
+        <target>Valid for the entire catalog</target>
+        <note>Line: 340</note>
+      </trans-unit>
+      <trans-unit id="467366059d7d7c743a4d0971363a8d66">
+        <source>Restricted to some categories</source>
+        <target>Restricted to some categories</target>
+        <note>Line: 341</note>
+      </trans-unit>
+      <trans-unit id="772911becd336c843ab09a1d4b4f66c0">
+        <source>Restricted to some products</source>
+        <target>Restricted to some products</target>
+        <note>Line: 342</note>
+      </trans-unit>
+    </body>
+  </file>
   <file original="modules/productcomments/views/templates/admin/_configure/helpers/form/form.tpl" source-language="en-US" target-language="en" datatype="plaintext">
     <body>
       <trans-unit id="b9aefa40a54680bb258f9f9569290fae">

diff --git a/translations/default/ShopFormsHelp.xlf b/translations/default/ShopFormsHelp.xlf
@@ -45,10 +45,14 @@
         <target>Customer password is too weak</target>
         <note>Line: 103</note>
       </trans-unit>
+    </body>
+  </file>
+  <file original="controllers/front/OrderConfirmationController.php" source-language="en-US" target-language="en" datatype="plaintext">
+    <body>
       <trans-unit id="4e46ead161638465b5f8cc4351e559a3">
         <source>Enter a password to transform your guest account into a customer account.</source>
         <target>Enter a password to transform your guest account into a customer account.</target>
-        <note>Line: 91</note>
+        <note>Line: 131</note>
       </trans-unit>
     </body>
   </file>

diff --git a/translations/default/ShopFormsLabels.xlf b/translations/default/ShopFormsLabels.xlf
@@ -126,19 +126,14 @@ Comment: Please localize this string with the applicable registration number typ
         <target>Message</target>
         <note>Line: 101</note>
       </trans-unit>
-      <trans-unit id="b357b524e740bc85b9790a0712d84a30">
-        <source>Email address</source>
-        <target>Email address</target>
-        <note>Line: 58</note>
-      </trans-unit>
     </body>
   </file>
-  <file original="themes/classic/modules/ps_emailsubscription/views/templates/hook/ps_emailsubscription-column.tpl" source-language="en-US" target-language="en" datatype="plaintext">
+  <file original="themes/classic/modules/ps_emailsubscription/views/templates/hook/ps_emailsubscription.tpl" source-language="en-US" target-language="en" datatype="plaintext">
     <body>
       <trans-unit id="198584454b0ce1101ff5b50323325aa8">
         <source>Your email address</source>
         <target>Your email address</target>
-        <note>Line: 42</note>
+        <note>Line: 50</note>
       </trans-unit>
     </body>
   </file>
@@ -208,6 +203,15 @@ Comment: Please localize this string with the applicable registration number typ
       </trans-unit>
     </body>
   </file>
+  <file original="themes/classic/templates/customer/password-email.tpl" source-language="en-US" target-language="en" datatype="plaintext">
+    <body>
+      <trans-unit id="b357b524e740bc85b9790a0712d84a30">
+        <source>Email address</source>
+        <target>Email address</target>
+        <note>Line: 53</note>
+      </trans-unit>
+    </body>
+  </file>
   <file original="themes/classic/templates/customer/password-new.tpl" source-language="en-US" target-language="en" datatype="plaintext">
     <body>
       <trans-unit id="3544848f820b9d94a3f3871a382cf138">

diff --git a/translations/default/ShopNotificationsSuccess.xlf b/translations/default/ShopNotificationsSuccess.xlf
@@ -19,15 +19,6 @@
       </trans-unit>
     </body>
   </file>
-  <file original="controllers/front/GuestTrackingController.php" source-language="en-US" target-language="en" datatype="plaintext">
-    <body>
-      <trans-unit id="228289d31b9bf52373066156f9b0190e">
-        <source>Your guest account has been successfully transformed into a customer account. You can now log in as a registered shopper.</source>
-        <target>Your guest account has been successfully transformed into a customer account. You can now log in as a registered shopper.</target>
-        <note>Line: 126</note>
-      </trans-unit>
-    </body>
-  </file>
   <file original="controllers/front/IdentityController.php" source-language="en-US" target-language="en" datatype="plaintext">
     <body>
       <trans-unit id="7c8682d92dfb1522b4cc2975608e582d">
@@ -37,6 +28,15 @@
       </trans-unit>
     </body>
   </file>
+  <file original="controllers/front/OrderConfirmationController.php" source-language="en-US" target-language="en" datatype="plaintext">
+    <body>
+      <trans-unit id="228289d31b9bf52373066156f9b0190e">
+        <source>Your guest account has been successfully transformed into a customer account. You can now log in as a registered shopper.</source>
+        <target>Your guest account has been successfully transformed into a customer account. You can now log in as a registered shopper.</target>
+        <note>Line: 193</note>
+      </trans-unit>
+    </body>
+  </file>
   <file original="controllers/front/OrderDetailController.php" source-language="en-US" target-language="en" datatype="plaintext">
     <body>
       <trans-unit id="0c478a7069ab13f446e9e765cffd1550">

diff --git a/translations/default/ShopThemeCustomeraccount.xlf b/translations/default/ShopThemeCustomeraccount.xlf
@@ -105,6 +105,15 @@
       </trans-unit>
     </body>
   </file>
+  <file original="themes/classic/templates/checkout/_partials/order-final-summary.tpl" source-language="en-US" target-language="en" datatype="plaintext">
+    <body>
+      <trans-unit id="755bb0834a77079fd1330b555b69e6bf">
+        <source>You have given permission to receive your order in recycled packaging.</source>
+        <target>You have given permission to receive your order in recycled packaging.</target>
+        <note>Line: 90</note>
+      </trans-unit>
+    </body>
+  </file>
   <file original="themes/classic/templates/checkout/_partials/steps/personal-information.tpl" source-language="en-US" target-language="en" datatype="plaintext">
     <body>
       <trans-unit id="2fdfd506efea08144c0794c32ca8250a">
@@ -152,17 +161,13 @@
       </trans-unit>
     </body>
   </file>
-  <file original="themes/classic/templates/customer/_partials/order-detail-no-return.tpl" source-language="en-US" target-language="en" datatype="plaintext">
+  <file original="themes/classic/templates/customer/_partials/order-detail-return.tpl" source-language="en-US" target-language="en" datatype="plaintext">
     <body>
       <trans-unit id="10fe8cbbbb00225183547fea1d675020">
         <source>Virtual products can't be returned.</source>
         <target>Virtual products can't be returned.</target>
-        <note>Line: 51</note>
+        <note>Line: 55</note>
       </trans-unit>
-    </body>
-  </file>
-  <file original="themes/classic/templates/customer/_partials/order-detail-return.tpl" source-language="en-US" target-language="en" datatype="plaintext">
-    <body>
       <trans-unit id="fdfac28b5ad628f25649d9c2eb4fc62e">
         <source>Returned</source>
         <target>Returned</target>
@@ -317,11 +322,6 @@
   </file>
   <file original="themes/classic/templates/customer/order-detail.tpl" source-language="en-US" target-language="en" datatype="plaintext">
     <body>
-      <trans-unit id="755bb0834a77079fd1330b555b69e6bf">
-        <source>You have given permission to receive your order in recycled packaging.</source>
-        <target>You have given permission to receive your order in recycled packaging.</target>
-        <note>Line: 71</note>
-      </trans-unit>
       <trans-unit id="f5d74ea75357b5e139854c14f8e24fe3">
         <source>Order details</source>
         <target>Order details</target>
@@ -515,11 +515,6 @@
   </file>
   <file original="themes/classic/templates/customer/registration.tpl" source-language="en-US" target-language="en" datatype="plaintext">
     <body>
-      <trans-unit id="2fdfd506efea08144c0794c32ca8250a">
-        <source>Create an account</source>
-        <target>Create an account</target>
-        <note>Line: 28</note>
-      </trans-unit>
       <trans-unit id="21bdc5689c12595ae14298354d5550d5">
         <source>Already have an account?</source>
         <target>Already have an account?</target>