← All changes | includes/autoloader.php +38 -44 4.2.1 → 3.2.0 View file →

		@@ -127,9 +127,8 @@
127	127	'Fonts' => 'includes/fonts.php',
128	128	'Frontend' => 'includes/frontend.php',
129	129	'Group_Control_Base' => 'includes/controls/groups/base.php',
130	130	'Group_Control_Interface' => 'includes/interfaces/group-control.php',
131		- 'Has_Validation' => 'includes/interfaces/has-validation.php',
132	131	'Heartbeat' => 'includes/heartbeat.php',
133	132	'Images_Manager' => 'includes/managers/image.php',
134	133	'Maintenance' => 'includes/maintenance.php',
135	134	'Maintenance_Mode' => 'includes/maintenance-mode.php',
		@@ -144,21 +143,15 @@
144	143	'Icons_Manager' => 'includes/managers/icons.php',
145	144	'Stylesheet' => 'includes/stylesheet.php',
146	145	'System_Info\Main' => 'includes/settings/system-info/main.php',
147	146	'TemplateLibrary\Classes\Import_Images' => 'includes/template-library/classes/class-import-images.php',
148		- 'TemplateLibrary\Classes\Media_Collector' => 'includes/template-library/classes/class-media-collector.php',
149		- 'TemplateLibrary\Classes\Media_Mapper' => 'includes/template-library/classes/class-media-mapper.php',
150		- 'TemplateLibrary\Forms\New_Template_Form' => 'includes/template-library/forms/new-template-form.php',
151	147	'TemplateLibrary\Manager' => 'includes/template-library/manager.php',
152	148	'TemplateLibrary\Source_Base' => 'includes/template-library/sources/base.php',
153	149	'TemplateLibrary\Source_Local' => 'includes/template-library/sources/local.php',
154	150	'TemplateLibrary\Source_Remote' => 'includes/template-library/sources/remote.php',
155		- 'TemplateLibrary\Source_Cloud' => 'includes/template-library/sources/cloud.php',
156	151	'Tools' => 'includes/settings/tools.php',
157		- 'Container\Container' => 'includes/container/container.php',
158	152	'Tracker' => 'includes/tracker.php',
159	153	'User' => 'includes/user.php',
160		- 'User_Data' => 'includes/user-data.php',
161	154	'Utils' => 'includes/utils.php',
162	155	'Widget_WordPress' => 'includes/widgets/wordpress.php',
163	156	'Widgets_Manager' => 'includes/managers/widgets.php',
164	157	'WordPress_Widgets_Manager' => 'includes/managers/wordpress-widgets.php',
		@@ -190,46 +183,47 @@
190	183	* Normalize Class Name
191	184	*
192	185	* Used to convert control names to class names.
193	186	*
194		- * @param string $class_name
	187	+ * @param $string
195	188	* @param string $delimiter
196	189	*
197	190	* @return mixed
198	191	*/
199		- private static function normalize_class_name( $class_name, $delimiter = ' ' ) {
200		- return ucwords( str_replace( '-', '_', $class_name ), $delimiter );
	192	+ private static function normalize_class_name( $string, $delimiter = ' ' ) {
	193	+ return ucwords( str_replace( '-', '_', $string ), $delimiter );
201	194	}
202	195
203		- /**
204		- * Init classes aliases.
205		- *
206		- * When Elementor classes renamed or moved to different folders, developers
207		- * can still use the old names by setting an alias.
208		- *
209		- * While in deprecation period both classes will work. When the deprecation
210		- * period ends, the alies should be removed from the list of aliases.
211		- *
212		- * Usage:
213		- *
214		- * self::$classes_aliases = [
215		- * 'Namespace\OldClassName' => [
216		- * 'replacement' => 'Namespace\NewClassName',
217		- * 'version' => '3.0.0',
218		- * ],
219		- * 'Namespace\OldModule\ClassName' => [
220		- * 'replacement' => 'Namespace\NewModule\ClassName',
221		- * 'version' => '3.5.0',
222		- * ],
223		- * ];
224		- *
225		- * @access private
226		- * @static
227		- *
228		- * @return void
229		- */
230	196	private static function init_classes_aliases() {
231	197	self::$classes_aliases = [
	198	+ 'Core\Ajax' => [
	199	+ 'replacement' => 'Core\Common\Modules\Ajax\Module',
	200	+ 'version' => '2.3.0',
	201	+ ],
	202	+ 'Editor' => [
	203	+ 'replacement' => 'Core\Editor\Editor',
	204	+ 'version' => '2.6.0',
	205	+ ],
	206	+ 'Scheme_Base' => [
	207	+ 'replacement' => 'Core\Schemes\Base',
	208	+ 'version' => '2.8.0',
	209	+ ],
	210	+ 'Scheme_Color' => [
	211	+ 'replacement' => 'Core\Schemes\Color',
	212	+ 'version' => '2.8.0',
	213	+ ],
	214	+ 'Scheme_Color_Picker' => [
	215	+ 'replacement' => 'Core\Schemes\Color_Picker',
	216	+ 'version' => '2.8.0',
	217	+ ],
	218	+ 'Schemes_Manager' => [
	219	+ 'replacement' => 'Core\Schemes\Manager',
	220	+ 'version' => '2.8.0',
	221	+ ],
	222	+ 'Scheme_Typography' => [
	223	+ 'replacement' => 'Core\Schemes\Typography',
	224	+ 'version' => '2.8.0',
	225	+ ],
232	226	'System_Info\Main' => [
233	227	'replacement' => 'Modules\System_Info\Module',
234	228	'version' => '2.9.0',
235	229	],
		@@ -309,22 +303,22 @@
309	303	* @since 1.6.0
310	304	* @access private
311	305	* @static
312	306	*
313		- * @param string $class_name Class name.
	307	+ * @param string $class Class name.
314	308	*/
315		- private static function autoload( $class_name ) {
316		- if ( 0 !== strpos( $class_name, self::$default_namespace . '\\' ) ) {
	309	+ private static function autoload( $class ) {
	310	+ if ( 0 !== strpos( $class, self::$default_namespace . '\\' ) ) {
317	311	return;
318	312	}
319	313
320		- $relative_class_name = preg_replace( '/^' . self::$default_namespace . '\\\/', '', $class_name );
	314	+ $relative_class_name = preg_replace( '/^' . self::$default_namespace . '\\\/', '', $class );
321	315
322	316	$classes_aliases = self::get_classes_aliases();
323	317
324	318	$has_class_alias = isset( $classes_aliases[ $relative_class_name ] );
325	319
326		- // Backward Compatibility: Save old class name for set an alias after the new class is loaded.
	320	+ // Backward Compatibility: Save old class name for set an alias after the new class is loaded
327	321	if ( $has_class_alias ) {
328	322	$alias_data = $classes_aliases[ $relative_class_name ];
329	323
330	324	$relative_class_name = $alias_data['replacement'];
		@@ -336,10 +330,10 @@
336	330	self::load_class( $relative_class_name );
337	331	}
338	332
339	333	if ( $has_class_alias ) {
340		- class_alias( $final_class_name, $class_name );
	334	+ class_alias( $final_class_name, $class );
341	335
342		- Utils::handle_deprecation( $class_name, $alias_data['version'], $final_class_name );
	336	+ Utils::handle_deprecation( $class, $alias_data['version'], $final_class_name );
343	337	}
344	338	}
345	339	}