Merge branch 'dev33'

Author: michield

.dotgitlab-ci.yml

@@ -0,0 +1,37 @@
+# Configuration file for running the test suite. Results will be at https://travis-ci.org/phpList/phplist3
+# whitelist
+language: php
+php:
+  - 7.0
+  - 5.6
+  - 5.5
+  - 5.4
+  - 5.3
+
+before_script:
+  - sudo apt-get update > /dev/null
+  - sudo apt-get install -y --force-yes apache2 libapache2-mod-php5 php5-curl php5-mysql php5-intl
+  # Set a custom vhost
+  - sudo sed -i -e "s,/var/www,$(pwd)/public_html,g" /etc/apache2/sites-available/default
+  - sudo sed -i -e "/DocumentRoot/i\ServerName phplist.dev" /etc/apache2/sites-available/default
+  - echo "127.0.0.1 phplist.dev" | sudo tee -a /etc/hosts
+  - sudo /etc/init.d/apache2 restart
+  - sudo cp -f tests/travis-ci/behat.yml behat.yml
+  - sudo cp -f tests/travis-ci/config.php public_html/lists/config/config.php
+  - composer self-update
+  - composer install --prefer-dist
+  - cd vendor/bin && ln -s ../njoannidi/php-lint-bash/phpLint && cd ../../
+  - ls -l vendor/bin
+
+  # Set MySQL configuration and create the database.
+  - mysql -e 'SET GLOBAL wait_timeout = 5400;'
+  - mysql -e 'create database phplistdb;'
+
+script:
+  - vendor/bin/phpLint ./public_html
+  - vendor/bin/behat
+
+after_failure:
+  - echo "Failures detected. Outputing additional logs:"
+  - sudo cat /var/log/apache2/error.log
+  - sudo cat /var/log/mysql/error.log

.php_cs

@@ -16,6 +16,7 @@ $finder = Symfony\CS\Finder\DefaultFinder::create()
     ->exclude('admin/ui')
     ->exclude('admin/locale')
     ->exclude('admin/PHPMailer')
+    ->exclude('admin/inc/random_compat')
     ->in(__DIR__)
 ;
 

VERSION

@@ -1,7 +1,7 @@
 # file that keeps track of the latest tag in cvs and the corresponding version
 # this automates publishing a new version, when it's tagged
 # if you don't understand this, don't worry. You don't need this file
-VERSION=3.2.7
+VERSION=3.3.0
 TAG=xx
 PREVTAG=xx
 DEVVERSION=3.3.0

default.behat.yml

@@ -5,3 +5,7 @@ default:
       selenium2: ~
       # Change to you custom url
       base_url: http://localhost/phplist3/public_html/
+  context :
+     parameters :
+          user: xyz
+          password : abc

public_html/lists/admin/EmailSender.php

@@ -2,16 +2,15 @@
 /**
  * A plugin should implement this interface if it wants to be responsible
  * for sending emails.
- *
  */
 interface EmailSender
 {
     /**
      * Send an email.
      *
      * @param PHPlistMailer $phplistmailer mailer instance
-     * @param string        $header the message http headers
-     * @param string        $body   the message body
+     * @param string        $header        the message http headers
+     * @param string        $body          the message body
      *
      * @return bool success/failure
      */

public_html/lists/admin/PHPMailer/PHPMailerAutoload.php

@@ -1,9 +1,10 @@
 <?php
 /**
  * PHPMailer SPL autoloader.
- * PHP Version 5
- * @package PHPMailer
+ * PHP Version 5.
+ *
  * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ *
  * @author Marcus Bointon (Synchro/coolbru) <[email protected]>
  * @author Jim Jagielski (jimjag) <[email protected]>
  * @author Andy Prevost (codeworxtech) <[email protected]>
@@ -19,6 +20,7 @@
 
 /**
  * PHPMailer SPL autoloader.
+ *
  * @param string $classname The name of the class to load
  */
 function PHPMailerAutoload($classname)
@@ -39,7 +41,8 @@ function PHPMailerAutoload($classname)
     }
 } else {
     /**
-     * Fall back to traditional autoload for old PHP versions
+     * Fall back to traditional autoload for old PHP versions.
+     *
      * @param string $classname The name of the class to load
      */
     function __autoload($classname)