PHP 8 support (#542)

* PHP 8 support, test workflow syntax

* Try using a custom data structure in the workflow

* Try using matrix include

* Default PHP target

* single include

* fix composer package name

* [WIP] Try using dev-master for valuestore

* Update spatie/valuestore constraint to be stable

.github/workflows/ci.yml

@@ -15,16 +15,18 @@ jobs:
 
     strategy:
       matrix:
-        laravel: [
+        php_version: ["7.4"]
-          "^6.0",
+        php_target: ["php:7.4-cli"]
-          "^7.0",
+        laravel: ["^6.0", "^8.0"]
-          "^8.0"
+        include:
-        ]
+          - php_version: "8.0"
+            php_target: "php:8.0.0RC5-cli"
+            laravel: "^8.0"
 
     steps:
     - uses: actions/checkout@v2
     - name: Start docker containers
-      run: docker-compose up -d
+      run: PHP_TARGET=${{ matrix.php_target }} PHP_VERSION=${{ matrix.php_version }} docker-compose up -d
     - name: Install dependencies
       run: docker-compose exec -T test composer require --no-interaction "laravel/framework:${{ matrix.laravel }}"
     - name: Run tests

Dockerfile

@@ -1,9 +1,8 @@
-ARG PHP_TARGET=7.4
+ARG PHP_VERSION=7.4
+ARG PHP_TARGET=php:${PHP_VERSION}-cli
 
-FROM php:${PHP_TARGET}-cli
+FROM ${PHP_TARGET}
 
-# We need to do this again as the FROM line seems to clear the ARG
-ARG PHP_TARGET=7.4
 ARG COMPOSER_TARGET=2.0.3
 
 WORKDIR /var/www/html
@@ -11,8 +10,8 @@ WORKDIR /var/www/html
 LABEL org.opencontainers.image.source=https://github.com/stancl/tenancy \
     org.opencontainers.image.vendor="Samuel Štancl" \
     org.opencontainers.image.licenses="MIT" \
-    org.opencontainers.image.title="PHP ${PHP_TARGET} with modules for laravel support" \
+    org.opencontainers.image.title="PHP ${PHP_VERSION} with modules for laravel support" \
-    org.opencontainers.image.description="PHP ${PHP_TARGET} with a set of php/os packages suitable for running Laravel apps"
+    org.opencontainers.image.description="PHP ${PHP_VERSION} with a set of php/os packages suitable for running Laravel apps"
 
 # our default timezone and langauge
 ENV TZ=Europe/London
@@ -23,28 +22,29 @@ ENV LANG=en_GB.UTF-8
 #       Dockerfile _and pin the versions_! Eg:
 #       RUN pecl install memcached-2.2.0 && docker-php-ext-enable memcached
 
-RUN apt-get update \
+# install some OS packages we need
-    # install some OS packages we need
+RUN apt-get update
-    && apt-get install -y --no-install-recommends libfreetype6-dev libjpeg62-turbo-dev libpng-dev libgmp-dev libldap2-dev netcat curl sqlite3 libsqlite3-dev libpq-dev libzip-dev unzip vim-tiny gosu git \
+RUN apt-get install -y --no-install-recommends libfreetype6-dev libjpeg62-turbo-dev libpng-dev libgmp-dev libldap2-dev netcat curl sqlite3 libsqlite3-dev libpq-dev libzip-dev unzip vim-tiny gosu git
     # install php extensions
-    && if [ "${PHP_TARGET}" = "7.4" ]; then docker-php-ext-configure gd --with-freetype --with-jpeg; else docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/; fi \
+RUN docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \
-    && docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \
+    # && if [ "${PHP_VERSION}" = "7.4" ]; then docker-php-ext-configure gd --with-freetype --with-jpeg; else docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/; fi \
     && docker-php-ext-install -j$(nproc) gd pdo pdo_mysql pdo_pgsql pdo_sqlite pgsql zip gmp bcmath pcntl ldap sysvmsg exif \
     # install the redis php extension
-    && pecl install redis-5.0.2 \
+    && pecl install redis-5.3.2 \
     && docker-php-ext-enable redis \
     # install the pcov extention
     && pecl install pcov \
     && docker-php-ext-enable pcov \
-    && echo "pcov.enabled = 1" > /usr/local/etc/php/conf.d/pcov.ini \
+    && echo "pcov.enabled = 1" > /usr/local/etc/php/conf.d/pcov.ini
-    # clear the apt cache
+# clear the apt cache
+RUN rm -rf /var/lib/apt/lists/* \
     && rm -rf /var/lib/apt/lists/* \
     # install composer
     && curl -o /tmp/composer-setup.php https://getcomposer.org/installer \
     && curl -o /tmp/composer-setup.sig https://composer.github.io/installer.sig \
     && php -r "if (hash('SHA384', file_get_contents('/tmp/composer-setup.php')) !== trim(file_get_contents('/tmp/composer-setup.sig'))) { unlink('/tmp/composer-setup.php'); echo 'Invalid installer' . PHP_EOL; exit(1); }" \
     && php /tmp/composer-setup.php --version=${COMPOSER_TARGET} --no-ansi --install-dir=/usr/local/bin --filename=composer --snapshot \
-    && rm -f /tmp/composer-setup.* \
+    && rm -f /tmp/composer-setup.*
-    # set the system timezone
+# set the system timezone
-    && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime \
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime \
     && echo $TZ > /etc/timezone

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "stancl/tenancy-private",
+    "name": "stancl/tenancy",
     "description": "Automatic multi-tenancy for your Laravel application.",
     "keywords": ["laravel", "multi-tenancy", "multi-database", "tenancy"],
     "license": "MIT",
@@ -23,7 +23,7 @@
         "orchestra/testbench-browser-kit": "^4.0|^5.0|^6.0",
         "league/flysystem-aws-s3-v3": "~1.0",
         "doctrine/dbal": "^2.10",
-        "spatie/valuestore": "^1.2"
+        "spatie/valuestore": "^1.2.5"
     },
     "autoload": {
         "psr-4": {

docker-compose.yml

@@ -3,6 +3,9 @@ services:
     test:
         build:
             context: .
+            args:
+              PHP_VERSION: ${PHP_VERSION}
+              PHP_TARGET: ${PHP_TARGET}
         depends_on:
             mysql:
                 condition: service_healthy

src/Bootstrappers/FilesystemTenancyBootstrapper.php

@@ -59,7 +59,11 @@ class FilesystemTenancyBootstrapper implements TenancyBootstrapper
             $filesystemDisk = Storage::disk($disk);
             $this->originalPaths['disks'][$disk] = $filesystemDisk->getAdapter()->getPathPrefix();
 
-            if ($root = str_replace('%storage_path%', storage_path(), $this->app['config']["tenancy.filesystem.root_override.{$disk}"])) {
+            if ($root = str_replace(
+                '%storage_path%',
+                storage_path(),
+                $this->app['config']["tenancy.filesystem.root_override.{$disk}"] ?? ''
+            )) {
                 $filesystemDisk->getAdapter()->setPathPrefix($finalPrefix = $root);
             } else {
                 $root = $this->app['config']["filesystems.disks.{$disk}.root"];

src/Concerns/CreatesDatabaseUsers.php

@@ -10,19 +10,15 @@ trait CreatesDatabaseUsers
 {
     public function createDatabase(TenantWithDatabase $tenant): bool
     {
-        return $this->database()->transaction(function () use ($tenant) {
+        parent::createDatabase($tenant);
-            parent::createDatabase($tenant);
 
-            return $this->createUser($tenant->database());
+        return $this->createUser($tenant->database());
-        });
     }
 
     public function deleteDatabase(TenantWithDatabase $tenant): bool
     {
-        return $this->database()->transaction(function () use ($tenant) {
+        parent::deleteDatabase($tenant);
-            parent::deleteDatabase($tenant);
 
-            return $this->deleteUser($tenant->database());
+        return $this->deleteUser($tenant->database());
-        });
     }
 }