Support Laravel 9 / PHP 8.1

.github/workflows/tests.yml

@@ -33,7 +33,7 @@ jobs:
       max-parallel: 8
       matrix:
         operatingSystem: [ubuntu-latest, windows-latest]
-        phpVersion: ['7.2', '7.3', '7.4', '8.0']
+        phpVersion: ['8.0', '8.1']
       fail-fast: false
     runs-on: ${{ matrix.operatingSystem }}
     name: ${{ matrix.operatingSystem }} / PHP ${{ matrix.phpVersion }}
@@ -82,6 +82,10 @@ jobs:
         if: github.ref == 'refs/heads/1.1' || github.base_ref == '1.1'
         run: php ./.github/workflows/utilities/library-switcher "1.1.x-dev as 1.1"
 
+      - name: Switch library dependency (1.2)
+        if: github.ref == 'refs/heads/1.2' || github.base_ref == '1.2'
+        run: php ./.github/workflows/utilities/library-switcher "1.2.x-dev as 1.2"
+
       - name: Setup dependency cache
         id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
@@ -103,7 +107,7 @@ jobs:
         run: php artisan package:discover
 
       - name: Setup problem matchers for PHPUnit
-        if: matrix.phpVersion == '7.4'
+        if: matrix.phpVersion == '8.1'
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Run Linting and Tests

composer.json

@@ -29,12 +29,12 @@
         "source": "https://github.com/wintercms/winter"
     },
     "require": {
-        "php": "^7.2.9|^8.0",
-        "winter/storm": "dev-develop as 1.1.999",
-        "winter/wn-system-module": "dev-develop as 1.1.999",
-        "winter/wn-backend-module": "dev-develop as 1.1.999",
-        "winter/wn-cms-module": "dev-develop as 1.1.999",
-        "laravel/framework": "~6.0",
+        "php": "^8.0.2",
+        "winter/storm": "dev-wip/1.2 as 1.2",
+        "winter/wn-system-module": "dev-wip/1.2",
+        "winter/wn-backend-module": "dev-wip/1.2",
+        "winter/wn-cms-module": "dev-wip/1.2",
+        "laravel/framework": "9.x-dev",
         "wikimedia/composer-merge-plugin": "~2.0.1"
     },
     "require-dev": {

config/app.php

@@ -110,13 +110,15 @@
     | from your proxy when rewriting the request. This is an integer map value
     | so you may specify more than one value.
     |
-    | Possible values (prepended with `Illuminate\Http\Request::`)
-    |   - HEADER_X_FORWARDED_ALL - trust all forwarded headers
-    |   - HEADER_X_FORWARDED_FOR - trust only the proxy IP
-    |   - HEADER_X_FORWARDED_HOST - trust only the proxy hostname
-    |   - HEADER_X_FORWARDED_PORT - trust only the proxy port
-    |   - HEADER_X_FORWARDED_PROTO - trust only the proxy protocol
-    |   - HEADER_X_FORWARDED_AWS_ELB - trust Amazon Elastic Load Balancing header
+    | Possible values:
+    |   - 'HEADER_X_FORWARDED_ALL' - trust all forwarded headers
+    |   - Illuminate\Http\Request::HEADER_X_FORWARDED_FOR - trust only the proxy IP
+    |   - Illuminate\Http\Request::HEADER_X_FORWARDED_HOST - trust only the proxy hostname
+    |   - Illuminate\Http\Request::HEADER_X_FORWARDED_PORT - trust only the proxy port
+    |   - Illuminate\Http\Request::HEADER_X_FORWARDED_PROTO - trust only the proxy protocol
+    |   - Illuminate\Http\Request::HEADER_X_FORWARDED_PREFIX - trust only the proxy prefix
+    |   - Illuminate\Http\Request::HEADER_X_FORWARDED_AWS_ELB - trust Amazon Elastic Load Balancing headers
+    |   - Illuminate\Http\Request::HEADER_X_FORWARDED_TRAEFIK - trust Traefik reverse proxy headers
     |
     | Examples:
     |   - To trust only the hostname, use the following:
@@ -132,7 +134,7 @@
     |   - Amazon ELB users should always use the "HEADER_X_FORWARDED_AWS_ELB" option.
     */
 
-    'trustedProxyHeaders' => Illuminate\Http\Request::HEADER_X_FORWARDED_ALL,
+    'trustedProxyHeaders' => 'HEADER_X_FORWARDED_ALL',
 
     /*
     |--------------------------------------------------------------------------

config/filesystems.php

@@ -37,7 +37,7 @@
     | may even configure multiple disks of the same driver. Defaults have
     | been setup for each driver as an example of the required options.
     |
-    | Supported Drivers: "local", "ftp", "sftp", "s3", "rackspace"
+    | Supported Drivers: "local", "ftp", "sftp", "s3"
     |
     */
 
@@ -59,14 +59,6 @@
             // 'endpoint' => env('AWS_ENDPOINT'),
         ],
 
-        'rackspace' => [
-            'driver'    => 'rackspace',
-            'username'  => 'your-username',
-            'key'       => 'your-key',
-            'container' => 'your-container',
-            'endpoint'  => 'https://identity.api.rackspacecloud.com/v2.0/',
-            'region'    => 'IAD',
-        ],
     ],
 
 ];

config/testing/filesystems.php

@@ -0,0 +1,64 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Filesystem Disk
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the default filesystem disk that should be used
+    | by the framework. The "local" disk, as well as a variety of cloud
+    | based disks are available to your application. Just store away!
+    |
+    */
+
+    'default' => 'local',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Cloud Filesystem Disk
+    |--------------------------------------------------------------------------
+    |
+    | Many applications store files both locally and in the cloud. For this
+    | reason, you may specify a default "cloud" driver here. This driver
+    | will be bound as the Cloud disk implementation in the container.
+    |
+    */
+
+    'cloud' => 's3',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Filesystem Disks
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure as many filesystem "disks" as you wish, and you
+    | may even configure multiple disks of the same driver. Defaults have
+    | been setup for each driver as an example of the required options.
+    |
+    | Supported Drivers: "local", "ftp", "sftp", "s3"
+    |
+    */
+
+    'disks' => [
+
+        'local' => [
+            'driver' => 'local',
+            'root'   => base_path('tests/storage'),
+            'url'    => '/tests/storage',
+        ],
+
+        's3' => [
+            'driver'      => 's3',
+            'key'         => '',
+            'secret'      => '',
+            'region'      => '',
+            'bucket'      => '',
+            // 'url'      => env('AWS_URL'),
+            // 'endpoint' => env('AWS_ENDPOINT'),
+        ],
+
+    ],
+
+];

modules/backend/composer.json

@@ -23,17 +23,14 @@
         }
     ],
     "require": {
-        "php": ">=7.2",
-        "composer/installers": "~1.11",
-        "laravel/framework": "~6.0"
+        "php": "^8.0.2",
+        "composer/installers": "~1.11.0",
+        "laravel/framework": "9.x-dev"
     },
     "autoload": {
         "psr-4": {
             "Backend\\": ""
         }
     },
-    "extra": {
-        "installer-name": "backend"
-    },
     "minimum-stability": "dev"
 }

modules/backend/controllers/Files.php

@@ -9,6 +9,7 @@
 use Backend\Classes\Controller;
 use ApplicationException;
 use Exception;
+use RuntimeException;
 
 /**
  * Backend files controller
@@ -64,33 +65,33 @@ public function thumb($code = null, $width = 100, $height = 100, $mode = 'auto',
      */
     protected static function getTemporaryUrl($file, $path = null)
     {
-        // Get the disk and adapter used
-        $url = null;
+        // Get the disk used
         $disk = $file->getDisk();
-        $adapter = $disk->getAdapter();
-        if (class_exists('\League\Flysystem\Cached\CachedAdapter') && $adapter instanceof \League\Flysystem\Cached\CachedAdapter) {
-            $adapter = $adapter->getAdapter();
-        }
 
-        if ((class_exists('\League\Flysystem\AwsS3v3\AwsS3Adapter') && $adapter instanceof \League\Flysystem\AwsS3v3\AwsS3Adapter) ||
-            (class_exists('\League\Flysystem\Rackspace\RackspaceAdapter') && $adapter instanceof \League\Flysystem\Rackspace\RackspaceAdapter) ||
-            method_exists($adapter, 'getTemporaryUrl')
-        ) {
-            if (empty($path)) {
-                $path = $file->getDiskPath();
-            }
+        if (empty($path)) {
+            $path = $file->getDiskPath();
+        }
 
-            // Check to see if the URL has already been generated
-            $pathKey = 'backend.file:' . $path;
-            $url = Cache::get($pathKey);
+        // Check to see if the URL has already been generated
+        $pathKey = 'backend.file:' . $path;
+        $url = Cache::get($pathKey, null);
 
-            // The AWS S3 storage drivers will return a valid temporary URL even if the file does not exist
-            if (is_null($url) && $disk->exists($path)) {
-                $expires = now()->addSeconds(Config::get('cms.storage.uploads.temporaryUrlTTL', 3600));
-                $url = Cache::remember($pathKey, $expires, function () use ($disk, $path, $expires) {
+        if ($url !== false && is_null($url) && $disk->exists($path)) {
+            $expires = now()->addSeconds(Config::get('cms.storage.uploads.temporaryUrlTTL', 3600));
+            $url = Cache::remember($pathKey, $expires, function () use ($disk, $path, $expires) {
+                // Attempt to generate a temporary URL, if a RuntimeException occurs it's "probably"
+                // because the driver doesn't support that method
+                try {
                     return $disk->temporaryUrl($path, $expires);
-                });
-            }
+                } catch (RuntimeException $ex) {
+                    return false;
+                }
+            });
+        }
+
+        // Limit the return types to strings or null
+        if (!is_string($url) || empty($url)) {
+            $url = null;
         }
 
         return $url;

modules/cms/classes/CmsException.php

@@ -4,7 +4,7 @@
 use Twig\Error\Error as TwigError;
 use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Halcyon\Processors\SectionParser;
-use Exception;
+use Throwable;
 
 /**
  * The CMS exception class.
@@ -40,9 +40,9 @@ class CmsException extends ApplicationException
      * Error 200: Mask the exception as INI content.
      * Error 300: Mask the exception as PHP content.
      * Error 400: Mask the exception as Twig content.
-     * @param \Exception $previous Previous exception.
+     * @param Throwable $previous Previous exception.
      */
-    public function __construct($message = null, $code = 100, Exception $previous = null)
+    public function __construct($message = null, $code = 100, Throwable $previous = null)
     {
         if ($message instanceof CmsCompoundObject || $message instanceof ComponentPartial) {
             $this->compoundObject = $message;
@@ -62,10 +62,10 @@ public function __construct($message = null, $code = 100, Exception $previous =
      * has occurred in external code, the function will return false. Otherwise return
      * true and modify the exception by overriding it's content, line and message values
      * to be accurate against a CMS object properties.
-     * @param \Exception $exception The exception to modify.
+     * @param Throwable $exception The exception to modify.
      * @return bool
      */
-    public function processCompoundObject(Exception $exception)
+    public function processCompoundObject(Throwable $exception)
     {
         switch ($this->code) {
             case 200:
@@ -94,10 +94,10 @@ public function processCompoundObject(Exception $exception)
     /**
      * Override properties of an exception specific to the INI section
      * of a CMS object.
-     * @param \Exception $exception The exception to modify.
+     * @param Throwable $exception The exception to modify.
      * @return bool
      */
-    protected function processIni(Exception $exception)
+    protected function processIni(Throwable $exception)
     {
         $message = $exception->getMessage();
 
@@ -137,15 +137,15 @@ protected function processIni(Exception $exception)
     /**
      * Override properties of an exception specific to the PHP section
      * of a CMS object.
-     * @param \Exception $exception The exception to modify.
+     * @param Throwable $exception The exception to modify.
      * @return bool
      */
-    protected function processPhp(Exception $exception)
+    protected function processPhp(Throwable $exception)
     {
         /*
          * Fatal Error
          */
-        if ($exception instanceof \Symfony\Component\Debug\Exception\FatalErrorException) {
+        if ($exception instanceof \Symfony\Component\ErrorHandler\Error\FatalError) {
             $check = false;
 
             // Expected: */modules/cms/classes/CodeParser.php(165) : eval()'d code line 7
@@ -193,10 +193,10 @@ protected function processPhp(Exception $exception)
     /**
      * Override properties of an exception specific to the Twig section
      * of a CMS object.
-     * @param \Exception $exception The exception to modify.
+     * @param Throwable $exception The exception to modify.
      * @return bool
      */
-    protected function processTwig(Exception $exception)
+    protected function processTwig(Throwable $exception)
     {
         // Must be a Twig related exception
         if (!$exception instanceof TwigError) {
@@ -219,14 +219,14 @@ protected function processTwig(Exception $exception)
     /**
      * Masks this exception with the details of the supplied. The error code for
      * this exception object will determine how the supplied exception is used.
-     * Error 100: A general exception. Inherits \System\Classes\ExceptionBase::applyMask()
+     * Error 100: A general exception. Inherits \Winter\Storm\Exception\ExceptionBase::applyMask()
      * Error 200: Mask the exception as INI content.
      * Error 300: Mask the exception as PHP content.
      * Error 400: Mask the exception as Twig content.
-     * @param \Exception $exception The exception to modify.
+     * @param Throwable $exception The exception to modify.
      * @return void
      */
-    public function applyMask(Exception $exception)
+    public function applyMask(Throwable $exception)
     {
         if ($this->code == 100 || $this->processCompoundObject($exception) === false) {
             parent::applyMask($exception);

modules/cms/composer.json

@@ -23,17 +23,14 @@
         }
     ],
     "require": {
-        "php": ">=7.2",
-        "composer/installers": "~1.11",
-        "laravel/framework": "~6.0"
+        "php": "^8.0.2",
+        "composer/installers": "~1.11.0",
+        "laravel/framework": "9.x-dev"
     },
     "autoload": {
         "psr-4": {
             "Cms\\": ""
         }
     },
-    "extra": {
-        "installer-name": "cms"
-    },
     "minimum-stability": "dev"
 }

modules/system/classes/ImageResizer.php

@@ -225,9 +225,9 @@ public function getConfig()
         // to support atomic deployments where the base application path changes
         // each deployment but the realpath of the storage directory does not
         if (FileHelper::isLocalDisk($disk)) {
-            $realPath = realpath($disk->getAdapter()->getPathPrefix());
+            $realPath = realpath($disk->getPathPrefix());
             if ($realPath) {
-                $disk->getAdapter()->setPathPrefix($realPath);
+                $disk->setPathPrefix($realPath);
             }
         }