← All changes | includes/plugin.php +62 -9 4.2.1 → 3.25.0-dev3 View file →

		@@ -1,8 +1,9 @@
1	1	<?php
2		-
3	2	namespace Elementor;
4	3
	4	+use Elementor\Container\Container;
	5	+use ElementorDeps\DI\Container as DIContainer;
5	6	use Elementor\Core\Admin\Menu\Admin_Menu_Manager;
6	7	use Elementor\Core\Wp_Api;
7	8	use Elementor\Core\Admin\Admin;
8	9	use Elementor\Core\Breakpoints\Manager as Breakpoints_Manager;
		@@ -14,8 +15,9 @@
14	15	use Elementor\Core\Editor\Editor;
15	16	use Elementor\Core\Files\Manager as Files_Manager;
16	17	use Elementor\Core\Files\Assets\Manager as Assets_Manager;
17	18	use Elementor\Core\Modules_Manager;
	19	+use Elementor\Core\Schemes\Manager as Schemes_Manager;
18	20	use Elementor\Core\Settings\Manager as Settings_Manager;
19	21	use Elementor\Core\Settings\Page\Manager as Page_Settings_Manager;
20	22	use Elementor\Modules\History\Revisions_Manager;
21	23	use Elementor\Core\DynamicTags\Manager as Dynamic_Tags_Manager;
		@@ -23,9 +25,10 @@
23	25	use Elementor\Core\Page_Assets\Loader as Assets_Loader;
24	26	use Elementor\Modules\System_Info\Module as System_Info_Module;
25	27	use Elementor\Data\Manager as Data_Manager;
26	28	use Elementor\Data\V2\Manager as Data_Manager_V2;
27		-use Elementor\Core\Files\Uploads_Manager;
	29	+use Elementor\Core\Common\Modules\DevTools\Module as Dev_Tools;
	30	+use Elementor\Core\Files\Uploads_Manager as Uploads_Manager;
28	31
29	32	if ( ! defined( 'ABSPATH' ) ) {
30	33	exit;
31	34	}
		@@ -38,9 +41,8 @@
38	41	*
39	42	* @since 1.0.0
40	43	*/
41	44	class Plugin {
42		-
43	45	const ELEMENTOR_DEFAULT_POST_TYPES = [ 'page', 'post' ];
44	46
45	47	/**
46	48	* Instance.
		@@ -93,8 +95,21 @@
93	95	*/
94	96	public $documents;
95	97
96	98	/**
	99	+ * Schemes manager.
	100	+ *
	101	+ * Holds the plugin schemes manager.
	102	+ *
	103	+ * @since 1.0.0
	104	+ * @access public
	105	+ * @deprecated 3.0.0
	106	+ *
	107	+ * @var Schemes_Manager
	108	+ */
	109	+ public $schemes_manager;
	110	+
	111	+ /**
97	112	* Elements manager.
98	113	*
99	114	* Holds the plugin elements manager.
100	115	*
		@@ -424,8 +439,19 @@
424	439	*/
425	440	public $logger;
426	441
427	442	/**
	443	+ * Dev tools.
	444	+ *
	445	+ * Holds the plugin dev tools.
	446	+ *
	447	+ * @access private
	448	+ *
	449	+ * @var Dev_Tools
	450	+ */
	451	+ private $dev_tools;
	452	+
	453	+ /**
428	454	* Upgrade manager.
429	455	*
430	456	* Holds the plugin upgrade manager.
431	457	*
		@@ -545,8 +571,16 @@
545	571	*/
546	572	public $assets_loader;
547	573
548	574	/**
	575	+ * Container instance for managing dependencies.
	576	+ *
	577	+ * @since 3.24.0
	578	+ * @var DIContainer
	579	+ */
	580	+ private $container;
	581	+
	582	+ /**
549	583	* Clone.
550	584	*
551	585	* Disable class cloning and throw an error on object clone.
552	586	*
		@@ -607,9 +641,26 @@
607	641
608	642	return self::$instance;
609	643	}
610	644
	645	+ public function initialize_container() {
	646	+ Container::initialize_instance();
	647	+
	648	+ $this->container = Container::get_instance();
	649	+ }
	650	+
611	651	/**
	652	+ * Get the Elementor container or resolve a dependency.
	653	+ */
	654	+ public function elementor_container( $abstract = null ) {
	655	+ if ( is_null( $abstract ) ) {
	656	+ return $this->container;
	657	+ }
	658	+
	659	+ return $this->container->make( $abstract );
	660	+ }
	661	+
	662	+ /**
612	663	* Init.
613	664	*
614	665	* Initialize Elementor Plugin. Register Elementor support for all the
615	666	* supported post types and initialize Elementor components.
		@@ -688,8 +739,9 @@
688	739	$this->db = new DB();
689	740	$this->controls_manager = new Controls_Manager();
690	741	$this->documents = new Documents_Manager();
691	742	$this->kits_manager = new Kits_Manager();
	743	+ $this->schemes_manager = new Schemes_Manager();
692	744	$this->elements_manager = new Elements_Manager();
693	745	$this->widgets_manager = new Widgets_Manager();
694	746	$this->skins_manager = new Skins_Manager();
695	747	$this->files_manager = new Files_Manager();
		@@ -715,9 +767,8 @@
715	767	$this->admin_menu_manager = new Admin_Menu_Manager();
716	768	$this->admin_menu_manager->register_actions();
717	769
718	770	User::init();
719		- User_Data::init();
720	771	Api::init();
721	772	Tracker::init();
722	773
723	774	$this->upgrade = new Core\Upgrade\Manager();
		@@ -778,16 +829,16 @@
778	829	Autoloader::run();
779	830	}
780	831
781	832	/**
782		- * Magic getter for accessing certain properties.
	833	+ * Plugin Magic Getter
783	834	*
784	835	* @since 3.1.0
785	836	* @access public
786	837	*
787		- * @param string $property The property name.
788		- * @return mixed The property value or null if not found.
789		- * @throws \Exception If trying to access a private property.
	838	+ * @param $property
	839	+ * @return mixed
	840	+ * @throws \Exception
790	841	*/
791	842	public function __get( $property ) {
792	843	if ( 'posts_css_manager' === $property ) {
793	844	self::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_argument( 'Plugin::$instance->posts_css_manager', '2.7.0', 'Plugin::$instance->files_manager' );
		@@ -833,6 +884,8 @@
833	884	}
834	885
835	886	if ( ! defined( 'ELEMENTOR_TESTS' ) ) {
836	887	// In tests we run the instance manually.
837		- Plugin::instance();
	888	+ $plugin_instance = Plugin::instance();
	889	+
	890	+ $plugin_instance->initialize_container();
838	891	}