Merge pull request #7385 from stanley-cheung/php-fix-interop-test

PHP: fix interop tests breakage
pull/7333/merge
Craig Tiller 8 years ago committed by GitHub
commit 741cd45e93
  1. 8
      composer.json
  2. 6
      examples/php/composer.json
  3. 2
      src/php/README.md
  4. 8
      src/php/composer.json
  5. 8
      templates/composer.json.template

@ -5,15 +5,9 @@
"keywords": ["rpc"], "keywords": ["rpc"],
"homepage": "http://grpc.io", "homepage": "http://grpc.io",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"repositories": [
{
"type": "vcs",
"url": "https://github.com/stanley-cheung/Protobuf-PHP"
}
],
"require": { "require": {
"php": ">=5.5.0", "php": ">=5.5.0",
"datto/protobuf-php": "dev-master" "stanley-cheung/protobuf-php": "dev-master"
}, },
"require-dev": { "require-dev": {
"google/auth": "v0.9" "google/auth": "v0.9"

@ -2,12 +2,6 @@
"name": "grpc/grpc-demo", "name": "grpc/grpc-demo",
"description": "gRPC example for PHP", "description": "gRPC example for PHP",
"minimum-stability": "dev", "minimum-stability": "dev",
"repositories": [
{
"type": "vcs",
"url": "https://github.com/stanley-cheung/Protobuf-PHP"
}
],
"require": { "require": {
"grpc/grpc": "v0.15.0" "grpc/grpc": "v0.15.0"
} }

@ -148,7 +148,7 @@ Alternatively, you can download `protoc` binaries from [the protocol buffers Git
You need to install `protoc-gen-php` to generate stub class `.php` files from service definition `.proto` files. You need to install `protoc-gen-php` to generate stub class `.php` files from service definition `.proto` files.
```sh ```sh
$ cd grpc/src/php/vendor/datto/protobuf-php # if you had run `composer install` in the previous step $ cd grpc/src/php/vendor/stanley-cheung/protobuf-php # if you had run `composer install` in the previous step
OR OR

@ -6,15 +6,9 @@
"homepage": "http://grpc.io", "homepage": "http://grpc.io",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"version": "1.0.0", "version": "1.0.0",
"repositories": [
{
"type": "vcs",
"url": "https://github.com/stanley-cheung/Protobuf-PHP"
}
],
"require": { "require": {
"php": ">=5.5.0", "php": ">=5.5.0",
"datto/protobuf-php": "dev-master", "stanley-cheung/protobuf-php": "dev-master",
"google/auth": "v0.7" "google/auth": "v0.7"
}, },
"autoload": { "autoload": {

@ -7,15 +7,9 @@
"keywords": ["rpc"], "keywords": ["rpc"],
"homepage": "http://grpc.io", "homepage": "http://grpc.io",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"repositories": [
{
"type": "vcs",
"url": "https://github.com/stanley-cheung/Protobuf-PHP"
}
],
"require": { "require": {
"php": ">=5.5.0", "php": ">=5.5.0",
"datto/protobuf-php": "dev-master" "stanley-cheung/protobuf-php": "dev-master"
}, },
"require-dev": { "require-dev": {
"google/auth": "v0.9" "google/auth": "v0.9"

Loading…
Cancel
Save