Merge branch 'master' of github.com:google/grpc into go-auth-tests

pull/884/head
Donna Dionne 10 years ago
commit e7e6e73bff
  1. 2
      src/php/ext/grpc/credentials.c
  2. 4
      src/php/ext/grpc/event.c
  3. 6
      src/ruby/spec/credentials_spec.rb

@ -94,7 +94,7 @@ zval *grpc_php_wrap_credentials(grpc_credentials *wrapped) {
* @return Credentials The new default credentials object
*/
PHP_METHOD(Credentials, createDefault) {
grpc_credentials *creds = grpc_default_credentials_create();
grpc_credentials *creds = grpc_google_default_credentials_create();
zval *creds_object = grpc_php_wrap_credentials(creds);
RETURN_DESTROY_ZVAL(creds_object);
}

@ -90,10 +90,6 @@ zval *grpc_php_convert_event(grpc_event *event) {
add_property_stringl(event_object, "data", read_string, read_len, true);
}
break;
case GRPC_INVOKE_ACCEPTED:
add_property_long(event_object, "data",
(long)event->data.invoke_accepted);
break;
case GRPC_WRITE_ACCEPTED:
add_property_long(event_object, "data", (long)event->data.write_accepted);
break;

@ -68,10 +68,4 @@ describe Credentials do
expect { cred1.compose(cred2) }.to_not raise_error
end
end
describe 'Credentials#default' do
it 'is not implemented yet' do
expect { Credentials.default }.to raise_error RuntimeError
end
end
end

Loading…
Cancel
Save