Merge pull request #433 from stellarwp/bugfix/563052/container-not-fo…

…und-exception

Bugfix: container not found exception

includes/resources/App.php

@@ -3,9 +3,11 @@
 namespace KadenceWP\KadenceBlocks;
 
 use InvalidArgumentException;
+use KadenceWP\KadenceBlocks\Adbar\Dot;
 use KadenceWP\KadenceBlocks\Cache\Cache_Provider;
 use KadenceWP\KadenceBlocks\Image_Downloader\Image_Downloader_Provider;
 use KadenceWP\KadenceBlocks\Shutdown\Shutdown_Provider;
+use KadenceWP\KadenceBlocks\StellarWP\ContainerContract\ContainerInterface;
 use KadenceWP\KadenceBlocks\StellarWP\ProphecyMonorepo\Container\Contracts\Container;
 use KadenceWP\KadenceBlocks\StellarWP\ProphecyMonorepo\Container\Contracts\Providable;
 use KadenceWP\KadenceBlocks\Uplink\Uplink_Provider;
@@ -69,6 +71,8 @@ public function container(): Container {
 
 	private function init(): void {
 		$this->container->bind( Container::class, $this->container );
+		$this->container->bind( ContainerInterface::class, $this->container );
+		$this->container->singleton( Dot::class, new Dot() );
 
 		foreach ( $this->providers as $provider ) {
 			$this->container->register( $provider );

includes/resources/Cache/Cache_Provider.php

@@ -28,9 +28,7 @@ private function register_block_library_storage(): void {
 
 		$this->container->when( Block_Library_Cache::class )
 		                ->needs( Storage::class )
-		                ->give( static function ( $c ) use ( $path ) {
-			                return new LocalStorage( $c->get( Filesystem::class ), $path );
-		                } );
+		                ->give( new LocalStorage( $this->container->get( Filesystem::class ), $path ) );
 
 		$this->container->singleton( Block_Library_Cache::class, Block_Library_Cache::class );
 	}
@@ -41,9 +39,7 @@ private function register_ai_storage(): void {
 
 		$this->container->when( Ai_Cache::class )
 		                ->needs( Storage::class )
-		                ->give( static function ( $c ) use ( $path ) {
-			                return new LocalStorage( $c->get( Filesystem::class ), $path );
-		                } );
+		                ->give( new LocalStorage( $this->container->get( Filesystem::class ), $path ) );
 
 		$this->container->singleton( Ai_Cache::class, Ai_Cache::class );
 	}

includes/resources/Image_Downloader/Image_Downloader_Provider.php

@@ -61,10 +61,10 @@ private function register_logging(): void {
 			                ->needs( '$level' )
 			                ->give( LogLevel::fromName( $log_level ) );
 
-			$this->container->bind( LoggerInterface::class, static function ( $c ) {
+			$this->container->bind( LoggerInterface::class, function () {
 				$logger  = new Logger( 'kadence' );
-				$handler = $c->get( ErrorLogHandler::class );
-				$handler->setFormatter( $c->get( ColoredLineFormatter::class ) );
+				$handler = $this->container->get( ErrorLogHandler::class );
+				$handler->setFormatter( $this->container->get( ColoredLineFormatter::class ) );
 				$logger->pushHandler( $handler );
 
 				return $logger;

includes/resources/Shutdown/Shutdown_Provider.php

@@ -15,15 +15,13 @@ final class Shutdown_Provider extends Provider {
 	public function register(): void {
 		$this->container->when( Shutdown_Collection::class )
 		                ->needs( '$tasks' )
-		                ->give( static function ( $c ): array {
+		                ->give( [
 			                // Add any terminable tasks to the collection to run on shutdown.
-			                // Important: these will run in the order provided!
-			                return [
-				                $c->get( Cache_Primer::class ),
-				                $c->get( Block_Library_Cache::class ),
-				                $c->get( Ai_Cache::class ),
-			                ];
-		                } );
+			                // Important: these will run in the order provided.
+			                $this->container->get( Cache_Primer::class ),
+			                $this->container->get( Block_Library_Cache::class ),
+			                $this->container->get( Ai_Cache::class ),
+		                ] );
 
 		add_action( 'shutdown', $this->container->callback( Shutdown_Handler::class, 'handle' ), 1 );
 	}

kadence-blocks.php

@@ -29,26 +29,26 @@
 use KadenceWP\KadenceBlocks\StellarWP\ProphecyMonorepo\Container\ContainerAdapter;
 use KadenceWP\KadenceBlocks\StellarWP\Telemetry\Config;
 use KadenceWP\KadenceBlocks\StellarWP\Telemetry\Core as Telemetry;
-use KadenceWP\KadenceBlocks\Container;
 use KadenceWP\KadenceBlocks\StellarWP\Uplink\Config as UplinkConfig;
-use KadenceWP\KadenceBlocks\StellarWP\Uplink\Uplink;
 use KadenceWP\KadenceBlocks\StellarWP\Uplink\Register;
+use KadenceWP\KadenceBlocks\StellarWP\Uplink\Uplink;
+
 /**
  * Add a check before redirecting
  */
-function kadence_blocks_activate() {
+function kadence_blocks_activate(): void {
 	add_option( 'kadence_blocks_redirect_on_activation', true );
 }
 register_activation_hook( __FILE__, 'kadence_blocks_activate' );
 
 /**
  * Load Plugin
  */
-function kadence_blocks_init() {
-	$container = new Container();
+function kadence_blocks_init(): void {
+	$container = new ContainerAdapter( new \KadenceWP\KadenceBlocks\lucatume\DI52\Container() );
 
 	// The Kadence Blocks Application.
-	App::instance( new ContainerAdapter( $container->container() ) );
+	App::instance( $container );
 
 	require_once KADENCE_BLOCKS_PATH . 'includes/init.php';
 	require_once KADENCE_BLOCKS_PATH . 'includes/form-ajax.php';
@@ -146,7 +146,7 @@ function kadence_blocks_init() {
 	add_filter( 'stellarwp/uplink/kadence-blocks/prevent_update_check', '__return_true' );
 	add_filter(
 		'stellarwp/uplink/kadence-blocks/api_get_base_url',
-		static function() {
+		static function () {
 			return 'https://licensing.kadencewp.com';
 		},
 		10,
@@ -158,7 +158,7 @@ static function() {
 /**
  * Load the plugin textdomain
  */
-function kadence_blocks_lang() {
+function kadence_blocks_lang(): void {
 	load_plugin_textdomain( 'kadence-blocks', false, basename( dirname( __FILE__ ) ) . '/languages' );
 }
 add_action( 'init', 'kadence_blocks_lang' );