no longer support PHP-7.1

Author: matyhtf

ext-src/php_swoole.h

@@ -39,16 +39,7 @@
 #include "config.h"
 #endif
 
-// zend iterator interface
-#if PHP_VERSION_ID < 70200
-#ifdef HAVE_PCRE
-#include "ext/spl/spl_iterators.h"
-#define zend_ce_countable spl_ce_Countable
-#define SW_HAVE_COUNTABLE 1
-#endif
-#else
 #define SW_HAVE_COUNTABLE 1
-#endif
 
 #include "swoole_api.h"
 #include "swoole_async.h"
@@ -105,8 +96,8 @@ extern zend_module_entry swoole_module_entry;
 #define SWOOLE_SOCKETS_SUPPORT
 #endif
 
-#if PHP_VERSION_ID < 70100
-#error "require PHP version 7.1 or later"
+#if PHP_VERSION_ID < 70200
+#error "require PHP version 7.2 or later"
 #endif
 
 //--------------------------------------------------------
@@ -313,20 +304,10 @@ extern ZEND_DECLARE_MODULE_GLOBALS(swoole);
 #endif
 
 /* PHP 7 compatibility patches */
-
-// Fixed C++ warning (https://github.com/php/php-src/commit/ec31924cd68df4f5591664d487baaba0d01b1daf)
-#if PHP_VERSION_ID < 70200
-#define sw_zend_bailout() _sw_zend_bailout(__FILE__, __LINE__)
-static sw_inline void _sw_zend_bailout(const char *filename, uint32_t lineno)
-{
-    _zend_bailout((char *)filename, lineno);
-}
-#else
 #define sw_zend_bailout() zend_bailout()
-#endif
 
-// Fixed in php-7.1.15RC1, php-7.2.3RC1 (https://github.com/php/php-src/commit/e88e83d3e5c33fcd76f08b23e1a2e4e8dc98ce41)
-#if PHP_MAJOR_VERSION == 7 && ((PHP_MINOR_VERSION == 1 && PHP_RELEASE_VERSION < 15) || (PHP_MINOR_VERSION == 2 && PHP_RELEASE_VERSION < 3))
+// Fixed in php-7.2.3RC1 (https://github.com/php/php-src/commit/e88e83d3e5c33fcd76f08b23e1a2e4e8dc98ce41)
+#if PHP_MAJOR_VERSION == 7 && ((PHP_MINOR_VERSION == 2 && PHP_RELEASE_VERSION < 3))
 // See https://github.com/php/php-src/commit/0495bf5650995cd8f18d6a9909eb4c5dcefde669
 // Then https://github.com/php/php-src/commit/2dcfd8d16f5fa69582015cbd882aff833075a34c
 // See https://github.com/php/php-src/commit/52db03b3e52bfc886896925d050af79bc4dc1ba3

ext-src/php_swoole_library.h

@@ -2,7 +2,7 @@
  * Generated by build-library.php, Please DO NOT modify!
  */
 
-/* $Id: 7952a7b69374058b888e279d996b8b8a4e286b44 */
+/* $Id: 138bd3ee518144ea6dccceb624d540627537a972 */
 
 static const char* swoole_library_source_constants =
     "\n"
@@ -16,7 +16,10 @@ static const char* swoole_library_source_constants =
     "\n"
     "declare(strict_types=1);\n"
     "\n"
-    "define('SWOOLE_LIBRARY', true);\n";
+    "define('SWOOLE_LIBRARY', true);\n"
+    "\n"
+    "!defined('CURLOPT_HEADEROPT') && define('CURLOPT_HEADEROPT', 229);\n"
+    "!defined('CURLOPT_PROXYHEADER') && define('CURLOPT_PROXYHEADER', 10228);\n";
 
 static const char* swoole_library_source_std_exec =
     "\n"
@@ -3477,11 +3480,7 @@ static const char* swoole_library_source_core_curl_handler =
     "\n"
     "    public function __toString()\n"
     "    {\n"
-    "        if (PHP_VERSION_ID < 70200) {\n"
-    "            $id = spl_object_hash($this);\n"
-    "        } else {\n"
-    "            $id = spl_object_id($this);\n"
-    "        }\n"
+    "        $id = spl_object_id($this);\n"
     "        return \"Object({$id}) of type (curl)\";\n"
     "    }\n"
     "\n"
@@ -6694,6 +6693,7 @@ static const char* swoole_library_source_core_server_helper =
     "        'task_max_request_grace' => true,\n"
     "        'max_connection' => true,\n"
     "        'max_conn' => true,\n"
+    "        'start_session_id' => true,\n"
     "        'heartbeat_check_interval' => true,\n"
     "        'heartbeat_idle_time' => true,\n"
     "        'max_request' => true,\n"
@@ -6982,6 +6982,10 @@ static const char* swoole_library_source_functions =
     "\n"
     "declare(strict_types=1);\n"
     "\n"
+    "if (PHP_VERSION_ID < 70200) {\n"
+    "    throw new RuntimeException(\"require PHP version 7.2 or later\");\n"
+    "}\n"
+    "\n"
     "if (SWOOLE_USE_SHORTNAME) {\n"
     "    function _string(string $string = ''): Swoole\\StringObject\n"
     "    {\n"

ext-src/swoole_coroutine.cc

@@ -647,11 +647,7 @@ void PHPCoroutine::main_func(void *arg) {
             ZVAL_UNDEF(retval);
             // TODO: enhancement it, separate execute data is necessary, but we lose the backtrace
             EG(current_execute_data) = nullptr;
-#if PHP_VERSION_ID >= 70200
             zend_init_func_execute_data(call, &func->op_array, retval);
-#else
-        zend_init_execute_data(call, &func->op_array, retval);
-#endif
             zend_execute_ex(EG(current_execute_data));
         } else /* ZEND_INTERNAL_FUNCTION */
         {

ext-src/swoole_runtime.cc

@@ -148,10 +148,6 @@ static const zend_function_entry swoole_runtime_methods[] =
 
 static php_stream_wrapper ori_php_plain_files_wrapper;
 
-#if PHP_VERSION_ID < 70200
-typedef void (*zif_handler)(INTERNAL_FUNCTION_PARAMETERS);
-#endif
-
 #define SW_HOOK_FUNC(f) hook_func(ZEND_STRL(#f), PHP_FN(swoole_##f))
 #define SW_UNHOOK_FUNC(f) unhook_func(ZEND_STRL(#f))