Merge pull request #16074 from bshaffer/issue-16072

fixes subpackage issue with loading composer
6 years ago · a3939fd9d5
parent 254841d8fa ad371f802d
commit a3939fd9d5
1 changed files with 5 additions and 4 deletions
--- 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 {