Skip to content

Commit 4891896

Browse files
committed
Bump php-sandbox. Fixes #31
1 parent c6162fb commit 4891896

33 files changed

Lines changed: 603 additions & 628 deletions

composer.lock

Lines changed: 18 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

composer.phar

39.8 KB
Binary file not shown.

vendor/autoload.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44

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

7-
return ComposerAutoloaderInitc5eb6c61dea33c587b462d2698a7e677::getLoader();
7+
return ComposerAutoloaderInit905b83fb126b062f4c2d3d659f6f0e12::getLoader();

vendor/composer/autoload_namespaces.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@
77

88
return array(
99
'PHPParser' => array($vendorDir . '/nikic/php-parser/lib'),
10-
'FunctionParser' => array($vendorDir . '/jeremeamia/FunctionParser/src'),
1110
);

vendor/composer/autoload_psr4.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@
77

88
return array(
99
'PHPSandbox\\' => array($vendorDir . '/fieryprophet/php-sandbox/src'),
10+
'FunctionParser\\' => array($vendorDir . '/jeremeamia/FunctionParser/src'),
1011
);

vendor/composer/autoload_real.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// autoload_real.php @generated by Composer
44

5-
class ComposerAutoloaderInitc5eb6c61dea33c587b462d2698a7e677
5+
class ComposerAutoloaderInit905b83fb126b062f4c2d3d659f6f0e12
66
{
77
private static $loader;
88

@@ -19,9 +19,9 @@ public static function getLoader()
1919
return self::$loader;
2020
}
2121

22-
spl_autoload_register(array('ComposerAutoloaderInitc5eb6c61dea33c587b462d2698a7e677', 'loadClassLoader'), true, true);
22+
spl_autoload_register(array('ComposerAutoloaderInit905b83fb126b062f4c2d3d659f6f0e12', 'loadClassLoader'), true, true);
2323
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
24-
spl_autoload_unregister(array('ComposerAutoloaderInitc5eb6c61dea33c587b462d2698a7e677', 'loadClassLoader'));
24+
spl_autoload_unregister(array('ComposerAutoloaderInit905b83fb126b062f4c2d3d659f6f0e12', 'loadClassLoader'));
2525

2626
$map = require __DIR__ . '/autoload_namespaces.php';
2727
foreach ($map as $namespace => $path) {
@@ -42,14 +42,14 @@ public static function getLoader()
4242

4343
$includeFiles = require __DIR__ . '/autoload_files.php';
4444
foreach ($includeFiles as $file) {
45-
self::composerRequirec5eb6c61dea33c587b462d2698a7e677($file);
45+
composerRequire905b83fb126b062f4c2d3d659f6f0e12($file);
4646
}
4747

4848
return $loader;
4949
}
50+
}
5051

51-
private static function composerRequirec5eb6c61dea33c587b462d2698a7e677($file)
52-
{
53-
require $file;
54-
}
52+
function composerRequire905b83fb126b062f4c2d3d659f6f0e12($file)
53+
{
54+
require $file;
5555
}

vendor/composer/installed.json

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,23 +53,28 @@
5353
"source": {
5454
"type": "git",
5555
"url": "https://github.com/jeremeamia/FunctionParser.git",
56-
"reference": "9e1ea101f2680dcce65c338bba76dac380d921c6"
56+
"reference": "035b52000b88ea8d72a6647dd4cd39f080cf7ada"
5757
},
5858
"dist": {
5959
"type": "zip",
60-
"url": "https://api.github.com/repos/jeremeamia/FunctionParser/zipball/9e1ea101f2680dcce65c338bba76dac380d921c6",
61-
"reference": "9e1ea101f2680dcce65c338bba76dac380d921c6",
60+
"url": "https://api.github.com/repos/jeremeamia/FunctionParser/zipball/035b52000b88ea8d72a6647dd4cd39f080cf7ada",
61+
"reference": "035b52000b88ea8d72a6647dd4cd39f080cf7ada",
6262
"shasum": ""
6363
},
6464
"require": {
6565
"php": ">=5.3.2"
6666
},
67-
"time": "2014-01-14 23:32:26",
67+
"time": "2015-02-02 17:30:47",
6868
"type": "library",
69+
"extra": {
70+
"branch-alias": {
71+
"dev-master": "1.0-dev"
72+
}
73+
},
6974
"installation-source": "source",
7075
"autoload": {
71-
"psr-0": {
72-
"FunctionParser": "src/"
76+
"psr-4": {
77+
"FunctionParser\\": "src/"
7378
}
7479
},
7580
"notification-url": "http://packagist.org/downloads/",
@@ -97,24 +102,24 @@
97102
"source": {
98103
"type": "git",
99104
"url": "https://github.com/fieryprophet/php-sandbox.git",
100-
"reference": "db9ca30c51d3d6a5644fc0288d6408562c5011a4"
105+
"reference": "4a30e96e1a525a4a6b74e24034d7f505133eb8cb"
101106
},
102107
"dist": {
103108
"type": "zip",
104-
"url": "https://api.github.com/repos/fieryprophet/php-sandbox/zipball/db9ca30c51d3d6a5644fc0288d6408562c5011a4",
105-
"reference": "db9ca30c51d3d6a5644fc0288d6408562c5011a4",
109+
"url": "https://api.github.com/repos/fieryprophet/php-sandbox/zipball/4a30e96e1a525a4a6b74e24034d7f505133eb8cb",
110+
"reference": "4a30e96e1a525a4a6b74e24034d7f505133eb8cb",
106111
"shasum": ""
107112
},
108113
"require": {
109-
"jeremeamia/functionparser": "dev-master",
110-
"nikic/php-parser": "0.9.*@dev",
114+
"jeremeamia/functionparser": "~1.0.0",
115+
"nikic/php-parser": "~0.9.5",
111116
"php": ">=5.3.2"
112117
},
113118
"require-dev": {
114-
"phpdocumentor/phpdocumentor": "v2.3.0",
119+
"phpdocumentor/phpdocumentor": "v2.3.2",
115120
"phpunit/phpunit": "3.7.*"
116121
},
117-
"time": "2014-10-27 14:56:02",
122+
"time": "2015-02-27 20:09:02",
118123
"type": "library",
119124
"installation-source": "source",
120125
"autoload": {

vendor/fieryprophet/php-sandbox/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#CHANGELOG
22

3+
##02/27/2015
4+
- Addressed issue #18 where arrays may potentially allow for compromising the sandbox by encapsulating unsandboxed callables
5+
36
##07/24/2014
47
- Fixed bug with prepare_vars()
58

vendor/fieryprophet/php-sandbox/composer.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@
1010
"name": "Elijah Horton"
1111
}
1212
],
13-
"minimum-stability": "dev",
1413
"require": {
1514
"php": ">=5.3.2",
16-
"nikic/php-parser": "0.9.*@dev",
17-
"jeremeamia/functionparser": "dev-master"
15+
"nikic/php-parser": "~0.9.5",
16+
"jeremeamia/functionparser": "~1.0.0"
1817
},
1918
"require-dev": {
2019
"phpunit/phpunit": "3.7.*",
21-
"phpdocumentor/phpdocumentor": "v2.3.0"
20+
"phpdocumentor/phpdocumentor": "v2.3.2"
2221
},
2322
"autoload": {
2423
"files": [ "src/functions.php" ],

0 commit comments

Comments
 (0)