Merge branch 'develop'

fooman · Mar 18, 2024 · 7898633 · 7898633
2 parents 230f7ae + 6bff94c
commit 7898633
Show file tree

Hide file tree

Showing 20 changed files with 66 additions and 47 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## [Unreleased]
+### Added
+- Support for Php 8.3
+### Changed
+- Code style updates for newer Magento Coding Standard
+
 ## [107.3.0] - 2023-02-07
 ### Added
 - Support for Php 8.2

diff --git a/captainhook.json b/captainhook.json
@@ -26,12 +26,12 @@
                 "conditions": []
             },
             {
-                "action": "vendor/bin/phpcs --config-set installed_paths ../../magento/magento-coding-standard/,../../phpcompatibility/php-compatibility && vendor/bin/phpcs --severity=7 -s --standard=Magento2 src",
+                "action": "vendor/bin/phpcs --config-set installed_paths ../../magento/magento-coding-standard,../../magento/php-compatibility-fork,../../phpcsstandards/phpcsutils && vendor/bin/phpcs --severity=6 -s --standard=Magento2 src",
                 "options": [],
                 "conditions": []
             },
             {
-                "action": "vendor/bin/phpstan analyse src/ -l 4",
+                "action": "vendor/bin/phpstan analyse src/ -l 5",
                 "options": [],
                 "conditions": []
             }

diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "license": "OSL-3.0",
     "description": "Automatically attach pdf and terms and conditions documents to outgoing sales emails.",
     "type": "magento2-module",
-    "version": "107.3.0",
+    "version": "107.4.0",
     "autoload": {
         "psr-4": {
             "Fooman\\EmailAttachments\\": "src/"
@@ -13,13 +13,13 @@
         ]
     },
     "require": {
-        "php": "~7.1.0||~7.2.0||~7.3.0||~7.4.0||~8.0.0||~8.1.0||~8.2.0",
+        "php": "~7.1.0||~7.2.0||~7.3.0||~7.4.0||~8.0.0||~8.1.0||~8.2.0||~8.3.0",
+        "laminas/laminas-mime": "^2.5",
         "magento/framework": "^102.0.5 || ^103.0.0",
         "magento/module-backend": "^101.0.0 || ^102.0.0",
-        "magento/module-sales": "^102.0.0 || ^103.0.0",
         "magento/module-checkout-agreements": "^100.0.2",
         "magento/module-email": "^101.0.3",
-        "laminas/laminas-mime": "^2.5"
+        "magento/module-sales": "^102.0.0 || ^103.0.0"
     },
     "require-dev": {
         "fooman/testing-and-quality-tools": "^1.0"
@@ -29,5 +29,8 @@
     "suggest": {
         "fooman/printorderpdf-m2": "Allows attaching the order confirmation pdf to the order confirmation email",
         "fooman/pdfcustomiser-m2": "Allows to easily customise the sales pdfs while also reducing file sizes "
+    },
+    "config": {
+        "sort-packages": true
     }
-}
+}
diff --git a/src/Block/Config/PrintOrderPdf.php b/src/Block/Config/PrintOrderPdf.php
@@ -11,7 +11,7 @@
  */
 class PrintOrderPdf extends \Magento\Config\Block\System\Config\Form\Field
 {
-    const EXT_URL = 'http://store.fooman.co.nz/extensions/magento2/magento-extension-print-order-pdf-m2.html';
+    public const EXT_URL = 'http://store.fooman.co.nz/extensions/magento2/magento-extension-print-order-pdf-m2.html';
 
     protected $moduleList;
 

diff --git a/src/Model/Api/AttachmentInterface.php b/src/Model/Api/AttachmentInterface.php
@@ -11,8 +11,8 @@
  */
 interface AttachmentInterface
 {
-    const ENCODING_BASE64          = 'base64';
-    const DISPOSITION_ATTACHMENT   = 'attachment';
+    public const ENCODING_BASE64          = 'base64';
+    public const DISPOSITION_ATTACHMENT   = 'attachment';
 
     public function getMimeType();
 

diff --git a/src/Model/ContentAttacher.php b/src/Model/ContentAttacher.php
@@ -13,10 +13,10 @@
  */
 class ContentAttacher
 {
-    const MIME_PDF = 'application/pdf';
-    const TYPE_OCTETSTREAM = 'application/octet-stream';
-    const MIME_TXT = 'text/plain';
-    const MIME_HTML = 'text/html';
+    public const MIME_PDF = 'application/pdf';
+    public const TYPE_OCTETSTREAM = 'application/octet-stream';
+    public const MIME_TXT = 'text/plain';
+    public const MIME_HTML = 'text/html';
 
     private $attachmentFactory;
 

diff --git a/src/Model/TermsAndConditionsAttacher.php b/src/Model/TermsAndConditionsAttacher.php
@@ -32,7 +32,7 @@ public function attachForStore($storeId, ContainerInterface $attachmentContainer
          * @var \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Collection $agreements
          */
         $agreements = $this->termsCollection->create();
-        $agreements->addStoreFilter($storeId)->addFieldToFilter('is_active', 1);
+        $agreements->addStoreFilter($storeId)->addFieldToFilter('is_active', "1");
 
         foreach ($agreements as $agreement) {
             $this->attachAgreement($agreement, $attachmentContainer);

diff --git a/src/Observer/AbstractSendCreditmemoObserver.php b/src/Observer/AbstractSendCreditmemoObserver.php
@@ -11,8 +11,8 @@
  */
 class AbstractSendCreditmemoObserver extends AbstractObserver
 {
-    const XML_PATH_ATTACH_PDF = 'sales_email/creditmemo/attachpdf';
-    const XML_PATH_ATTACH_AGREEMENT = 'sales_email/creditmemo/attachagreement';
+    public const XML_PATH_ATTACH_PDF = 'sales_email/creditmemo/attachpdf';
+    public const XML_PATH_ATTACH_AGREEMENT = 'sales_email/creditmemo/attachagreement';
 
     public function execute(\Magento\Framework\Event\Observer $observer)
     {

diff --git a/src/Observer/AbstractSendInvoiceObserver.php b/src/Observer/AbstractSendInvoiceObserver.php
@@ -11,8 +11,8 @@
  */
 class AbstractSendInvoiceObserver extends AbstractObserver
 {
-    const XML_PATH_ATTACH_PDF = 'sales_email/invoice/attachpdf';
-    const XML_PATH_ATTACH_AGREEMENT = 'sales_email/invoice/attachagreement';
+    public const XML_PATH_ATTACH_PDF = 'sales_email/invoice/attachpdf';
+    public const XML_PATH_ATTACH_AGREEMENT = 'sales_email/invoice/attachagreement';
 
     public function execute(\Magento\Framework\Event\Observer $observer)
     {

diff --git a/src/Observer/AbstractSendInvoiceShipmentObserver.php b/src/Observer/AbstractSendInvoiceShipmentObserver.php
@@ -11,7 +11,7 @@
  */
 class AbstractSendInvoiceShipmentObserver extends AbstractObserver
 {
-    const XML_PATH_ATTACH_PDF = 'sales_email/shipment/attachinvoicepdf';
+    public const XML_PATH_ATTACH_PDF = 'sales_email/shipment/attachinvoicepdf';
 
     public function execute(\Magento\Framework\Event\Observer $observer)
     {

diff --git a/src/Observer/AbstractSendOrderObserver.php b/src/Observer/AbstractSendOrderObserver.php
@@ -11,8 +11,8 @@
  */
 class AbstractSendOrderObserver extends AbstractObserver
 {
-    const XML_PATH_ATTACH_PDF = 'sales_email/order/attachpdf';
-    const XML_PATH_ATTACH_AGREEMENT = 'sales_email/order/attachagreement';
+    public const XML_PATH_ATTACH_PDF = 'sales_email/order/attachpdf';
+    public const XML_PATH_ATTACH_AGREEMENT = 'sales_email/order/attachagreement';
 
     public function execute(\Magento\Framework\Event\Observer $observer)
     {

diff --git a/src/Observer/AbstractSendShipmentObserver.php b/src/Observer/AbstractSendShipmentObserver.php
@@ -11,8 +11,8 @@
  */
 class AbstractSendShipmentObserver extends AbstractObserver
 {
-    const XML_PATH_ATTACH_PDF = 'sales_email/shipment/attachpdf';
-    const XML_PATH_ATTACH_AGREEMENT = 'sales_email/shipment/attachagreement';
+    public const XML_PATH_ATTACH_PDF = 'sales_email/shipment/attachpdf';
+    public const XML_PATH_ATTACH_AGREEMENT = 'sales_email/shipment/attachagreement';
 
     public function execute(\Magento\Framework\Event\Observer $observer)
     {

diff --git a/src/Observer/BeforeSendCreditmemoCommentObserver.php b/src/Observer/BeforeSendCreditmemoCommentObserver.php
@@ -11,6 +11,6 @@
  */
 class BeforeSendCreditmemoCommentObserver extends AbstractSendCreditmemoObserver
 {
-    const XML_PATH_ATTACH_PDF = 'sales_email/creditmemo_comment/attachpdf';
-    const XML_PATH_ATTACH_AGREEMENT = 'sales_email/creditmemo_comment/attachagreement';
+    public const XML_PATH_ATTACH_PDF = 'sales_email/creditmemo_comment/attachpdf';
+    public const XML_PATH_ATTACH_AGREEMENT = 'sales_email/creditmemo_comment/attachagreement';
 }
diff --git a/src/Observer/BeforeSendInvoiceCommentObserver.php b/src/Observer/BeforeSendInvoiceCommentObserver.php
@@ -11,6 +11,6 @@
  */
 class BeforeSendInvoiceCommentObserver extends AbstractSendInvoiceObserver
 {
-    const XML_PATH_ATTACH_PDF = 'sales_email/invoice_comment/attachpdf';
-    const XML_PATH_ATTACH_AGREEMENT = 'sales_email/invoice_comment/attachagreement';
+    public const XML_PATH_ATTACH_PDF = 'sales_email/invoice_comment/attachpdf';
+    public const XML_PATH_ATTACH_AGREEMENT = 'sales_email/invoice_comment/attachagreement';
 }
diff --git a/src/Observer/BeforeSendInvoiceShipmentCommentObserver.php b/src/Observer/BeforeSendInvoiceShipmentCommentObserver.php
@@ -11,5 +11,5 @@
  */
 class BeforeSendInvoiceShipmentCommentObserver extends AbstractSendInvoiceShipmentObserver
 {
-    const XML_PATH_ATTACH_PDF = 'sales_email/shipment_comment/attachinvoicepdf';
+    public const XML_PATH_ATTACH_PDF = 'sales_email/shipment_comment/attachinvoicepdf';
 }
diff --git a/src/Observer/BeforeSendOrderCommentObserver.php b/src/Observer/BeforeSendOrderCommentObserver.php
@@ -11,6 +11,6 @@
  */
 class BeforeSendOrderCommentObserver extends AbstractSendOrderObserver
 {
-    const XML_PATH_ATTACH_PDF = 'sales_email/order_comment/attachpdf';
-    const XML_PATH_ATTACH_AGREEMENT = 'sales_email/order_comment/attachagreement';
+    public const XML_PATH_ATTACH_PDF = 'sales_email/order_comment/attachpdf';
+    public const XML_PATH_ATTACH_AGREEMENT = 'sales_email/order_comment/attachagreement';
 }
diff --git a/src/Observer/BeforeSendShipmentCommentObserver.php b/src/Observer/BeforeSendShipmentCommentObserver.php
@@ -11,6 +11,6 @@
  */
 class BeforeSendShipmentCommentObserver extends AbstractSendShipmentObserver
 {
-    const XML_PATH_ATTACH_PDF = 'sales_email/shipment_comment/attachpdf';
-    const XML_PATH_ATTACH_AGREEMENT = 'sales_email/shipment_comment/attachagreement';
+    public const XML_PATH_ATTACH_PDF = 'sales_email/shipment_comment/attachpdf';
+    public const XML_PATH_ATTACH_AGREEMENT = 'sales_email/shipment_comment/attachagreement';
 }
diff --git a/src/composer.json b/src/composer.json
@@ -3,7 +3,7 @@
     "license": "OSL-3.0",
     "description": "Automatically attach pdf and terms and conditions documents to outgoing sales emails.",
     "type": "magento2-module",
-    "version": "107.3.0",
+    "version": "107.4.0",
     "autoload": {
         "psr-4": {
             "Fooman\\EmailAttachments\\": ""
@@ -13,13 +13,13 @@
         ]
     },
     "require": {
-        "php": "~7.1.0||~7.2.0||~7.3.0||~7.4.0||~8.0.0||~8.1.0||~8.2.0",
+        "php": "~7.1.0||~7.2.0||~7.3.0||~7.4.0||~8.0.0||~8.1.0||~8.2.0||~8.3.0",
+        "laminas/laminas-mime": "^2.5",
         "magento/framework": "^102.0.5 || ^103.0.0",
         "magento/module-backend": "^101.0.0 || ^102.0.0",
-        "magento/module-sales": "^102.0.0 || ^103.0.0",
         "magento/module-checkout-agreements": "^100.0.2",
         "magento/module-email": "^101.0.3",
-        "laminas/laminas-mime": "^2.5"
+        "magento/module-sales": "^102.0.0 || ^103.0.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

diff --git a/src/etc/adminhtml/system.xml b/src/etc/adminhtml/system.xml
@@ -37,7 +37,8 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <label>Attach Terms and Conditions</label>
                     <tooltip><![CDATA[When set to Yes, your Terms and Conditions
-                                (from <b>Stores &gt; Terms and Conditions</b>) will be automatically attached to the email.]]></tooltip>
+                                (from <b>Stores &gt; Terms and Conditions</b>) 
+                                will be automatically attached to the email.]]></tooltip>
                 </field>
             </group>
             <group id="order_comment">
@@ -64,7 +65,8 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <label>Attach Terms and Conditions</label>
                     <tooltip><![CDATA[When set to Yes, your Terms and Conditions
-                                (from <b>Stores &gt; Terms and Conditions</b>) will be automatically attached to the email.]]></tooltip>
+                                (from <b>Stores &gt; Terms and Conditions</b>) 
+                                will be automatically attached to the email.]]></tooltip>
                 </field>
             </group>
             <group id="invoice">
@@ -90,7 +92,8 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <label>Attach Terms and Conditions</label>
                     <tooltip><![CDATA[When set to Yes, your Terms and Conditions
-                                (from <b>Stores &gt; Terms and Conditions</b>) will be automatically attached to the email.]]></tooltip>
+                                (from <b>Stores &gt; Terms and Conditions</b>) 
+                                will be automatically attached to the email.]]></tooltip>
                 </field>
             </group>
             <group id="invoice_comment">
@@ -116,7 +119,8 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <label>Attach Terms and Conditions</label>
                     <tooltip><![CDATA[When set to Yes, your Terms and Conditions
-                                (from <b>Stores &gt; Terms and Conditions</b>) will be automatically attached to the email.]]></tooltip>
+                                (from <b>Stores &gt; Terms and Conditions</b>) 
+                                will be automatically attached to the email.]]></tooltip>
                 </field>
             </group>
             <group id="shipment">
@@ -154,7 +158,8 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <label>Attach Terms and Conditions</label>
                     <tooltip><![CDATA[When set to Yes, your Terms and Conditions
-                                (from <b>Stores &gt; Terms and Conditions</b>) will be automatically attached to the email.]]></tooltip>
+                                (from <b>Stores &gt; Terms and Conditions</b>) 
+                                will be automatically attached to the email.]]></tooltip>
                 </field>
             </group>
             <group id="shipment_comment">
@@ -192,7 +197,8 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <label>Attach Terms and Conditions</label>
                     <tooltip><![CDATA[When set to Yes, your Terms and Conditions
-                                (from <b>Stores &gt; Terms and Conditions</b>) will be automatically attached to the email.]]></tooltip>
+                                (from <b>Stores &gt; Terms and Conditions</b>) 
+                                will be automatically attached to the email.]]></tooltip>
                 </field>
             </group>
             <group id="creditmemo">
@@ -218,7 +224,8 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <label>Attach Terms and Conditions</label>
                     <tooltip><![CDATA[When set to Yes, your Terms and Conditions
-                                (from <b>Stores &gt; Terms and Conditions</b>) will be automatically attached to the email.]]></tooltip>
+                                (from <b>Stores &gt; Terms and Conditions</b>) 
+                                will be automatically attached to the email.]]></tooltip>
                 </field>
             </group>
             <group id="creditmemo_comment">
@@ -244,7 +251,8 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <label>Attach Terms and Conditions</label>
                     <tooltip><![CDATA[When set to Yes, your Terms and Conditions
-                                (from <b>Stores &gt; Terms and Conditions</b>) will be automatically attached to the email.]]></tooltip>
+                                (from <b>Stores &gt; Terms and Conditions</b>) 
+                                will be automatically attached to the email.]]></tooltip>
                 </field>
             </group>
         </section>

diff --git a/src/etc/di.xml b/src/etc/di.xml
@@ -17,7 +17,8 @@
         <plugin name="fooman_emailattachments_transportbuilder" type="Fooman\EmailAttachments\Plugin\TransportBuilder"/>
     </type>
     <type name="\Magento\Framework\Mail\MimeMessageInterfaceFactory">
-        <plugin name="fooman_emailattachments_mimemessagefactory" type="Fooman\EmailAttachments\Plugin\MimeMessageFactory"/>
+        <plugin name="fooman_emailattachments_mimemessagefactory"
+            type="Fooman\EmailAttachments\Plugin\MimeMessageFactory"/>
     </type>
 
     <!-- module introduced preferences -->
@@ -59,7 +60,8 @@
         </arguments>
     </type>
 
-    <virtualType name="fooman_emailattachments_creditmemo_pdf_renderer" type="\Fooman\EmailAttachments\Model\PdfRenderer">
+    <virtualType name="fooman_emailattachments_creditmemo_pdf_renderer"
+        type="\Fooman\EmailAttachments\Model\PdfRenderer">
         <arguments>
             <argument name="pdfRenderer" xsi:type="object">\Magento\Sales\Model\Order\Pdf\Creditmemo</argument>
         </arguments>