[Security] Updating Guzzle to address CVE-2016-5385

gmintoco · Jul 19, 2016 · ebc74a6 · ebc74a6
1 parent 13d250f
commit ebc74a6
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 176 deletions.
diff --git a/c3.php b/c3.php
@@ -48,6 +48,16 @@ function __c3_error($message)
     }
 }
 
+// phpunit codecoverage shimming
+if (class_exists('SebastianBergmann\CodeCoverage\CodeCoverage')) {
+      class_alias('SebastianBergmann\CodeCoverage\CodeCoverage', 'PHP_CodeCoverage');
+      class_alias('SebastianBergmann\CodeCoverage\Report\Text', 'PHP_CodeCoverage_Report_Text');
+      class_alias('SebastianBergmann\CodeCoverage\Report\PHP', 'PHP_CodeCoverage_Report_PHP');
+      class_alias('SebastianBergmann\CodeCoverage\Report\Clover', 'PHP_CodeCoverage_Report_Clover');
+      class_alias('SebastianBergmann\CodeCoverage\Report\Html\Facade', 'PHP_CodeCoverage_Report_HTML');
+      class_alias('SebastianBergmann\CodeCoverage\Exception', 'PHP_CodeCoverage_Exception');
+}
+
 // Autoload Codeception classes
 if (!class_exists('\\Codeception\\Codecept')) {
     if (file_exists(__DIR__ . '/codecept.phar')) {

diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
       "maknz/slack": "dev-master",
       "erusev/parsedown": "dev-master",
       "fideloper/proxy": "^3.1",
-      "guzzlehttp/guzzle": "5.3.0",
+      "guzzlehttp/guzzle": "6.2.1",
       "aws/aws-sdk-php-laravel": "~3.0",
       "tecnickcom/tc-lib-barcode": "dev-master",
       "laravelcollective/html" : "~5.0",

diff --git a/composer.lock b/composer.lock