Remove ini directives below PATH and HOST sections (#133)

Author: johnstevenson

src/XdebugHandler.php

@@ -377,15 +377,20 @@ private function writeTmpIni(array $iniFiles, $tmpDir, &$error)
         }
 
         $content = '';
-        $regex = '/^\s*(zend_extension\s*=.*xdebug.*)$/mi';
+        $sectionRegex = '/^\s*\[(?:PATH|HOST)\s*=/mi';
+        $xdebugRegex = '/^\s*(zend_extension\s*=.*xdebug.*)$/mi';
 
         foreach ($iniFiles as $file) {
             // Check for inaccessible ini files
             if (($data = @file_get_contents($file)) === false) {
                 $error = 'Unable to read ini: '.$file;
                 return false;
             }
-            $content .= preg_replace($regex, ';$1', $data).PHP_EOL;
+            // Check and remove directives after HOST and PATH sections
+            if (preg_match($sectionRegex, $data, $matches, PREG_OFFSET_CAPTURE)) {
+                $data = substr($data, 0, $matches[0][1]);
+            }
+            $content .= preg_replace($xdebugRegex, ';$1', $data).PHP_EOL;
         }
 
         // Merge loaded settings into our ini content, if it is valid

tests/Fixtures/scandir/section-first.ini

@@ -0,0 +1,5 @@
+;
+; This file is used for test mocking xdebug-handler, it is not read by php.
+;
+
+cli.setting=CLI

tests/Fixtures/scandir/section-host.ini

@@ -0,0 +1,7 @@
+;
+; This file is used for test mocking xdebug-handler, it is not read by php.
+;
+
+; Directives below HOST ini section must be removed
+  [Host= some/where]
+  cgi.only.setting=HOST

tests/Fixtures/scandir/section-path.ini

@@ -0,0 +1,7 @@
+;
+; This file is used for test mocking xdebug-handler, it is not read by php.
+;
+
+; Directives below PATHini section must be removed
+[Path=some/where]
+cgi.only.setting=PATH

tests/Helpers/IniHelper.php

@@ -90,6 +90,17 @@ public function setInaccessibleIni()
         $this->setEnvironment();
     }
 
+    public function setSectionInis($sectionName)
+    {
+        $this->files = array(
+            $this->loadedIni,
+            $this->scanDir.DIRECTORY_SEPARATOR.'section-first.ini',
+            $this->scanDir.DIRECTORY_SEPARATOR.'section-'.$sectionName.'.ini',
+        );
+
+        $this->setEnvironment();
+    }
+
     public function getIniFiles()
     {
         return $this->files;

tests/IniFilesTest.php

@@ -145,6 +145,33 @@ public function testInaccessbleIni()
         $this->checkNoRestart($xdebug);
     }
 
+    /**
+     * Tests that directives below HOST and PATH sections are removed
+     *
+     * @dataProvider iniSectionsProvider
+     */
+    public function testIniSections($sectionName)
+    {
+        $ini = new IniHelper();
+        $ini->setSectionInis($sectionName);
+
+        $loaded = true;
+        $xdebug = PartialMock::createAndCheck($loaded);
+
+        $content = $this->getTmpIniContent($xdebug);
+        $config = parse_ini_string($content);
+        $this->assertArrayHasKey('cli.setting', $config);
+        $this->assertArrayNotHasKey('cgi.only.setting', $config);
+    }
+
+    public function iniSectionsProvider()
+    {
+        return array(
+            'host-section' => array('host'),
+            'path-section' => array('path'),
+        );
+    }
+
     /**
      * Common method to get mocked tmp ini content
      */