← All changes | includes/autoloader.php +10 -15 4.2.2 → 3.24.8 View file →

		@@ -144,21 +144,16 @@
144	144	'Icons_Manager' => 'includes/managers/icons.php',
145	145	'Stylesheet' => 'includes/stylesheet.php',
146	146	'System_Info\Main' => 'includes/settings/system-info/main.php',
147	147	'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	148	'TemplateLibrary\Forms\New_Template_Form' => 'includes/template-library/forms/new-template-form.php',
151	149	'TemplateLibrary\Manager' => 'includes/template-library/manager.php',
152	150	'TemplateLibrary\Source_Base' => 'includes/template-library/sources/base.php',
153	151	'TemplateLibrary\Source_Local' => 'includes/template-library/sources/local.php',
154	152	'TemplateLibrary\Source_Remote' => 'includes/template-library/sources/remote.php',
155		- 'TemplateLibrary\Source_Cloud' => 'includes/template-library/sources/cloud.php',
156	153	'Tools' => 'includes/settings/tools.php',
157		- 'Container\Container' => 'includes/container/container.php',
158	154	'Tracker' => 'includes/tracker.php',
159	155	'User' => 'includes/user.php',
160		- 'User_Data' => 'includes/user-data.php',
161	156	'Utils' => 'includes/utils.php',
162	157	'Widget_WordPress' => 'includes/widgets/wordpress.php',
163	158	'Widgets_Manager' => 'includes/managers/widgets.php',
164	159	'WordPress_Widgets_Manager' => 'includes/managers/wordpress-widgets.php',
		@@ -190,15 +185,15 @@
190	185	* Normalize Class Name
191	186	*
192	187	* Used to convert control names to class names.
193	188	*
194		- * @param string $class_name
	189	+ * @param $string
195	190	* @param string $delimiter
196	191	*
197	192	* @return mixed
198	193	*/
199		- private static function normalize_class_name( $class_name, $delimiter = ' ' ) {
200		- return ucwords( str_replace( '-', '_', $class_name ), $delimiter );
	194	+ private static function normalize_class_name( $string, $delimiter = ' ' ) {
	195	+ return ucwords( str_replace( '-', '_', $string ), $delimiter );
201	196	}
202	197
203	198	/**
204	199	* Init classes aliases.
		@@ -309,22 +304,22 @@
309	304	* @since 1.6.0
310	305	* @access private
311	306	* @static
312	307	*
313		- * @param string $class_name Class name.
	308	+ * @param string $class Class name.
314	309	*/
315		- private static function autoload( $class_name ) {
316		- if ( 0 !== strpos( $class_name, self::$default_namespace . '\\' ) ) {
	310	+ private static function autoload( $class ) {
	311	+ if ( 0 !== strpos( $class, self::$default_namespace . '\\' ) ) {
317	312	return;
318	313	}
319	314
320		- $relative_class_name = preg_replace( '/^' . self::$default_namespace . '\\\/', '', $class_name );
	315	+ $relative_class_name = preg_replace( '/^' . self::$default_namespace . '\\\/', '', $class );
321	316
322	317	$classes_aliases = self::get_classes_aliases();
323	318
324	319	$has_class_alias = isset( $classes_aliases[ $relative_class_name ] );
325	320
326		- // Backward Compatibility: Save old class name for set an alias after the new class is loaded.
	321	+ // Backward Compatibility: Save old class name for set an alias after the new class is loaded
327	322	if ( $has_class_alias ) {
328	323	$alias_data = $classes_aliases[ $relative_class_name ];
329	324
330	325	$relative_class_name = $alias_data['replacement'];
		@@ -336,10 +331,10 @@
336	331	self::load_class( $relative_class_name );
337	332	}
338	333
339	334	if ( $has_class_alias ) {
340		- class_alias( $final_class_name, $class_name );
	335	+ class_alias( $final_class_name, $class );
341	336
342		- Utils::handle_deprecation( $class_name, $alias_data['version'], $final_class_name );
	337	+ Utils::handle_deprecation( $class, $alias_data['version'], $final_class_name );
343	338	}
344	339	}
345	340	}