Changeset 2654150

Timestamp:

01/07/2022 11:34:52 AM (4 years ago)

Author:

juvodesign

Message:

Update to version 3.0.1 from GitHub

Location:

juvo-mail-editor

Files:

• tags/3.0.1 (copied) (copied from juvo-mail-editor/trunk)
• tags/3.0.1/juvo-mail-editor.php (modified) (1 diff)
• tags/3.0.1/readme.txt (modified) (1 diff)
• tags/3.0.1/src/Mail_Editor.php (modified) (2 diffs)
• tags/3.0.1/src/Mail_Generator.php (modified) (4 diffs)
• tags/3.0.1/src/Mails/Mail.php (modified) (1 diff)
• tags/3.0.1/src/Mails/New_User.php (modified) (3 diffs)
• tags/3.0.1/src/Mails/New_User_Admin.php (modified) (3 diffs)
• tags/3.0.1/src/Mails/New_User_Admin_Rest.php (modified) (3 diffs)
• tags/3.0.1/src/Mails/New_User_Rest.php (modified) (3 diffs)
• tags/3.0.1/src/Mails/Password_Changed.php (modified) (1 diff)
• tags/3.0.1/src/Mails/Password_Changed_Admin.php (modified) (2 diffs)
• tags/3.0.1/src/Mails/Password_Reset.php (modified) (1 diff)
• tags/3.0.1/src/Mails/Password_Reset_Admin.php (modified) (2 diffs)
• tags/3.0.1/src/Options_Page.php (modified) (3 diffs)
• tags/3.0.1/vendor/autoload.php (modified) (1 diff)
• tags/3.0.1/vendor/composer/autoload_files.php (modified) (1 diff)
• tags/3.0.1/vendor/composer/autoload_real.php (modified) (5 diffs)
• tags/3.0.1/vendor/composer/autoload_static.php (modified) (2 diffs)
• tags/3.0.1/vendor/composer/installed.php (modified) (2 diffs)
• trunk/juvo-mail-editor.php (modified) (1 diff)
• trunk/readme.txt (modified) (1 diff)
• trunk/src/Mail_Editor.php (modified) (2 diffs)
• trunk/src/Mail_Generator.php (modified) (4 diffs)
• trunk/src/Mails/Mail.php (modified) (1 diff)
• trunk/src/Mails/New_User.php (modified) (3 diffs)
• trunk/src/Mails/New_User_Admin.php (modified) (3 diffs)
• trunk/src/Mails/New_User_Admin_Rest.php (modified) (3 diffs)
• trunk/src/Mails/New_User_Rest.php (modified) (3 diffs)
• trunk/src/Mails/Password_Changed.php (modified) (1 diff)
• trunk/src/Mails/Password_Changed_Admin.php (modified) (2 diffs)
• trunk/src/Mails/Password_Reset.php (modified) (1 diff)
• trunk/src/Mails/Password_Reset_Admin.php (modified) (2 diffs)
• trunk/src/Options_Page.php (modified) (3 diffs)
• trunk/vendor/autoload.php (modified) (1 diff)
• trunk/vendor/composer/autoload_files.php (modified) (1 diff)
• trunk/vendor/composer/autoload_real.php (modified) (5 diffs)
• trunk/vendor/composer/autoload_static.php (modified) (2 diffs)
• trunk/vendor/composer/installed.php (modified) (2 diffs)

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

@@ -8 +8 @@
  * Text Domain:     juvo-mail-editor
  * Domain Path:     /languages
- * Version:         3.0.0
+ * Version:         3.0.1
  */
 

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

@@ -4 +4 @@
 License: GPLv2 or later
 Tested up to: 5.8
-Stable tag: 3.0.0
+Stable tag: 3.0.1
 
 JUVO Mail Editor helps to modify the standard WordPress Mailings and allows adding dynamic mail triggers.

juvo-mail-editor/tags/3.0.1/src/Mail_Editor.php

@@ -100 +100 @@
          */
         $options = new Options_Page();
-        $this->loader->add_action( 'cmb2_admin_init', $options, 'yourprefix_register_options_submenu_for_page_post_type' );
+        $this->loader->add_action( 'cmb2_admin_init', $options, 'registerOptionsPage' );
         $this->loader->add_action( 'wp_ajax_juvo-mail-editor-sync-triggers', $options, 'ajax_sync_triggers' );
 
@@ -127 +127 @@
          * New User Notification for enduser
          */
-        $newUser = new New_User();
-        $this->loader->add_filter( 'juvo_mail_editor_trigger', $newUser, 'registerTrigger' );
-        $this->loader->add_filter( 'juvo_mail_editor_post_metabox', $newUser, 'addCustomFields' );
-        $this->loader->add_action( 'wp_new_user_notification_email', $newUser, 'send', 10, 2 );
-
-        // Rest
-        $newUserRest = new New_User_Rest();
-        $this->loader->add_filter( 'juvo_mail_editor_trigger', $newUserRest, 'registerTrigger' );
-        $this->loader->add_filter( 'juvo_mail_editor_post_metabox', $newUserRest, 'addCustomFields' );
-        $this->loader->add_action( 'rest_insert_user', $newUserRest, 'send', 12, 1 );
+        $this->loader->add_action( 'wp_new_user_notification_email', new New_User(), 'send', 10, 2 );
+        $this->loader->add_action( 'rest_insert_user', new New_User_Rest(), 'send', 12, 1 ); // Rest
 
         /**
          * New User Notification Admin
          */
-        $newUserAdmin = new New_User_Admin();
-        $this->loader->add_filter( 'juvo_mail_editor_trigger', $newUserAdmin, 'registerTrigger' );
-        $this->loader->add_filter( 'juvo_mail_editor_post_metabox', $newUserAdmin, 'addCustomFields' );
-        $this->loader->add_action( 'wp_new_user_notification_email_admin', $newUserAdmin, 'send', 10, 2 );
-
-        // Rest
-        $newUserAdminRest = new New_User_Admin_Rest();
-        $this->loader->add_filter( 'juvo_mail_editor_trigger', $newUserAdminRest, 'registerTrigger' );
-        $this->loader->add_filter( 'juvo_mail_editor_post_metabox', $newUserAdminRest, 'addCustomFields' );
-        $this->loader->add_action( 'rest_insert_user', $newUserAdminRest, 'send', 12, 1 );
+        $this->loader->add_action( 'wp_new_user_notification_email_admin', new New_User_Admin(), 'send', 10, 2 );
+        $this->loader->add_action( 'rest_insert_user', new New_User_Admin_Rest(), 'send', 12, 1 ); // Rest
 
         /**
          * Password Reset
          */
-        $passwordReset = new Password_Reset();
-        $this->loader->add_filter( 'juvo_mail_editor_trigger', $passwordReset, 'registerTrigger' );
-        $this->loader->add_filter( 'juvo_mail_editor_post_metabox', $passwordReset, 'addCustomFields' );
-        $this->loader->add_filter( 'retrieve_password_message', $passwordReset, 'send', 10, 4 );
+        $this->loader->add_filter( 'retrieve_password_message', new Password_Reset(), 'send', 10, 4 );
 
         /**
          * Password Reset Admin
          */
-        $passwordResetAdmin = new Password_Reset_Admin();
-        $this->loader->add_filter( 'juvo_mail_editor_trigger', $passwordResetAdmin, 'registerTrigger' );
-        $this->loader->add_filter( 'juvo_mail_editor_post_metabox', $passwordResetAdmin, 'addCustomFields' );
-        $this->loader->add_filter( 'retrieve_password_message', $passwordResetAdmin, 'send', 99, 4 );
+        $this->loader->add_filter( 'retrieve_password_message', new Password_Reset_Admin(), 'send', 99, 4 );
 
         /**
          * Password Changed
          */
-        $passwordChanged = new Password_Changed();
-        $this->loader->add_filter( 'juvo_mail_editor_trigger', $passwordChanged, 'registerTrigger' );
-        $this->loader->add_filter( 'juvo_mail_editor_post_metabox', $passwordChanged, 'addCustomFields' );
-        $this->loader->add_filter( 'password_change_email', $passwordChanged, 'send', 10, 2 );
+        $this->loader->add_filter( 'password_change_email', new Password_Changed(), 'send', 10, 2 );
 
         /**
          * Password Changed Admin
          */
-        $passwordChangedAdmin = new Password_Changed_Admin();
-        $this->loader->add_filter( 'juvo_mail_editor_trigger', $passwordChangedAdmin, 'registerTrigger' );
-        $this->loader->add_filter( 'juvo_mail_editor_post_metabox', $passwordChangedAdmin, 'addCustomFields' );
-        $this->loader->add_filter( 'wp_password_change_notification_email', $passwordChangedAdmin, 'send', 10, 2 );
+        $this->loader->add_filter( 'wp_password_change_notification_email', new Password_Changed_Admin(), 'send', 10, 2 );
 
         /**

juvo-mail-editor/tags/3.0.1/src/Mail_Generator.php

@@ -12 +12 @@
     public function __construct() {
         add_filter( 'juvo_mail_editor_post_metabox', array( $this, 'addCustomFields' ) );
+        add_filter( 'juvo_mail_editor_trigger', array( $this, 'registerTrigger' ) );
 
         add_filter( "juvo_mail_editor_{$this->getTrigger()}_always_sent", array( $this, 'getAlwaysSent' ), 1, 0 );
@@ -28 +29 @@
         add_filter( "juvo_mail_editor_{$this->getTrigger()}_language", array( $this, 'getLanguage' ), 1, 2 );
     }
+
+    abstract protected function getTrigger(): string;
 
     abstract public function send( ...$params );
@@ -51 +54 @@
      * @return CMB2
      */
-    abstract public function addCustomFields( CMB2 $cmb ): CMB2;
+    public function addCustomFields( CMB2 $cmb ): CMB2 {
+        return $cmb;
+    } // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassAfterLastUsed
 
     public function postHasTrigger( CMB2_Field $field ): bool {
@@ -65 +70 @@
      * @phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter
      */
-    abstract public function getLanguage( string $language, array $context ): string; // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassAfterLastUsed
+    public function getLanguage( string $language, array $context ): string {
+        return $language;
+    }
 
     /**

juvo-mail-editor/tags/3.0.1/src/Mails/Mail.php

@@ -11 +11 @@
     public function getRecipient(): string;
 
-    public function getTrigger(): string;
-
     /**
      * Return default placeholder set

juvo-mail-editor/tags/3.0.1/src/Mails/New_User.php

@@ -3 +3 @@
 namespace JUVO_MailEditor\Mails;
 
-use CMB2;
 use JUVO_MailEditor\Mail_Generator;
 use JUVO_MailEditor\Relay;
@@ -12 +11 @@
     protected WP_User $user;
 
-    public function getTrigger(): string {
+    protected function getTrigger(): string {
         return 'new_user';
-    }
-
-    /**
-     * Add Custom Fields to metabox
-     *
-     * @param CMB2 $cmb
-     *
-     * @return CMB2
-     */
-    public function addCustomFields( CMB2 $cmb ): CMB2 {
-        return $cmb;
     }
 
@@ -94 +82 @@
         return $language;
     }
+
 }

juvo-mail-editor/tags/3.0.1/src/Mails/New_User_Admin.php

@@ -3 +3 @@
 namespace JUVO_MailEditor\Mails;
 
-use CMB2;
 use JUVO_MailEditor\Mail_Generator;
 use JUVO_MailEditor\Relay;
@@ -15 +14 @@
      * @return string
      */
-    public function getTrigger(): string {
+    protected function getTrigger(): string {
         return 'new_user_admin';
-    }
-
-    /**
-     * @param CMB2 $cmb
-     *
-     * @return CMB2
-     */
-    public function addCustomFields( CMB2 $cmb ): CMB2 {
-        return $cmb;
     }
 
@@ -78 +68 @@
         return true;
     }
-
-    public function getLanguage( string $language, array $context ): string {
-        return $language;
-    }
 }

juvo-mail-editor/tags/3.0.1/src/Mails/New_User_Admin_Rest.php

@@ -3 +3 @@
 namespace JUVO_MailEditor\Mails;
 
-use CMB2;
 use JUVO_MailEditor\Mail_Generator;
 use JUVO_MailEditor\Relay;
 
 class New_User_Admin_Rest extends Mail_Generator {
-
-    /**
-     * @param CMB2 $cmb
-     *
-     * @return CMB2
-     */
-    public function addCustomFields( CMB2 $cmb ): CMB2 {
-        return $cmb;
-    }
 
     public function send( ...$params ) {
@@ -37 +27 @@
      * @return string
      */
-    public function getTrigger(): string {
+    protected function getTrigger(): string {
         return 'new_user_admin_rest';
     }
@@ -71 +61 @@
         return false;
     }
-
-    public function getLanguage( string $language, array $context ): string {
-        return $language;
-    }
 }

juvo-mail-editor/tags/3.0.1/src/Mails/New_User_Rest.php

@@ -3 +3 @@
 namespace JUVO_MailEditor\Mails;
 
-use CMB2;
 use JUVO_MailEditor\Mail_Generator;
 use JUVO_MailEditor\Relay;
@@ -11 +10 @@
 
     protected WP_User $user;
-
-    /**
-     * Add Custom Fields to metabox
-     *
-     * @param CMB2 $cmb
-     *
-     * @return CMB2
-     */
-    public function addCustomFields( CMB2 $cmb ): CMB2 {
-        return $cmb;
-    }
 
     public function send( ...$params ) {
@@ -57 +45 @@
     }
 
-    public function getTrigger(): string {
+    protected function getTrigger(): string {
         return 'new_user_rest';
     }

juvo-mail-editor/tags/3.0.1/src/Mails/Password_Changed.php

@@ -21 +21 @@
     }
 
-    public function getTrigger(): string {
+    protected function getTrigger(): string {
         return 'password_changed';
     }

juvo-mail-editor/tags/3.0.1/src/Mails/Password_Changed_Admin.php

@@ -21 +21 @@
     }
 
-    public function getTrigger(): string {
+    protected function getTrigger(): string {
         return 'password_changed_admin';
     }
@@ -66 +66 @@
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function getLanguage( string $language, array $context ): string {
-        return $language;
-    }
-
     protected function setPlaceholderValues( WP_User $user, array $options = array() ): void {
     }

juvo-mail-editor/tags/3.0.1/src/Mails/Password_Reset.php

@@ -16 +16 @@
     protected string $key;
 
-    public function getTrigger(): string {
+    protected function getTrigger(): string {
         return 'password_reset';
     }

juvo-mail-editor/tags/3.0.1/src/Mails/Password_Reset_Admin.php

@@ -48 +48 @@
     }
 
-    public function getTrigger(): string {
+    protected function getTrigger(): string {
         return 'password_reset_admin';
     }
@@ -63 +63 @@
     }
 
-    public function getLanguage( string $language, array $context ): string {
-        return get_bloginfo( 'language' );
-    }
-
     protected function getName(): string {
         return 'Password Reset (Admin)';

juvo-mail-editor/tags/3.0.1/src/Options_Page.php

@@ -5 +5 @@
 class Options_Page {
 
-    public function yourprefix_register_options_submenu_for_page_post_type() {
+    public function registerOptionsPage() {
 
         /**
@@ -17 +17 @@
                 'option_key'   => 'settings',
                 'parent_slug'  => 'edit.php?post_type=' . Mails_PT::POST_TYPE_NAME,
-                'capability'   => 'post', // Cap required to view options-page.
-                'display_cb'   => array( $this, 'yourprefix_theme_options_page_output' ),
+                'capability'   => 'edit_pages', // Cap required to view options-page.
+                'display_cb'   => array( $this, 'mailEditorOptionsPageRender' ),
             )
         );
@@ -38 +38 @@
     }
 
-    public function yourprefix_theme_options_page_output( $hookup ) {
+    public function mailEditorOptionsPageRender( $hookup ) {
         // Output custom markup for the options-page.
         ?>

juvo-mail-editor/tags/3.0.1/vendor/autoload.php

@@ -5 +5 @@
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit674898f297032be810617af09893b8de::getLoader();
+return ComposerAutoloaderInit76482599c4a7f1e1877c9fc12cff0611::getLoader();

juvo-mail-editor/tags/3.0.1/vendor/composer/autoload_files.php

@@ -7 +7 @@
 
 return array(
+    '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
     '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
-    '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
 );

juvo-mail-editor/tags/3.0.1/vendor/composer/autoload_real.php

@@ -3 +3 @@
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit674898f297032be810617af09893b8de
+class ComposerAutoloaderInit76482599c4a7f1e1877c9fc12cff0611
 {
     private static $loader;
@@ -23 +23 @@
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit674898f297032be810617af09893b8de', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit76482599c4a7f1e1877c9fc12cff0611', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInit674898f297032be810617af09893b8de', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit76482599c4a7f1e1877c9fc12cff0611', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
@@ -31 +31 @@
             require __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit674898f297032be810617af09893b8de::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit76482599c4a7f1e1877c9fc12cff0611::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
@@ -52 +52 @@
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit674898f297032be810617af09893b8de::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit76482599c4a7f1e1877c9fc12cff0611::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire674898f297032be810617af09893b8de($fileIdentifier, $file);
+            composerRequire76482599c4a7f1e1877c9fc12cff0611($fileIdentifier, $file);
         }
 
@@ -64 +64 @@
 }
 
-function composerRequire674898f297032be810617af09893b8de($fileIdentifier, $file)
+function composerRequire76482599c4a7f1e1877c9fc12cff0611($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {

juvo-mail-editor/tags/3.0.1/vendor/composer/autoload_static.php

@@ -5 +5 @@
 namespace Composer\Autoload;
 
-class ComposerStaticInit674898f297032be810617af09893b8de
+class ComposerStaticInit76482599c4a7f1e1877c9fc12cff0611
 {
     public static $files = array (
+        '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
         '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
-        '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
     );
 
@@ -94 +94 @@
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit674898f297032be810617af09893b8de::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit674898f297032be810617af09893b8de::$prefixDirsPsr4;
-            $loader->fallbackDirsPsr4 = ComposerStaticInit674898f297032be810617af09893b8de::$fallbackDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit674898f297032be810617af09893b8de::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInit674898f297032be810617af09893b8de::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit76482599c4a7f1e1877c9fc12cff0611::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit76482599c4a7f1e1877c9fc12cff0611::$prefixDirsPsr4;
+            $loader->fallbackDirsPsr4 = ComposerStaticInit76482599c4a7f1e1877c9fc12cff0611::$fallbackDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit76482599c4a7f1e1877c9fc12cff0611::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInit76482599c4a7f1e1877c9fc12cff0611::$classMap;
 
         }, null, ClassLoader::class);

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

@@ -1 +1 @@
 <?php return array(
     'root' => array(
-        'pretty_version' => '3.0.0',
-        'version' => '3.0.0.0',
+        'pretty_version' => '3.0.1',
+        'version' => '3.0.1.0',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => 'da722589b432f877651467e2e28882824b947c75',
+        'reference' => '4d9364fb994ade9d09584753f64df3f53b155ccc',
         'name' => 'juvo/mail-editor',
         'dev' => false,
@@ -39 +39 @@
         ),
         'juvo/mail-editor' => array(
-            'pretty_version' => '3.0.0',
-            'version' => '3.0.0.0',
+            'pretty_version' => '3.0.1',
+            'version' => '3.0.1.0',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => 'da722589b432f877651467e2e28882824b947c75',
+            'reference' => '4d9364fb994ade9d09584753f64df3f53b155ccc',
             'dev_requirement' => false,
         ),

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

@@ -8 +8 @@
  * Text Domain:     juvo-mail-editor
  * Domain Path:     /languages
- * Version:         3.0.0
+ * Version:         3.0.1
  */
 

juvo-mail-editor/trunk/readme.txt

@@ -4 +4 @@
 License: GPLv2 or later
 Tested up to: 5.8
-Stable tag: 3.0.0
+Stable tag: 3.0.1
 
 JUVO Mail Editor helps to modify the standard WordPress Mailings and allows adding dynamic mail triggers.

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

@@ -100 +100 @@
          */
         $options = new Options_Page();
-        $this->loader->add_action( 'cmb2_admin_init', $options, 'yourprefix_register_options_submenu_for_page_post_type' );
+        $this->loader->add_action( 'cmb2_admin_init', $options, 'registerOptionsPage' );
         $this->loader->add_action( 'wp_ajax_juvo-mail-editor-sync-triggers', $options, 'ajax_sync_triggers' );
 
@@ -127 +127 @@
          * New User Notification for enduser
          */
-        $newUser = new New_User();
-        $this->loader->add_filter( 'juvo_mail_editor_trigger', $newUser, 'registerTrigger' );
-        $this->loader->add_filter( 'juvo_mail_editor_post_metabox', $newUser, 'addCustomFields' );
-        $this->loader->add_action( 'wp_new_user_notification_email', $newUser, 'send', 10, 2 );
-
-        // Rest
-        $newUserRest = new New_User_Rest();
-        $this->loader->add_filter( 'juvo_mail_editor_trigger', $newUserRest, 'registerTrigger' );
-        $this->loader->add_filter( 'juvo_mail_editor_post_metabox', $newUserRest, 'addCustomFields' );
-        $this->loader->add_action( 'rest_insert_user', $newUserRest, 'send', 12, 1 );
+        $this->loader->add_action( 'wp_new_user_notification_email', new New_User(), 'send', 10, 2 );
+        $this->loader->add_action( 'rest_insert_user', new New_User_Rest(), 'send', 12, 1 ); // Rest
 
         /**
          * New User Notification Admin
          */
-        $newUserAdmin = new New_User_Admin();
-        $this->loader->add_filter( 'juvo_mail_editor_trigger', $newUserAdmin, 'registerTrigger' );
-        $this->loader->add_filter( 'juvo_mail_editor_post_metabox', $newUserAdmin, 'addCustomFields' );
-        $this->loader->add_action( 'wp_new_user_notification_email_admin', $newUserAdmin, 'send', 10, 2 );
-
-        // Rest
-        $newUserAdminRest = new New_User_Admin_Rest();
-        $this->loader->add_filter( 'juvo_mail_editor_trigger', $newUserAdminRest, 'registerTrigger' );
-        $this->loader->add_filter( 'juvo_mail_editor_post_metabox', $newUserAdminRest, 'addCustomFields' );
-        $this->loader->add_action( 'rest_insert_user', $newUserAdminRest, 'send', 12, 1 );
+        $this->loader->add_action( 'wp_new_user_notification_email_admin', new New_User_Admin(), 'send', 10, 2 );
+        $this->loader->add_action( 'rest_insert_user', new New_User_Admin_Rest(), 'send', 12, 1 ); // Rest
 
         /**
          * Password Reset
          */
-        $passwordReset = new Password_Reset();
-        $this->loader->add_filter( 'juvo_mail_editor_trigger', $passwordReset, 'registerTrigger' );
-        $this->loader->add_filter( 'juvo_mail_editor_post_metabox', $passwordReset, 'addCustomFields' );
-        $this->loader->add_filter( 'retrieve_password_message', $passwordReset, 'send', 10, 4 );
+        $this->loader->add_filter( 'retrieve_password_message', new Password_Reset(), 'send', 10, 4 );
 
         /**
          * Password Reset Admin
          */
-        $passwordResetAdmin = new Password_Reset_Admin();
-        $this->loader->add_filter( 'juvo_mail_editor_trigger', $passwordResetAdmin, 'registerTrigger' );
-        $this->loader->add_filter( 'juvo_mail_editor_post_metabox', $passwordResetAdmin, 'addCustomFields' );
-        $this->loader->add_filter( 'retrieve_password_message', $passwordResetAdmin, 'send', 99, 4 );
+        $this->loader->add_filter( 'retrieve_password_message', new Password_Reset_Admin(), 'send', 99, 4 );
 
         /**
          * Password Changed
          */
-        $passwordChanged = new Password_Changed();
-        $this->loader->add_filter( 'juvo_mail_editor_trigger', $passwordChanged, 'registerTrigger' );
-        $this->loader->add_filter( 'juvo_mail_editor_post_metabox', $passwordChanged, 'addCustomFields' );
-        $this->loader->add_filter( 'password_change_email', $passwordChanged, 'send', 10, 2 );
+        $this->loader->add_filter( 'password_change_email', new Password_Changed(), 'send', 10, 2 );
 
         /**
          * Password Changed Admin
          */
-        $passwordChangedAdmin = new Password_Changed_Admin();
-        $this->loader->add_filter( 'juvo_mail_editor_trigger', $passwordChangedAdmin, 'registerTrigger' );
-        $this->loader->add_filter( 'juvo_mail_editor_post_metabox', $passwordChangedAdmin, 'addCustomFields' );
-        $this->loader->add_filter( 'wp_password_change_notification_email', $passwordChangedAdmin, 'send', 10, 2 );
+        $this->loader->add_filter( 'wp_password_change_notification_email', new Password_Changed_Admin(), 'send', 10, 2 );
 
         /**

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

@@ -12 +12 @@
     public function __construct() {
         add_filter( 'juvo_mail_editor_post_metabox', array( $this, 'addCustomFields' ) );
+        add_filter( 'juvo_mail_editor_trigger', array( $this, 'registerTrigger' ) );
 
         add_filter( "juvo_mail_editor_{$this->getTrigger()}_always_sent", array( $this, 'getAlwaysSent' ), 1, 0 );
@@ -28 +29 @@
         add_filter( "juvo_mail_editor_{$this->getTrigger()}_language", array( $this, 'getLanguage' ), 1, 2 );
     }
+
+    abstract protected function getTrigger(): string;
 
     abstract public function send( ...$params );
@@ -51 +54 @@
      * @return CMB2
      */
-    abstract public function addCustomFields( CMB2 $cmb ): CMB2;
+    public function addCustomFields( CMB2 $cmb ): CMB2 {
+        return $cmb;
+    } // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassAfterLastUsed
 
     public function postHasTrigger( CMB2_Field $field ): bool {
@@ -65 +70 @@
      * @phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter
      */
-    abstract public function getLanguage( string $language, array $context ): string; // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassAfterLastUsed
+    public function getLanguage( string $language, array $context ): string {
+        return $language;
+    }
 
     /**

juvo-mail-editor/trunk/src/Mails/Mail.php

@@ -11 +11 @@
     public function getRecipient(): string;
 
-    public function getTrigger(): string;
-
     /**
      * Return default placeholder set

juvo-mail-editor/trunk/src/Mails/New_User.php

@@ -3 +3 @@
 namespace JUVO_MailEditor\Mails;
 
-use CMB2;
 use JUVO_MailEditor\Mail_Generator;
 use JUVO_MailEditor\Relay;
@@ -12 +11 @@
     protected WP_User $user;
 
-    public function getTrigger(): string {
+    protected function getTrigger(): string {
         return 'new_user';
-    }
-
-    /**
-     * Add Custom Fields to metabox
-     *
-     * @param CMB2 $cmb
-     *
-     * @return CMB2
-     */
-    public function addCustomFields( CMB2 $cmb ): CMB2 {
-        return $cmb;
     }
 
@@ -94 +82 @@
         return $language;
     }
+
 }

juvo-mail-editor/trunk/src/Mails/New_User_Admin.php

@@ -3 +3 @@
 namespace JUVO_MailEditor\Mails;
 
-use CMB2;
 use JUVO_MailEditor\Mail_Generator;
 use JUVO_MailEditor\Relay;
@@ -15 +14 @@
      * @return string
      */
-    public function getTrigger(): string {
+    protected function getTrigger(): string {
         return 'new_user_admin';
-    }
-
-    /**
-     * @param CMB2 $cmb
-     *
-     * @return CMB2
-     */
-    public function addCustomFields( CMB2 $cmb ): CMB2 {
-        return $cmb;
     }
 
@@ -78 +68 @@
         return true;
     }
-
-    public function getLanguage( string $language, array $context ): string {
-        return $language;
-    }
 }

juvo-mail-editor/trunk/src/Mails/New_User_Admin_Rest.php

@@ -3 +3 @@
 namespace JUVO_MailEditor\Mails;
 
-use CMB2;
 use JUVO_MailEditor\Mail_Generator;
 use JUVO_MailEditor\Relay;
 
 class New_User_Admin_Rest extends Mail_Generator {
-
-    /**
-     * @param CMB2 $cmb
-     *
-     * @return CMB2
-     */
-    public function addCustomFields( CMB2 $cmb ): CMB2 {
-        return $cmb;
-    }
 
     public function send( ...$params ) {
@@ -37 +27 @@
      * @return string
      */
-    public function getTrigger(): string {
+    protected function getTrigger(): string {
         return 'new_user_admin_rest';
     }
@@ -71 +61 @@
         return false;
     }
-
-    public function getLanguage( string $language, array $context ): string {
-        return $language;
-    }
 }

juvo-mail-editor/trunk/src/Mails/New_User_Rest.php

@@ -3 +3 @@
 namespace JUVO_MailEditor\Mails;
 
-use CMB2;
 use JUVO_MailEditor\Mail_Generator;
 use JUVO_MailEditor\Relay;
@@ -11 +10 @@
 
     protected WP_User $user;
-
-    /**
-     * Add Custom Fields to metabox
-     *
-     * @param CMB2 $cmb
-     *
-     * @return CMB2
-     */
-    public function addCustomFields( CMB2 $cmb ): CMB2 {
-        return $cmb;
-    }
 
     public function send( ...$params ) {
@@ -57 +45 @@
     }
 
-    public function getTrigger(): string {
+    protected function getTrigger(): string {
         return 'new_user_rest';
     }

juvo-mail-editor/trunk/src/Mails/Password_Changed.php

@@ -21 +21 @@
     }
 
-    public function getTrigger(): string {
+    protected function getTrigger(): string {
         return 'password_changed';
     }

juvo-mail-editor/trunk/src/Mails/Password_Changed_Admin.php

@@ -21 +21 @@
     }
 
-    public function getTrigger(): string {
+    protected function getTrigger(): string {
         return 'password_changed_admin';
     }
@@ -66 +66 @@
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function getLanguage( string $language, array $context ): string {
-        return $language;
-    }
-
     protected function setPlaceholderValues( WP_User $user, array $options = array() ): void {
     }

juvo-mail-editor/trunk/src/Mails/Password_Reset.php

@@ -16 +16 @@
     protected string $key;
 
-    public function getTrigger(): string {
+    protected function getTrigger(): string {
         return 'password_reset';
     }

juvo-mail-editor/trunk/src/Mails/Password_Reset_Admin.php

@@ -48 +48 @@
     }
 
-    public function getTrigger(): string {
+    protected function getTrigger(): string {
         return 'password_reset_admin';
     }
@@ -63 +63 @@
     }
 
-    public function getLanguage( string $language, array $context ): string {
-        return get_bloginfo( 'language' );
-    }
-
     protected function getName(): string {
         return 'Password Reset (Admin)';

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

@@ -5 +5 @@
 class Options_Page {
 
-    public function yourprefix_register_options_submenu_for_page_post_type() {
+    public function registerOptionsPage() {
 
         /**
@@ -17 +17 @@
                 'option_key'   => 'settings',
                 'parent_slug'  => 'edit.php?post_type=' . Mails_PT::POST_TYPE_NAME,
-                'capability'   => 'post', // Cap required to view options-page.
-                'display_cb'   => array( $this, 'yourprefix_theme_options_page_output' ),
+                'capability'   => 'edit_pages', // Cap required to view options-page.
+                'display_cb'   => array( $this, 'mailEditorOptionsPageRender' ),
             )
         );
@@ -38 +38 @@
     }
 
-    public function yourprefix_theme_options_page_output( $hookup ) {
+    public function mailEditorOptionsPageRender( $hookup ) {
         // Output custom markup for the options-page.
         ?>

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

@@ -5 +5 @@
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit674898f297032be810617af09893b8de::getLoader();
+return ComposerAutoloaderInit76482599c4a7f1e1877c9fc12cff0611::getLoader();

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

@@ -7 +7 @@
 
 return array(
+    '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
     '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
-    '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
 );

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

@@ -3 +3 @@
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit674898f297032be810617af09893b8de
+class ComposerAutoloaderInit76482599c4a7f1e1877c9fc12cff0611
 {
     private static $loader;
@@ -23 +23 @@
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit674898f297032be810617af09893b8de', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit76482599c4a7f1e1877c9fc12cff0611', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInit674898f297032be810617af09893b8de', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit76482599c4a7f1e1877c9fc12cff0611', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
@@ -31 +31 @@
             require __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit674898f297032be810617af09893b8de::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit76482599c4a7f1e1877c9fc12cff0611::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
@@ -52 +52 @@
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit674898f297032be810617af09893b8de::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit76482599c4a7f1e1877c9fc12cff0611::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire674898f297032be810617af09893b8de($fileIdentifier, $file);
+            composerRequire76482599c4a7f1e1877c9fc12cff0611($fileIdentifier, $file);
         }
 
@@ -64 +64 @@
 }
 
-function composerRequire674898f297032be810617af09893b8de($fileIdentifier, $file)
+function composerRequire76482599c4a7f1e1877c9fc12cff0611($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {

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

@@ -5 +5 @@
 namespace Composer\Autoload;
 
-class ComposerStaticInit674898f297032be810617af09893b8de
+class ComposerStaticInit76482599c4a7f1e1877c9fc12cff0611
 {
     public static $files = array (
+        '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
         '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
-        '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
     );
 
@@ -94 +94 @@
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit674898f297032be810617af09893b8de::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit674898f297032be810617af09893b8de::$prefixDirsPsr4;
-            $loader->fallbackDirsPsr4 = ComposerStaticInit674898f297032be810617af09893b8de::$fallbackDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit674898f297032be810617af09893b8de::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInit674898f297032be810617af09893b8de::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit76482599c4a7f1e1877c9fc12cff0611::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit76482599c4a7f1e1877c9fc12cff0611::$prefixDirsPsr4;
+            $loader->fallbackDirsPsr4 = ComposerStaticInit76482599c4a7f1e1877c9fc12cff0611::$fallbackDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit76482599c4a7f1e1877c9fc12cff0611::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInit76482599c4a7f1e1877c9fc12cff0611::$classMap;
 
         }, null, ClassLoader::class);

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

@@ -1 +1 @@
 <?php return array(
     'root' => array(
-        'pretty_version' => '3.0.0',
-        'version' => '3.0.0.0',
+        'pretty_version' => '3.0.1',
+        'version' => '3.0.1.0',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => 'da722589b432f877651467e2e28882824b947c75',
+        'reference' => '4d9364fb994ade9d09584753f64df3f53b155ccc',
         'name' => 'juvo/mail-editor',
         'dev' => false,
@@ -39 +39 @@
         ),
         'juvo/mail-editor' => array(
-            'pretty_version' => '3.0.0',
-            'version' => '3.0.0.0',
+            'pretty_version' => '3.0.1',
+            'version' => '3.0.1.0',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => 'da722589b432f877651467e2e28882824b947c75',
+            'reference' => '4d9364fb994ade9d09584753f64df3f53b155ccc',
             'dev_requirement' => false,
         ),