Merge pull request #4 from Micro-PHP/release-1.2

v1.2 release
Micro-PHP · Nov 25, 2022 · 44049f8 · 44049f8
2 parents 9899b4d + de63db2
commit 44049f8
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 108 deletions.
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "micro/kernel-app",
     "description": "Micro Framework: App Kernel component",
     "type": "library",
-    "version": "0.1",
+    "version": "1.2",
     "license": "MIT",
     "autoload": {
         "psr-4": {
@@ -16,6 +16,10 @@
         }
     ],
     "require": {
-        "micro/kernel": "^0.1"
+        "micro/kernel": "^1",
+        "micro/deprecation-supports": "^1",
+        "micro/plugin-event-emitter": "^1",
+        "micro/kernel-boot-dependency": "^1",
+        "micro/kernel-boot-configuration": "^1"
     }
 }
diff --git a/src/AppKernel.php b/src/AppKernel.php
@@ -3,15 +3,19 @@
 namespace Micro\Kernel\App;
 
 use Micro\Component\DependencyInjection\Container;
+use Micro\Framework\Kernel\Boot\ConfigurationProviderBootLoader;
+use Micro\Framework\Kernel\Boot\DependencyProviderBootLoader;
 use Micro\Framework\Kernel\Configuration\ApplicationConfigurationInterface;
 use Micro\Framework\Kernel\Container\ApplicationContainerFactoryInterface;
 use Micro\Framework\Kernel\Container\Impl\ApplicationContainerFactory;
 use Micro\Framework\Kernel\KernelBuilder;
 use Micro\Framework\Kernel\KernelInterface;
-use Micro\Framework\Kernel\Plugin\BootLoader\ProvideDependenciesBootLoader;
+use Micro\Framework\Kernel\Plugin\PluginBootLoaderInterface;
 use Micro\Kernel\App\Business\KernelActionProcessorInterface;
 use Micro\Kernel\App\Business\KernelRunActionProcessor;
 use Micro\Kernel\App\Business\KernelTerminateActionProcessor;
+use Micro\Plugin\EventEmitter\EventEmitterPlugin;
+use Psr\Container\ContainerInterface;
 
 class AppKernel implements AppKernelInterface
 {
@@ -21,19 +25,24 @@ class AppKernel implements AppKernelInterface
     private KernelInterface $kernel;
 
     /**
-     * @var Container|null
+     * @var ContainerInterface|null
      */
-    private ?Container $container;
+    private ?ContainerInterface $container;
 
     /**
-     * @param ApplicationConfigurationInterface $configuration
-     * @param array                             $plugins
-     * @param string                            $environment
+     * @var PluginBootLoaderInterface[]
+     */
+    private iterable $additionalBootLoaders = [];
+
+    /**
+     * @param ApplicationConfigurationInterface|array $configuration
+     * @param array $plugins
+     * @param string $environment
      */
     public function __construct(
-    private ApplicationConfigurationInterface $configuration,
-    private array $plugins,
-    private string $environment = 'dev'
+        private ApplicationConfigurationInterface|array $configuration = [],
+        private array $plugins = [],
+        private readonly string $environment = 'dev'
     )
     {
         $this->container = $this->createApplicationContainerFactory()->create();
@@ -92,17 +101,33 @@ public function isDevMode(): bool
         return $this->environment() === 'dev';
     }
 
+    /**
+     * @param PluginBootLoaderInterface $pluginBootLoader
+     *
+     * @return $this
+     */
+    public function addBootLoader(PluginBootLoaderInterface $pluginBootLoader): self
+    {
+        $this->additionalBootLoaders[] = $pluginBootLoader;
+
+        return $this;
+    }
+
     /**
      * @return KernelInterface
      */
     protected function createKernel(): KernelInterface
     {
         $kernel = $this
             ->createKernelBuilder()
-            ->setApplicationConfiguration($this->configuration)
-            ->setBootLoaders($this->createBootLoaderCollection())
+            ->addBootLoaders($this->createBootLoaderCollection())
             ->setContainer($this->container)
-            ->setApplicationPlugins($this->plugins)
+            ->setApplicationPlugins(
+                [
+                    EventEmitterPlugin::class,
+                    ...$this->plugins
+                ]
+            )
             ->build();
 
         $this->container = null;
@@ -135,12 +160,17 @@ protected function createTerminateActionProcessor(): KernelActionProcessorInterf
     }
 
     /**
-     * @return ProvideDependenciesBootLoader[]
+     * @return PluginBootLoaderInterface[]
      */
     protected function createBootLoaderCollection(): array
     {
+        $bl = $this->additionalBootLoaders;
+        $this->additionalBootLoaders = [];
+
         return [
-            new ProvideDependenciesBootLoader($this->container),
+            new DependencyProviderBootLoader($this->container),
+            new ConfigurationProviderBootLoader($this->configuration),
+            ...$bl
         ];
     }
 

diff --git a/src/AppKernelInterface.php b/src/AppKernelInterface.php
@@ -3,6 +3,7 @@
 namespace Micro\Kernel\App;
 
 use Micro\Framework\Kernel\KernelInterface;
+use Micro\Framework\Kernel\Plugin\PluginBootLoaderInterface;
 
 interface AppKernelInterface extends KernelInterface
 {
@@ -15,4 +16,11 @@ public function environment(): string;
      * @return bool
      */
     public function isDevMode(): bool;
+
+    /**
+     * @param PluginBootLoaderInterface $pluginBootLoader
+     *
+     * @return $this
+     */
+    public function addBootLoader(PluginBootLoaderInterface $pluginBootLoader): self;
 }
diff --git a/src/Business/ApplicationListenerProviderPluginInterface.php b/src/Business/ApplicationListenerProviderPluginInterface.php
diff --git a/src/Business/KernelRunActionProcessor.php b/src/Business/KernelRunActionProcessor.php
@@ -2,30 +2,18 @@
 
 namespace Micro\Kernel\App\Business;
 
-use Micro\Component\DependencyInjection\Container;
-use Micro\Component\EventEmitter\ListenerProviderInterface;
 use Micro\Kernel\App\Business\Processor\AppCreateEventRunSuccess;
-use Micro\Kernel\App\Business\Processor\PluginEventsListenerRegistration;
 use Micro\Kernel\App\Business\Processor\ProvideKernelProcessor;
-use Micro\Plugin\EventEmitter\EventsFacadeInterface;
 
 class KernelRunActionProcessor extends AbstractActionProcessor
 {
-    /**
-     * @param Container $container
-     */
-    public function __construct(private Container $container)
-    {
-    }
-
     /**
      * {@inheritDoc}
      */
     protected function createActionProcessorCollection(): array
     {
         return [
             $this->createProvideKernelProcessor(),
-            $this->createPluginEventsListenerRegistration(),
             $this->createAppCreateEventRunSuccess(),
         ];
     }
@@ -38,16 +26,6 @@ protected function createAppCreateEventRunSuccess(): KernelActionProcessorInterf
         return new AppCreateEventRunSuccess();
     }
 
-    /**
-     * @return KernelActionProcessorInterface
-     */
-    protected function createPluginEventsListenerRegistration(): KernelActionProcessorInterface
-    {
-        $listenerProvider = $this->container->get(EventsFacadeInterface::class);
-
-        return new PluginEventsListenerRegistration($listenerProvider);
-    }
-
     /**
      * @return KernelActionProcessorInterface
      */

diff --git a/src/Business/Processor/PluginEventsListenerRegistration.php b/src/Business/Processor/PluginEventsListenerRegistration.php
diff --git a/src/Business/Processor/ProvideKernelProcessor.php b/src/Business/Processor/ProvideKernelProcessor.php
@@ -2,6 +2,7 @@
 
 namespace Micro\Kernel\App\Business\Processor;
 
+use Micro\Framework\Kernel\KernelInterface;
 use Micro\Kernel\App\AppKernelInterface;
 use Micro\Kernel\App\Business\KernelActionProcessorInterface;
 
@@ -13,8 +14,9 @@ class ProvideKernelProcessor implements KernelActionProcessorInterface
      */
     public function process(AppKernelInterface $appKernel): void
     {
-        $appKernel->container()->register(AppKernelInterface::class, function () use ($appKernel) {
-            return $appKernel;
-        });
+        $callback = fn() => $appKernel;
+
+        $appKernel->container()->register(AppKernelInterface::class, $callback);
+        $appKernel->container()->register(KernelInterface::class, $callback);
     }
 }