From dc814989422262750bdb3da344edbc3e9bdd3e9b Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Thu, 1 Nov 2018 10:27:02 +0100
Subject: [PATCH] Refactor namespace to extend LakeDrops Composer Components
---
composer.json | 2 +-
src/Handler.php | 47 +++--------------------------------------------
src/Plugin.php | 18 ++++--------------
3 files changed, 8 insertions(+), 59 deletions(-)
diff --git a/composer.json b/composer.json
index 17e8e2e..e783004 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
},
"require": {
"composer-plugin-api": "^1.0.0",
- "lakedrops/composer-json-utils": "^1.0.0"
+ "lakedrops/composer-json-utils": "^1.1.0"
},
"require-dev": {
"composer/composer": "^1.5.0",
diff --git a/src/Handler.php b/src/Handler.php
index 7f36c7f..5e0c437 100644
--- a/src/Handler.php
+++ b/src/Handler.php
@@ -2,57 +2,16 @@
namespace LakeDrops\ComposerScripts;
-use Composer\Composer;
-use Composer\IO\IOInterface;
use Composer\Script\Event;
+use LakeDrops\Component\Composer\BaseHandler;
use LakeDrops\Component\Composer\Utils;
/**
* Class Handler.
*
- * @package LakeDrops\Drupal8Scaffold
+ * @package LakeDrops\ComposerScripts
*/
-class Handler {
-
- /**
- * The composer object running this session.
- *
- * @var \Composer\Composer
- */
- protected $composer;
-
- /**
- * The input-output object for the composer session.
- *
- * @var \Composer\IO\IOInterface
- */
- protected $io;
-
- /**
- * Handler constructor.
- *
- * @param \Composer\Composer $composer
- * The composer object.
- * @param \Composer\IO\IOInterface $io
- * The input-output object.
- */
- public function __construct(Composer $composer, IOInterface $io) {
- $this->composer = $composer;
- $this->io = $io;
- }
-
- /**
- * Retrieve a package from the current composer process.
- *
- * @param string $name
- * Name of the package to get from the current composer installation.
- *
- * @return \Composer\Package\PackageInterface
- * The package.
- */
- protected function getPackage($name) {
- return $this->composer->getRepositoryManager()->getLocalRepository()->findPackage($name, '*');
- }
+class Handler extends BaseHandler {
/**
* Update scripts of all LakeDrops plugins.
diff --git a/src/Plugin.php b/src/Plugin.php
index cd9dff4..30cccdb 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -2,30 +2,20 @@
namespace LakeDrops\ComposerScripts;
-use Composer\Composer;
-use Composer\EventDispatcher\EventSubscriberInterface;
-use Composer\IO\IOInterface;
-use Composer\Plugin\PluginInterface;
use Composer\Script\Event;
use Composer\Script\ScriptEvents;
+use LakeDrops\Component\Composer\BasePlugin;
/**
* Composer plugin for handling drupal scaffold.
*/
-class Plugin implements PluginInterface, EventSubscriberInterface {
-
- /**
- * The handler object for events.
- *
- * @var \LakeDrops\ComposerScripts\Handler
- */
- protected $handler;
+class Plugin extends BasePlugin {
/**
* {@inheritdoc}
*/
- public function activate(Composer $composer, IOInterface $io) {
- $this->handler = new Handler($composer, $io);
+ public function getHandlerClass() {
+ return Handler::class;
}
/**
--
GitLab