Moved require'd() handling into Context.

src/Task/Context.php

@@ -9,6 +9,7 @@
 
 use Deployer\Server\Environment;
 use Deployer\Server\ServerInterface;
+use Deployer\Exception\Exception;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -69,6 +70,24 @@ public static function get()
         return end(self::$contexts);
     }
 
+    /**
+     * Returns the current context when available.
+     *
+     * Throws a Exception when not called within a task-context and therefore no Context is available.
+     *
+     * This method provides a usefull error to the end-user to make him/her aware
+     * to use a function in the required task-context.
+     *
+     * @throws Exception
+     */
+    public static function required($callerName)
+    {
+        if (!self::get()) {
+            throw new Exception("'$callerName' can only be used within a 'task()'-function!");
+        }
+    }
+
+
     /**
      * @return Context
      */

src/functions.php

@@ -17,7 +17,6 @@
 use Deployer\Task\GroupTask;
 use Deployer\Type\Result;
 use Deployer\Cluster\ClusterFactory;
-use Deployer\Exception\Exception;
 use Monolog\Logger;
 use Symfony\Component\Console\Question\ChoiceQuestion;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
@@ -561,7 +560,7 @@ function has($name)
  */
 function ask($message, $default = null, $suggestedChoices = null)
 {
-    requiresTaskContext(__FUNCTION__);
+    Context::required(__FUNCTION__);
 
     if (($suggestedChoices !== null) && (empty($suggestedChoices))) {
         throw new \InvalidArgumentException('Suggested choices should not be empty');
@@ -594,7 +593,7 @@ function ask($message, $default = null, $suggestedChoices = null)
  */
 function askChoice($message, array $availableChoices, $default = null, $multiselect = false)
 {
-    requiresTaskContext(__FUNCTION__);
+    Context::required(__FUNCTION__);
 
     if (empty($availableChoices)) {
         throw new \InvalidArgumentException('Available choices should not be empty');
@@ -629,7 +628,7 @@ function askChoice($message, array $availableChoices, $default = null, $multisel
  */
 function askConfirmation($message, $default = false)
 {
-    requiresTaskContext(__FUNCTION__);
+    Context::required(__FUNCTION__);
 
     if (isQuiet()) {
         return $default;
@@ -652,7 +651,7 @@ function askConfirmation($message, $default = false)
  */
 function askHiddenResponse($message)
 {
-    requiresTaskContext(__FUNCTION__);
+    Context::required(__FUNCTION__);
 
     if (isQuiet()) {
         return '';
@@ -751,16 +750,3 @@ function parse($value)
 {
     return Context::get()->getEnvironment()->parse($value);
 }
-
-/**
- * Throws a Exception when not called within a task-context.
- *
- * This method provides a usefull error to the end-user to make him/her aware
- * to use a function in the required task-context.
- */
-function requiresTaskContext($callerName)
-{
-    if (!Context::get()) {
-        throw new Exception("'$callerName' can only be used within a 'task()'-function!");
-    }
-}