Merge branch 'master' into php7

Conflicts:
	.travis.yml
	travis/compile.sh

.travis.yml

@@ -1,21 +1,23 @@
-language: php
+language: php 
+
+addons:
+  apt:
+    packages:
+      - liblua5.2-dev
 
 php:
-  - 5.6
-  - 5.5
-  - 5.4
-  - 5.3
-  - 5.3.3
+  - 7.0
 
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -y libjson0-dev libjson0 php5-cli php5-dev  liblua5.2-dev
+notifications:
+  email: false
+  irc: "irc.efnet.org#php.yaf"
 
+env:
+  - REPORT_EXIT_STATUS=1 NO_INTERACTION=1
 
+#Compile
 before_script:
-    # Compile PHP
     - ./travis/compile.sh
 
-script: 
- - ./travis/build_check.sh
-
+# Run PHPs run-tests.php 
+script: make test

README

@@ -1,2 +1,5 @@
-"Lua is a powerful, fast, light-weight, embeddable scripting language." 
+##PHP Lua
+======
 This extension embeds the lua interpreter and offers an OO-API to lua variables and functions.
+
+"Lua is a powerful, fast, light-weight, embeddable scripting language." 

config.m4

@@ -3,6 +3,8 @@ PHP_ARG_WITH(lua, for lua support,
 [  --with-lua=[DIR]    Include php lua support])
 PHP_ARG_WITH(lua-version, to specify a custom lua version, [  --with-lua-version=[VERSION]]   Use the specified lua version.)
 
+PHP_ARG_WITH(lua-version, to specify a custom lua version, [  --with-lua-version=[VERSION]]   Use the specified lua version.)
+
 if test "$PHP_LUA" != "no"; then
   if test -r $PHP_LUA/include/lua.h; then
     LUA_INCLUDE_DIR=$PHP_LUA/include

travis/compile.sh

@@ -1,14 +1,2 @@
-phpize
-
-./configure  --with-lua-version=5.2
-make
-EX=$?;
-if [ $EX != 0 ];
-then
-	echo "compile failed";
-	exit $EX;
-fi;
-
-
-
-exit $EX;
+#!/bin/sh
+phpize && ./configure --with-lua-version=5.2 && make