Merge branch 'PHP-7.0'

* PHP-7.0:
  remove imap tests for now until I finish the sudoless dovecot config

.travis.yml

@@ -54,7 +54,6 @@ before_script:
     - . ./travis/ext/pdo_mysql/setup.sh
     - . ./travis/ext/pgsql/setup.sh
     - . ./travis/ext/pdo_pgsql/setup.sh
-    - . ./travis/ext/imap/setup.sh
 
 # Run PHPs run-tests.php 
 script:

travis/ext/imap/dovecot.conf

@@ -1,22 +0,0 @@
-auth_debug = yes
-auth_mechanisms = login
-auth_verbose = yes
-disable_plaintext_auth = no
-auth_mechanisms = plain login cram-md5
-listen = *
-mail_location = maildir:/home/vmail/mail/%d/%n/Maildir
-mbox_write_locks = fcntl
-passdb  {
-  args = /etc/dovecot/dovecotpass
-  driver = passwd-file
-}
-protocols = imap
-service auth {
-  user = root
-}
-ssl = no
-userdb {
-  args = uid=11459 gid=10002 home=/home/vmail/dovecot/mail/%d/%n
-  driver = static
-}
-log_path = /var/log/dovecot.log

travis/ext/imap/dovecotpass

@@ -1 +0,0 @@
-webmaster@something.com:{plain}p4ssw0rd

travis/ext/imap/imap.exp

@@ -1,29 +0,0 @@
-send_user "IMAP test start..."
-spawn telnet 127.0.0.1 143
-
-expect "Dovecot ready" {
-                send_user "OK: $expect_out(0,string)\n"
-} "refused" {
-                send_user "connect to POP refused\n"
-                exit 1
-} timeout {
-                send_user "connect to POP timeout\n"
-                exit 1
-}
-
-send "a1 LOGIN webmaster@something.com p4ssw0rd\n"
-
-expect "a1 OK" {
-                send_user "OK, imap works\n"
-} "a1 NO*" {
-                send_user "auth failed: $expect_out(buffer)\n"
-                exit 1
-} "error*" {
-		send_user "ERROR: $expect_out(buffer)\n"
-} timeout {
-                send_user "connect to POP timeout\n"
-                exit 1
-}
-
-exit 0
-

travis/ext/imap/setup.sh

@@ -1,11 +0,0 @@
-#!/bin/sh
-sudo groupadd -g 10002 vmail
-sudo useradd -g 10002 -u 11459 vmail
-sudo apt-get -y install expect dovecot-imapd
-sudo cp ./travis/ext/imap/dovecot.conf ./travis/ext/imap/dovecotpass /etc/dovecot
-sudo mkdir -p /home/vmail/mail/something.com
-sudo chown -R vmail:vmail /home/vmail/mail
-sudo chmod -R u+w /home/vmail/mail
-sudo service dovecot stop
-sudo service dovecot start
-expect ./travis/ext/imap/imap.exp