Skip to content

Commit

Permalink
Merge pull request #466 from matomo-org/l3-564-guzzle-version
Browse files Browse the repository at this point in the history 
Updating Guzzle dependency to 7.8.0
  • Loading branch information
@snake14
snake14 authored Oct 15, 2023
2 parents 5a444d0 + 276abc2 commit e989260
Show file tree
Hide file tree
Showing 63 changed files with 542 additions and 445 deletions.
4 changes: 2 additions & 2 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"google/apiclient": "^2.13.1",
"google/apiclient-services": "^0.221",
"guzzlehttp/guzzle": "^7.0",
"guzzlehttp/psr7": "2.5.0",
"guzzlehttp/promises": "1.5.1",
"guzzlehttp/psr7": "2.5.1",
"guzzlehttp/promises": "1.5.3",
"google/analytics-data": "^0.9.4",
"google/analytics-admin": "^0.10.0",
"phpseclib/phpseclib": "^3.0.19",
Expand Down
50 changes: 23 additions & 27 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 25 additions & 29 deletions vendor/composer/installed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -647,23 +647,23 @@
},
{
"name": "guzzlehttp/guzzle",
"version": "7.6.1",
"version_normalized": "7.6.1.0",
"version": "7.8.0",
"version_normalized": "7.8.0.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "8444a2bacf1960bc6a2b62ed86b8e72e11eebe51"
"reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/8444a2bacf1960bc6a2b62ed86b8e72e11eebe51",
"reference": "8444a2bacf1960bc6a2b62ed86b8e72e11eebe51",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/1110f66a6530a40fe7aea0378fe608ee2b2248f9",
"reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9",
"shasum": ""
},
"require": {
"ext-json": "*",
"guzzlehttp/promises": "^1.5",
"guzzlehttp/psr7": "^1.9.1 || ^2.4.5",
"guzzlehttp/promises": "^1.5.3 || ^2.0.1",
"guzzlehttp/psr7": "^1.9.1 || ^2.5.1",
"php": "^7.2.5 || ^8.0",
"psr/http-client": "^1.0",
"symfony/deprecation-contracts": "^2.2 || ^3.0"
Expand All @@ -674,7 +674,8 @@
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8.1",
"ext-curl": "*",
"php-http/client-integration-tests": "^3.0",
"php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999",
"php-http/message-factory": "^1.1",
"phpunit/phpunit": "^8.5.29 || ^9.5.23",
"psr/log": "^1.1 || ^2.0 || ^3.0"
},
Expand All @@ -683,7 +684,7 @@
"ext-intl": "Required for Internationalized Domain Name (IDN) support",
"psr/log": "Required for using the Log middleware"
},
"time": "2023-05-15T20:43:01+00:00",
"time": "2023-08-27T10:20:53+00:00",
"type": "library",
"extra": {
"bamarni-bin": {
Expand Down Expand Up @@ -755,7 +756,7 @@
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
"source": "https://github.com/guzzle/guzzle/tree/7.6.1"
"source": "https://github.com/guzzle/guzzle/tree/7.8.0"
},
"funding": [
{
Expand All @@ -775,17 +776,17 @@
},
{
"name": "guzzlehttp/promises",
"version": "1.5.1",
"version_normalized": "1.5.1.0",
"version": "1.5.3",
"version_normalized": "1.5.3.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
"reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da"
"reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
"reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
"url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e",
"reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e",
"shasum": ""
},
"require": {
Expand All @@ -794,13 +795,8 @@
"require-dev": {
"symfony/phpunit-bridge": "^4.4 || ^5.1"
},
"time": "2021-10-22T20:56:57+00:00",
"time": "2023-05-21T12:31:43+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.5-dev"
}
},
"installation-source": "dist",
"autoload": {
"files": [
Expand Down Expand Up @@ -842,7 +838,7 @@
],
"support": {
"issues": "https://github.com/guzzle/promises/issues",
"source": "https://github.com/guzzle/promises/tree/1.5.1"
"source": "https://github.com/guzzle/promises/tree/1.5.3"
},
"funding": [
{
Expand All @@ -862,17 +858,17 @@
},
{
"name": "guzzlehttp/psr7",
"version": "2.5.0",
"version_normalized": "2.5.0.0",
"version": "2.5.1",
"version_normalized": "2.5.1.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
"reference": "b635f279edd83fc275f822a1188157ffea568ff6"
"reference": "a0b3a03e8e8005257fbc408ce5f0fd0a8274dc7f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6",
"reference": "b635f279edd83fc275f822a1188157ffea568ff6",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/a0b3a03e8e8005257fbc408ce5f0fd0a8274dc7f",
"reference": "a0b3a03e8e8005257fbc408ce5f0fd0a8274dc7f",
"shasum": ""
},
"require": {
Expand All @@ -893,7 +889,7 @@
"suggest": {
"laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
},
"time": "2023-04-17T16:11:26+00:00",
"time": "2023-08-03T15:02:42+00:00",
"type": "library",
"extra": {
"bamarni-bin": {
Expand Down Expand Up @@ -961,7 +957,7 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/2.5.0"
"source": "https://github.com/guzzle/psr7/tree/2.5.1"
},
"funding": [
{
Expand Down
30 changes: 15 additions & 15 deletions vendor/composer/installed.php
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?php return array(
'root' => array(
'name' => '__root__',
'pretty_version' => 'dev-4.x-dev',
'version' => 'dev-4.x-dev',
'reference' => '5d497d9f3d54bb00c82b2145425ebb8ad2d0c8a9',
'pretty_version' => 'dev-5.x-dev',
'version' => 'dev-5.x-dev',
'reference' => '5a444d0661156d14252eeb80de2754bb6f25d783',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
'dev' => true,
),
'versions' => array(
'__root__' => array(
'pretty_version' => 'dev-4.x-dev',
'version' => 'dev-4.x-dev',
'reference' => '5d497d9f3d54bb00c82b2145425ebb8ad2d0c8a9',
'pretty_version' => 'dev-5.x-dev',
'version' => 'dev-5.x-dev',
'reference' => '5a444d0661156d14252eeb80de2754bb6f25d783',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand Down Expand Up @@ -128,27 +128,27 @@
'dev_requirement' => false,
),
'guzzlehttp/guzzle' => array(
'pretty_version' => '7.6.1',
'version' => '7.6.1.0',
'reference' => '8444a2bacf1960bc6a2b62ed86b8e72e11eebe51',
'pretty_version' => '7.8.0',
'version' => '7.8.0.0',
'reference' => '1110f66a6530a40fe7aea0378fe608ee2b2248f9',
'type' => 'library',
'install_path' => __DIR__ . '/../guzzlehttp/guzzle',
'aliases' => array(),
'dev_requirement' => false,
),
'guzzlehttp/promises' => array(
'pretty_version' => '1.5.1',
'version' => '1.5.1.0',
'reference' => 'fe752aedc9fd8fcca3fe7ad05d419d32998a06da',
'pretty_version' => '1.5.3',
'version' => '1.5.3.0',
'reference' => '67ab6e18aaa14d753cc148911d273f6e6cb6721e',
'type' => 'library',
'install_path' => __DIR__ . '/../guzzlehttp/promises',
'aliases' => array(),
'dev_requirement' => false,
),
'guzzlehttp/psr7' => array(
'pretty_version' => '2.5.0',
'version' => '2.5.0.0',
'reference' => 'b635f279edd83fc275f822a1188157ffea568ff6',
'pretty_version' => '2.5.1',
'version' => '2.5.1.0',
'reference' => 'a0b3a03e8e8005257fbc408ce5f0fd0a8274dc7f',
'type' => 'library',
'install_path' => __DIR__ . '/../guzzlehttp/psr7',
'aliases' => array(),
Expand Down
Loading

0 comments on commit e989260

Please sign in to comment.