Merge pull request #7 from weirdan/XH-1.3

Update to XdebugHandler 1.3

Author: weirdan

.travis.yml

@@ -23,4 +23,5 @@ install:
   - composer install --no-interaction --no-progress --prefer-dist --ansi
 
 script:
+  - composer cs-check
   - composer test

composer.json

@@ -3,13 +3,14 @@
     "description": "Runs a php script with XDebug disabled",
     "keywords" : ["Xdebug", "xdebug", "performance"],
     "require": {
-        "composer/xdebug-handler": "^1.2",
+        "composer/xdebug-handler": "^1.3",
         "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",
+        "squizlabs/php_codesniffer": "^3.3"
     },
     "autoload-dev": {
         "psr-4": {
@@ -25,6 +26,8 @@
     ],
     "bin": ["bin/php-noxdebug"],
     "scripts": {
-        "test": "bin/php-noxdebug vendor/bin/phpunit --color=always"
+        "test": "bin/php-noxdebug vendor/bin/phpunit --color=always",
+	"cs-check": "phpcs",
+	"cs-fix": "phpcbf"
     }
 }

phpcs.xml.dist

@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<ruleset name="RWX Standard" namespace="Weirdan\RunWithoutXdebug\CS\Standard">
+    <file>./src</file>
+    <file>./tests</file>
+    <arg name="colors"/>
+    <rule ref="PSR12">
+        <exclude name="PSR1.Files.SideEffects.FoundWithSymbols"/>
+    </rule>
+</ruleset>

src/prepend.php

@@ -4,12 +4,12 @@
 if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
     // standalone
     require __DIR__ . '/../vendor/autoload.php';
-} else if (file_exists(__DIR__ . '/../../../autoload.php')) {
+} elseif (file_exists(__DIR__ . '/../../../autoload.php')) {
     // global or project
     require __DIR__ . '/../../../autoload.php';
 }
 
-call_user_func(function() {
+call_user_func(function () {
     $x = new \Composer\XdebugHandler\XdebugHandler('RWX');
     if ($logFile = getenv('RWX_DEBUG_LOG')) {
         if (!class_exists(Logger::class, false)) {
@@ -33,7 +33,7 @@ public function log($level, $message, array $context = array())
         }
         $logger = new Logger($logFile);
     } else {
-        $logger = new \Psr\Log\NullLogger;
+        $logger = new \Psr\Log\NullLogger();
     }
 
     // we don't have to detect command line code as auto_prepend_file doesn't work in that case
@@ -44,10 +44,9 @@ public function log($level, $message, array $context = array())
     $logger->debug('argv[0]: ' . $_SERVER['argv'][0]);
     $logger->debug('Main script: ' . $mainScript);
 
-    $x->setMainScript($mainScript);
-
-    $x->setLogger($logger);
-    $x->check();
-    $config = new \Composer\XdebugHandler\PhpConfig;
-    $config->usePersistent();
+    $x
+        ->setMainScript($mainScript)
+        ->setPersistent()
+        ->setLogger($logger)
+        ->check();
 });