From c93174346149f259ebc85fdb46826fcf84abb07d Mon Sep 17 00:00:00 2001
From: Paul Yang <TeBoring@users.noreply.github.com>
Date: Mon, 2 Apr 2018 15:55:28 -0700
Subject: Merge branch (#4466)

* Fix setup.py for windows build.

* Bump version number to 3.5.2

* Cat the test-suite.log on errors for presubits
---
 php/ext/google/protobuf/package.xml | 22 +++++++++++++++++++---
 php/ext/google/protobuf/protobuf.h  |  2 +-
 2 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'php')

diff --git a/php/ext/google/protobuf/package.xml b/php/ext/google/protobuf/package.xml
index 626eb46b..3a556acf 100644
--- a/php/ext/google/protobuf/package.xml
+++ b/php/ext/google/protobuf/package.xml
@@ -10,11 +10,11 @@
   <email>protobuf-opensource@google.com</email>
   <active>yes</active>
  </lead>
- <date>2017-12-11</date>
+ <date>2018-03-06</date>
  <time>11:02:07</time>
  <version>
-  <release>3.5.1</release>
-  <api>3.5.1</api>
+  <release>3.5.2</release>
+  <api>3.5.2</api>
  </version>
  <stability>
   <release>stable</release>
@@ -216,5 +216,21 @@ GA release.
 GA release.
    </notes>
   </release>
+  <release>
+   <version>
+    <release>3.5.2</release>
+    <api>3.5.2</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2018-03-06</date>
+   <time>11:02:07</time>
+   <license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
+   <notes>
+G  A release.
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h
index be1de5cf..c15bde2d 100644
--- a/php/ext/google/protobuf/protobuf.h
+++ b/php/ext/google/protobuf/protobuf.h
@@ -37,7 +37,7 @@
 #include "upb.h"
 
 #define PHP_PROTOBUF_EXTNAME "protobuf"
-#define PHP_PROTOBUF_VERSION "3.5.1"
+#define PHP_PROTOBUF_VERSION "3.5.2"
 
 #define MAX_LENGTH_OF_INT64 20
 #define SIZEOF_INT64 8
-- 
cgit v1.2.3