From ece4c15d767618490084121ff7d91149349d0404 Mon Sep 17 00:00:00 2001
From: Rajab Natshah <rajabn@gmail.com>
Date: Thu, 20 Jul 2017 11:09:51 +0300
Subject: [PATCH] Issue #2894493 by RajabNatshah, Mohammed J. Razem,
abu-zakham, josebc: Cleaned up [Varbase Project] composer files for easier
updates
---
composer.json | 6 +++---
src/composer/ScriptHandler.php | 7 ++++---
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/composer.json b/composer.json
index e886b62b..f09183a8 100644
--- a/composer.json
+++ b/composer.json
@@ -167,14 +167,14 @@
]
},
"scripts": {
- "drupal-scaffold": "DrupalComposer\\DrupalScaffold\\Plugin::scaffold",
- "post-drupal-scaffold-cmd": ["Varbase\\composer\\ScriptHandler::postDrupalScaffoldProcedure"],
"pre-install-cmd": ["Varbase\\composer\\ScriptHandler::checkComposerVersion"],
- "pre-update-cmd": ["Varbase\\composer\\ScriptHandler:checkComposerVersion"],
+ "pre-update-cmd": ["Varbase\\composer\\ScriptHandler::checkComposerVersion"],
"post-install-cmd": ["Varbase\\composer\\ScriptHandler::createRequiredFiles"],
"post-update-cmd": ["Varbase\\composer\\ScriptHandlerr::createRequiredFiles"],
"post-package-install": ["Varbase\\composer\\ScriptHandler::postInstallProcedure"],
"post-package-update": ["Varbase\\composer\\ScriptHandler::postUpdateProcedure"],
+ "post-drupal-scaffold-cmd": ["Varbase\\composer\\ScriptHandler::postDrupalScaffoldProcedure"],
+ "drupal-scaffold": "DrupalComposer\\DrupalScaffold\\Plugin::scaffold",
"create-new-vartheme": "scripts/create-new-vartheme.sh",
"varbase-check-tests": "scripts/varbase-check-tests.sh",
"varbase-init-tests": "scripts/varbase-init-tests.sh",
diff --git a/src/composer/ScriptHandler.php b/src/composer/ScriptHandler.php
index b9055952..f9dd16af 100644
--- a/src/composer/ScriptHandler.php
+++ b/src/composer/ScriptHandler.php
@@ -2,6 +2,7 @@
namespace Varbase\composer;
+use Composer\Semver\Comparator;
use Symfony\Component\Filesystem\Filesystem;
use Composer\EventDispatcher\Event;
@@ -22,10 +23,10 @@ class ScriptHandler {
protected static function getDrupalRoot($project_root) {
return $project_root . '/docroot';
}
-
+
/**
* Create required files.
- *
+ *
* @param Event $event
*/
public static function createRequiredFiles(Event $event) {
@@ -64,7 +65,7 @@ class ScriptHandler {
$event->getIO()->write("Create a sites/default/files directory with chmod 0777");
}
}
-
+
/**
* Checks if the installed version of Composer is compatible.
*
--
GitLab