natas_hw
/
grpc
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PHP: stop reading composer.json file just to read the version string (#26156) 

* PHP: remove reading from composer.json just for the version string

* Be extra defensive
This commit is contained in:
Stanley Cheung 2021-05-10 15:45:40 -07:00 committed by GitHub
parent bba425fa11
commit 44b113b3c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/php/ext/grpc/php_grpc.c
View File

@ -22,6 +22,7 @@
#include "channel.h"
#include "server.h"
#include "timeval.h"
#include "version.h"
#include "channel_credentials.h"
#include "call_credentials.h"
#include "server_credentials.h"
@ -541,6 +542,10 @@ PHP_MINIT_FUNCTION(grpc) {
GRPC_CHANNEL_SHUTDOWN,
CONST_CS | CONST_PERSISTENT);
/** grpc version string */
REGISTER_STRING_CONSTANT("Grpc\\VERSION", PHP_GRPC_VERSION,
CONST_CS | CONST_PERSISTENT);
grpc_init_call(TSRMLS_C);
GRPC_STARTUP(channel);
grpc_init_server(TSRMLS_C);

18
src/php/lib/Grpc/BaseStub.php
View File

@ -86,18 +86,22 @@ class BaseStub
}
private static function updateOpts($opts) {
if (!file_exists($composerFile = __DIR__.'/../../composer.json')) {
// for grpc/grpc-php subpackage
$composerFile = __DIR__.'/../composer.json';
}
$package_config = json_decode(file_get_contents($composerFile), true);
if (!empty($opts['grpc.primary_user_agent'])) {
$opts['grpc.primary_user_agent'] .= ' ';
} else {
$opts['grpc.primary_user_agent'] = '';
}
$opts['grpc.primary_user_agent'] .=
'grpc-php/'.$package_config['version'];
if (defined('\Grpc\VERSION')) {
$version_str = \Grpc\VERSION;
} else {
if (!file_exists($composerFile = __DIR__.'/../../composer.json')) {
// for grpc/grpc-php subpackage
$composerFile = __DIR__.'/../composer.json';
}
$package_config = json_decode(file_get_contents($composerFile), true);
$version_str = $package_config['version'];
}
$opts['grpc.primary_user_agent'] .= 'grpc-php/'.$version_str;
if (!array_key_exists('credentials', $opts)) {
throw new \Exception("The opts['credentials'] key is now ".
'required. Please see one of the '.