nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-22 02:04:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update to PHP7.0 naming

Browse Source
This commit is contained in:
Nishanth Aravamudan 2016-05-11 00:13:51 +02:00 committed by Florian Schlichting
parent fee15797f7
commit 56d4edca87
4 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -53,7 +53,7 @@ snapshot: release
.PHONY: test .PHONY: test
test: test:
@for PHP in htdocs/*.php inc/*.php; do php5 -l $${PHP} | grep -v 'No syntax errors detected' >> test-syntax; done; \ @for PHP in htdocs/*.php inc/*.php; do php -l $${PHP} | grep -v 'No syntax errors detected' >> test-syntax; done; \
if [ -s test-syntax ]; then \ if [ -s test-syntax ]; then \
cat test-syntax >&2; \ cat test-syntax >&2; \
rm test-syntax; \ rm test-syntax; \

25
debian/patches/php7.patch vendored
View File

@ -1,25 +0,0 @@
Description: Update to PHP7.0 naming
Author: Nishanth Aravamudan <nish.aravamudan@canonical.com>
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@
.PHONY: test
test:
- @for PHP in htdocs/*.php inc/*.php; do php5 -l $${PHP} | grep -v 'No syntax errors detected' >> test-syntax; done; \
+ @for PHP in htdocs/*.php inc/*.php; do php -l $${PHP} | grep -v 'No syntax errors detected' >> test-syntax; done; \
if [ -s test-syntax ]; then \
cat test-syntax >&2; \
rm test-syntax; \
--- a/inc/drivers_imap_pam.php
+++ b/inc/drivers_imap_pam.php
@@ -13,7 +13,7 @@
// The PHP interpreter will die quietly unless satisfied. This provides user feedback instead.
if (!function_exists('imap_open')) {
- die("drivers_imap_pam: php5-imap required.");
+ die("drivers_imap_pam: php-imap required.");
}
require_once("auth-functions.php");

1
debian/patches/series vendored
View File

@ -1 +0,0 @@
php7.patch

2
inc/drivers_imap_pam.php
View File

@ -13,7 +13,7 @@
// The PHP interpreter will die quietly unless satisfied. This provides user feedback instead. // The PHP interpreter will die quietly unless satisfied. This provides user feedback instead.
if (!function_exists('imap_open')) { if (!function_exists('imap_open')) {
die("drivers_imap_pam: php5-imap required."); die("drivers_imap_pam: php-imap required.");
} }
require_once("auth-functions.php"); require_once("auth-functions.php");