Changeset 3068443

Timestamp:

04/10/2024 11:22:34 AM (2 years ago)

Author:

juvodesign

Message:

Update to version 3.1.7 from GitHub

Location:

juvo-mail-editor

Files:

• tags/3.1.7 (copied) (copied from juvo-mail-editor/trunk)
• tags/3.1.7/juvo-mail-editor.php (modified) (1 diff)
• tags/3.1.7/readme.txt (modified) (1 diff)
• tags/3.1.7/src/Trigger.php (modified) (5 diffs)
• tags/3.1.7/vendor/composer/installed.php (modified) (2 diffs)
• trunk/juvo-mail-editor.php (modified) (1 diff)
• trunk/readme.txt (modified) (1 diff)
• trunk/src/Trigger.php (modified) (5 diffs)
• trunk/vendor/composer/installed.php (modified) (2 diffs)

juvo-mail-editor/tags/3.1.7/juvo-mail-editor.php

@@ -8 +8 @@
  * Text Domain:     juvo-mail-editor
  * Domain Path:     /languages
- * Version:         3.1.6
- * Requires at least: 6.5
+ * Version:         3.1.7
+ * Requires at least: 6.2
  * Requires PHP: 7.4
  */

juvo-mail-editor/tags/3.1.7/readme.txt

@@ -3 +3 @@
 Tags: mail,editor,framework
 License: GPLv2 or later
-Tested up to: 6.3
-Stable tag: 3.1.6
+Tested up to: 6.5
+Stable tag: 3.1.7
 
 JUVO Mail Editor helps to modify the standard WordPress Mailings and allows adding dynamic mail triggers.

juvo-mail-editor/tags/3.1.7/src/Trigger.php

@@ -18 +18 @@
      * @var string
      */
-    private $name;
+    private string $name;
 
     /**
      * @var string
      */
-    private $slug;
+    private string $slug;
 
     /**
@@ -32 +32 @@
     private array $context = [];
 
+    /**
+     * The hook name of the filter which is used to modify the mails data
+     *
+     * @var string
+     */
     private string $mailHook;
 
@@ -47 +52 @@
         $this->term     = get_term_by( 'slug', $slug, Mail_Trigger_TAX::TAXONOMY_NAME ) ?: null;
 
-        add_filter( $this->mailHook, array( $this, 'addTriggerToHeader' ), 9, 1 );
+        if ($this->mailHook) {
+            add_filter( $this->mailHook, array( $this, 'addTriggerToHeader' ), 9, 1 );
+        }
     }
 
@@ -139 +146 @@
      * Adds template slug as header to mark the mails to be processed later
      *
-     * @param array|string $headers
+     * @param array $email
      *
      * @return array
      */
-    public function addTriggerToHeader( $headers ): array {
+    public function addTriggerToHeader( array $email ): array {
+
+        // Check if the passed argument is of the correct structure
+        if ( !isset( $email['to'] )
+             || ! isset( $email['subject'] )
+        ) {
+            return $email;
+        }
+
+        $headers = $email['headers'] ?? [];
 
         // Ensure string or array
-        if (!is_array($headers) && !is_string($headers)) {
-            return $headers;
-        }
-
-        // Exit early
-        if (empty($headers)) {
-            return $headers;
+        if ( ! is_array( $headers ) && ! is_string( $headers ) ) {
+            return $email;
         }
 
@@ -159 +170 @@
         }
 
-        $headers[] = "X-JUVO-ME-Trigger: {$this->getSlug()}";
+        $headers[]        = "X-JUVO-ME-Trigger: {$this->getSlug()}";
+        $email['headers'] = $headers;
 
-        return $headers;
-
+        return $email;
     }
 

juvo-mail-editor/tags/3.1.7/vendor/composer/installed.php

@@ -2 +2 @@
     'root' => array(
         'name' => 'juvo/mail-editor',
-        'pretty_version' => '3.1.6',
-        'version' => '3.1.6.0',
-        'reference' => '63ef9debafcac090a1f81e5eda29cc4fc8e270d7',
+        'pretty_version' => '3.1.7',
+        'version' => '3.1.7.0',
+        'reference' => '304d45081e1568c76425ca36a981a4ea72f4267c',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -30 +30 @@
         ),
         'juvo/mail-editor' => array(
-            'pretty_version' => '3.1.6',
-            'version' => '3.1.6.0',
-            'reference' => '63ef9debafcac090a1f81e5eda29cc4fc8e270d7',
+            'pretty_version' => '3.1.7',
+            'version' => '3.1.7.0',
+            'reference' => '304d45081e1568c76425ca36a981a4ea72f4267c',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',

juvo-mail-editor/trunk/juvo-mail-editor.php

@@ -8 +8 @@
  * Text Domain:     juvo-mail-editor
  * Domain Path:     /languages
- * Version:         3.1.6
- * Requires at least: 6.5
+ * Version:         3.1.7
+ * Requires at least: 6.2
  * Requires PHP: 7.4
  */

juvo-mail-editor/trunk/readme.txt

@@ -3 +3 @@
 Tags: mail,editor,framework
 License: GPLv2 or later
-Tested up to: 6.3
-Stable tag: 3.1.6
+Tested up to: 6.5
+Stable tag: 3.1.7
 
 JUVO Mail Editor helps to modify the standard WordPress Mailings and allows adding dynamic mail triggers.

juvo-mail-editor/trunk/src/Trigger.php

@@ -18 +18 @@
      * @var string
      */
-    private $name;
+    private string $name;
 
     /**
      * @var string
      */
-    private $slug;
+    private string $slug;
 
     /**
@@ -32 +32 @@
     private array $context = [];
 
+    /**
+     * The hook name of the filter which is used to modify the mails data
+     *
+     * @var string
+     */
     private string $mailHook;
 
@@ -47 +52 @@
         $this->term     = get_term_by( 'slug', $slug, Mail_Trigger_TAX::TAXONOMY_NAME ) ?: null;
 
-        add_filter( $this->mailHook, array( $this, 'addTriggerToHeader' ), 9, 1 );
+        if ($this->mailHook) {
+            add_filter( $this->mailHook, array( $this, 'addTriggerToHeader' ), 9, 1 );
+        }
     }
 
@@ -139 +146 @@
      * Adds template slug as header to mark the mails to be processed later
      *
-     * @param array|string $headers
+     * @param array $email
      *
      * @return array
      */
-    public function addTriggerToHeader( $headers ): array {
+    public function addTriggerToHeader( array $email ): array {
+
+        // Check if the passed argument is of the correct structure
+        if ( !isset( $email['to'] )
+             || ! isset( $email['subject'] )
+        ) {
+            return $email;
+        }
+
+        $headers = $email['headers'] ?? [];
 
         // Ensure string or array
-        if (!is_array($headers) && !is_string($headers)) {
-            return $headers;
-        }
-
-        // Exit early
-        if (empty($headers)) {
-            return $headers;
+        if ( ! is_array( $headers ) && ! is_string( $headers ) ) {
+            return $email;
         }
 
@@ -159 +170 @@
         }
 
-        $headers[] = "X-JUVO-ME-Trigger: {$this->getSlug()}";
+        $headers[]        = "X-JUVO-ME-Trigger: {$this->getSlug()}";
+        $email['headers'] = $headers;
 
-        return $headers;
-
+        return $email;
     }
 

juvo-mail-editor/trunk/vendor/composer/installed.php

@@ -2 +2 @@
     'root' => array(
         'name' => 'juvo/mail-editor',
-        'pretty_version' => '3.1.6',
-        'version' => '3.1.6.0',
-        'reference' => '63ef9debafcac090a1f81e5eda29cc4fc8e270d7',
+        'pretty_version' => '3.1.7',
+        'version' => '3.1.7.0',
+        'reference' => '304d45081e1568c76425ca36a981a4ea72f4267c',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -30 +30 @@
         ),
         'juvo/mail-editor' => array(
-            'pretty_version' => '3.1.6',
-            'version' => '3.1.6.0',
-            'reference' => '63ef9debafcac090a1f81e5eda29cc4fc8e270d7',
+            'pretty_version' => '3.1.7',
+            'version' => '3.1.7.0',
+            'reference' => '304d45081e1568c76425ca36a981a4ea72f4267c',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',