Updated PHPUnit to version 7 + gh-24 + gh-42 + gh-85 + gh-83 + gh-71

.gitignore

@@ -21,6 +21,7 @@ Makefile.in
 /config.nice
 /config.status
 /config.sub
+/configure.ac
 /configure.in
 /libtool
 /ltmain.sh

config.m4

@@ -10,10 +10,12 @@ if test "$PHP_TARANTOOL" != "no"; then
         src/tarantool_schema.c      \
         src/tarantool_proto.c       \
         src/tarantool_tp.c          \
+        src/tarantool_url.c         \
         src/tarantool_exception.c   \
         src/utils.c                 \
         src/third_party/msgpuck.c   \
         src/third_party/sha1.c      \
+        src/third_party/uri.c       \
         src/third_party/PMurHash.c  \
         , $ext_shared)
     PHP_ADD_BUILD_DIR([$ext_builddir/src/])

lib/tarantool_server.py

@@ -95,32 +95,35 @@ def execute_no_reconnect(self, command):
         if not command:
             return
         cmd = command.replace('\n', ' ') + '\n'
-        self.socket.sendall(cmd)
+        self.socket.sendall(cmd.encode())
 
         bufsiz = 4096
-        res = ""
+        res = b''
 
         while True:
             buf = self.socket.recv(bufsiz)
             if not buf:
                 break
             res = res + buf
-            if (res.rfind("\n...\n") >= 0 or res.rfind("\r\n...\r\n") >= 0):
+            if (res.rfind(b'\n...\n') >= 0 or res.rfind(b'\r\n...\r\n') >= 0):
                 break
 
         return yaml.load(res)
 
 class TarantoolServer(object):
     default_tarantool = {
-            "bin":           "tarantool",
-            "logfile":   "tarantool.log",
-            "init":           "init.lua"}
+        "bin":           "tarantool",
+        "logfile":   "tarantool.log",
+        "init":           "init.lua",
+        "unix":     "tarantool.sock"
+    }
 
     default_cfg = {
-            "custom_proc_title": "\"tarantool-python testing\"",
-            "slab_alloc_arena":                             0.5,
-            "pid_file":                           "\"box.pid\"",
-            "rows_per_wal":                                 200}
+        "custom_proc_title": "\"tarantool-python testing\"",
+        "slab_alloc_arena":                             0.5,
+        "pid_file":                           "\"box.pid\"",
+        "rows_per_wal":                                 200
+    }
 
     @property
     def logfile_path(self):
@@ -134,6 +137,10 @@ def cfgfile_path(self):
     def script_path(self):
         return os.path.join(self.vardir, self.default_tarantool['init'])
 
+    @property
+    def unix_path(self):
+        return os.path.join(self.vardir, self.default_tarantool['unix'])
+
     @property
     def script_dst(self):
         return os.path.join(self.vardir, os.path.basename(self.script))
@@ -187,9 +194,9 @@ def log_des(self):
     def __init__(self):
         os.popen('ulimit -c unlimited')
         self.args = {}
-        self.args['primary'] = find_port()
-        self.args['admin'] = find_port(self.args['primary'] + 1)
-        self._admin = self.args['admin']
+
+        self.use_unix = False
+
         self.vardir = tempfile.mkdtemp(prefix='var_', dir=os.getcwd())
         self.find_exe()
 
@@ -204,6 +211,7 @@ def find_exe(self):
         raise RuntimeError("Can't find server executable in " + os.environ["PATH"])
 
     def generate_configuration(self):
+        # print(self.args)
         os.putenv("PRIMARY_PORT", str(self.args['primary']))
         os.putenv("ADMIN_PORT", str(self.args['admin']))
 
@@ -242,10 +250,18 @@ def start(self):
         #   start Tarantool\Box       --DONE(prepare_args)
         # * Wait unitl Tarantool\Box
         #   started                   --DONE(wait_until_started)
+        if self.use_unix:
+            self.args['primary'] = self.unix_path
+            self.args['admin']   = find_port()
+        else:
+            self.args['primary'] = find_port()
+            self.args['admin']   = find_port(self.args['primary'] + 1)
+        self._admin = self.args['admin']
+
         self.generate_configuration()
         if self.script:
             shutil.copy(self.script, self.script_dst)
-            os.chmod(self.script_dst, 0777)
+            os.chmod(self.script_dst, 511)
         args = self.prepare_args()
         self.process = subprocess.Popen(args,
                 cwd = self.vardir,
@@ -268,5 +284,4 @@ def clean(self):
 
     def __del__(self):
         self.stop()
-        self.clean()
-
+        # self.clean()

src/php_tarantool.h

@@ -95,18 +95,16 @@ ZEND_EXTERN_MODULE_GLOBALS(tarantool);
 
 typedef struct tarantool_object {
 	struct tarantool_connection  {
-		char                    *host;
-		int                      port;
-		char                    *login;
-		char                    *passwd;
+		char                    *url;
+		struct tarantool_url    *url_parsed;
 		php_stream              *stream;
 		struct tarantool_schema *schema;
 		smart_string            *value;
 		struct tp               *tps;
 		char                    *greeting;
 		char                    *salt;
 		/* Only for persistent connections */
-		char                    *orig_login;
+		char                    *orig_user;
 		char                    *suffix;
 		int                     suffix_len;
 		zend_string             *persistent_id;