From: Michael Wallner <mike@php.net>
Date: Mon, 7 Dec 2015 14:53:05 +0000 (+0100)
Subject: add 7.0 as explicitely supported PHP version
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=2d7406d5c003e208d14a6a755e0971e009e57d00;p=m6w6%2Ftravis-pecl

add 7.0 as explicitely supported PHP version
---

diff --git a/Makefile b/Makefile
index 7274717..9712317 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,9 @@ PECL_SONAME ?= $(if $(shell echo $(PECL) | cut -d: -f2),$(shell echo $(PECL) | c
 PECL_VERSION ?= $(shell echo $(PECL) | cut -d: -f3 -s)
 PECL_INI = $(with_config_file_scan_dir)/pecl.ini
 
-PHP_VERSION ?= $(shell test -e $(srcdir)/php-versions.json && cat $(srcdir)/php-versions.json | $(srcdir)/php-version.php $(PHP))
+PHP_VERSION_MAJOR = $(firstword $(subst ., ,$(PHP)))
+PHP_VERSIONS_JSON = $(srcdir)/php-versions$(PHP_VERSION_MAJOR).json
+PHP_VERSION ?= $(shell test -e $(PHP_VERSIONS_JSON) && cat $(PHP_VERSIONS_JSON) | $(srcdir)/php-version.php $(PHP))
 
 .SUFFIXES:
 
@@ -41,7 +43,7 @@ clean:
 	@if test -d $(srcdir)/php-$(PHP_VERSION); then cd $(srcdir)/php-$(PHP_VERSION); make distclean || true; fi
 
 .PHONY: check
-check: $(srcdir)/php-versions.json
+check: $(PHP_VERSIONS_JSON)
 	@if test -z "$(PHP)"; then echo "No php version specified, e.g. PHP=5.6"; exit 1; fi
 
 .PHONY: reconf
@@ -51,8 +53,8 @@ reconf: check $(srcdir)/php-$(PHP_VERSION)/configure
 .PHONY: php
 php: check $(bindir)/php
 
-$(srcdir)/php-versions.json: $(srcdir)/php-version.php
-	curl -Sso $@ "http://php.net/releases/index.php?json&version=5&max=-1"
+$(PHP_VERSIONS_JSON): $(srcdir)/php-version.php
+	curl -Sso $@ "http://php.net/releases/index.php?json&version=$(PHP_VERSION_MAJOR)&max=-1"
 
 $(srcdir)/php-$(PHP_VERSION)/configure: | $(srcdir)/php-versions.json
 	if test $(PHP_VERSION) = "master"; then \
@@ -105,7 +107,7 @@ $(srcdir)/pecl-$(PECL_EXTENSION)/Makefile: $(srcdir)/pecl-$(PECL_EXTENSION)/conf
 
 $(srcdir)/pecl-$(PECL_EXTENSION)/.libs/$(PECL_SONAME).so: $(srcdir)/pecl-$(PECL_EXTENSION)/Makefile
 	cd $(srcdir)/pecl-$(PECL_EXTENSION) && make -j $(JOBS) || make
-	
+
 $(extdir)/$(PECL_SONAME).so: $(srcdir)/pecl-$(PECL_EXTENSION)/.libs/$(PECL_SONAME).so
 	cd $(srcdir)/pecl-$(PECL_EXTENSION) && make install
 
diff --git a/php-version.php b/php-version.php
index 47d4574..2c9c394 100755
--- a/php-version.php
+++ b/php-version.php
@@ -1,5 +1,5 @@
 #!/usr/bin/env php
-<?php 
+<?php
 
 $version = $argv[1];
 $versions = @json_decode(stream_get_contents(STDIN), 1);
@@ -29,13 +29,16 @@ if (isset($by_minor[$version])) {
 	# failsafe
 	switch ($version) {
 	case "5.4":
-		print("5.4.43\n");
+		print("5.4.45\n");
 		break;
 	case "5.5":
-		print("5.5.27\n");
+		print("5.5.30\n");
 		break;
 	case "5.6":
-		print("5.6.11\n");
+		print("5.6.16\n");
+		break;
+	case "7.0":
+		printf("7.0.0\n");
 		break;
 	case "master":
 		print("master\n");