Try and refcount the returned zval to avoid it being GCed

.travis.yml

@@ -0,0 +1,14 @@
+language: c
+
+before_install:
+    - sudo apt-get update -qq
+    - sudo apt-get -y install libc-ares-dev libssl-dev uuid-dev
+
+before_script:
+    - ./travis/compile-mosquitto.sh
+    - ./travis/compile-php.sh
+    - ./travis/compile-ext.sh
+
+script:
+    - ./travis/run-tests.sh
+

README.md

@@ -2,6 +2,8 @@
 
 This is an extension to allow using the [Mosquitto MQTT library](http://mosquitto.org) with PHP. See the examples/ directory for usage.
 
+[![Build Status](https://travis-ci.org/mgdm/Mosquitto-PHP.svg?branch=master)](https://travis-ci.org/mgdm/Mosquitto-PHP)
+
 ## Requirements
 
 * PHP 5.3+

examples/socket-refcount-test.php

@@ -0,0 +1,16 @@
+<?php
+
+$client = new Mosquitto\Client;
+$client->onConnect(function() use ($client) {
+    $client->subscribe('#', 0);
+});
+
+$client->connect('localhost');
+
+while (true) {
+    $socket = $client->getSocket();
+    var_dump($socket);
+    $r = $w = $e = [$socket];
+    $changedSockets = socket_select($r, $w, $e, 30);
+    $client->loop();
+}

mosquitto.c

@@ -611,6 +611,13 @@ PHP_METHOD(Mosquitto_Client, getSocket)
 
 	object = (mosquitto_client_object *) mosquitto_client_object_get(getThis() TSRMLS_CC);
 
+	if (object->socket_zval != NULL) {
+		zval_dtor(return_value);
+		*return_value = *object->socket_zval;
+		zval_copy_ctor(return_value);
+		return;
+	}
+
 	socket = mosquitto_socket(object->client);
 	if (socket < 0) {
 		zend_throw_exception_ex(mosquitto_ce_exception, 0 TSRMLS_CC, "Unable to create socket resource");
@@ -625,6 +632,8 @@ PHP_METHOD(Mosquitto_Client, getSocket)
 	php_sock->zstream = NULL;
 
 	ZEND_REGISTER_RESOURCE(return_value, php_sock, php_sockets_le_socket());
+	object->socket_zval = return_value;
+	Z_ADDREF_P(object->socket_zval);
 }
 /* }}} */
 
@@ -859,6 +868,10 @@ static void mosquitto_client_object_destroy(void *object TSRMLS_DC)
 		efree(MQTTG(client_key));
 	}
 
+	if (client->socket_zval != NULL) {
+		zval_ptr_dtor(&(client->socket_zval));
+	}
+
 	PHP_MOSQUITTO_FREE_CALLBACK(connect);
 	PHP_MOSQUITTO_FREE_CALLBACK(subscribe);
 	PHP_MOSQUITTO_FREE_CALLBACK(unsubscribe);
@@ -885,6 +898,7 @@ static zend_object_value mosquitto_client_object_new(zend_class_entry *ce TSRMLS
 	client = ecalloc(1, sizeof(mosquitto_client_object));
 	client->std.ce = ce;
 	client->client = NULL;
+	client->socket_zval = NULL;
 
 #ifdef ZTS
 	client->TSRMLS_C = TSRMLS_C;

php_mosquitto.h

@@ -53,6 +53,8 @@ typedef struct _mosquitto_client_object {
 	zend_fcall_info log_callback;
 	zend_fcall_info_cache log_callback_cache;
 
+    zval *socket_zval;
+
     int looping;
 
 #ifdef ZTS

tests/Client/__construct.phpt

@@ -22,8 +22,12 @@ $client = new Mosquitto\Client(null, true);
 var_dump($client);
 
 /* Null ID and no clean session should fail */
-$client = new Mosquitto\Client(null, false);
-var_dump($client);
+/* Behaviour varies between OSX and Linux in Mosquitto 1.4 */
+try {
+    $client = new Mosquitto\Client(null, false);
+} catch (Exception $e) {
+    echo "Caught exception.";
+}
 
 ?>
 --EXPECTF--
@@ -37,9 +41,4 @@ object(Mosquitto\Client)#%d (%d) {
 }
 object(Mosquitto\Client)#%d (%d) {
 }
-
-Fatal error: Uncaught exception 'Mosquitto\Exception' with message 'Invalid argument' in %s
-Stack trace:
-#0 %s: Mosquitto\Client->__construct(NULL, false)
-#1 {main}
-  thrown in %s
+Caught exception.

tests/Client/onDisconnect.phpt

@@ -47,7 +47,7 @@ for ($i = 0; $i < 5; $i++) {
 
 ?>
 --EXPECTF--
-Caught error 4096 (Argument 1 passed to Mosquitto\Client::onDisconnect() must be callable, string given) in /Users/michael/Code/Mosquitto-PHP/tests/Client/onDisconnect.php on line 6
+Caught error 4096 (Argument 1 passed to Mosquitto\Client::onDisconnect() must be callable, string given) in %s on line 6
 Caught Mosquitto\Exception with code 0 and message: Mosquitto\Client::onDisconnect() expects parameter 1 to be a valid callback, function 'foo' not found or invalid function name
 Triggering disconnect
 Disconnected

tests/Client/onSubscribe.phpt

@@ -29,7 +29,7 @@ $client->loopForever();
 
 ?>
 --EXPECTF--
-Caught error 4096 (Argument 1 passed to Mosquitto\Client::onSubscribe() must be callable, string given) in /Users/michael/Code/Mosquitto-PHP/tests/Client/onSubscribe.php on line 6
+Caught error 4096 (Argument 1 passed to Mosquitto\Client::onSubscribe() must be callable, string given) in %s on line 6
 Caught Mosquitto\Exception with code 0 and message: Mosquitto\Client::onSubscribe() expects parameter 1 to be a valid callback, function 'foo' not found or invalid function name
 array(3) {
   [0]=>

travis/compile-ext.sh

@@ -0,0 +1,7 @@
+#!/bin/sh -x
+set -e
+$HOME/bin/phpize
+./configure --with-php-config=$HOME/bin/php-config
+make -j2 --quiet
+make install
+echo "extension=mosquitto.so" > $HOME/php.d/mosquitto.ini

travis/compile-mosquitto.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+wget http://mosquitto.org/files/source/mosquitto-1.4.tar.gz
+tar xvzf mosquitto-1.4.tar.gz
+cd mosquitto-1.4
+make
+sudo make install
+

travis/compile-php.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env sh
+set -e
+mkdir -p $HOME/php
+git clone https://github.com/php/php-src $HOME/php/src
+cd $HOME/php/src
+git checkout PHP-5.6
+./buildconf --force
+./configure \
+    --prefix=$HOME \
+    --disable-all \
+    --enable-debug \
+    --with-config-file-path=$HOME \
+    --with-config-file-scan-dir=$HOME/php.d \
+    --enable-json \
+    --enable-phar \
+    --with-openssl
+
+make -j2 --quiet install
+cp php.ini-development $HOME
+mkdir $HOME/php.d
+

travis/run-tests.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+cd $TRAVIS_BUILD_DIR
+
+cd tests
+./makeTestCerts.sh
+mosquitto -c mosquitto.conf -d
+cd ..
+
+REPORT_EXIT_STATUS=1 TEST_PHP_ARGS="-q --show-diff" make test