Merge branch 'master' into master-michiel

# Conflicts:
#	.github/workflows/docker-test.yml
#	.github/workflows/main.yml
#	.github/workflows/s3upload-test.yml
#	Dockerfile.release
#	docker/docker-apache-phplist.conf

Author: michield

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,6 +4,7 @@
 <!--- Please provide a general description of your changes in the Pull Request -->
 
 ## Related Issue
-<!--- If it fixes an open issue on Mantis (https://mantis.phplist.org), please include a link to the issue here. -->
+
+
 
 ## Screenshots (if appropriate):

.github/workflows/build-release.yml

@@ -113,6 +113,14 @@ jobs:
           ../vendor/bin/behat -n -fprogress -p chrome --strict --stop-on-failure --tags=@initialise
           ../vendor/bin/behat -n -fprogress -p chrome --strict --stop-on-failure --tags="~@initialise && ~@wip"
 
+      - name: Upload the screenshots
+        if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          path: "output"
+          name: "behat output"
+          retention-days: 3
+
       - name: Clean Up
         run: |
           cd $GITHUB_WORKSPACE
@@ -163,7 +171,6 @@ jobs:
             public_html/lists/base/.htaccess
             public_html/lists/base/phpunit.xml.dist 
             public_html/lists/base/composer.lock
-            public_html/lists/base/composer.json
             public_html/lists/base/CODE_OF_CONDUCT.md 
             public_html/lists/admin/ui/default
           )

.github/workflows/main.yml

@@ -31,6 +31,7 @@ jobs:
         run: |
           cd $GITHUB_WORKSPACE
           sudo apt update
+          sudo apt install rsync
 
       - name: Cache Composer dependencies
         uses: actions/cache@v2
@@ -57,13 +58,13 @@ jobs:
           sudo mysqladmin -proot create phplistdb
           sudo mysql -proot -e 'grant all on phplistdb.* to phplist@"%" identified by "phplist"'
 
-      # - name: Set bootlist theme
-      #   run: |
-      #     cd $GITHUB_WORKSPACE/public_html/lists/admin/ui/
-      #     wget https://github.com/phpList/phplist-ui-bootlist/archive/master.tar.gz
-      #     tar -xzf master.tar.gz
-      #     mv phplist-ui-bootlist-master phplist-ui-bootlist
-      #     rm master.tar.gz
+      - name: Set bootlist theme
+        run: |
+          cd $GITHUB_WORKSPACE/public_html/lists/admin/ui/
+          wget https://github.com/phpList/phplist-ui-bootlist/archive/master.tar.gz
+          tar -xzf master.tar.gz
+          mv phplist-ui-bootlist-master phplist-ui-bootlist
+          rm master.tar.gz
 
       - name: Start Test Server
         run: |
@@ -77,30 +78,40 @@ jobs:
           sudo php -S 0.0.0.0:80 -t public_html > /dev/null 2>&1 &
 
       - name: Check PHP syntax errors
-        uses: phplist/[email protected]
+        uses: overtrue/[email protected]
         with:
           path: ./public_html
 
-      # - name: Report Versions
-      #   run: |
-      #     google-chrome --version
-      #     php -v
-      #     chromedriver -v
-      #     geckodriver -V
-      #     which geckodriver
-      #     which chromedriver
-      #     firefox -v
-      #     vendor/bin/behat -V
+      - name: Report Versions
+        run: |
+          google-chrome --version
+          php -v
+          chromedriver -v
+          geckodriver -V
+          which geckodriver
+          which chromedriver
+          firefox -v
+          vendor/bin/behat -V
 
       - name: Run BDD Tests
         run: |
           cd $GITHUB_WORKSPACE/tests
-          ../vendor/bin/behat -n -fprogress -p chrome --strict --stop-on-failure --tags=@initialise
-          ../vendor/bin/behat -n -fprogress -p chrome --strict --stop-on-failure --tags="~@initialise && ~@wip"
+          ../vendor/bin/behat -p chrome --stop-on-failure --tags=@initialise
+          ../vendor/bin/behat -p chrome --tags="~@initialise && ~@wip"
+
+      - name: Upload the screenshots
+        if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          path: "output"
+          name: "behat output"
+          retention-days: 3
 
       - name: Display output
         run: |
           cd $GITHUB_WORKSPACE
-          cat output/selenium.log
+        #  find . -type f
+        #  cat output/selenium.log
+        if: ${{ failure() }}
 
 

Dockerfile.release

@@ -3,30 +3,29 @@ FROM debian:buster-slim
 
 LABEL maintainer="[email protected]" 
 
- RUN apt-get update && apt-get upgrade -y
+RUN apt-get update && apt-get upgrade -y
 
- RUN apt-get install -y apt-utils \
-     vim apache2 net-tools php-mysql \
-     libapache2-mod-php php-curl php-gd \
-     git cron php-imap php-xml php-zip php-mbstring python-pip
+RUN apt-get install -y apt-utils \
+    vim apache2 net-tools php-mysql \
+    libapache2-mod-php php-curl php-gd \
+    git cron php-imap php-xml php-zip php-mbstring
 
 RUN useradd -d /var/www/phpList3 phplist
 
 ARG VERSION=unknown
 RUN echo VERSION=${VERSION}
-ARG AWS_ACCESSKEY=x
-ARG AWS_SECRETKEY=y
-ARG S3_VERSIONS_BUCKET=unknown
 
 RUN rm -rf /var/www/phpList3 && mkdir -p /var/www/phpList3
 RUN rm -rf /etc/phplist && mkdir /etc/phplist
 
 COPY docker/docker-apache-phplist.conf /etc/apache2/sites-available
 COPY docker/docker-entrypoint.sh /usr/local/bin/
-COPY docker/phplist-crontab /etc/cron.d/
-COPY docker/docker-phplist-config-live.php /etc/phplist/
+RUN chmod 755 /usr/local/bin/docker-entrypoint.sh
+RUN a2ensite docker-apache-phplist
+RUN a2enmod rewrite
 
-RUN pip install s3cmd
+COPY docker/phplist-crontab /etc/cron.d/
+COPY docker/docker-phplist-config-live.php /etc/phplist/config.php
 
 COPY phplist-${VERSION}.tgz ./
 
@@ -43,4 +42,4 @@ RUN chown -R www-data: /var/www/phpList3
 EXPOSE 80 
 
 VOLUME ["/var/www", "/var/log/apache2"]
-ENTRYPOINT ["docker-entrypoint.sh"]
+ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]

README.md

@@ -5,7 +5,7 @@
 
 #
 ![CI](https://github.com/phpList/phplist3/workflows/CI/badge.svg)
-[![Stable release](https://img.shields.io/badge/stable-3.6.2-blue.svg)](https://sourceforge.net/projects/phplist/files/phplist/)
+[![Stable release](https://img.shields.io/badge/stable-3.6.3-blue.svg)](https://sourceforge.net/projects/phplist/files/phplist/)
 [![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0)
 <a href="http://translate.phplist.org/engage/phplist/?utm_source=widget">
 <img src="http://translate.phplist.org/widgets/phplist/-/svg-badge.svg" alt="Translation status" />
@@ -122,8 +122,7 @@ This process may take quite a while if your database is large. Don't interrupt i
 <div align="center" width="100%">
   <img src="https://www.phplist.com/site/images/readme-images/issues_icon.svg" align="center" width="96px" />
   <h3>Issues</h3>
-  <p>Report issues to <a href="https://mantis.phplist.org/bug_report_page.php">Mantis issue tracker</a> (select project phpList 3 application)<br>
-     'Please don't use GitHub issues'.</p>
+  <p>Report issues to <a href="https://github.com/phpList/phplist3/issues">GitHub Issues</a> and, if applicable, add the respective label.</p>
 </div>
 
 #

VERSION

@@ -1,5 +1,5 @@
 # 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.6.2
-DEVVERSION=3.6.3-RC1
+VERSION=3.6.3
+DEVVERSION=3.6.4-RC1

Vagrantfile

@@ -8,13 +8,8 @@
 ## below
 
 Vagrant.configure("2") do |config|
-  config.vagrant.plugins = [
-    "vagrant-docker-compose",
-  ]
   config.vm.box = "ubuntu/bionic64"
-  config.vm.provision :docker
-  config.vm.provision :docker_compose,
-    compose_version: "1.22.0"
+  config.vm.network "public_network"
 
   config.vm.provider "virtualbox" do |v|
       v.memory = 10640
@@ -31,9 +26,7 @@ Vagrant.configure("2") do |config|
       apt install software-properties-common
       add-apt-repository ppa:ondrej/php
       DEBIAN_FRONTEND=noninteractive apt update
-      DEBIAN_FRONTEND=noninteractive apt install -y composer mariadb-client mariadb-server postfix chromium-chromedriver firefox openjdk-8-jre-headless fonts-liberation
-      DEBIAN_FRONTEND=noninteractive apt install -y php7.0 php7.0-mbstring php7.0-curl php7.0-mysql php7.0-xml php7.0-zip 
-      DEBIAN_FRONTEND=noninteractive apt install -y php7.1 php7.1-mbstring php7.1-curl php7.1-mysql php7.1-xml php7.1-zip 
+      DEBIAN_FRONTEND=noninteractive apt install -y make mariadb-client mariadb-server postfix chromium-chromedriver firefox openjdk-8-jre-headless fonts-liberation xdg-utils 
       DEBIAN_FRONTEND=noninteractive apt install -y php7.2 php7.2-mbstring php7.2-curl php7.2-mysql php7.2-xml php7.2-zip 
       DEBIAN_FRONTEND=noninteractive apt install -y php7.3 php7.3-mbstring php7.3-curl php7.3-mysql php7.3-xml php7.3-zip 
       DEBIAN_FRONTEND=noninteractive apt install -y php7.4 php7.4-mbstring php7.4-curl php7.4-mysql php7.4-xml php7.4-zip 
@@ -49,17 +42,20 @@ Vagrant.configure("2") do |config|
       update-alternatives --set phpize /usr/bin/phpize$PHPVERSION
       update-alternatives --set php-config /usr/bin/php-config$PHPVERSION
       [[ ! -z $(which google-chrome) ]] || {
-        wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+        [[ ! -f google-chrome-stable_current_amd64.deb ]] && wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
         dpkg -i google-chrome-stable_current_amd64.deb
       }
       google-chrome --version
       rm -rf vendor
-      composer install
+      bin/update-composer.sh
+      sudo -u vagrant php composer.phar update
+      ln -s /vagrant/vendor/bin/chromedriver /usr/local/bin/chromedriver
+      ln -s /vagrant/vendor/bin/geckodriver /usr/local/bin/geckodriver
       service postfix stop
       service apache2 stop
       service mysqld start
       cp -fv tests/ci/config.php public_html/lists/config/config.php
-      cp -fv tests/default.behat.yml tests/behat.yml
+      cp -fv tests/ci/behat.yml tests/behat.yml
       [[ ! -d public_html/lists/admin/ui/phplist-ui-bootlist ]] && { 
         cd public_html/lists/admin/ui/ 
         wget https://github.com/phpList/phplist-ui-bootlist/archive/master.tar.gz

bin/update-composer.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')"
+php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+ACTUAL_CHECKSUM="$(php -r "echo hash_file('sha384', 'composer-setup.php');")"
+
+if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ]
+then
+    >&2 echo 'ERROR: Invalid installer checksum'
+    rm composer-setup.php
+    exit 1
+fi
+echo installing composer
+php composer-setup.php --quiet
+RESULT=$?
+rm composer-setup.php
+exit $RESULT