Bump php-sandbox. Fixes #31

mrjoelkemp · Feb 27, 2015 · 4891896 · 4891896
1 parent c6162fb
commit 4891896
Show file tree

Hide file tree

Showing 33 changed files with 603 additions and 628 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/composer.phar b/composer.phar
diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInitc5eb6c61dea33c587b462d2698a7e677::getLoader();
+return ComposerAutoloaderInit905b83fb126b062f4c2d3d659f6f0e12::getLoader();
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
@@ -7,5 +7,4 @@
 
 return array(
     'PHPParser' => array($vendorDir . '/nikic/php-parser/lib'),
-    'FunctionParser' => array($vendorDir . '/jeremeamia/FunctionParser/src'),
 );
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
@@ -7,4 +7,5 @@
 
 return array(
     'PHPSandbox\\' => array($vendorDir . '/fieryprophet/php-sandbox/src'),
+    'FunctionParser\\' => array($vendorDir . '/jeremeamia/FunctionParser/src'),
 );
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitc5eb6c61dea33c587b462d2698a7e677
+class ComposerAutoloaderInit905b83fb126b062f4c2d3d659f6f0e12
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitc5eb6c61dea33c587b462d2698a7e677', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit905b83fb126b062f4c2d3d659f6f0e12', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitc5eb6c61dea33c587b462d2698a7e677', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit905b83fb126b062f4c2d3d659f6f0e12', 'loadClassLoader'));
 
         $map = require __DIR__ . '/autoload_namespaces.php';
         foreach ($map as $namespace => $path) {
@@ -42,14 +42,14 @@ public static function getLoader()
 
         $includeFiles = require __DIR__ . '/autoload_files.php';
         foreach ($includeFiles as $file) {
-            self::composerRequirec5eb6c61dea33c587b462d2698a7e677($file);
+            composerRequire905b83fb126b062f4c2d3d659f6f0e12($file);
         }
 
         return $loader;
     }
+}
 
-    private static function composerRequirec5eb6c61dea33c587b462d2698a7e677($file)
-    {
-        require $file;
-    }
+function composerRequire905b83fb126b062f4c2d3d659f6f0e12($file)
+{
+    require $file;
 }
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -53,23 +53,28 @@
         "source": {
             "type": "git",
             "url": "https://github.com/jeremeamia/FunctionParser.git",
-            "reference": "9e1ea101f2680dcce65c338bba76dac380d921c6"
+            "reference": "035b52000b88ea8d72a6647dd4cd39f080cf7ada"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/jeremeamia/FunctionParser/zipball/9e1ea101f2680dcce65c338bba76dac380d921c6",
-            "reference": "9e1ea101f2680dcce65c338bba76dac380d921c6",
+            "url": "https://api.github.com/repos/jeremeamia/FunctionParser/zipball/035b52000b88ea8d72a6647dd4cd39f080cf7ada",
+            "reference": "035b52000b88ea8d72a6647dd4cd39f080cf7ada",
             "shasum": ""
         },
         "require": {
             "php": ">=5.3.2"
         },
-        "time": "2014-01-14 23:32:26",
+        "time": "2015-02-02 17:30:47",
         "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.0-dev"
+            }
+        },
         "installation-source": "source",
         "autoload": {
-            "psr-0": {
-                "FunctionParser": "src/"
+            "psr-4": {
+                "FunctionParser\\": "src/"
             }
         },
         "notification-url": "http://packagist.org/downloads/",
@@ -97,24 +102,24 @@
         "source": {
             "type": "git",
             "url": "https://github.com/fieryprophet/php-sandbox.git",
-            "reference": "db9ca30c51d3d6a5644fc0288d6408562c5011a4"
+            "reference": "4a30e96e1a525a4a6b74e24034d7f505133eb8cb"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/fieryprophet/php-sandbox/zipball/db9ca30c51d3d6a5644fc0288d6408562c5011a4",
-            "reference": "db9ca30c51d3d6a5644fc0288d6408562c5011a4",
+            "url": "https://api.github.com/repos/fieryprophet/php-sandbox/zipball/4a30e96e1a525a4a6b74e24034d7f505133eb8cb",
+            "reference": "4a30e96e1a525a4a6b74e24034d7f505133eb8cb",
             "shasum": ""
         },
         "require": {
-            "jeremeamia/functionparser": "dev-master",
-            "nikic/php-parser": "0.9.*@dev",
+            "jeremeamia/functionparser": "~1.0.0",
+            "nikic/php-parser": "~0.9.5",
             "php": ">=5.3.2"
         },
         "require-dev": {
-            "phpdocumentor/phpdocumentor": "v2.3.0",
+            "phpdocumentor/phpdocumentor": "v2.3.2",
             "phpunit/phpunit": "3.7.*"
         },
-        "time": "2014-10-27 14:56:02",
+        "time": "2015-02-27 20:09:02",
         "type": "library",
         "installation-source": "source",
         "autoload": {

diff --git a/vendor/fieryprophet/php-sandbox/CHANGELOG.md b/vendor/fieryprophet/php-sandbox/CHANGELOG.md
@@ -1,5 +1,8 @@
 #CHANGELOG
 
+##02/27/2015
+- Addressed issue #18 where arrays may potentially allow for compromising the sandbox by encapsulating unsandboxed callables
+
 ##07/24/2014
 - Fixed bug with prepare_vars()
 

diff --git a/vendor/fieryprophet/php-sandbox/composer.json b/vendor/fieryprophet/php-sandbox/composer.json
@@ -10,15 +10,14 @@
             "name": "Elijah Horton"
         }
     ],
-    "minimum-stability": "dev",
     "require": {
         "php": ">=5.3.2",
-        "nikic/php-parser": "0.9.*@dev",
-        "jeremeamia/functionparser": "dev-master"
+        "nikic/php-parser": "~0.9.5",
+        "jeremeamia/functionparser": "~1.0.0"
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*",
-        "phpdocumentor/phpdocumentor": "v2.3.0"
+        "phpdocumentor/phpdocumentor": "v2.3.2"
     },
     "autoload": {
         "files": [ "src/functions.php" ],
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@

		require_once __DIR__ . '/composer' . '/autoload_real.php';

		return ComposerAutoloaderInitc5eb6c61dea33c587b462d2698a7e677::getLoader();
		return ComposerAutoloaderInit905b83fb126b062f4c2d3d659f6f0e12::getLoader();