Fixes #115

hassankhan · Feb 1, 2019 · 5c0ad8e · 5c0ad8e
1 parent a2b9931
commit 5c0ad8e
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 2 deletions.
diff --git a/src/Parser/Php.php b/src/Parser/Php.php
@@ -45,7 +45,7 @@ public function parseFile($filename)
 
     /**
      * {@inheritDoc}
-     *Loads a PHP string and gets its' contents as an array
+     * Loads a PHP string and gets its' contents as an array
      *
      * @throws ParseException             If the PHP string throws an exception
      * @throws UnsupportedFormatException If the PHP string does not return an array
@@ -60,7 +60,7 @@ public function parseString($config)
 
         // Eval the string, if it throws an exception, rethrow it
         try {
-            $data = eval($config);
+            $data = $this->isolate($config);
         } catch (Exception $exception) {
             throw new ParseException(
                 [
@@ -97,6 +97,18 @@ protected function parse($data = null, $filename = null)
         return $data;
     }
 
+    /**
+     * Runs PHP string in isolated method
+     *
+     * @param  string $EGsfKPdue7ahnMTy
+     *
+     * @return array
+     */
+    protected function isolate($EGsfKPdue7ahnMTy)
+    {
+        return eval($EGsfKPdue7ahnMTy);
+    }
+
     /**
      * {@inheritDoc}
      */

diff --git a/tests/Parser/PhpTest.php b/tests/Parser/PhpTest.php
@@ -64,6 +64,7 @@ public function testLoadExceptionalPhpFile()
 
     /**
      * @covers                   Noodlehaus\Parser\Php::parseString()
+     * @covers                   Noodlehaus\Parser\Php::isolate()
      * @expectedException        Noodlehaus\Exception\ParseException
      * @expectedExceptionMessage PHP string threw an exception
      */
@@ -75,6 +76,7 @@ public function testLoadExceptionalPhpString()
     /**
      * @covers Noodlehaus\Parser\Php::parseFile()
      * @covers Noodlehaus\Parser\Php::parseString()
+     * @covers Noodlehaus\Parser\Php::isolate()
      * @covers Noodlehaus\Parser\Php::parse()
      */
     public function testLoadPhpArray()
@@ -92,6 +94,7 @@ public function testLoadPhpArray()
     /**
      * @covers Noodlehaus\Parser\Php::parseFile()
      * @covers Noodlehaus\Parser\Php::parseString()
+     * @covers Noodlehaus\Parser\Php::isolate()
      * @covers Noodlehaus\Parser\Php::parse()
      */
     public function testLoadPhpCallable()
@@ -105,4 +108,22 @@ public function testLoadPhpCallable()
         $this->assertEquals('localhost', $string['host']);
         $this->assertEquals('80', $string['port']);
     }
+
+    /**
+     * @covers Noodlehaus\Parser\Php::parseFile()
+     * @covers Noodlehaus\Parser\Php::parseString()
+     * @covers Noodlehaus\Parser\Php::isolate()
+     * @covers Noodlehaus\Parser\Php::parse()
+     */
+    public function testLoadPhpVariable()
+    {
+        $file = $this->php->parseFile(__DIR__ . '/../mocks/pass/config-var.php');
+        $string = $this->php->parseString(file_get_contents(__DIR__ . '/../mocks/pass/config-var.php'));
+
+        $this->assertEquals('localhost', $file['host']);
+        $this->assertEquals('80', $file['port']);
+
+        $this->assertEquals('localhost', $string['host']);
+        $this->assertEquals('80', $string['port']);
+    }
 }
diff --git a/tests/mocks/pass/config-var.php b/tests/mocks/pass/config-var.php
@@ -0,0 +1,11 @@
+<?php
+
+$config['host'] = 'localhost';
+$config['port'] = 80;
+$config['servers'][0] = 'host1';
+$config['servers'][1] = 'host2';
+$config['servers'][2] = 'host3';
+$config['application']['name'] = 'configuration';
+$config['application']['secret'] = 's3cr3t';
+
+return $config;