Merge pull request #8305 from stanley-cheung/php-update-composer-json

PHP: require grpc extension to be installed before composer package
pull/8287/merge
Stanley Cheung 8 years ago committed by GitHub
commit 9fee24f3a6
  1. 1
      composer.json
  2. 1
      examples/php/composer.json
  3. 1
      src/php/composer.json
  4. 1
      templates/composer.json.template
  5. 1
      templates/src/php/composer.json.template
  6. 2
      tools/dockerfile/interoptest/grpc_interop_php/build_interop.sh
  7. 2
      tools/dockerfile/interoptest/grpc_interop_php7/build_interop.sh
  8. 2
      tools/dockerfile/stress_test/grpc_interop_stress_php/build_interop_stress.sh

@ -7,6 +7,7 @@
"license": "BSD-3-Clause",
"require": {
"php": ">=5.5.0",
"ext-grpc": "*",
"google/protobuf": "v3.1.0-alpha-1"
},
"require-dev": {

@ -2,6 +2,7 @@
"name": "grpc/grpc-demo",
"description": "gRPC example for PHP",
"require": {
"ext-grpc": "*",
"grpc/grpc": "v1.0.0"
}
}

@ -8,6 +8,7 @@
"version": "1.1.0",
"require": {
"php": ">=5.5.0",
"ext-grpc": "*",
"google/protobuf": "v3.1.0-alpha-1"
},
"require-dev": {

@ -9,6 +9,7 @@
"license": "BSD-3-Clause",
"require": {
"php": ">=5.5.0",
"ext-grpc": "*",
"google/protobuf": "v3.1.0-alpha-1"
},
"require-dev": {

@ -10,6 +10,7 @@
"version": "${settings.php_version.php_composer()}",
"require": {
"php": ">=5.5.0",
"ext-grpc": "*",
"google/protobuf": "v3.1.0-alpha-1"
},
"require-dev": {

@ -46,6 +46,6 @@ make install
(cd third_party/protobuf && make install)
(cd src/php && composer install)
(cd src/php && php -d extension=ext/grpc/modules/grpc.so /usr/local/bin/composer install)
(cd src/php && ./bin/generate_proto_php.sh)

@ -46,6 +46,6 @@ make install
(cd third_party/protobuf && make install)
(cd src/php && composer install)
(cd src/php && php -d extension=ext/grpc/modules/grpc.so /usr/local/bin/composer install)
(cd src/php && ./bin/generate_proto_php.sh)

@ -48,6 +48,6 @@ make install
(cd third_party/protobuf && make install)
(cd src/php && composer install)
(cd src/php && php -d extension=ext/grpc/modules/grpc.so /usr/local/bin/composer install)
(cd src/php && ./bin/generate_proto_php.sh)

Loading…
Cancel
Save