travisci updates for php7.1, php7.2 and php7.3

- fixed unstable tests
- add pthreads for php7.2

Author: zebastian

.travis.yml

@@ -1,5 +1,12 @@
+dist: trusty
+
 language: php
 php:
+    #- nightly requires more changes
+    #- 7.4 requires more changes
+    - 7.3
+    - 7.2
+    - 7.1
     - 7.0
     - 5.6
     - 5.5
@@ -10,19 +17,18 @@ env:
     - LIBZMQ_VERSION=3.2.5
     - LIBZMQ_VERSION=4.0.7 LIBSODIUM_VERSION=1.0.8
     - LIBZMQ_VERSION=4.1.4 LIBSODIUM_VERSION=1.0.8
-    - LIBZMQ_VERSION=master LIBSODIUM_VERSION=1.0.8
+    - LIBZMQ_VERSION=master LIBSODIUM_VERSION=1.0.18
 addons:
     apt:
         packages:
             - uuid-dev
+            - libtool
 
 before_script:
-  - phpenv config-rm xdebug.ini
+  - phpenv config-rm xdebug.ini || true
 
 script: travis/script.sh $HOME/zeromq-cache $LIBZMQ_VERSION $LIBSODIUM_VERSION $CZMQ_VERSION
-#cache:
-#    directories:
-#        - travis/cache
+
 sudo: false
 
 cache:

tests/028-xpub.phpt

@@ -4,6 +4,9 @@ Test send / recv with XPUB and XSUB sockets
 <?php 
     require_once(dirname(__FILE__) . '/skipif.inc'); 
     if(!defined('ZMQ::SOCKET_XPUB')) die('skip');
+    if (!defined('ZMQ::LIBZMQ_VERSION_MAJOR') || ZMQ::LIBZMQ_VERSION_MAJOR < 3) {
+         die ("skip This test is for libzmq version 3.x and up");
+    }
 ?>
 --FILE--
 <?php

tests/052-pthreads.phpt

@@ -17,49 +17,79 @@ Test pthreads integration
 $threads = 10;
 
 class MyWorker extends Thread {
-	public $sendThisBack;
+	private $sendThisBack;
 
 	public function __construct($sendThisBack){
 		$this->sendThisBack = $sendThisBack;
 	}
 
 	public function run() {
 		$context = ZMQContext::acquire();
-
 		$socket = $context->getSocket(ZMQ::SOCKET_PUSH);
 		$socket->connect ("inproc://pthreads-test");
 		$socket->send($this->sendThisBack);
-		
-		sleep(2);
+		usleep(500 * 1000);
 	}
 }
 
-$context = ZMQContext::acquire();
-
-
-$socket = $context->getSocket(ZMQ::SOCKET_PULL);
-$socket->bind("inproc://pthreads-test");
-$socket->setSockOpt(ZMQ::SOCKOPT_HWM, 1000);
+class MyServer extends Thread {
+	private $threads;
+	
+	public function __construct($threads){
+		$this->threads = $threads;
+	}
+	
+	public function run() {
+		$context = ZMQContext::acquire();
+		$socket = $context->getSocket(ZMQ::SOCKET_PULL);
+		$socket->bind("inproc://pthreads-test");
+		$socket->setSockOpt(ZMQ::SOCKOPT_HWM, 1000);
+		usleep(500 * 1000);
+		
+		echo 'Receiving responses' . PHP_EOL;
+		$responses = array();
+		for ($i = 0; $i < $this->threads; $i++) {
+			$responses[] = $socket->recv();
+		}
+		sort($responses);
+		foreach($responses as $response){
+			echo $response . PHP_EOL;
+		}
+	}
+}
 
-$request = array();
+$server = new MyServer($threads);
+$server->start();
+echo 'Server started' . PHP_EOL;
 
+$requests = array();
 for ($i = 0; $i < $threads; $i++) {
 	$requests[$i] = new MyWorker("thr_$i");
 	$requests[$i]->start();
 }
-
-var_dump($context->getSocketCount());
+echo 'Workers started' . PHP_EOL;
 
 for ($i = 0; $i < $threads; $i++) {
 	$requests[$i]->join();
 }
-
-for ($i = 0; $i < $threads; $i++) {
-	$socket->recv();
-}
+$server->join();
+echo 'All requests pushed' . PHP_EOL;
 
 echo "OK";
 
 --EXPECT--
-int(11)
+Server started
+Workers started
+Receiving responses
+thr_0
+thr_1
+thr_2
+thr_3
+thr_4
+thr_5
+thr_6
+thr_7
+thr_8
+thr_9
+All requests pushed
 OK

travis/script.sh

@@ -21,7 +21,9 @@ if test "x$4" != "x"; then
     CZMQ_VERSION=$4
 fi
 
-BUILD_PTHREADS=`php -r 'die(PHP_ZTS == 1 && PHP_VERSION_ID >= 70000 ? "yes" : "no");'`
+# pthreads only available for php7.0 and php7.2 (2020-02)
+# 7.1 and 7.3 is not compiling, no more support for php7.4 and up, package is discontinued
+BUILD_PTHREADS=`php -r 'die(PHP_ZTS == 1 && ((PHP_VERSION_ID >= 70000 && PHP_VERSION_ID < 70100) || (PHP_VERSION_ID >= 70200 && PHP_VERSION_ID < 70300)) ? "yes" : "no");'`
 
 LIBSODIUM_PREFIX="${CACHE_DIR}/libsodium-${LIBSODIUM_VERSION}"
 LIBZMQ_PREFIX="${CACHE_DIR}/libzmq-${LIBZMQ_VERSION}-libsodium-${LIBSODIUM_VERSION}"
@@ -204,7 +206,26 @@ make_test() {
 
         if test "${BUILD_PTHREADS}" = "yes"
         then
-            pecl install pthreads
+
+            PHP_VERSION_MAJOR_MINOR=`php -r 'die(PHP_MAJOR_VERSION . "." . PHP_MINOR_VERSION);'`
+            echo "PHP Version is: $PHP_VERSION_MAJOR_MINOR"
+
+            if test "$PHP_VERSION_MAJOR_MINOR" = "7.3"
+            then
+                # pthreads from from github master branch (not "yet" released) ->  is broken for php7.3
+                pecl install --ignore-errors https://github.com/krakjoe/pthreads/archive/master.tar.gz
+            elif test "$PHP_VERSION_MAJOR_MINOR" = "7.2"
+            then
+                # pthreads from from github release directly
+                pecl install --ignore-errors https://github.com/krakjoe/pthreads/archive/v3.2.0.tar.gz
+            elif test "$PHP_VERSION_MAJOR_MINOR" = "7.1"
+            then
+                # pthreads from from github release directly -> is broken for php7.1
+                pecl install --ignore-errors https://github.com/krakjoe/pthreads/archive/v3.1.6.tar.gz
+            else
+                # pthreads from pear release till 7.0
+                pecl install pthreads
+            fi
             pthreads_flag="extension=pthreads.so"
         fi