← All changes | plugin-loader.php +20 -53 2.11.1 → 1.4.2 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,12 @@
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		-use SRFM\Inc\Compatibility\Themes\Astra;
28	22	use SRFM\Inc\Create_New_Form;
29	23	use SRFM\Inc\Database\Register as DatabaseRegister;
30		-use SRFM\Inc\Duplicate_Form;
31	24	use SRFM\Inc\Events_Scheduler;
32	25	use SRFM\Inc\Export;
33		-use SRFM\Inc\Form_Restriction;
34	26	use SRFM\Inc\Form_Submit;
35	27	use SRFM\Inc\Forms_Data;
36	28	use SRFM\Inc\Frontend_Assets;
37	29	use SRFM\Inc\Generate_Form_Markup;
		@@ -36,22 +28,16 @@
36	28	use SRFM\Inc\Frontend_Assets;
37	29	use SRFM\Inc\Generate_Form_Markup;
38	30	use SRFM\Inc\Global_Settings\Email_Summary;
39	31	use SRFM\Inc\Global_Settings\Global_Settings;
40		-use SRFM\Inc\Global_Settings\Global_Settings_Defaults;
41	32	use SRFM\Inc\Gutenberg_Hooks;
42	33	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;
	34	+use SRFM\Inc\Lib\SRFM_Nps_Survey;
	35	+use SRFM\Inc\Nps_Notice;
48	36	use SRFM\Inc\Page_Builders\Page_Builders;
49		-use SRFM\Inc\Payments\Payments;
50	37	use SRFM\Inc\Post_Types;
51	38	use SRFM\Inc\Rest_Api;
52	39	use SRFM\Inc\Single_Form_Settings\Compliance_Settings;
53		-use SRFM\Inc\Single_Form_Settings\Form_Settings_Api;
54	40	use SRFM\Inc\Smart_Tags;
55	41	use SRFM\Inc\Updater;
56	42
57	43	if ( ! defined( 'ABSPATH' ) ) {
		@@ -150,24 +136,18 @@
150	136	[ '', '$1-$2', '-', DIRECTORY_SEPARATOR ],
151	137	$class
152	138	);
153	139
154		- if ( ! is_string( $filename ) ) {
155		- return;
156		- }
	140	+ if ( is_string( $filename ) ) {
157	141
158		- // Check for directory traversal.
159		- if ( strpos( $filename, '..' ) !== false ) {
160		- return;
161		- }
	142	+ $filename = strtolower( $filename );
162	143
163		- $filename = strtolower( $filename );
	144	+ $file = SRFM_DIR . $filename . '.php';
164	145
165		- $file = SRFM_DIR . $filename . '.php';
166		-
167		- // if the file is readable, include it.
168		- if ( is_readable( $file ) ) {
169		- require_once $file;
	146	+ // if the file is readable, include it.
	147	+ if ( is_readable( $file ) ) {
	148	+ require_once $file;
	149	+ }
170	150	}
171	151	}
172	152
173	153	/**
		@@ -218,20 +198,9 @@
218	198
219	199	Register::get_instance();
220	200	if ( is_admin() ) {
221	201	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	202	}
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	203	}
235	204
236	205	/**
237	206	* Load Plugin Text Domain.
		@@ -296,8 +265,9 @@
296	265	*/
297	266	public function load_plugin() {
298	267	Post_Types::get_instance();
299	268	Form_Submit::get_instance();
	269	+ Block_Patterns::get_instance();
300	270	Gutenberg_Hooks::get_instance();
301	271	Frontend_Assets::get_instance();
302	272	Helper::get_instance();
303	273	Activator::get_instance();
		@@ -307,12 +277,10 @@
307	277	Smart_Tags::get_instance();
308	278	Generate_Form_Markup::get_instance();
309	279	Create_New_Form::get_instance();
310	280	Global_Settings::get_instance();
311		- Global_Settings_Defaults::get_instance();
312	281	Email_Summary::get_instance();
313	282	Compliance_Settings::get_instance();
314		- Form_Settings_Api::get_instance();
315	283	Events_Scheduler::get_instance();
316	284	AI_Form_Builder::get_instance();
317	285	Field_Mapping::get_instance();
318	286	Background_Process::get_instance();
		@@ -317,22 +285,21 @@
317	285	Field_Mapping::get_instance();
318	286	Background_Process::get_instance();
319	287	Page_Builders::get_instance();
320	288	Rest_Api::get_instance();
321		- // region: form-migration — Phase P1 foundation.
322		- Migrator_Bootstrap::get_instance();
323		- // endregion: form-migration.
324	289	AI_Helper::get_instance();
325	290	AI_Auth::get_instance();
326	291	Updater::get_instance();
327		- Onboarding::get_instance();
328	292	DatabaseRegister::init();
329		- Form_Restriction::get_instance();
330		- Abilities_Registrar::get_instance();
331		- // Initializing Compatibilities.
332		- Astra::get_instance();
333		- Multilingual_Manager::get_instance();
334		- String_Collector::get_instance();
	293	+ /**
	294	+ * Required to add the if check for the class existence to resolve phpstan error,
	295	+ * as the phpstan configuration ignores the inc/lib directory which gives error
	296	+ * unknown class.
	297	+ */
	298	+ if ( class_exists( 'SRFM\Inc\Lib\SRFM_Nps_Survey' ) && ! apply_filters( 'srfm_disable_nps_survey', false ) ) {
	299	+ SRFM_Nps_Survey::get_instance(); // Inits the NPS Survey class for which inits the NPS Survey plugin.
	300	+ Nps_Notice::get_instance(); // Responsible for displaying the NPS Survey: keeping the line out of the check will also work.
	301	+ }
335	302
336	303	/**
337	304	* Load core files necessary for the Spectra block.
338	305	* This method is called in the Spectra block loader to ensure core files are loaded during the 'plugins_loaded' action.