Skip to content

Commit ebc74a6

Browse files
committed
[Security] Updating Guzzle to address CVE-2016-5385
1 parent 13d250f commit ebc74a6

File tree

3 files changed

+45
-176
lines changed

3 files changed

+45
-176
lines changed

c3.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,16 @@ function __c3_error($message)
4848
}
4949
}
5050

51+
// phpunit codecoverage shimming
52+
if (class_exists('SebastianBergmann\CodeCoverage\CodeCoverage')) {
53+
class_alias('SebastianBergmann\CodeCoverage\CodeCoverage', 'PHP_CodeCoverage');
54+
class_alias('SebastianBergmann\CodeCoverage\Report\Text', 'PHP_CodeCoverage_Report_Text');
55+
class_alias('SebastianBergmann\CodeCoverage\Report\PHP', 'PHP_CodeCoverage_Report_PHP');
56+
class_alias('SebastianBergmann\CodeCoverage\Report\Clover', 'PHP_CodeCoverage_Report_Clover');
57+
class_alias('SebastianBergmann\CodeCoverage\Report\Html\Facade', 'PHP_CodeCoverage_Report_HTML');
58+
class_alias('SebastianBergmann\CodeCoverage\Exception', 'PHP_CodeCoverage_Exception');
59+
}
60+
5161
// Autoload Codeception classes
5262
if (!class_exists('\\Codeception\\Codecept')) {
5363
if (file_exists(__DIR__ . '/codecept.phar')) {

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"maknz/slack": "dev-master",
1313
"erusev/parsedown": "dev-master",
1414
"fideloper/proxy": "^3.1",
15-
"guzzlehttp/guzzle": "5.3.0",
15+
"guzzlehttp/guzzle": "6.2.1",
1616
"aws/aws-sdk-php-laravel": "~3.0",
1717
"tecnickcom/tc-lib-barcode": "dev-master",
1818
"laravelcollective/html" : "~5.0",

composer.lock

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

0 commit comments

Comments
 (0)