diff options
| author |  Stanley Cheung <stanley.cheung@gmail.com> | 2018-07-24 15:00:38 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-07-24 15:00:38 -0700 |
| commit | a3939fd9d588f60bc586e8202bef83d74b078b92 (patch) | |
| tree | 07f5efa2c144ee78c9f6145b717c099bec7bb335 | |
| parent | 254841d8fa2065ab4efb749d8bafe7f965e1a8f3 (diff) | |
| parent | ad371f802d35686ad6776cc01d1287275f6dd9d6 (diff) | |
Merge pull request #16074 from bshaffer/issue-16072
fixes subpackage issue with loading composer
| -rw-r--r-- | src/php/lib/Grpc/BaseStub.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/php/lib/Grpc/BaseStub.php b/src/php/lib/Grpc/BaseStub.php index ecb419ac8f..fe81e37761 100644 --- a/src/php/lib/Grpc/BaseStub.php +++ b/src/php/lib/Grpc/BaseStub.php @@ -83,10 +83,11 @@ class BaseStub } private static function updateOpts($opts) { - $package_config = json_decode( - file_get_contents(dirname(__FILE__).'/../../composer.json'), - true - ); + 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 { |