aboutsummaryrefslogtreecommitdiffhomepage
path: root/php
diff options
context:
space:
mode:
authorGravatar Paul Yang <TeBoring@users.noreply.github.com>2017-12-12 14:28:27 -0800
committerGravatar GitHub <noreply@github.com>2017-12-12 14:28:27 -0800
commitf69a5db66f170b22b8a5a0abc04ee65d11ef2621 (patch)
tree9c6e0cf0e8b48afaa4950de49138a7613edcf9c0 /php
parentb1386e77a2f4a901a45ad906da7c8cf8a517ab0e (diff)
parent3b13c3f02e476bb668a28fce3e86a1ec62f85562 (diff)
Merge pull request #4028 from TeBoring/3.5.x
Add backslach to make class explict in global namespace
Diffstat (limited to 'php')
-rw-r--r--php/src/Google/Protobuf/Internal/Message.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/php/src/Google/Protobuf/Internal/Message.php b/php/src/Google/Protobuf/Internal/Message.php
index 93e81c01..b7f83c57 100644
--- a/php/src/Google/Protobuf/Internal/Message.php
+++ b/php/src/Google/Protobuf/Internal/Message.php
@@ -1111,7 +1111,7 @@ class Message
}
try {
$this->mergeFromJsonArray($array);
- } catch (Exception $e) {
+ } catch (\Exception $e) {
throw new GPBDecodeException($e->getMessage());
}
}