mirror of
https://gitlab.com/davical-project/davical.git
synced 2026-05-21 01:54:23 +00:00
Update to PHP7.0 naming
This commit is contained in:
parent
fee15797f7
commit
56d4edca87
2
Makefile
2
Makefile
@ -53,7 +53,7 @@ snapshot: release
|
||||
|
||||
.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; \
|
||||
|
||||
25
debian/patches/php7.patch
vendored
25
debian/patches/php7.patch
vendored
@ -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
1
debian/patches/series
vendored
@ -1 +0,0 @@
|
||||
php7.patch
|
||||
@ -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");
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user