Merge branch 'post-1.1-fixes'

Author: weirdan

composer.json

@@ -3,13 +3,14 @@
     "description": "Runs a php script with XDebug disabled",
     "keywords" : ["Xdebug", "xdebug", "performance"],
     "require": {
-        "composer/xdebug-handler": "1.0.0 || >= 1.2",
+        "composer/xdebug-handler": "^1.1.0",
         "php": "~5.3 || ~7.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.0 || ^6.0 || ^7.0",
         "ext-xdebug": "*",
-        "php": "~5.6 || ~7.0"
+        "php": "~5.6 || ~7.0",
+        "monolog/monolog": "^1.23"
     },
     "autoload-dev": {
         "psr-4": {

src/prepend.php

@@ -7,4 +7,25 @@
     // global or project
     require __DIR__ . '/../../../autoload.php';
 }
-(new \Composer\XdebugHandler\XdebugHandler('RUNWITHOUTXDEBUG'))->check();
+
+call_user_func(function() {
+    $x = new \Composer\XdebugHandler\XdebugHandler('RWX');
+    if ($logFile = getenv('RWX_DEBUG_LOG')) {
+        $logger = new \Monolog\Logger('rwx', [new \Monolog\Handler\StreamHandler($logFile)]);
+    } else {
+        $logger = new \Psr\Log\NullLogger;
+    }
+
+    // we don't have to detect command line code as auto_prepend_file doesn't work in that case
+    $mainScript = in_array($_SERVER['argv'][0], ['-', 'Standard input code'], true)
+                    ? '--'
+                    : $_SERVER['argv'][0];
+
+    $logger->debug('argv[0]: ' . $_SERVER['argv'][0]);
+    $logger->debug('Main script: ' . $mainScript);
+
+    $x->setMainScript($mainScript);
+
+    $x->setLogger($logger);
+    $x->check();
+});