Merge pull request #2 from ipublikuj/nette30

Task: Better nette 3 integration
ipublikuj-archive · Nov 15, 2019 · 2da01ef · 2da01ef
2 parents 6ee3838 + fb7c0a9
commit 2da01ef
Show file tree

Hide file tree

Showing 19 changed files with 569 additions and 28 deletions.
diff --git a/src/IPub/Packages/Commands/EnableCommand.php b/src/IPub/Packages/Commands/EnableCommand.php
@@ -50,7 +50,7 @@ protected function configure() : void
 	/**
 	 * @param Input\InputInterface $input
 	 * @param Output\OutputInterface $output
-	 * 
+	 *
 	 * @return void
 	 */
 	protected function execute(Input\InputInterface $input, Output\OutputInterface $output) : void

diff --git a/src/IPub/Packages/Commands/InstallCommand.php b/src/IPub/Packages/Commands/InstallCommand.php
@@ -45,7 +45,7 @@ protected function configure() : void
 	/**
 	 * @param Input\InputInterface $input
 	 * @param Output\OutputInterface $output
-	 * 
+	 *
 	 * @return void
 	 */
 	protected function execute(Input\InputInterface $input, Output\OutputInterface $output) : void

diff --git a/src/IPub/Packages/Commands/ListCommand.php b/src/IPub/Packages/Commands/ListCommand.php
@@ -70,7 +70,7 @@ protected function execute(Input\InputInterface $input, Output\OutputInterface $
 
 			foreach ($packages as $package) {
 				$output->writeln(sprintf(
-					'<info>%'. $maxLength .'s</info> | status: <comment>%-12s</comment> | version: <comment>%s</comment>',
+					'<info>%' . $maxLength . 's</info> | status: <comment>%-12s</comment> | version: <comment>%s</comment>',
 					$package->getName(),
 					$this->packageManager->getStatus($package),
 					$this->packageManager->getVersion($package)

diff --git a/src/IPub/Packages/Commands/SyncCommand.php b/src/IPub/Packages/Commands/SyncCommand.php
@@ -71,13 +71,13 @@ protected function execute(Input\InputInterface $input, Output\OutputInterface $
 					$output->writeln(sprintf('<info>%s : %s</info>', $action, $name));
 				}
 			}
-/*
-			foreach ($this->packageManager->disableAbsent() as $item) {
-				foreach ($item as $name => $action) {
-					$output->writeln(sprintf('<info>%s : %s</info>', $action, $name));
-				}
-			}
-*/
+			/*
+						foreach ($this->packageManager->disableAbsent() as $item) {
+							foreach ($item as $name => $action) {
+								$output->writeln(sprintf('<info>%s : %s</info>', $action, $name));
+							}
+						}
+			*/
 		} catch (Exceptions\InvalidArgumentException $e) {
 			$output->writeln(sprintf('<error>%s</error>', $e->getMessage()));
 		}

diff --git a/src/IPub/Packages/Commands/UninstallCommand.php b/src/IPub/Packages/Commands/UninstallCommand.php
@@ -45,7 +45,7 @@ protected function configure() : void
 	/**
 	 * @param Input\InputInterface $input
 	 * @param Output\OutputInterface $output
-	 * 
+	 *
 	 * @return void
 	 */
 	protected function execute(Input\InputInterface $input, Output\OutputInterface $output) : void

diff --git a/src/IPub/Packages/DI/PackagesExtension.php b/src/IPub/Packages/DI/PackagesExtension.php
@@ -21,6 +21,7 @@
 
 use IPub\Packages;
 use IPub\Packages\Commands;
+use IPub\Packages\Events;
 use IPub\Packages\Helpers;
 use IPub\Packages\Loaders;
 use IPub\Packages\Repository;
@@ -41,19 +42,20 @@ final class PackagesExtension extends DI\CompilerExtension
 	 * @var array
 	 */
 	private $defaults = [
-		'path'       => NULL,                        // Paths where to search for packages
-		'dirs'       => [                            // Define path to folders
+		'path'          => NULL,                        // Paths where to search for packages
+		'dirs'          => [                            // Define path to folders
 			'configDir' => '%appDir%/config',        // Path where is stored app configuration
 			'vendorDir' => '%appDir%/../vendor',     // Path to composer vendor folder
 			'tempDir'   => '%tempDir%',              // Path to temporary folder
 		],
-		'configFile' => 'config.neon',               // Filename with enabled packages extensions
-		'loader'     => [
+		'configFile'    => 'config.neon',               // Filename with enabled packages extensions
+		'loader'        => [
 			'packageFiles' => [
 				'package.php',
 			],
 		],
-		'sources'    => [],
+		'sources'       => [],
+		'symfonyEvents' => FALSE,
 	];
 
 	/**
@@ -63,12 +65,12 @@ public function loadConfiguration() : void
 	{
 		// Get container builder
 		$builder = $this->getContainerBuilder();
-
-		// Merge extension default config
-		$this->setConfig(DI\Config\Helpers::merge($this->config, DI\Helpers::expand($this->defaults, $builder->parameters)));
-
-		// Get extension configuration
-		$configuration = $this->getConfig();
+		/** @var array $configuration */
+		if (method_exists($this, 'validateConfig')) {
+			$configuration = $this->validateConfig($this->defaults);
+		} else {
+			$configuration = $this->getConfig($this->defaults);
+		}
 
 		/**
 		 * Load packages configuration
@@ -150,13 +152,62 @@ public function beforeCompile() : void
 
 		// Get container builder
 		$builder = $this->getContainerBuilder();
+		/** @var array $configuration */
+		if (method_exists($this, 'validateConfig')) {
+			$configuration = $this->validateConfig($this->defaults);
+		} else {
+			$configuration = $this->getConfig($this->defaults);
+		}
 
 		// Get packages manager
 		$manager = $builder->getDefinition($this->prefix('manager'));
 
 		foreach ($builder->findByType(Packages\Scripts\IScript::class) as $serviceDefinition) {
 			$manager->addSetup('addScript', [$serviceDefinition->getType(), $serviceDefinition]);
 		}
+
+		if ($configuration['symfonyEvents'] === TRUE) {
+			$dispatcher = $builder->getDefinition($builder->getByType(EventDispatcher\EventDispatcherInterface::class));
+
+			$packagesManager = $builder->getDefinition($builder->getByType(Packages\PackagesManager::class));
+			assert($packagesManager instanceof DI\ServiceDefinition);
+
+			$packagesManager->addSetup('?->onEnable[] = function() {?->dispatch(new ?(...func_get_args()));}', [
+				'@self',
+				$dispatcher,
+				new Nette\PhpGenerator\PhpLiteral(Events\EnableEvent::class),
+			]);
+			$packagesManager->addSetup('?->onDisable[] = function() {?->dispatch(new ?(...func_get_args()));}', [
+				'@self',
+				$dispatcher,
+				new Nette\PhpGenerator\PhpLiteral(Events\DisableEvent::class),
+			]);
+			$packagesManager->addSetup('?->onUpgrade[] = function() {?->dispatch(new ?(...func_get_args()));}', [
+				'@self',
+				$dispatcher,
+				new Nette\PhpGenerator\PhpLiteral(Events\UpgradeEvent::class),
+			]);
+			$packagesManager->addSetup('?->onInstall[] = function() {?->dispatch(new ?(...func_get_args()));}', [
+				'@self',
+				$dispatcher,
+				new Nette\PhpGenerator\PhpLiteral(Events\InstallEvent::class),
+			]);
+			$packagesManager->addSetup('?->onUninstall[] = function() {?->dispatch(new ?(...func_get_args()));}', [
+				'@self',
+				$dispatcher,
+				new Nette\PhpGenerator\PhpLiteral(Events\UninstallEvent::class),
+			]);
+			$packagesManager->addSetup('?->onRegister[] = function() {?->dispatch(new ?(...func_get_args()));}', [
+				'@self',
+				$dispatcher,
+				new Nette\PhpGenerator\PhpLiteral(Events\RegisterEvent::class),
+			]);
+			$packagesManager->addSetup('?->onUnregister[] = function() {?->dispatch(new ?(...func_get_args()));}', [
+				'@self',
+				$dispatcher,
+				new Nette\PhpGenerator\PhpLiteral(Events\UnregisterEvent::class),
+			]);
+		}
 	}
 
 	/**

diff --git a/src/IPub/Packages/Entities/Package.php b/src/IPub/Packages/Entities/Package.php
@@ -299,7 +299,7 @@ public function getPath() : string
 	public function compare(IPackage $package, string $operator = '==') : bool
 	{
 		return strtolower($this->getName()) === strtolower($package->getName()) &&
-		version_compare(strtolower($this->getVersion()), strtolower($package->getVersion()), $operator);
+			version_compare(strtolower($this->getVersion()), strtolower($package->getVersion()), $operator);
 	}
 
 	/**

diff --git a/src/IPub/Packages/Events/DisableEvent.php b/src/IPub/Packages/Events/DisableEvent.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * DisableEvent.php
+ *
+ * @copyright      More in license.md
+ * @license        https://www.ipublikuj.eu
+ * @author         Adam Kadlec <[email protected]>
+ * @package        iPublikuj:Packages!
+ * @subpackage     Events
+ * @since          1.0.0
+ *
+ * @date           15.11.19
+ */
+
+namespace IPub\Packages\Events;
+
+use Symfony\Contracts\EventDispatcher;
+
+use IPub\Packages;
+use IPub\Packages\Entities;
+
+/**
+ * Package disabled event
+ *
+ * @package        iPublikuj:Packages!
+ * @subpackage     Events
+ *
+ * @author         Adam Kadlec <[email protected]>
+ */
+final class DisableEvent extends EventDispatcher\Event
+{
+	/**
+	 * @var Packages\PackagesManager
+	 */
+	private $manager;
+
+	/**
+	 * @var Entities\IPackage
+	 */
+	private $package;
+
+	/**
+	 * @param Packages\PackagesManager $manager
+	 * @param Entities\IPackage $package
+	 */
+	public function __construct(
+		Packages\PackagesManager $manager,
+		Entities\IPackage $package
+	) {
+		$this->manager = $manager;
+		$this->package = $package;
+	}
+
+	/**
+	 * @return Packages\PackagesManager
+	 */
+	public function getManager() : Packages\PackagesManager
+	{
+		return $this->manager;
+	}
+
+	/**
+	 * @return Entities\IPackage
+	 */
+	public function getPackage() : Entities\IPackage
+	{
+		return $this->package;
+	}
+}
diff --git a/src/IPub/Packages/Events/EnableEvent.php b/src/IPub/Packages/Events/EnableEvent.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * EnableEvent.php
+ *
+ * @copyright      More in license.md
+ * @license        https://www.ipublikuj.eu
+ * @author         Adam Kadlec <[email protected]>
+ * @package        iPublikuj:Packages!
+ * @subpackage     Events
+ * @since          1.0.0
+ *
+ * @date           15.11.19
+ */
+
+namespace IPub\Packages\Events;
+
+use Symfony\Contracts\EventDispatcher;
+
+use IPub\Packages;
+use IPub\Packages\Entities;
+
+/**
+ * Package enabled event
+ *
+ * @package        iPublikuj:Packages!
+ * @subpackage     Events
+ *
+ * @author         Adam Kadlec <[email protected]>
+ */
+final class EnableEvent extends EventDispatcher\Event
+{
+	/**
+	 * @var Packages\PackagesManager
+	 */
+	private $manager;
+
+	/**
+	 * @var Entities\IPackage
+	 */
+	private $package;
+
+	/**
+	 * @param Packages\PackagesManager $manager
+	 * @param Entities\IPackage $package
+	 */
+	public function __construct(
+		Packages\PackagesManager $manager,
+		Entities\IPackage $package
+	) {
+		$this->manager = $manager;
+		$this->package = $package;
+	}
+
+	/**
+	 * @return Packages\PackagesManager
+	 */
+	public function getManager() : Packages\PackagesManager
+	{
+		return $this->manager;
+	}
+
+	/**
+	 * @return Entities\IPackage
+	 */
+	public function getPackage() : Entities\IPackage
+	{
+		return $this->package;
+	}
+}
diff --git a/src/IPub/Packages/Events/InstallEvent.php b/src/IPub/Packages/Events/InstallEvent.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * InstallEvent.php
+ *
+ * @copyright      More in license.md
+ * @license        https://www.ipublikuj.eu
+ * @author         Adam Kadlec <[email protected]>
+ * @package        iPublikuj:Packages!
+ * @subpackage     Events
+ * @since          1.0.0
+ *
+ * @date           15.11.19
+ */
+
+namespace IPub\Packages\Events;
+
+use Symfony\Contracts\EventDispatcher;
+
+use IPub\Packages;
+use IPub\Packages\Entities;
+
+/**
+ * Package installed event
+ *
+ * @package        iPublikuj:Packages!
+ * @subpackage     Events
+ *
+ * @author         Adam Kadlec <[email protected]>
+ */
+final class InstallEvent extends EventDispatcher\Event
+{
+	/**
+	 * @var Packages\PackagesManager
+	 */
+	private $manager;
+
+	/**
+	 * @var Entities\IPackage
+	 */
+	private $package;
+
+	/**
+	 * @param Packages\PackagesManager $manager
+	 * @param Entities\IPackage $package
+	 */
+	public function __construct(
+		Packages\PackagesManager $manager,
+		Entities\IPackage $package
+	) {
+		$this->manager = $manager;
+		$this->package = $package;
+	}
+
+	/**
+	 * @return Packages\PackagesManager
+	 */
+	public function getManager() : Packages\PackagesManager
+	{
+		return $this->manager;
+	}
+
+	/**
+	 * @return Entities\IPackage
+	 */
+	public function getPackage() : Entities\IPackage
+	{
+		return $this->package;
+	}
+}