-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #583 from elmsln/renovate/packagist-guzzlehttp/guz…
…zle-vulnerability Update dependency guzzlehttp/guzzle to v6.5.8 [SECURITY]
- Loading branch information
Showing
137 changed files
with
23,652 additions
and
1,568 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| <?php | ||
|
|
||
| $config = PhpCsFixer\Config::create() | ||
| ->setRiskyAllowed(true) | ||
| ->setRules([ | ||
| '@PSR2' => true, | ||
| 'array_syntax' => ['syntax' => 'short'], | ||
| 'declare_strict_types' => false, | ||
| 'concat_space' => ['spacing'=>'one'], | ||
| 'php_unit_test_case_static_method_calls' => ['call_type' => 'self'], | ||
| 'ordered_imports' => true, | ||
| // 'phpdoc_align' => ['align'=>'vertical'], | ||
| // 'native_function_invocation' => true, | ||
| ]) | ||
| ->setFinder( | ||
| PhpCsFixer\Finder::create() | ||
| ->in(__DIR__.'/src') | ||
| ->in(__DIR__.'/tests') | ||
| ->name('*.php') | ||
| ) | ||
| ; | ||
|
|
||
| return $config; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| FROM composer:latest as setup | ||
|
|
||
| RUN mkdir /guzzle | ||
|
|
||
| WORKDIR /guzzle | ||
|
|
||
| RUN set -xe \ | ||
| && composer init --name=guzzlehttp/test --description="Simple project for testing Guzzle scripts" --author="Márk Sági-Kazár <[email protected]>" --no-interaction \ | ||
| && composer require guzzlehttp/guzzle | ||
|
|
||
|
|
||
| FROM php:7.3 | ||
|
|
||
| RUN mkdir /guzzle | ||
|
|
||
| WORKDIR /guzzle | ||
|
|
||
| COPY --from=setup /guzzle /guzzle |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,12 @@ | ||
| Copyright (c) 2011-2018 Michael Dowling, https://github.com/mtdowling <[email protected]> | ||
| The MIT License (MIT) | ||
|
|
||
| Copyright (c) 2011 Michael Dowling <[email protected]> | ||
| Copyright (c) 2012 Jeremy Lindblom <[email protected]> | ||
| Copyright (c) 2014 Graham Campbell <[email protected]> | ||
| Copyright (c) 2015 Márk Sági-Kazár <[email protected]> | ||
| Copyright (c) 2015 Tobias Schultze <[email protected]> | ||
| Copyright (c) 2016 Tobias Nyholm <[email protected]> | ||
| Copyright (c) 2016 George Mponos <[email protected]> | ||
|
|
||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| of this software and associated documentation files (the "Software"), to deal | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,43 +2,91 @@ | |
| "name": "guzzlehttp/guzzle", | ||
| "type": "library", | ||
| "description": "Guzzle is a PHP HTTP client library", | ||
| "keywords": ["framework", "http", "rest", "web service", "curl", "client", "HTTP client"], | ||
| "keywords": [ | ||
| "framework", | ||
| "http", | ||
| "rest", | ||
| "web service", | ||
| "curl", | ||
| "client", | ||
| "HTTP client" | ||
| ], | ||
| "homepage": "http://guzzlephp.org/", | ||
| "license": "MIT", | ||
| "authors": [ | ||
| { | ||
| "name": "Graham Campbell", | ||
| "email": "[email protected]", | ||
| "homepage": "https://github.com/GrahamCampbell" | ||
| }, | ||
| { | ||
| "name": "Michael Dowling", | ||
| "email": "[email protected]", | ||
| "homepage": "https://github.com/mtdowling" | ||
| }, | ||
| { | ||
| "name": "Jeremy Lindblom", | ||
| "email": "[email protected]", | ||
| "homepage": "https://github.com/jeremeamia" | ||
| }, | ||
| { | ||
| "name": "George Mponos", | ||
| "email": "[email protected]", | ||
| "homepage": "https://github.com/gmponos" | ||
| }, | ||
| { | ||
| "name": "Tobias Nyholm", | ||
| "email": "[email protected]", | ||
| "homepage": "https://github.com/Nyholm" | ||
| }, | ||
| { | ||
| "name": "Márk Sági-Kazár", | ||
| "email": "[email protected]", | ||
| "homepage": "https://github.com/sagikazarmark" | ||
| }, | ||
| { | ||
| "name": "Tobias Schultze", | ||
| "email": "[email protected]", | ||
| "homepage": "https://github.com/Tobion" | ||
| } | ||
| ], | ||
| "require": { | ||
| "php": ">=5.5", | ||
| "guzzlehttp/psr7": "^1.4", | ||
| "guzzlehttp/promises": "^1.0" | ||
| "ext-json": "*", | ||
| "symfony/polyfill-intl-idn": "^1.17", | ||
| "guzzlehttp/promises": "^1.0", | ||
| "guzzlehttp/psr7": "^1.9" | ||
| }, | ||
| "require-dev": { | ||
| "ext-curl": "*", | ||
| "phpunit/phpunit": "^8.0.0", | ||
| "psr/log": "^1.0" | ||
| "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", | ||
| "psr/log": "^1.1" | ||
| }, | ||
| "suggest": { | ||
| "psr/log": "Required for using the Log middleware" | ||
| }, | ||
| "config": { | ||
| "sort-packages": true, | ||
| "allow-plugins": { | ||
| "bamarni/composer-bin-plugin": true | ||
| } | ||
| }, | ||
| "extra": { | ||
| "branch-alias": { | ||
| "dev-master": "6.5-dev" | ||
| } | ||
| }, | ||
| "autoload": { | ||
| "files": ["src/functions_include.php"], | ||
| "psr-4": { | ||
| "GuzzleHttp\\": "src/" | ||
| } | ||
| }, | ||
| "files": [ | ||
| "src/functions_include.php" | ||
| ] | ||
| }, | ||
| "autoload-dev": { | ||
| "psr-4": { | ||
| "GuzzleHttp\\Tests\\": "tests/" | ||
| } | ||
| }, | ||
| "suggest": { | ||
| "psr/log": "Required for using the Log middleware" | ||
| }, | ||
| "extra": { | ||
| "branch-alias": { | ||
| "dev-master": "6.3-dev" | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.