Merge branch 'hotfix/2400'

Close zendframework/zendframework#2400

src/Console.php

@@ -24,6 +24,13 @@ abstract class Console
      */
     protected static $instance;
 
+    /**
+     * Allow overriding whether or not we're in a console env. If set, and
+     * boolean, returns that value from isConsole().
+     * @var bool
+     */
+    protected static $isConsole;
+
     /**
      * Create and return Adapter\AdapterInterface instance.
      *
@@ -125,13 +132,29 @@ public static function isAnsicon()
     /**
      * Check if running in a console environment (CLI)
      *
+     * By default, returns value of PHP_SAPI global constant. If $isConsole is
+     * set, and a boolean value, that value will be returned.
+     *
      * @return bool
      */
     public static function isConsole()
     {
+        if (null !== static::$isConsole && is_bool(static::$isConsole)) {
+            return static::$isConsole;
+        }
         return PHP_SAPI == 'cli';
     }
 
+    /**
+     * Override the "is console environment" flag
+     *
+     * @param  null|bool $flag
+     */
+    public static function overrideIsConsole($flag)
+    {
+        static::$isConsole = $flag;
+    }
+
     /**
      * Try to detect best matching adapter
      * @return string|null