Merge branch 'release/2.2.0'

.github/workflows/php.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [ 8.0, 7.4 ]
+        php: [ 8.0 ]
         stability: [ prefer-lowest, prefer-stable ]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
@@ -31,6 +31,9 @@ jobs:
     - name: Validate composer.json and composer.lock
       run: composer validate
 
+    - name: Add HTTP basic auth credentials
+      run: echo '${{ secrets.VDLP_OCTOBER_CMS_AUTH_JSON }}' > $GITHUB_WORKSPACE/auth.json
+
     - name: Cache Composer packages
       id: composer-cache
       uses: actions/cache@v2

CHANGELOG.md

@@ -4,7 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.1.2] 2022-02-02
+## [2.2.0] - 2023-02-17
+
+- Fix namespace of MaintenanceServiceProvider.
+- Fix namespace of ResponseMaker.
+- Drop support for older October CMS versions (<3.0).
+- Drop support for PHP 7.4
+
+## [2.1.2] - 2022-02-02
 
 ### Added
 
@@ -14,17 +21,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Move `ResponseMaker` interface to `Classes\Contracts` namespace.
 
-## [2.1.1] 2022-01-07
+## [2.1.1] - 2022-01-07
 
 ### Added
 
 - Add configuration option `use_preferred_locale` to switch locale based on preferred locale from browser request.
 
-## [2.1.0] 2021-08-30
+## [2.1.0] - 2021-08-30
 
 - Move Service Provider to ServiceProviders namespace.
 - Add CHANGELOG file.
 
-## [2.0.0] 2021-07-13
+## [2.0.0] - 2021-07-13
 
 - Add support for PHP 7.4 and higher.

Plugin.php

@@ -5,7 +5,7 @@
 namespace Vdlp\Maintenance;
 
 use System\Classes\PluginBase;
-use Vdlp\Maintenance\ServiceProviders\MaintenanceServiceProvider;
+use Vdlp\Maintenance\Providers\MaintenanceServiceProvider;
 
 final class Plugin extends PluginBase
 {

README.md

@@ -39,7 +39,7 @@ composer require vdlp/oc-maintenance-plugin
 To configure this plugin execute the following command:
 
 ```
-php artisan vendor:publish --provider="Vdlp\Maintenance\ServiceProviders\MaintenanceServiceProvider" --tag="config"
+php artisan vendor:publish --provider="Vdlp\Maintenance\Providers\MaintenanceServiceProvider" --tag="config"
 ```
 
 ## Customization

composer.json

@@ -16,14 +16,34 @@
             "email": "[email protected]"
         }
     ],
+    "config": {
+        "allow-plugins": {
+            "composer/installers": true
+        }
+    },
+    "homepage": "https://vdlp.nl",
+    "support": {
+        "email": "[email protected]"
+    },
     "require": {
-        "php": "^7.4 || ^8.0",
-        "composer/installers": "^1.0"
+        "php": "^8.0",
+        "composer/installers": "^1.0 || ^2.0",
+        "october/rain": "^3.0"
     },
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://gateway.octobercms.com",
+            "only": [
+                "october/rain"
+            ]
+        }
+    ],
     "archive": {
         "exclude": [
-            ".gitignore",
-            ".github"
+            ".gitattributes",
+            ".github",
+            ".gitignore"
         ]
     }
 }

serviceproviders/MaintenanceServiceProvider.php → providers/MaintenanceServiceProvider.php

@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Vdlp\Maintenance\ServiceProviders;
+namespace Vdlp\Maintenance\Providers;
 
 use Illuminate\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
+use Vdlp\Maintenance\Classes\Contracts\ResponseMaker;
 use Vdlp\Maintenance\Classes\MaintenanceResponder;
-use Vdlp\Maintenance\Contracts\ResponseMaker;
 
 final class MaintenanceServiceProvider extends ServiceProvider
 {

updates/version.yaml

@@ -7,3 +7,4 @@ v2.0.0: "Add support for PHP 7.4 and higher"
 v2.1.0: "Minor code improvements (see CHANGELOG.md)"
 v2.1.1: "Add configuration option `use_preferred_locale` (see CHANGELOG.md)"
 v2.1.2: "Add .gitattributes file to plugin repository"
+v2.2.0: "Maintenance release (see CHANGELOG.md)"