Use WP Contained Hook

composer.json

@@ -36,6 +36,7 @@
         "typisttech/cloudflare-wp-api": "^0.3.0",
         "typisttech/imposter-plugin": "^0.2.5",
         "typisttech/wp-better-settings": "^0.11.0",
+        "typisttech/wp-contained-hook": "^0.1.0",
         "yoast/i18n-module": "^2.0"
     },
     "require-dev": {

src/Admin.php

@@ -26,6 +26,7 @@
 use TypistTech\WPCFG\Vendor\TypistTech\WPBetterSettings\Pages\SubmenuPage;
 use TypistTech\WPCFG\Vendor\TypistTech\WPBetterSettings\Section;
 use TypistTech\WPCFG\Vendor\TypistTech\WPBetterSettings\SettingRegister;
+use TypistTech\WPCFG\Vendor\TypistTech\WPContainedHook\Action;
 
 /**
  * Final class Admin.
@@ -71,8 +72,8 @@ public function __construct(OptionStore $optionStore)
     public static function getHooks(): array
     {
         return [
-            new Action(__CLASS__, 'admin_menu', 'registerPages'),
-            new Action(__CLASS__, 'admin_init', 'registerSettings'),
+            new Action('admin_menu', __CLASS__, 'registerPages'),
+            new Action('admin_init', __CLASS__, 'registerSettings'),
         ];
     }
 

src/Ads/I18nPromoter.php

@@ -20,10 +20,10 @@
 
 namespace TypistTech\WPCFG\Ads;
 
-use TypistTech\WPCFG\Action;
 use TypistTech\WPCFG\Admin;
 use TypistTech\WPCFG\Container;
 use TypistTech\WPCFG\LoadableInterface;
+use TypistTech\WPCFG\Vendor\TypistTech\WPContainedHook\Action;
 use TypistTech\WPCFG\Vendor\Yoast_I18n_WordPressOrg_v2;
 
 /**
@@ -63,7 +63,7 @@ public function __construct(Admin $admin, Container $container)
     public static function getHooks(): array
     {
         return [
-            new Action(__CLASS__, 'admin_menu', 'addYoastI18nModuleToMenuPages', 20),
+            new Action('admin_menu', __CLASS__, 'addYoastI18nModuleToMenuPages'),
         ];
     }
 

src/BadLogin/Admin.php

@@ -20,11 +20,11 @@
 
 namespace TypistTech\WPCFG\BadLogin;
 
-use TypistTech\WPCFG\Filter;
 use TypistTech\WPCFG\LoadableInterface;
 use TypistTech\WPCFG\Vendor\TypistTech\WPBetterSettings\Fields\Textarea;
 use TypistTech\WPCFG\Vendor\TypistTech\WPBetterSettings\Pages\SubmenuPage;
 use TypistTech\WPCFG\Vendor\TypistTech\WPBetterSettings\Section;
+use TypistTech\WPCFG\Vendor\TypistTech\WPContainedHook\Filter;
 
 /**
  * Final class Admin.
@@ -39,8 +39,8 @@ final class Admin implements LoadableInterface
     public static function getHooks(): array
     {
         return [
-            new Filter(__CLASS__, 'wpcfg_pages', 'addPage'),
-            new Filter(__CLASS__, 'wpcfg_settings_sections', 'addSettingsSection'),
+            new Filter('wpcfg_pages', __CLASS__, 'addPage'),
+            new Filter('wpcfg_settings_sections', __CLASS__, 'addSettingsSection'),
         ];
     }
 

src/BadLogin/BadLogin.php

@@ -20,11 +20,11 @@
 
 namespace TypistTech\WPCFG\BadLogin;
 
-use TypistTech\WPCFG\Action;
 use TypistTech\WPCFG\Blacklist\Event;
 use TypistTech\WPCFG\Container;
 use TypistTech\WPCFG\LoadableInterface;
 use TypistTech\WPCFG\OptionStore;
+use TypistTech\WPCFG\Vendor\TypistTech\WPContainedHook\Action;
 
 /**
  * Final class BadLogin.
@@ -65,7 +65,7 @@ public function __construct(OptionStore $optionStore, Container $container)
     public static function getHooks(): array
     {
         return [
-            new Action(__CLASS__, 'wp_authenticate', 'emitBlacklistEventIfBadUsername'),
+            new Action('wp_authenticate', __CLASS__, 'emitBlacklistEventIfBadUsername'),
         ];
     }
 

src/Blacklist/Handler.php

@@ -20,10 +20,10 @@
 
 namespace TypistTech\WPCFG\Blacklist;
 
-use TypistTech\WPCFG\Action;
 use TypistTech\WPCFG\Cloudflare\AccessRules;
 use TypistTech\WPCFG\LoadableInterface;
 use TypistTech\WPCFG\OptionStore;
+use TypistTech\WPCFG\Vendor\TypistTech\WPContainedHook\Action;
 
 /**
  * Final class Handler.
@@ -64,7 +64,7 @@ public function __construct(OptionStore $optionStore, AccessRules $accessRules)
     public static function getHooks(): array
     {
         return [
-            new Action(__CLASS__, 'wpcfg_blacklist', 'handleBlacklist'),
+            new Action('wpcfg_blacklist', __CLASS__, 'handleBlacklist'),
         ];
     }