← All changes | plugin-loader.php +20 -50 2.11.0 → 1.7.4 View file →

		@@ -9,13 +9,10 @@
9	9	namespace SRFM;
10	10
11	11	use SRFM\Admin\Admin;
12	12	use SRFM\Admin\Analytics;
13		-use SRFM\Admin\Notice_Manager;
14		-use SRFM\Inc\Abilities\Abilities_Registrar;
	13	+use SRFM\API\Block_Patterns;
15	14	use SRFM\Inc\Activator;
16		-use SRFM\Inc\Admin\Editor_Nudge;
17		-use SRFM\Inc\Admin\Html_Form_Detector;
18	15	use SRFM\Inc\Admin_Ajax;
19	16	use SRFM\Inc\AI_Form_Builder\AI_Auth;
20	17	use SRFM\Inc\AI_Form_Builder\AI_Form_Builder;
21	18	use SRFM\Inc\AI_Form_Builder\AI_Helper;
		@@ -21,17 +18,13 @@
21	18	use SRFM\Inc\AI_Form_Builder\AI_Helper;
22	19	use SRFM\Inc\AI_Form_Builder\Field_Mapping;
23	20	use SRFM\Inc\Background_Process;
24	21	use SRFM\Inc\Blocks\Register;
25		-use SRFM\Inc\Compatibility\Multilingual\Multilingual_Manager;
26		-use SRFM\Inc\Compatibility\Multilingual\String_Collector;
27	22	use SRFM\Inc\Compatibility\Themes\Astra;
28	23	use SRFM\Inc\Create_New_Form;
29	24	use SRFM\Inc\Database\Register as DatabaseRegister;
30		-use SRFM\Inc\Duplicate_Form;
31	25	use SRFM\Inc\Events_Scheduler;
32	26	use SRFM\Inc\Export;
33		-use SRFM\Inc\Form_Restriction;
34	27	use SRFM\Inc\Form_Submit;
35	28	use SRFM\Inc\Forms_Data;
36	29	use SRFM\Inc\Frontend_Assets;
37	30	use SRFM\Inc\Generate_Form_Markup;
		@@ -36,22 +29,16 @@
36	29	use SRFM\Inc\Frontend_Assets;
37	30	use SRFM\Inc\Generate_Form_Markup;
38	31	use SRFM\Inc\Global_Settings\Email_Summary;
39	32	use SRFM\Inc\Global_Settings\Global_Settings;
40		-use SRFM\Inc\Global_Settings\Global_Settings_Defaults;
41	33	use SRFM\Inc\Gutenberg_Hooks;
42	34	use SRFM\Inc\Helper;
43		-use SRFM\Inc\Learn;
44		-// region: form-migration — Phase P1 foundation.
45		-use SRFM\Inc\Migrator\Bootstrap as Migrator_Bootstrap;
46		-// endregion: form-migration.
47		-use SRFM\Inc\Onboarding;
	35	+use SRFM\Inc\Lib\SRFM_Nps_Survey;
	36	+use SRFM\Inc\Nps_Notice;
48	37	use SRFM\Inc\Page_Builders\Page_Builders;
49		-use SRFM\Inc\Payments\Payments;
50	38	use SRFM\Inc\Post_Types;
51	39	use SRFM\Inc\Rest_Api;
52	40	use SRFM\Inc\Single_Form_Settings\Compliance_Settings;
53		-use SRFM\Inc\Single_Form_Settings\Form_Settings_Api;
54	41	use SRFM\Inc\Smart_Tags;
55	42	use SRFM\Inc\Updater;
56	43
57	44	if ( ! defined( 'ABSPATH' ) ) {
		@@ -150,24 +137,18 @@
150	137	[ '', '$1-$2', '-', DIRECTORY_SEPARATOR ],
151	138	$class
152	139	);
153	140
154		- if ( ! is_string( $filename ) ) {
155		- return;
156		- }
	141	+ if ( is_string( $filename ) ) {
157	142
158		- // Check for directory traversal.
159		- if ( strpos( $filename, '..' ) !== false ) {
160		- return;
161		- }
	143	+ $filename = strtolower( $filename );
162	144
163		- $filename = strtolower( $filename );
	145	+ $file = SRFM_DIR . $filename . '.php';
164	146
165		- $file = SRFM_DIR . $filename . '.php';
166		-
167		- // if the file is readable, include it.
168		- if ( is_readable( $file ) ) {
169		- require_once $file;
	147	+ // if the file is readable, include it.
	148	+ if ( is_readable( $file ) ) {
	149	+ require_once $file;
	150	+ }
170	151	}
171	152	}
172	153
173	154	/**
		@@ -218,20 +199,9 @@
218	199
219	200	Register::get_instance();
220	201	if ( is_admin() ) {
221	202	Admin::get_instance();
222		- // phpcs:ignore /** @phpstan-ignore-next-line */ -- Class is loaded dynamically in WordPress
223		- Notice_Manager::get_instance();
224		- Editor_Nudge::get_instance();
225	203	}
226		- // Always instantiate — script enqueue is self-gated by `allow_load()`,
227		- // while the REST endpoint for converting HTML forms must register
228		- // outside the admin context (REST dispatch runs with `is_admin()` ===
229		- // false, so admin-only instantiation would 404 the endpoint).
230		- Html_Form_Detector::get_instance();
231		- Payments::get_instance();
232		- Duplicate_Form::get_instance();
233		- Learn::get_instance();
234	204	}
235	205
236	206	/**
237	207	* Load Plugin Text Domain.
		@@ -296,8 +266,9 @@
296	266	*/
297	267	public function load_plugin() {
298	268	Post_Types::get_instance();
299	269	Form_Submit::get_instance();
	270	+ Block_Patterns::get_instance();
300	271	Gutenberg_Hooks::get_instance();
301	272	Frontend_Assets::get_instance();
302	273	Helper::get_instance();
303	274	Activator::get_instance();
		@@ -307,12 +278,10 @@
307	278	Smart_Tags::get_instance();
308	279	Generate_Form_Markup::get_instance();
309	280	Create_New_Form::get_instance();
310	281	Global_Settings::get_instance();
311		- Global_Settings_Defaults::get_instance();
312	282	Email_Summary::get_instance();
313	283	Compliance_Settings::get_instance();
314		- Form_Settings_Api::get_instance();
315	284	Events_Scheduler::get_instance();
316	285	AI_Form_Builder::get_instance();
317	286	Field_Mapping::get_instance();
318	287	Background_Process::get_instance();
		@@ -317,22 +286,23 @@
317	286	Field_Mapping::get_instance();
318	287	Background_Process::get_instance();
319	288	Page_Builders::get_instance();
320	289	Rest_Api::get_instance();
321		- // region: form-migration — Phase P1 foundation.
322		- Migrator_Bootstrap::get_instance();
323		- // endregion: form-migration.
324	290	AI_Helper::get_instance();
325	291	AI_Auth::get_instance();
326	292	Updater::get_instance();
327		- Onboarding::get_instance();
328	293	DatabaseRegister::init();
329		- Form_Restriction::get_instance();
330		- Abilities_Registrar::get_instance();
331	294	// Initializing Compatibilities.
332	295	Astra::get_instance();
333		- Multilingual_Manager::get_instance();
334		- String_Collector::get_instance();
	296	+ /**
	297	+ * Required to add the if check for the class existence to resolve phpstan error,
	298	+ * as the phpstan configuration ignores the inc/lib directory which gives error
	299	+ * unknown class.
	300	+ */
	301	+ if ( class_exists( 'SRFM\Inc\Lib\SRFM_Nps_Survey' ) && ! apply_filters( 'srfm_disable_nps_survey', false ) ) {
	302	+ SRFM_Nps_Survey::get_instance(); // Inits the NPS Survey class for which inits the NPS Survey plugin.
	303	+ Nps_Notice::get_instance(); // Responsible for displaying the NPS Survey: keeping the line out of the check will also work.
	304	+ }
335	305
336	306	/**
337	307	* Load core files necessary for the Spectra block.
338	308	* This method is called in the Spectra block loader to ensure core files are loaded during the 'plugins_loaded' action.