From f3756c1e0d09a90173851a8e8ab4f6342ae8de45 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 1 Jul 2015 17:21:01 -0700 Subject: Introduce multiple clocks to GPR --- src/php/ext/grpc/timeval.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/php') diff --git a/src/php/ext/grpc/timeval.c b/src/php/ext/grpc/timeval.c index 8a278d6760..ccf7f0f81a 100644 --- a/src/php/ext/grpc/timeval.c +++ b/src/php/ext/grpc/timeval.c @@ -208,7 +208,7 @@ PHP_METHOD(Timeval, similar) { * @return Timeval The current time */ PHP_METHOD(Timeval, now) { - zval *now = grpc_php_wrap_timeval(gpr_now()); + zval *now = grpc_php_wrap_timeval(gpr_now(GPR_CLOCK_REALTIME)); RETURN_DESTROY_ZVAL(now); } -- cgit v1.2.3 From 7e4a9bd556c342d603aee9522980e32439236d7d Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Thu, 9 Jul 2015 20:54:10 -0700 Subject: update php pecl extension to 0.5.1 because header change --- src/php/ext/grpc/README.md | 4 ++-- src/php/ext/grpc/package.xml | 31 +++++++++++++++++++++++-------- 2 files changed, 25 insertions(+), 10 deletions(-) (limited to 'src/php') diff --git a/src/php/ext/grpc/README.md b/src/php/ext/grpc/README.md index 0ac09e1835..88d2c481ec 100644 --- a/src/php/ext/grpc/README.md +++ b/src/php/ext/grpc/README.md @@ -4,7 +4,7 @@ gRPC PHP Extension # Requirements * PHP 5.5+ - * [gRPC core library](https://github.com/grpc/grpc) 0.9.1 + * [gRPC core library](https://github.com/grpc/grpc) 0.10.0 # Installation @@ -55,7 +55,7 @@ $ sudo pecl install grpc Note: before a stable release, you may need to do ```sh -$ sudo pecl install grpc-0.5.0 +$ sudo pecl install grpc-0.5.1 ``` OR diff --git a/src/php/ext/grpc/package.xml b/src/php/ext/grpc/package.xml index 2c89829d51..bc2a05923b 100644 --- a/src/php/ext/grpc/package.xml +++ b/src/php/ext/grpc/package.xml @@ -10,11 +10,11 @@ grpc-packages@google.com yes - 2015-06-16 - + 2015-07-09 + - 0.5.0 - 0.5.0 + 0.5.1 + 0.5.1 alpha @@ -22,7 +22,7 @@ BSD -First alpha release +Update to wrap gRPC C Core version 0.10.0 @@ -34,15 +34,15 @@ First alpha release - + - - + + @@ -78,5 +78,20 @@ First alpha release First alpha release + + + 0.5.1 + 0.5.1 + + + alpha + alpha + + 2015-07-09 + BSD + +Update to wrap gRPC C Core version 0.10.0 + + -- cgit v1.2.3 From 4a5c65464e03f421da7912e3fd43781e1b916fba Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Sat, 11 Jul 2015 01:31:17 -0700 Subject: update homebrew php ext location --- src/php/bin/determine_extension_dir.sh | 10 +++++----- src/php/bin/interop_client.sh | 2 +- src/php/bin/run_gen_code_test.sh | 6 +++--- src/php/bin/run_tests.sh | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/php') diff --git a/src/php/bin/determine_extension_dir.sh b/src/php/bin/determine_extension_dir.sh index 6bbd934bf1..1e04215550 100755 --- a/src/php/bin/determine_extension_dir.sh +++ b/src/php/bin/determine_extension_dir.sh @@ -27,12 +27,12 @@ # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - set -e default_extension_dir=$(php-config --extension-dir) -if command -v brew >/dev/null && [ -d $(brew --prefix)/opt/grpc-php ]; then - # homebrew and the grpc-php formula are installed - extension_dir="-d extension_dir="$(brew --prefix)/opt/grpc-php +if command -v brew > /dev/null && \ + brew ls --versions | grep php5[5\|6]-grpc > /dev/null; then + # the grpc php extension was installed by homebrew + : elif [ ! -e $default_extension_dir/grpc.so ]; then # the grpc extension is not found in the default PHP extension dir # try the source modules directory @@ -45,5 +45,5 @@ elif [ ! -e $default_extension_dir/grpc.so ]; then for f in $default_extension_dir/*.so; do ln -s $f $module_dir/$(basename $f) &> /dev/null || true done - extension_dir="-d extension_dir="$module_dir + extension_dir="-d extension_dir=${module_dir} -d extension=grpc.so" fi diff --git a/src/php/bin/interop_client.sh b/src/php/bin/interop_client.sh index 42e075cbe8..17b888dd4e 100755 --- a/src/php/bin/interop_client.sh +++ b/src/php/bin/interop_client.sh @@ -31,5 +31,5 @@ set -e cd $(dirname $0) source ./determine_extension_dir.sh -php $extension_dir -d extension=grpc.so \ +php $extension_dir \ ../tests/interop/interop_client.php $@ 1>&2 diff --git a/src/php/bin/run_gen_code_test.sh b/src/php/bin/run_gen_code_test.sh index 03a9101a45..6e56c7207c 100755 --- a/src/php/bin/run_gen_code_test.sh +++ b/src/php/bin/run_gen_code_test.sh @@ -31,8 +31,8 @@ set -e cd $(dirname $0) source ./determine_extension_dir.sh -export GRPC_TEST_HOST=localhost:7071 -php $extension_dir -d extension=grpc.so $(which phpunit) -v --debug --strict \ +export GRPC_TEST_HOST=localhost:50051 +php $extension_dir $(which phpunit) -v --debug --strict \ ../tests/generated_code/GeneratedCodeTest.php -php $extension_dir -d extension=grpc.so $(which phpunit) -v --debug --strict \ +php $extension_dir $(which phpunit) -v --debug --strict \ ../tests/generated_code/GeneratedCodeWithCallbackTest.php diff --git a/src/php/bin/run_tests.sh b/src/php/bin/run_tests.sh index 4c37285455..953f408ea8 100755 --- a/src/php/bin/run_tests.sh +++ b/src/php/bin/run_tests.sh @@ -33,5 +33,5 @@ set -e cd $(dirname $0) source ./determine_extension_dir.sh -php $extension_dir -d extension=grpc.so $(which phpunit) -v --debug --strict \ +php $extension_dir $(which phpunit) -v --debug --strict \ ../tests/unit_tests -- cgit v1.2.3 From 316eedd4e13d1a50284a60aa748ce6eb01f12add Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Tue, 14 Jul 2015 14:20:12 -0700 Subject: regex --- src/php/bin/determine_extension_dir.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/php') diff --git a/src/php/bin/determine_extension_dir.sh b/src/php/bin/determine_extension_dir.sh index 1e04215550..3c1fc297fa 100755 --- a/src/php/bin/determine_extension_dir.sh +++ b/src/php/bin/determine_extension_dir.sh @@ -30,7 +30,7 @@ set -e default_extension_dir=$(php-config --extension-dir) if command -v brew > /dev/null && \ - brew ls --versions | grep php5[5\|6]-grpc > /dev/null; then + brew ls --versions | grep php5[56]-grpc > /dev/null; then # the grpc php extension was installed by homebrew : elif [ ! -e $default_extension_dir/grpc.so ]; then -- cgit v1.2.3 From e726a53a6c946240ac5fffc0c6500c71d2ff3be6 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Wed, 15 Jul 2015 08:36:52 -0700 Subject: php script minor fix --- src/php/bin/determine_extension_dir.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/php') diff --git a/src/php/bin/determine_extension_dir.sh b/src/php/bin/determine_extension_dir.sh index 3c1fc297fa..b4342ac89f 100755 --- a/src/php/bin/determine_extension_dir.sh +++ b/src/php/bin/determine_extension_dir.sh @@ -46,4 +46,6 @@ elif [ ! -e $default_extension_dir/grpc.so ]; then ln -s $f $module_dir/$(basename $f) &> /dev/null || true done extension_dir="-d extension_dir=${module_dir} -d extension=grpc.so" +else + extension_dir="-d extension=grpc.so" fi -- cgit v1.2.3