Merge pull request #525 from matomo-org/PG-3461-update-dependency

snake14 · web-flow · commit 9e1385dbef75 · 2024-05-07T13:29:43.000+12:00
Update grpc/grpc dependency to avoid vulnerability
diff --git a/composer.lock b/composer.lock
diff --git a/vendor/autoload_original.php b/vendor/autoload_original.php
@@ -9,4 +9,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitc08e4cdc30bf907d6daec986e582bb21::getLoader();
+return ComposerAutoloaderInit4772b4f8b1accc7fd3f3497a28a4653b::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitc08e4cdc30bf907d6daec986e582bb21
+class ComposerAutoloaderInit4772b4f8b1accc7fd3f3497a28a4653b
 {
     private static $loader;
 
@@ -22,18 +22,18 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitc08e4cdc30bf907d6daec986e582bb21', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit4772b4f8b1accc7fd3f3497a28a4653b', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitc08e4cdc30bf907d6daec986e582bb21', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit4772b4f8b1accc7fd3f3497a28a4653b', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitc08e4cdc30bf907d6daec986e582bb21::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit4772b4f8b1accc7fd3f3497a28a4653b::getInitializer($loader));
 
         $loader->register(true);
 
-        $includeFiles = \Composer\Autoload\ComposerStaticInitc08e4cdc30bf907d6daec986e582bb21::$files;
+        $includeFiles = \Composer\Autoload\ComposerStaticInit4772b4f8b1accc7fd3f3497a28a4653b::$files;
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequirec08e4cdc30bf907d6daec986e582bb21($fileIdentifier, $file);
+            composerRequire4772b4f8b1accc7fd3f3497a28a4653b($fileIdentifier, $file);
         }
 
         return $loader;
@@ -45,7 +45,7 @@ public static function getLoader()
  * @param string $file
  * @return void
  */
-function composerRequirec08e4cdc30bf907d6daec986e582bb21($fileIdentifier, $file)
+function composerRequire4772b4f8b1accc7fd3f3497a28a4653b($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitc08e4cdc30bf907d6daec986e582bb21
+class ComposerStaticInit4772b4f8b1accc7fd3f3497a28a4653b
 {
     public static $files = array(
 );
@@ -175,9 +175,9 @@ class ComposerStaticInitc08e4cdc30bf907d6daec986e582bb21
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitc08e4cdc30bf907d6daec986e582bb21::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitc08e4cdc30bf907d6daec986e582bb21::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitc08e4cdc30bf907d6daec986e582bb21::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit4772b4f8b1accc7fd3f3497a28a4653b::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit4772b4f8b1accc7fd3f3497a28a4653b::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit4772b4f8b1accc7fd3f3497a28a4653b::$classMap;
 
         }, null, ClassLoader::class);
     }
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -599,17 +599,17 @@
         },
         {
             "name": "grpc/grpc",
-            "version": "1.42.0",
-            "version_normalized": "1.42.0.0",
+            "version": "1.57.0",
+            "version_normalized": "1.57.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/grpc/grpc-php.git",
-                "reference": "9fa44f104cb92e924d4da547323a97f3d8aca6d4"
+                "reference": "b610c42022ed3a22f831439cb93802f2a4502fdf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/grpc/grpc-php/zipball/9fa44f104cb92e924d4da547323a97f3d8aca6d4",
-                "reference": "9fa44f104cb92e924d4da547323a97f3d8aca6d4",
+                "url": "https://api.github.com/repos/grpc/grpc-php/zipball/b610c42022ed3a22f831439cb93802f2a4502fdf",
+                "reference": "b610c42022ed3a22f831439cb93802f2a4502fdf",
                 "shasum": ""
             },
             "require": {
@@ -622,7 +622,7 @@
                 "ext-protobuf": "For better performance, install the protobuf C extension.",
                 "google/protobuf": "To get started using grpc quickly, install the native protobuf library."
             },
-            "time": "2021-11-19T08:13:51+00:00",
+            "time": "2023-08-14T23:57:54+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -640,7 +640,7 @@
                 "rpc"
             ],
             "support": {
-                "source": "https://github.com/grpc/grpc-php/tree/v1.42.0"
+                "source": "https://github.com/grpc/grpc-php/tree/v1.57.0"
             },
             "install-path": "../grpc/grpc"
         },
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => '__root__',
         'pretty_version' => 'dev-5.x-dev',
         'version' => 'dev-5.x-dev',
-        'reference' => '03f5ed59057cfc2b8688b1e31118e3715b89824a',
+        'reference' => '129574f4684b701a1cd7a273bcad12249161c47e',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         '__root__' => array(
             'pretty_version' => 'dev-5.x-dev',
             'version' => 'dev-5.x-dev',
-            'reference' => '03f5ed59057cfc2b8688b1e31118e3715b89824a',
+            'reference' => '129574f4684b701a1cd7a273bcad12249161c47e',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
@@ -119,9 +119,9 @@
             'dev_requirement' => false,
         ),
         'grpc/grpc' => array(
-            'pretty_version' => '1.42.0',
-            'version' => '1.42.0.0',
-            'reference' => '9fa44f104cb92e924d4da547323a97f3d8aca6d4',
+            'pretty_version' => '1.57.0',
+            'version' => '1.57.0.0',
+            'reference' => 'b610c42022ed3a22f831439cb93802f2a4502fdf',
             'type' => 'library',
             'install_path' => __DIR__ . '/../grpc/grpc',
             'aliases' => array(),
diff --git a/vendor/prefixed/grpc/grpc/src/lib/BaseStub.php b/vendor/prefixed/grpc/grpc/src/lib/BaseStub.php
@@ -41,7 +41,7 @@ class BaseStub
      */
     public function __construct($hostname, $opts, $channel = null)
     {
-        if (!method_exists('ChannelCredentials', 'isDefaultRootsPemSet') || !ChannelCredentials::isDefaultRootsPemSet()) {
+        if (!method_exists('Matomo\\Dependencies\\GoogleAnalyticsImporter\\Grpc\\ChannelCredentials', 'isDefaultRootsPemSet') || !ChannelCredentials::isDefaultRootsPemSet()) {
             $ssl_roots = file_get_contents(dirname(__FILE__) . '/../../etc/roots.pem');
             ChannelCredentials::setDefaultRootsPem($ssl_roots);
         }
@@ -107,7 +107,7 @@ private static function updateOpts($opts)
     public static function getDefaultChannel($hostname, array $opts)
     {
         $channel_opts = self::updateOpts($opts);
-        return new Channel($hostname, $opts);
+        return new Channel($hostname, $channel_opts);
     }
     /**
      * @return string The URI of the endpoint
@@ -129,7 +129,7 @@ public function getConnectivityState($try_to_connect = \false)
      * @param int $timeout in microseconds
      *
      * @return bool true if channel is ready
-     * @throw Exception if channel is in FATAL_ERROR state
+     * @throws Exception if channel is in FATAL_ERROR state
      */
     public function waitForReady($timeout)
     {
@@ -162,7 +162,7 @@ public function close()
      * @param $new_state Connect state
      *
      * @return bool true if state is CHANNEL_READY
-     * @throw Exception if state is CHANNEL_FATAL_FAILURE
+     * @throws Exception if state is CHANNEL_FATAL_FAILURE
      */
     private function _checkConnectivityState($new_state)
     {
@@ -213,7 +213,7 @@ private function _get_jwt_aud_uri($method)
      * @param array $metadata The metadata map
      *
      * @return array $metadata Validated and key-normalized metadata map
-     * @throw InvalidArgumentException if key contains invalid characters
+     * @throws InvalidArgumentException if key contains invalid characters
      */
     private function _validate_and_normalize_metadata($metadata)
     {
diff --git a/vendor/prefixed/vendor/autoload.php b/vendor/prefixed/vendor/autoload.php
@@ -9,4 +9,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit6eee63908e021fe7b88de30f34493f4a::getLoader();
+return ComposerAutoloaderInitefbbfbccb77cf1d72296999539684a3b::getLoader();
diff --git a/vendor/prefixed/vendor/composer/autoload_classmap.php b/vendor/prefixed/vendor/composer/autoload_classmap.php
@@ -81,7 +81,7 @@
     'Matomo\\Dependencies\\GoogleAnalyticsImporter\\GPBMetadata\\Google\\Iam\\V1\\Policy' => $baseDir . '/google/common-protos/metadata/Iam/V1/Policy.php',
     'Matomo\\Dependencies\\GoogleAnalyticsImporter\\GPBMetadata\\Google\\Logging\\Type\\HttpRequest' => $baseDir . '/google/common-protos/metadata/Logging/Type/HttpRequest.php',
     'Matomo\\Dependencies\\GoogleAnalyticsImporter\\GPBMetadata\\Google\\Logging\\Type\\LogSeverity' => $baseDir . '/google/common-protos/metadata/Logging/Type/LogSeverity.php',
-    'Matomo\\Dependencies\\GoogleAnalyticsImporter\\GPBMetadata\\Google\\Longrunning\\Operations' => $baseDir . '/google/common-protos/metadata/Longrunning/Operations.php',
+    'Matomo\\Dependencies\\GoogleAnalyticsImporter\\GPBMetadata\\Google\\Longrunning\\Operations' => $baseDir . '/google/longrunning/metadata/Longrunning/Operations.php',
     'Matomo\\Dependencies\\GoogleAnalyticsImporter\\GPBMetadata\\Google\\Protobuf\\Any' => $baseDir . '/google/protobuf/src/GPBMetadata/Google/Protobuf/Any.php',
     'Matomo\\Dependencies\\GoogleAnalyticsImporter\\GPBMetadata\\Google\\Protobuf\\Api' => $baseDir . '/google/protobuf/src/GPBMetadata/Google/Protobuf/Api.php',
     'Matomo\\Dependencies\\GoogleAnalyticsImporter\\GPBMetadata\\Google\\Protobuf\\Duration' => $baseDir . '/google/protobuf/src/GPBMetadata/Google/Protobuf/Duration.php',
@@ -957,13 +957,13 @@
     'Matomo\\Dependencies\\GoogleAnalyticsImporter\\Google\\Http\\MediaFileUpload' => $baseDir . '/google/apiclient/src/Http/MediaFileUpload.php',
     'Matomo\\Dependencies\\GoogleAnalyticsImporter\\Google\\Http\\REST' => $baseDir . '/google/apiclient/src/Http/REST.php',
     'Matomo\\Dependencies\\GoogleAnalyticsImporter\\Google\\Iam\\V1\\Logging\\AuditData' => $baseDir . '/google/common-protos/src/Iam/V1/Logging/AuditData.php',
-    'Matomo\\Dependencies\\GoogleAnalyticsImporter\\Google\\LongRunning\\CancelOperationRequest' => $baseDir . '/google/common-protos/src/LongRunning/CancelOperationRequest.php',
-    'Matomo\\Dependencies\\GoogleAnalyticsImporter\\Google\\LongRunning\\DeleteOperationRequest' => $baseDir . '/google/common-protos/src/LongRunning/DeleteOperationRequest.php',
-    'Matomo\\Dependencies\\GoogleAnalyticsImporter\\Google\\LongRunning\\GetOperationRequest' => $baseDir . '/google/common-protos/src/LongRunning/GetOperationRequest.php',
-    'Matomo\\Dependencies\\GoogleAnalyticsImporter\\Google\\LongRunning\\ListOperationsRequest' => $baseDir . '/google/common-protos/src/LongRunning/ListOperationsRequest.php',
-    'Matomo\\Dependencies\\GoogleAnalyticsImporter\\Google\\LongRunning\\ListOperationsResponse' => $baseDir . '/google/common-protos/src/LongRunning/ListOperationsResponse.php',
-    'Matomo\\Dependencies\\GoogleAnalyticsImporter\\Google\\LongRunning\\Operation' => $baseDir . '/google/common-protos/src/LongRunning/Operation.php',
-    'Matomo\\Dependencies\\GoogleAnalyticsImporter\\Google\\LongRunning\\OperationInfo' => $baseDir . '/google/common-protos/src/LongRunning/OperationInfo.php',
+    'Matomo\\Dependencies\\GoogleAnalyticsImporter\\Google\\LongRunning\\CancelOperationRequest' => $baseDir . '/google/longrunning/src/LongRunning/CancelOperationRequest.php',
+    'Matomo\\Dependencies\\GoogleAnalyticsImporter\\Google\\LongRunning\\DeleteOperationRequest' => $baseDir . '/google/longrunning/src/LongRunning/DeleteOperationRequest.php',
+    'Matomo\\Dependencies\\GoogleAnalyticsImporter\\Google\\LongRunning\\GetOperationRequest' => $baseDir . '/google/longrunning/src/LongRunning/GetOperationRequest.php',
+    'Matomo\\Dependencies\\GoogleAnalyticsImporter\\Google\\LongRunning\\ListOperationsRequest' => $baseDir . '/google/longrunning/src/LongRunning/ListOperationsRequest.php',
+    'Matomo\\Dependencies\\GoogleAnalyticsImporter\\Google\\LongRunning\\ListOperationsResponse' => $baseDir . '/google/longrunning/src/LongRunning/ListOperationsResponse.php',
+    'Matomo\\Dependencies\\GoogleAnalyticsImporter\\Google\\LongRunning\\Operation' => $baseDir . '/google/longrunning/src/LongRunning/Operation.php',
+    'Matomo\\Dependencies\\GoogleAnalyticsImporter\\Google\\LongRunning\\OperationInfo' => $baseDir . '/google/longrunning/src/LongRunning/OperationInfo.php',
     'Matomo\\Dependencies\\GoogleAnalyticsImporter\\Google\\Model' => $baseDir . '/google/apiclient/src/Model.php',
     'Matomo\\Dependencies\\GoogleAnalyticsImporter\\Google\\Protobuf\\Any' => $baseDir . '/google/protobuf/src/Google/Protobuf/Any.php',
     'Matomo\\Dependencies\\GoogleAnalyticsImporter\\Google\\Protobuf\\Api' => $baseDir . '/google/protobuf/src/Google/Protobuf/Api.php',
diff --git a/vendor/prefixed/vendor/composer/autoload_real.php b/vendor/prefixed/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit6eee63908e021fe7b88de30f34493f4a
+class ComposerAutoloaderInitefbbfbccb77cf1d72296999539684a3b
 {
     private static $loader;
 
@@ -22,18 +22,18 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit6eee63908e021fe7b88de30f34493f4a', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitefbbfbccb77cf1d72296999539684a3b', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit6eee63908e021fe7b88de30f34493f4a', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitefbbfbccb77cf1d72296999539684a3b', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit6eee63908e021fe7b88de30f34493f4a::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitefbbfbccb77cf1d72296999539684a3b::getInitializer($loader));
 
         $loader->register(true);
 
-        $includeFiles = \Composer\Autoload\ComposerStaticInit6eee63908e021fe7b88de30f34493f4a::$files;
+        $includeFiles = \Composer\Autoload\ComposerStaticInitefbbfbccb77cf1d72296999539684a3b::$files;
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire6eee63908e021fe7b88de30f34493f4a($fileIdentifier, $file);
+            composerRequireefbbfbccb77cf1d72296999539684a3b($fileIdentifier, $file);
         }
 
         return $loader;
@@ -45,7 +45,7 @@ public static function getLoader()
  * @param string $file
  * @return void
  */
-function composerRequire6eee63908e021fe7b88de30f34493f4a($fileIdentifier, $file)
+function composerRequireefbbfbccb77cf1d72296999539684a3b($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
diff --git a/vendor/prefixed/vendor/composer/autoload_static.php b/vendor/prefixed/vendor/composer/autoload_static.php

Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,4 @@`
`9`	`9`
`10`	`10`	`require_once __DIR__ . '/composer/autoload_real.php';`
`11`	`11`
`12`		`-return ComposerAutoloaderInitc08e4cdc30bf907d6daec986e582bb21::getLoader();`
	`12`	`+return ComposerAutoloaderInit4772b4f8b1accc7fd3f3497a28a4653b::getLoader();`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Composer\Autoload;`
`6`	`6`
`7`		`-class ComposerStaticInitc08e4cdc30bf907d6daec986e582bb21`
	`7`	`+class ComposerStaticInit4772b4f8b1accc7fd3f3497a28a4653b`
`8`	`8`	`{`
`9`	`9`	`public static $files = array(`
`10`	`10`	`);`
`@@ -175,9 +175,9 @@ class ComposerStaticInitc08e4cdc30bf907d6daec986e582bb21`
`175`	`175`	`public static function getInitializer(ClassLoader $loader)`
`176`	`176`	`{`
`177`	`177`	`return \Closure::bind(function () use ($loader) {`
`178`		`- $loader->prefixLengthsPsr4 = ComposerStaticInitc08e4cdc30bf907d6daec986e582bb21::$prefixLengthsPsr4;`
`179`		`- $loader->prefixDirsPsr4 = ComposerStaticInitc08e4cdc30bf907d6daec986e582bb21::$prefixDirsPsr4;`
`180`		`- $loader->classMap = ComposerStaticInitc08e4cdc30bf907d6daec986e582bb21::$classMap;`
	`178`	`+ $loader->prefixLengthsPsr4 = ComposerStaticInit4772b4f8b1accc7fd3f3497a28a4653b::$prefixLengthsPsr4;`
	`179`	`+ $loader->prefixDirsPsr4 = ComposerStaticInit4772b4f8b1accc7fd3f3497a28a4653b::$prefixDirsPsr4;`
	`180`	`+ $loader->classMap = ComposerStaticInit4772b4f8b1accc7fd3f3497a28a4653b::$classMap;`
`181`	`181`
`182`	`182`	`}, null, ClassLoader::class);`
`183`	`183`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ class BaseStub`
`41`	`41`	`*/`
`42`	`42`	`public function __construct($hostname, $opts, $channel = null)`
`43`	`43`	`{`
`44`		`- if (!method_exists('ChannelCredentials', 'isDefaultRootsPemSet') \|\| !ChannelCredentials::isDefaultRootsPemSet()) {`
	`44`	`+ if (!method_exists('Matomo\\Dependencies\\GoogleAnalyticsImporter\\Grpc\\ChannelCredentials', 'isDefaultRootsPemSet') \|\| !ChannelCredentials::isDefaultRootsPemSet()) {`
`45`	`45`	`$ssl_roots = file_get_contents(dirname(__FILE__) . '/../../etc/roots.pem');`
`46`	`46`	`ChannelCredentials::setDefaultRootsPem($ssl_roots);`
`47`	`47`	`}`
`@@ -107,7 +107,7 @@ private static function updateOpts($opts)`
`107`	`107`	`public static function getDefaultChannel($hostname, array $opts)`
`108`	`108`	`{`
`109`	`109`	`$channel_opts = self::updateOpts($opts);`
`110`		`- return new Channel($hostname, $opts);`
	`110`	`+ return new Channel($hostname, $channel_opts);`
`111`	`111`	`}`
`112`	`112`	`/**`
`113`	`113`	`* @return string The URI of the endpoint`
`@@ -129,7 +129,7 @@ public function getConnectivityState($try_to_connect = \false)`
`129`	`129`	`* @param int $timeout in microseconds`
`130`	`130`	`*`
`131`	`131`	`* @return bool true if channel is ready`
`132`		`- * @throw Exception if channel is in FATAL_ERROR state`
	`132`	`+ * @throws Exception if channel is in FATAL_ERROR state`
`133`	`133`	`*/`
`134`	`134`	`public function waitForReady($timeout)`
`135`	`135`	`{`
`@@ -162,7 +162,7 @@ public function close()`
`162`	`162`	`* @param $new_state Connect state`
`163`	`163`	`*`
`164`	`164`	`* @return bool true if state is CHANNEL_READY`
`165`		`- * @throw Exception if state is CHANNEL_FATAL_FAILURE`
	`165`	`+ * @throws Exception if state is CHANNEL_FATAL_FAILURE`
`166`	`166`	`*/`
`167`	`167`	`private function _checkConnectivityState($new_state)`
`168`	`168`	`{`
`@@ -213,7 +213,7 @@ private function _get_jwt_aud_uri($method)`
`213`	`213`	`* @param array $metadata The metadata map`
`214`	`214`	`*`
`215`	`215`	`* @return array $metadata Validated and key-normalized metadata map`
`216`		`- * @throw InvalidArgumentException if key contains invalid characters`
	`216`	`+ * @throws InvalidArgumentException if key contains invalid characters`
`217`	`217`	`*/`
`218`	`218`	`private function _validate_and_normalize_metadata($metadata)`
`219`	`219`	`{`