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

lib/tarantool_server.py

@@ -95,17 +95,17 @@ 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)
@@ -245,7 +245,7 @@ def start(self):
         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,

src/tarantool.c

@@ -391,6 +391,7 @@ static zend_object *tarantool_create(zend_class_entry *entry) {
 	obj = (tarantool_object *)pecalloc(1, sizeof(tarantool_object) +
 		sizeof(zval) * (entry->default_properties_count - 1), 0);
 	zend_object_std_init(&obj->zo, entry);
+	object_properties_init(&obj->zo, entry);
 	obj->zo.handlers = &tarantool_obj_handlers;
 
 	return &obj->zo;

test-run.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 
 import os
 import sys
@@ -12,6 +12,8 @@
 
 from pprint import pprint
 
+PHPUNIT_PHAR = 'phpunit.phar'
+
 def read_popen(cmd):
     path = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE)
     path.wait()
@@ -22,7 +24,7 @@ def read_popen_config(cmd):
     return read_popen(cmd)
 
 def find_php_bin():
-    path = read_popen('which php').strip()
+    path = read_popen('which php').strip().decode()
     if (path.find('phpenv') != -1):
         version = read_popen('phpenv global')
         if (version.find('system') != -1):
@@ -37,7 +39,7 @@ def prepare_env(php_ini):
         os.mkdir('var')
     shutil.copy('test/shared/phpunit.xml', 'var')
     test_dir_path = os.path.abspath(os.path.join(os.getcwd(), 'test'))
-    test_lib_path = os.path.join(test_dir_path, 'phpunit.phar')
+    test_lib_path = os.path.join(test_dir_path, PHPUNIT_PHAR)
 #    shutil.copy('test/shared/tarantool.ini', 'var')
     shutil.copy(php_ini, 'var')
     shutil.copy('modules/tarantool.so', 'var')
@@ -60,10 +62,10 @@ def main():
     try:
         shutil.copy('test/shared/phpunit.xml', os.path.join(test_cwd, 'phpunit.xml'))
         shutil.copy('modules/tarantool.so', test_cwd)
-        test_lib_path = os.path.join(test_dir_path, 'phpunit.phar')
+        test_lib_path = os.path.join(test_dir_path, PHPUNIT_PHAR)
 
-        version = read_popen_config('--version').strip(' \n\t') + '.'
-        version1 = read_popen_config('--extension-dir').strip(' \n\t')
+        version = read_popen_config('--version').decode().strip(' \n\t') + '.'
+        version1 = read_popen_config('--extension-dir').decode().strip(' \n\t')
         version += '\n' + ('With' if version1.find('non-zts') == -1 else 'Without') + ' ZTS'
         version += '\n' + ('With' if version1.find('no-debug') == -1 else 'Without') + ' Debug'
         print('Running against ' + version)
@@ -100,9 +102,9 @@ def main():
                 cmd = cmd + 'sudo dtruss ' + find_php_bin()
                 cmd = cmd + ' -c tarantool.ini {0}'.format(test_lib_path)
             else:
-                print find_php_bin()
+                print(find_php_bin())
                 cmd = '{0} -c tarantool.ini {1}'.format(find_php_bin(), test_lib_path)
-                print cmd
+                print(cmd)
 
             print('Running "%s" with "%s"' % (cmd, php_ini))
             proc = subprocess.Popen(cmd, shell=True, cwd=test_cwd)

test/AssertTest.php

@@ -1,5 +1,8 @@
 <?php
-class AssertTest extends PHPUnit_Framework_TestCase
+
+use PHPUnit\Framework\TestCase;
+
+final class AssertTest extends TestCase
 {
 	protected static $tarantool, $tm;
 
@@ -39,6 +42,9 @@ function assert_f()
 		self::$tarantool->select("test");
 	}
 
+	/**
+	 * @doesNotPerformAssertions
+	 */
 	public function test_01_closed_connection() {
 		for ($i = 0; $i < 20000; $i++) {
 			try {

test/CreateTest.php

@@ -1,6 +1,8 @@
 <?php
 
-class CreateTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+final class CreateTest extends TestCase
 {
 		protected static $port, $tm;
 
@@ -34,6 +36,9 @@ public function test_01_create_test_ping_and_close() {
 			$c->close();
 		}
 
+		/**
+		 * @doesNotPerformAssertions
+		 */
 		public function test_01_01_double_disconnect() {
 			$a = new Tarantool('localhost', self::$port);
 			$a->disconnect();
@@ -42,7 +47,7 @@ public function test_01_01_double_disconnect() {
 
 		/**
 		 * @expectedException TarantoolException
-		 * @expectedExceptionMessageRegExp /Name or service not known|nodename nor servname provided/
+		 * @expectedExceptionMessageRegExp /Name or service not known|nodename nor servname provided|getaddrinfo/
 		 */
 		public function test_02_create_error_host() {
 			(new Tarantool('very_bad_host'))->connect();

test/DMLTest.php

@@ -1,5 +1,8 @@
 <?php
-class DMLTest extends PHPUnit_Framework_TestCase
+
+use PHPUnit\Framework\TestCase;
+
+final class DMLTest extends TestCase
 {
 		protected static $tarantool;
 
@@ -158,6 +161,9 @@ public function test_06_update() {
 			$this->assertEquals($result_tuple, $tuple[0]);
 		}
 
+		/**
+		 * @doesNotPerformAssertions
+		 */
 		public function test_07_update_no_error() {
 			self::$tarantool->update("test", 0, array());
 		}
@@ -439,6 +445,9 @@ public static function provideIteratorGood() {
 			];
 		}
 
+	/**
+	 * @doesNotPerformAssertions
+	 */
 	public function test_18_01_delete_loop() {
 		for ($i = 0; $i <= 1000; $i++) {
 			self::$tarantool->replace("pstring", array("test2" . $i, $i));
@@ -451,6 +460,9 @@ public function test_18_01_delete_loop() {
 		gc_collect_cycles();
 	}
 
+	/**
+	 * @doesNotPerformAssertions
+	 */
 	public function test_18_02_delete_loop() {
 		for ($i = 0; $i <= 1000; $i++) {
 			self::$tarantool->replace("pstring", array("test2" . $i, $i));

test/MockTest.php

@@ -1,9 +1,13 @@
 <?php
-class MockTest extends \PHPUnit_Framework_TestCase
+
+use PHPUnit\Framework\TestCase;
+
+final class MockTest extends TestCase
 {
     public function testFoo()
     {
-        $tnt = $this->getMock('Tarantool');
+        // $tnt = $this->createMock(['Tarantool']);
+        $tnt = $this->createMock(\Tarantool::class);
         $tnt->expects($this->once())->method('ping');
         $tnt->ping();
     }

test/MsgPackTest.php

@@ -1,5 +1,8 @@
 <?php
-class MsgPackTest extends PHPUnit_Framework_TestCase
+
+use PHPUnit\Framework\TestCase;
+
+final class MsgPackTest extends TestCase
 {
     protected static $tarantool;
 
@@ -48,6 +51,9 @@ public function test_03_msgpack_array_of_float_as_key() {
         self::$tarantool->select("msgpack", array(3));
     }
 
+    /**
+     * @doesNotPerformAssertions
+     */
     public function test_04_msgpack_integer_keys_arrays() {
         self::$tarantool->replace("msgpack", array(4,
                 "Integer keys causing server to error",
@@ -70,11 +76,12 @@ public function test_05_msgpack_string_keys() {
         $this->assertTrue(True);
     }
 
-		public function test_06_msgpack_array_reference() {
-			$data = [
-					'key1' => 'value1',
-			];
-			$link = &$data['key1'];
-			self::$tarantool->call('test_4', [$data]);
-		}
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function test_06_msgpack_array_reference() {
+        $data = [ 'key1' => 'value1', ];
+        $link = &$data['key1'];
+        self::$tarantool->call('test_4', [$data]);
+    }
 }

test/RandomTest.php

@@ -10,7 +10,9 @@ function generateRandomString($length = 10) {
 	return $randomString;
 }
 
-class RandomTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+final class RandomTest extends TestCase
 {
 		protected static $tarantool;
 
@@ -39,6 +41,10 @@ public function test_03_another_big_response() {
 				$this->assertEquals($i, count($result));
 			}
 		}
+
+		/**
+		 * @doesNotPerformAssertions
+		 */
 		public function test_04_get_strange_response() {
 			self::$tarantool->select("_schema", "12345");
 		}