From aab33fb85d305355d8594f5b412291657c7cd6eb Mon Sep 17 00:00:00 2001 From: Altamash Shaikh Date: Fri, 26 Sep 2025 17:17:41 +0530 Subject: [PATCH 1/4] Updated grpc to 1.74.0. #593 --- composer.lock | 14 ++-- vendor/autoload_original.php | 7 +- vendor/composer/InstalledVersions.php | 16 ++--- vendor/composer/LICENSE | 2 - vendor/composer/autoload_classmap.php | 2 +- vendor/composer/autoload_files.php | 4 +- vendor/composer/autoload_namespaces.php | 2 +- vendor/composer/autoload_psr4.php | 2 +- vendor/composer/autoload_real.php | 41 +++++++++--- vendor/composer/autoload_static.php | 8 +-- vendor/composer/installed.json | 14 ++-- vendor/composer/installed.php | 66 +++++++++---------- .../prefixed/grpc/grpc/src/lib/BaseStub.php | 2 +- .../grpc/grpc/src/lib/ServerCallWriter.php | 2 +- vendor/prefixed/grpc/grpc/src/lib/Status.php | 4 +- .../prefixed/grpc/grpc/src/lib/UnaryCall.php | 4 +- .../collection/src/AbstractCollection.php | 3 +- .../collection/src/CollectionInterface.php | 3 +- vendor/prefixed/vendor/autoload.php | 7 +- vendor/prefixed/vendor/composer/LICENSE | 2 - .../vendor/composer/autoload_classmap.php | 2 +- .../vendor/composer/autoload_files.php | 2 +- .../vendor/composer/autoload_namespaces.php | 2 +- .../vendor/composer/autoload_psr4.php | 2 +- .../vendor/composer/autoload_real.php | 41 +++++++++--- .../vendor/composer/autoload_static.php | 4 +- 26 files changed, 146 insertions(+), 112 deletions(-) diff --git a/composer.lock b/composer.lock index 8b34a56bd..175f756c2 100644 --- a/composer.lock +++ b/composer.lock @@ -646,16 +646,16 @@ }, { "name": "grpc/grpc", - "version": "1.57.0", + "version": "1.74.0", "source": { "type": "git", "url": "https://github.com/grpc/grpc-php.git", - "reference": "b610c42022ed3a22f831439cb93802f2a4502fdf" + "reference": "32bf4dba256d60d395582fb6e4e8d3936bcdb713" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/grpc/grpc-php/zipball/b610c42022ed3a22f831439cb93802f2a4502fdf", - "reference": "b610c42022ed3a22f831439cb93802f2a4502fdf", + "url": "https://api.github.com/repos/grpc/grpc-php/zipball/32bf4dba256d60d395582fb6e4e8d3936bcdb713", + "reference": "32bf4dba256d60d395582fb6e4e8d3936bcdb713", "shasum": "" }, "require": { @@ -684,9 +684,9 @@ "rpc" ], "support": { - "source": "https://github.com/grpc/grpc-php/tree/v1.57.0" + "source": "https://github.com/grpc/grpc-php/tree/v1.74.0" }, - "time": "2023-08-14T23:57:54+00:00" + "time": "2025-07-24T20:02:16+00:00" }, { "name": "guzzlehttp/guzzle", @@ -1814,5 +1814,5 @@ "php": ">=7.2.5" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.2.0" } diff --git a/vendor/autoload_original.php b/vendor/autoload_original.php index 175bb5ee1..aa5e86722 100644 --- a/vendor/autoload_original.php +++ b/vendor/autoload_original.php @@ -2,11 +2,6 @@ // autoload.php @generated by Composer -if (PHP_VERSION_ID < 50600) { - echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL; - exit(1); -} - require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit54cb5964df745acb578c0235eaab1abc::getLoader(); +return ComposerAutoloaderInit07578f5997f6343c198794f8b18aabc1::getLoader(); diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php index c6b54af7b..d50e0c9fc 100644 --- a/vendor/composer/InstalledVersions.php +++ b/vendor/composer/InstalledVersions.php @@ -21,14 +21,12 @@ * See also https://getcomposer.org/doc/07-runtime.md#installed-versions * * To require its presence, you can require `composer-runtime-api ^2.0` - * - * @final */ class InstalledVersions { /** * @var mixed[]|null - * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array}|array{}|null + * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array}|array{}|null */ private static $installed; @@ -39,7 +37,7 @@ class InstalledVersions /** * @var array[] - * @psalm-var array}> + * @psalm-var array}> */ private static $installedByVendor = array(); @@ -243,7 +241,7 @@ public static function getInstallPath($packageName) /** * @return array - * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool} + * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string} */ public static function getRootPackage() { @@ -257,7 +255,7 @@ public static function getRootPackage() * * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect. * @return array[] - * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} + * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array} */ public static function getRawData() { @@ -280,7 +278,7 @@ public static function getRawData() * Returns the raw data of all installed.php which are currently loaded for custom implementations * * @return array[] - * @psalm-return list}> + * @psalm-return list}> */ public static function getAllRawData() { @@ -303,7 +301,7 @@ public static function getAllRawData() * @param array[] $data A vendor/composer/installed.php data set * @return void * - * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $data + * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array} $data */ public static function reload($data) { @@ -313,7 +311,7 @@ public static function reload($data) /** * @return array[] - * @psalm-return list}> + * @psalm-return list}> */ private static function getInstalled() { diff --git a/vendor/composer/LICENSE b/vendor/composer/LICENSE index f27399a04..62ecfd8d0 100644 --- a/vendor/composer/LICENSE +++ b/vendor/composer/LICENSE @@ -1,4 +1,3 @@ - Copyright (c) Nils Adermann, Jordi Boggiano Permission is hereby granted, free of charge, to any person obtaining a copy @@ -18,4 +17,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 0fb0a2c19..b26f1b13b 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -2,7 +2,7 @@ // autoload_classmap.php @generated by Composer -$vendorDir = dirname(__DIR__); +$vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); return array( diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php index cb87822a5..be9ffe33c 100644 --- a/vendor/composer/autoload_files.php +++ b/vendor/composer/autoload_files.php @@ -2,15 +2,15 @@ // autoload_files.php @generated by Composer -$vendorDir = dirname(__DIR__); +$vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); return array( '7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php', '6e3fae29631ef280660b3cdad06f25a8' => $vendorDir . '/symfony/deprecation-contracts/function.php', '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php', - 'e39a8b23c42d4e1452234d762b03835a' => $vendorDir . '/ramsey/uuid/src/functions.php', 'decc78cc4436b1292c6c0d151b19445c' => $vendorDir . '/phpseclib/phpseclib/phpseclib/bootstrap.php', + 'e39a8b23c42d4e1452234d762b03835a' => $vendorDir . '/ramsey/uuid/src/functions.php', '1f87db08236948d07391152dccb70f04' => $vendorDir . '/google/apiclient-services/autoload.php', 'a8d3953fd9959404dd22d3dfcd0a79f0' => $vendorDir . '/google/apiclient/src/aliases.php', '56823cacd97af379eceaf82ad00b928f' => $vendorDir . '/phpseclib/bcmath_compat/lib/bcmath.php', diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php index 15a2ff3ad..b7fc0125d 100644 --- a/vendor/composer/autoload_namespaces.php +++ b/vendor/composer/autoload_namespaces.php @@ -2,7 +2,7 @@ // autoload_namespaces.php @generated by Composer -$vendorDir = dirname(__DIR__); +$vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); return array( diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index 2a53092f1..578af2f9f 100644 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -2,7 +2,7 @@ // autoload_psr4.php @generated by Composer -$vendorDir = dirname(__DIR__); +$vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); return array( diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 3e465f377..8a8bff2c5 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit54cb5964df745acb578c0235eaab1abc +class ComposerAutoloaderInit07578f5997f6343c198794f8b18aabc1 { private static $loader; @@ -22,18 +22,41 @@ public static function getLoader() return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit54cb5964df745acb578c0235eaab1abc', 'loadClassLoader'), true, true); - self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit54cb5964df745acb578c0235eaab1abc', 'loadClassLoader')); + spl_autoload_register(array('ComposerAutoloaderInit07578f5997f6343c198794f8b18aabc1', 'loadClassLoader'), true, true); + self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); + spl_autoload_unregister(array('ComposerAutoloaderInit07578f5997f6343c198794f8b18aabc1', 'loadClassLoader')); - require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit54cb5964df745acb578c0235eaab1abc::getInitializer($loader)); + $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); + if ($useStaticLoader) { + require __DIR__ . '/autoload_static.php'; + + call_user_func(\Composer\Autoload\ComposerStaticInit07578f5997f6343c198794f8b18aabc1::getInitializer($loader)); + } else { + $map = require __DIR__ . '/autoload_namespaces.php'; + foreach ($map as $namespace => $path) { + $loader->set($namespace, $path); + } + + $map = require __DIR__ . '/autoload_psr4.php'; + foreach ($map as $namespace => $path) { + $loader->setPsr4($namespace, $path); + } + + $classMap = require __DIR__ . '/autoload_classmap.php'; + if ($classMap) { + $loader->addClassMap($classMap); + } + } $loader->register(true); - $includeFiles = \Composer\Autoload\ComposerStaticInit54cb5964df745acb578c0235eaab1abc::$files; + if ($useStaticLoader) { + $includeFiles = Composer\Autoload\ComposerStaticInit07578f5997f6343c198794f8b18aabc1::$files; + } else { + $includeFiles = require __DIR__ . '/autoload_files.php'; + } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire54cb5964df745acb578c0235eaab1abc($fileIdentifier, $file); + composerRequire07578f5997f6343c198794f8b18aabc1($fileIdentifier, $file); } return $loader; @@ -45,7 +68,7 @@ public static function getLoader() * @param string $file * @return void */ -function composerRequire54cb5964df745acb578c0235eaab1abc($fileIdentifier, $file) +function composerRequire07578f5997f6343c198794f8b18aabc1($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 index 4048c3acf..4c2e77603 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit54cb5964df745acb578c0235eaab1abc +class ComposerStaticInit07578f5997f6343c198794f8b18aabc1 { public static $files = array( ); @@ -245,9 +245,9 @@ class ComposerStaticInit54cb5964df745acb578c0235eaab1abc public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit54cb5964df745acb578c0235eaab1abc::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit54cb5964df745acb578c0235eaab1abc::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit54cb5964df745acb578c0235eaab1abc::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit07578f5997f6343c198794f8b18aabc1::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit07578f5997f6343c198794f8b18aabc1::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit07578f5997f6343c198794f8b18aabc1::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index a44d4160c..2e0f59ed8 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -676,17 +676,17 @@ }, { "name": "grpc/grpc", - "version": "1.57.0", - "version_normalized": "1.57.0.0", + "version": "1.74.0", + "version_normalized": "1.74.0.0", "source": { "type": "git", "url": "https://github.com/grpc/grpc-php.git", - "reference": "b610c42022ed3a22f831439cb93802f2a4502fdf" + "reference": "32bf4dba256d60d395582fb6e4e8d3936bcdb713" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/grpc/grpc-php/zipball/b610c42022ed3a22f831439cb93802f2a4502fdf", - "reference": "b610c42022ed3a22f831439cb93802f2a4502fdf", + "url": "https://api.github.com/repos/grpc/grpc-php/zipball/32bf4dba256d60d395582fb6e4e8d3936bcdb713", + "reference": "32bf4dba256d60d395582fb6e4e8d3936bcdb713", "shasum": "" }, "require": { @@ -699,7 +699,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": "2023-08-14T23:57:54+00:00", + "time": "2025-07-24T20:02:16+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -717,7 +717,7 @@ "rpc" ], "support": { - "source": "https://github.com/grpc/grpc-php/tree/v1.57.0" + "source": "https://github.com/grpc/grpc-php/tree/v1.74.0" }, "install-path": "../grpc/grpc" }, diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index d303e88a3..7f754b2ac 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -1,166 +1,166 @@ array( - 'name' => '__root__', 'pretty_version' => 'dev-5.x-dev', 'version' => 'dev-5.x-dev', - 'reference' => 'e6215d99c7ea728150ce2bd4ada9e5a9f7030aa4', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), + 'reference' => '616311f9677bdd35910e10b81c6f651c21d0a8e5', + 'name' => '__root__', 'dev' => true, ), 'versions' => array( '__root__' => array( 'pretty_version' => 'dev-5.x-dev', 'version' => 'dev-5.x-dev', - 'reference' => 'e6215d99c7ea728150ce2bd4ada9e5a9f7030aa4', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), + 'reference' => '616311f9677bdd35910e10b81c6f651c21d0a8e5', 'dev_requirement' => false, ), 'brick/math' => array( 'pretty_version' => '0.12.1', 'version' => '0.12.1.0', - 'reference' => 'f510c0a40911935b77b86859eb5223d58d660df1', 'type' => 'library', 'install_path' => __DIR__ . '/../brick/math', 'aliases' => array(), + 'reference' => 'f510c0a40911935b77b86859eb5223d58d660df1', 'dev_requirement' => false, ), 'firebase/php-jwt' => array( 'pretty_version' => 'v6.10.1', 'version' => '6.10.1.0', - 'reference' => '500501c2ce893c824c801da135d02661199f60c5', 'type' => 'library', 'install_path' => __DIR__ . '/../firebase/php-jwt', 'aliases' => array(), + 'reference' => '500501c2ce893c824c801da135d02661199f60c5', 'dev_requirement' => false, ), 'google/analytics-admin' => array( 'pretty_version' => 'v0.22.5', 'version' => '0.22.5.0', - 'reference' => 'c28dce5b3158381a755d4a4443aa4e2b8d1a2809', 'type' => 'library', 'install_path' => __DIR__ . '/../google/analytics-admin', 'aliases' => array(), + 'reference' => 'c28dce5b3158381a755d4a4443aa4e2b8d1a2809', 'dev_requirement' => false, ), 'google/analytics-data' => array( 'pretty_version' => 'v0.17.1', 'version' => '0.17.1.0', - 'reference' => '0a7b129fd483179d16780d548be4fe16cd8bdc1a', 'type' => 'library', 'install_path' => __DIR__ . '/../google/analytics-data', 'aliases' => array(), + 'reference' => '0a7b129fd483179d16780d548be4fe16cd8bdc1a', 'dev_requirement' => false, ), 'google/apiclient' => array( 'pretty_version' => 'v2.15.4', 'version' => '2.15.4.0', - 'reference' => '73fa9cf8d8886db7269bcda0457d0a251a02cfd9', 'type' => 'library', 'install_path' => __DIR__ . '/../google/apiclient', 'aliases' => array(), + 'reference' => '73fa9cf8d8886db7269bcda0457d0a251a02cfd9', 'dev_requirement' => false, ), 'google/apiclient-services' => array( 'pretty_version' => 'v0.224.1', 'version' => '0.224.1.0', - 'reference' => '06e515176ebf32c3dcf7c01b3f377af6bfca6ae3', 'type' => 'library', 'install_path' => __DIR__ . '/../google/apiclient-services', 'aliases' => array(), + 'reference' => '06e515176ebf32c3dcf7c01b3f377af6bfca6ae3', 'dev_requirement' => false, ), 'google/auth' => array( 'pretty_version' => 'v1.41.0', 'version' => '1.41.0.0', - 'reference' => '1043ea18fe7f5dfbf5b208ce3ee6d6b6ab8cb038', 'type' => 'library', 'install_path' => __DIR__ . '/../google/auth', 'aliases' => array(), + 'reference' => '1043ea18fe7f5dfbf5b208ce3ee6d6b6ab8cb038', 'dev_requirement' => false, ), 'google/common-protos' => array( 'pretty_version' => 'v4.7.0', 'version' => '4.7.0.0', - 'reference' => 'e58068776f57605c336e32c7db373f0a81da17b8', 'type' => 'library', 'install_path' => __DIR__ . '/../google/common-protos', 'aliases' => array(), + 'reference' => 'e58068776f57605c336e32c7db373f0a81da17b8', 'dev_requirement' => false, ), 'google/gax' => array( 'pretty_version' => 'v1.34.0', 'version' => '1.34.0.0', - 'reference' => '28aa3e95969a75b278606a88448992a6396a119e', 'type' => 'library', 'install_path' => __DIR__ . '/../google/gax', 'aliases' => array(), + 'reference' => '28aa3e95969a75b278606a88448992a6396a119e', 'dev_requirement' => false, ), 'google/grpc-gcp' => array( 'pretty_version' => 'v0.4.0', 'version' => '0.4.0.0', - 'reference' => '2a80dbf690922aa52bb6bb79b9a32a9637a5c2d9', 'type' => 'library', 'install_path' => __DIR__ . '/../google/grpc-gcp', 'aliases' => array(), + 'reference' => '2a80dbf690922aa52bb6bb79b9a32a9637a5c2d9', 'dev_requirement' => false, ), 'google/longrunning' => array( 'pretty_version' => '0.4.3', 'version' => '0.4.3.0', - 'reference' => 'ed718a735e407826c3332b7197a44602eb03e608', 'type' => 'library', 'install_path' => __DIR__ . '/../google/longrunning', 'aliases' => array(), + 'reference' => 'ed718a735e407826c3332b7197a44602eb03e608', 'dev_requirement' => false, ), 'google/protobuf' => array( 'pretty_version' => 'v4.27.3', 'version' => '4.27.3.0', - 'reference' => 'ff079fe467bf86ac8f3359e2eb77a1613ebd204d', 'type' => 'library', 'install_path' => __DIR__ . '/../google/protobuf', 'aliases' => array(), + 'reference' => 'ff079fe467bf86ac8f3359e2eb77a1613ebd204d', 'dev_requirement' => false, ), 'grpc/grpc' => array( - 'pretty_version' => '1.57.0', - 'version' => '1.57.0.0', - 'reference' => 'b610c42022ed3a22f831439cb93802f2a4502fdf', + 'pretty_version' => '1.74.0', + 'version' => '1.74.0.0', 'type' => 'library', 'install_path' => __DIR__ . '/../grpc/grpc', 'aliases' => array(), + 'reference' => '32bf4dba256d60d395582fb6e4e8d3936bcdb713', 'dev_requirement' => false, ), 'guzzlehttp/guzzle' => array( 'pretty_version' => '7.9.2', 'version' => '7.9.2.0', - 'reference' => 'd281ed313b989f213357e3be1a179f02196ac99b', 'type' => 'library', 'install_path' => __DIR__ . '/../guzzlehttp/guzzle', 'aliases' => array(), + 'reference' => 'd281ed313b989f213357e3be1a179f02196ac99b', 'dev_requirement' => false, ), 'guzzlehttp/promises' => array( 'pretty_version' => '2.0.3', 'version' => '2.0.3.0', - 'reference' => '6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8', 'type' => 'library', 'install_path' => __DIR__ . '/../guzzlehttp/promises', 'aliases' => array(), + 'reference' => '6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8', 'dev_requirement' => false, ), 'guzzlehttp/psr7' => array( 'pretty_version' => '2.7.0', 'version' => '2.7.0.0', - 'reference' => 'a70f5c95fb43bc83f07c9c948baa0dc1829bf201', 'type' => 'library', 'install_path' => __DIR__ . '/../guzzlehttp/psr7', 'aliases' => array(), + 'reference' => 'a70f5c95fb43bc83f07c9c948baa0dc1829bf201', 'dev_requirement' => false, ), 'monolog/monolog' => array( @@ -172,55 +172,55 @@ 'paragonie/constant_time_encoding' => array( 'pretty_version' => 'v2.5.0', 'version' => '2.5.0.0', - 'reference' => '9229e15f2e6ba772f0c55dd6986c563b937170a8', 'type' => 'library', 'install_path' => __DIR__ . '/../paragonie/constant_time_encoding', 'aliases' => array(), + 'reference' => '9229e15f2e6ba772f0c55dd6986c563b937170a8', 'dev_requirement' => false, ), 'paragonie/random_compat' => array( 'pretty_version' => 'v9.99.100', 'version' => '9.99.100.0', - 'reference' => '996434e5492cb4c3edcb9168db6fbb1359ef965a', 'type' => 'library', 'install_path' => __DIR__ . '/../paragonie/random_compat', 'aliases' => array(), + 'reference' => '996434e5492cb4c3edcb9168db6fbb1359ef965a', 'dev_requirement' => false, ), 'phpseclib/bcmath_compat' => array( 'pretty_version' => '2.0.2', 'version' => '2.0.2.0', - 'reference' => '29bbf07a7039ff65ce7daa44502ba34baf1512ec', 'type' => 'library', 'install_path' => __DIR__ . '/../phpseclib/bcmath_compat', 'aliases' => array(), + 'reference' => '29bbf07a7039ff65ce7daa44502ba34baf1512ec', 'dev_requirement' => false, ), 'phpseclib/phpseclib' => array( 'pretty_version' => '3.0.36', 'version' => '3.0.36.0', - 'reference' => 'c2fb5136162d4be18fdd4da9980696f3aee96d7b', 'type' => 'library', 'install_path' => __DIR__ . '/../phpseclib/phpseclib', 'aliases' => array(), + 'reference' => 'c2fb5136162d4be18fdd4da9980696f3aee96d7b', 'dev_requirement' => false, ), 'psr/cache' => array( 'pretty_version' => '3.0.0', 'version' => '3.0.0.0', - 'reference' => 'aa5030cfa5405eccfdcb1083ce040c2cb8d253bf', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/cache', 'aliases' => array(), + 'reference' => 'aa5030cfa5405eccfdcb1083ce040c2cb8d253bf', 'dev_requirement' => false, ), 'psr/http-client' => array( 'pretty_version' => '1.0.1', 'version' => '1.0.1.0', - 'reference' => '2dfb5f6c5eff0e91e20e913f8c5452ed95b86621', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/http-client', 'aliases' => array(), + 'reference' => '2dfb5f6c5eff0e91e20e913f8c5452ed95b86621', 'dev_requirement' => false, ), 'psr/http-client-implementation' => array( @@ -232,10 +232,10 @@ 'psr/http-factory' => array( 'pretty_version' => '1.0.1', 'version' => '1.0.1.0', - 'reference' => '12ac7fcd07e5b077433f5f2bee95b3a771bf61be', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/http-factory', 'aliases' => array(), + 'reference' => '12ac7fcd07e5b077433f5f2bee95b3a771bf61be', 'dev_requirement' => false, ), 'psr/http-factory-implementation' => array( @@ -247,10 +247,10 @@ 'psr/http-message' => array( 'pretty_version' => '1.1', 'version' => '1.1.0.0', - 'reference' => 'cb6ce4845ce34a8ad9e68117c10ee90a29919eba', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/http-message', 'aliases' => array(), + 'reference' => 'cb6ce4845ce34a8ad9e68117c10ee90a29919eba', 'dev_requirement' => false, ), 'psr/http-message-implementation' => array( @@ -262,28 +262,28 @@ 'ralouphie/getallheaders' => array( 'pretty_version' => '3.0.3', 'version' => '3.0.3.0', - 'reference' => '120b605dfeb996808c31b6477290a714d356e822', 'type' => 'library', 'install_path' => __DIR__ . '/../ralouphie/getallheaders', 'aliases' => array(), + 'reference' => '120b605dfeb996808c31b6477290a714d356e822', 'dev_requirement' => false, ), 'ramsey/collection' => array( 'pretty_version' => '2.0.0', 'version' => '2.0.0.0', - 'reference' => 'a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5', 'type' => 'library', 'install_path' => __DIR__ . '/../ramsey/collection', 'aliases' => array(), + 'reference' => 'a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5', 'dev_requirement' => false, ), 'ramsey/uuid' => array( 'pretty_version' => '4.7.6', 'version' => '4.7.6.0', - 'reference' => '91039bc1faa45ba123c4328958e620d382ec7088', 'type' => 'library', 'install_path' => __DIR__ . '/../ramsey/uuid', 'aliases' => array(), + 'reference' => '91039bc1faa45ba123c4328958e620d382ec7088', 'dev_requirement' => false, ), 'rhumsaa/uuid' => array( @@ -295,10 +295,10 @@ 'symfony/deprecation-contracts' => array( 'pretty_version' => 'v2.5.2', 'version' => '2.5.2.0', - 'reference' => 'e8b495ea28c1d97b5e0c121748d6f9b53d075c66', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/deprecation-contracts', 'aliases' => array(), + 'reference' => 'e8b495ea28c1d97b5e0c121748d6f9b53d075c66', 'dev_requirement' => false, ), ), diff --git a/vendor/prefixed/grpc/grpc/src/lib/BaseStub.php b/vendor/prefixed/grpc/grpc/src/lib/BaseStub.php index 5eb189cf2..aeb1ae38e 100644 --- a/vendor/prefixed/grpc/grpc/src/lib/BaseStub.php +++ b/vendor/prefixed/grpc/grpc/src/lib/BaseStub.php @@ -201,7 +201,7 @@ private function _get_jwt_aud_uri($method) $hostname = $this->hostname; } // Remove the port if it is 443 - // See https://github.com/grpc/grpc/blob/07c9f7a36b2a0d34fcffebc85649cf3b8c339b5d/src/core/lib/security/transport/client_auth_filter.cc#L205 + // See https://github.com/grpc/grpc/blob/07c9f7a36b2a0d34fcffebc85649cf3b8c339b5d/src/core/filter/auth/client_auth_filter.cc#L205 if (strlen($hostname) > 4 && substr($hostname, -4) === ":443") { $hostname = substr($hostname, 0, -4); } diff --git a/vendor/prefixed/grpc/grpc/src/lib/ServerCallWriter.php b/vendor/prefixed/grpc/grpc/src/lib/ServerCallWriter.php index 89756514d..ed67e80c0 100644 --- a/vendor/prefixed/grpc/grpc/src/lib/ServerCallWriter.php +++ b/vendor/prefixed/grpc/grpc/src/lib/ServerCallWriter.php @@ -54,7 +54,7 @@ public function finish($data = null, array $options = []) $this->call_->startBatch($batch); } //////////////////////////// - private function addSendInitialMetadataOpIfNotSent(array &$batch, array $initialMetadata = null) + private function addSendInitialMetadataOpIfNotSent(array &$batch, ?array $initialMetadata = null) { if (!$this->initialMetadataSent_) { $batch[OP_SEND_INITIAL_METADATA] = $initialMetadata ?? []; diff --git a/vendor/prefixed/grpc/grpc/src/lib/Status.php b/vendor/prefixed/grpc/grpc/src/lib/Status.php index 358e671f6..5c0f5b9da 100644 --- a/vendor/prefixed/grpc/grpc/src/lib/Status.php +++ b/vendor/prefixed/grpc/grpc/src/lib/Status.php @@ -31,7 +31,7 @@ */ class Status { - public static function status(int $code, string $details, array $metadata = null) : array + public static function status(int $code, string $details, ?array $metadata = null) : array { $status = ['code' => $code, 'details' => $details]; if ($metadata) { @@ -39,7 +39,7 @@ public static function status(int $code, string $details, array $metadata = null } return $status; } - public static function ok(array $metadata = null) : array + public static function ok(?array $metadata = null) : array { return Status::status(STATUS_OK, 'OK', $metadata); } diff --git a/vendor/prefixed/grpc/grpc/src/lib/UnaryCall.php b/vendor/prefixed/grpc/grpc/src/lib/UnaryCall.php index b055b1ca2..01c25ad27 100644 --- a/vendor/prefixed/grpc/grpc/src/lib/UnaryCall.php +++ b/vendor/prefixed/grpc/grpc/src/lib/UnaryCall.php @@ -22,6 +22,8 @@ /** * Represents an active call that sends a single message and then gets a * single response. + * + * @template T of \Google\Protobuf\Internal\Message */ class UnaryCall extends AbstractCall { @@ -45,7 +47,7 @@ public function start($data, array $metadata = [], array $options = []) /** * Wait for the server to respond with data and a status. * - * @return array [response data, status] + * @return array{0: T|null, 1: \stdClass} [response data, status] */ public function wait() { diff --git a/vendor/prefixed/ramsey/collection/src/AbstractCollection.php b/vendor/prefixed/ramsey/collection/src/AbstractCollection.php index 80eb839d3..cdb7d2b0a 100644 --- a/vendor/prefixed/ramsey/collection/src/AbstractCollection.php +++ b/vendor/prefixed/ramsey/collection/src/AbstractCollection.php @@ -142,8 +142,9 @@ public function last() * on the elements in this collection. * @throws UnsupportedOperationException if unable to call sort() on this * collection. + * @param string $order */ - public function sort(?string $propertyOrMethod = null, Sort $order = Sort::Ascending) : CollectionInterface + public function sort(?string $propertyOrMethod = null, $order = Sort::Ascending) : CollectionInterface { $collection = clone $this; usort( diff --git a/vendor/prefixed/ramsey/collection/src/CollectionInterface.php b/vendor/prefixed/ramsey/collection/src/CollectionInterface.php index b7b431cfe..b540d807e 100644 --- a/vendor/prefixed/ramsey/collection/src/CollectionInterface.php +++ b/vendor/prefixed/ramsey/collection/src/CollectionInterface.php @@ -125,8 +125,9 @@ public function last(); * on the elements in this collection. * @throws UnsupportedOperationException if unable to call sort() on this * collection. + * @param \Matomo\Dependencies\GoogleAnalyticsImporter\Ramsey\Collection\Sort::* $order */ - public function sort(?string $propertyOrMethod = null, Sort $order = Sort::Ascending) : self; + public function sort(?string $propertyOrMethod = null, string $order = Sort::Ascending) : self; /** * Filter out items of the collection which don't match the criteria of * given callback. diff --git a/vendor/prefixed/vendor/autoload.php b/vendor/prefixed/vendor/autoload.php index ae60332fb..3e3444fa9 100644 --- a/vendor/prefixed/vendor/autoload.php +++ b/vendor/prefixed/vendor/autoload.php @@ -2,11 +2,6 @@ // autoload.php @generated by Composer -if (PHP_VERSION_ID < 50600) { - echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL; - exit(1); -} - require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit2724e8b56131e57ae8990860d59ec2c9::getLoader(); +return ComposerAutoloaderInita5e6e9aa49cf2c382e2d612fb49884ba::getLoader(); diff --git a/vendor/prefixed/vendor/composer/LICENSE b/vendor/prefixed/vendor/composer/LICENSE index f27399a04..62ecfd8d0 100644 --- a/vendor/prefixed/vendor/composer/LICENSE +++ b/vendor/prefixed/vendor/composer/LICENSE @@ -1,4 +1,3 @@ - Copyright (c) Nils Adermann, Jordi Boggiano Permission is hereby granted, free of charge, to any person obtaining a copy @@ -18,4 +17,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - diff --git a/vendor/prefixed/vendor/composer/autoload_classmap.php b/vendor/prefixed/vendor/composer/autoload_classmap.php index 1eea42ebf..62dcf184c 100644 --- a/vendor/prefixed/vendor/composer/autoload_classmap.php +++ b/vendor/prefixed/vendor/composer/autoload_classmap.php @@ -2,7 +2,7 @@ // autoload_classmap.php @generated by Composer -$vendorDir = dirname(__DIR__); +$vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); return array( diff --git a/vendor/prefixed/vendor/composer/autoload_files.php b/vendor/prefixed/vendor/composer/autoload_files.php index 5f644ebee..8f3071d9c 100644 --- a/vendor/prefixed/vendor/composer/autoload_files.php +++ b/vendor/prefixed/vendor/composer/autoload_files.php @@ -2,7 +2,7 @@ // autoload_files.php @generated by Composer -$vendorDir = dirname(__DIR__); +$vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); return array( diff --git a/vendor/prefixed/vendor/composer/autoload_namespaces.php b/vendor/prefixed/vendor/composer/autoload_namespaces.php index 15a2ff3ad..b7fc0125d 100644 --- a/vendor/prefixed/vendor/composer/autoload_namespaces.php +++ b/vendor/prefixed/vendor/composer/autoload_namespaces.php @@ -2,7 +2,7 @@ // autoload_namespaces.php @generated by Composer -$vendorDir = dirname(__DIR__); +$vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); return array( diff --git a/vendor/prefixed/vendor/composer/autoload_psr4.php b/vendor/prefixed/vendor/composer/autoload_psr4.php index 3890ddc24..b265c64a2 100644 --- a/vendor/prefixed/vendor/composer/autoload_psr4.php +++ b/vendor/prefixed/vendor/composer/autoload_psr4.php @@ -2,7 +2,7 @@ // autoload_psr4.php @generated by Composer -$vendorDir = dirname(__DIR__); +$vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); return array( diff --git a/vendor/prefixed/vendor/composer/autoload_real.php b/vendor/prefixed/vendor/composer/autoload_real.php index 90d136df2..a6c2a5402 100644 --- 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 ComposerAutoloaderInit2724e8b56131e57ae8990860d59ec2c9 +class ComposerAutoloaderInita5e6e9aa49cf2c382e2d612fb49884ba { private static $loader; @@ -22,18 +22,41 @@ public static function getLoader() return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit2724e8b56131e57ae8990860d59ec2c9', 'loadClassLoader'), true, true); - self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit2724e8b56131e57ae8990860d59ec2c9', 'loadClassLoader')); + spl_autoload_register(array('ComposerAutoloaderInita5e6e9aa49cf2c382e2d612fb49884ba', 'loadClassLoader'), true, true); + self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); + spl_autoload_unregister(array('ComposerAutoloaderInita5e6e9aa49cf2c382e2d612fb49884ba', 'loadClassLoader')); - require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit2724e8b56131e57ae8990860d59ec2c9::getInitializer($loader)); + $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); + if ($useStaticLoader) { + require __DIR__ . '/autoload_static.php'; + + call_user_func(\Composer\Autoload\ComposerStaticInita5e6e9aa49cf2c382e2d612fb49884ba::getInitializer($loader)); + } else { + $map = require __DIR__ . '/autoload_namespaces.php'; + foreach ($map as $namespace => $path) { + $loader->set($namespace, $path); + } + + $map = require __DIR__ . '/autoload_psr4.php'; + foreach ($map as $namespace => $path) { + $loader->setPsr4($namespace, $path); + } + + $classMap = require __DIR__ . '/autoload_classmap.php'; + if ($classMap) { + $loader->addClassMap($classMap); + } + } $loader->register(true); - $includeFiles = \Composer\Autoload\ComposerStaticInit2724e8b56131e57ae8990860d59ec2c9::$files; + if ($useStaticLoader) { + $includeFiles = Composer\Autoload\ComposerStaticInita5e6e9aa49cf2c382e2d612fb49884ba::$files; + } else { + $includeFiles = require __DIR__ . '/autoload_files.php'; + } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire2724e8b56131e57ae8990860d59ec2c9($fileIdentifier, $file); + composerRequirea5e6e9aa49cf2c382e2d612fb49884ba($fileIdentifier, $file); } return $loader; @@ -45,7 +68,7 @@ public static function getLoader() * @param string $file * @return void */ -function composerRequire2724e8b56131e57ae8990860d59ec2c9($fileIdentifier, $file) +function composerRequirea5e6e9aa49cf2c382e2d612fb49884ba($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 index 4085d489e..957b5c937 100644 --- a/vendor/prefixed/vendor/composer/autoload_static.php +++ b/vendor/prefixed/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit2724e8b56131e57ae8990860d59ec2c9 +class ComposerStaticInita5e6e9aa49cf2c382e2d612fb49884ba { public static $files = array ( '3b866681a14a27c0c8adec54ba7f6a5c' => __DIR__ . '/../..' . '/google/apiclient/src/aliases.php', @@ -2162,7 +2162,7 @@ class ComposerStaticInit2724e8b56131e57ae8990860d59ec2c9 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->classMap = ComposerStaticInit2724e8b56131e57ae8990860d59ec2c9::$classMap; + $loader->classMap = ComposerStaticInita5e6e9aa49cf2c382e2d612fb49884ba::$classMap; }, null, ClassLoader::class); } From f4e268137708d5d0246a3706204b73ecc1887de6 Mon Sep 17 00:00:00 2001 From: Altamash Shaikh Date: Fri, 26 Sep 2025 17:22:02 +0530 Subject: [PATCH 2/4] Bumped version --- CHANGELOG.md | 3 +++ plugin.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dbe9b5ab2..e0373e40b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ## Changelog +# 5.1.5 - 2025-09-29 +- Fixed minor bug in UI + # 5.1.4 - 2025-06-09 - Fixed minor bug in UI diff --git a/plugin.json b/plugin.json index 4e475eb7d..b1c3ef093 100644 --- a/plugin.json +++ b/plugin.json @@ -1,7 +1,7 @@ { "name": "GoogleAnalyticsImporter", "description": "Import reports from a Google Analytics account into Matomo.", - "version": "5.1.4", + "version": "5.1.5", "theme": false, "require": { "matomo": ">=5.0.0-rc5,<6.0.0-b1" From 181ecc6075bfc36dec650f80f91ce3f9aa8741ba Mon Sep 17 00:00:00 2001 From: Altamash Shaikh Date: Fri, 26 Sep 2025 17:31:00 +0530 Subject: [PATCH 3/4] PHPCS fixes --- Google/Authorization.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Google/Authorization.php b/Google/Authorization.php index 74ec8c615..b41994d96 100644 --- a/Google/Authorization.php +++ b/Google/Authorization.php @@ -75,8 +75,11 @@ public function saveAccessToken($oauthCode, \Matomo\Dependencies\GoogleAnalytics * @return \Google\Service\Oauth2\Tokeninfo * @throws \Exception */ - protected function getTokenInfo($accessToken, $client) - { + protected function getTokenInfo( + #[\SensitiveParameter] + $accessToken, + $client + ) { $service = new \Matomo\Dependencies\GoogleAnalyticsImporter\Google\Service\Oauth2($client); return $service->tokeninfo(['access_token' => $accessToken['access_token']]); } From edd0b91e30f88d97f6587df30bf8662f5d417e99 Mon Sep 17 00:00:00 2001 From: Altamash Shaikh Date: Mon, 29 Sep 2025 07:05:01 +0530 Subject: [PATCH 4/4] Updated changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0373e40b..7dbea2068 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ ## Changelog # 5.1.5 - 2025-09-29 -- Fixed minor bug in UI +- Upgraded grpc package to 1.74.0 # 5.1.4 - 2025-06-09 - Fixed minor bug in UI