Merge branch 'release/1.1.1'

Plugin.php

@@ -1,5 +1,7 @@
 <?php
 
+/** @noinspection PhpMissingParentCallCommonInspection */
+
 declare(strict_types=1);
 
 namespace Vdlp\RedirectConditions;
@@ -8,29 +10,17 @@
 use Backend\Widgets\Form;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Support\Facades\Event;
+use October\Rain\Foundation\Application;
 use System\Classes\PluginBase;
 use Vdlp\Redirect;
 use Vdlp\RedirectConditions\Models\ConditionParameter;
 
-/**
- * Class Plugin
- *
- * @package Vdlp\RedirectConditions
- */
 class Plugin extends PluginBase
 {
-    /**
-     * {@inheritdoc}
-     */
     public $require = [
         'Vdlp.Redirect',
     ];
 
-    /** @noinspection PhpMissingParentCallCommonInspection */
-
-    /**
-     * {@inheritdoc}
-     */
     public function pluginDetails(): array
     {
         return [
@@ -42,12 +32,7 @@ public function pluginDetails(): array
         ];
     }
 
-    /** @noinspection PhpMissingParentCallCommonInspection */
-
-    /**
-     * {@inheritdoc}
-     */
-    public function register()
+    public function register(): void
     {
         Redirect\Models\Redirect::extend(function (Redirect\Models\Redirect $redirect) {
             $redirect->hasMany['conditionParameters'] = [
@@ -63,6 +48,10 @@ public function register()
         });
 
         Event::listen('vdlp.redirect.afterRedirectSave', static function (Redirect\Models\Redirect $redirect) {
+            if (!Application::getInstance()->runningInBackend()) {
+                return;
+            }
+
             /** @var Redirect\Classes\Contracts\RedirectManagerInterface $manager */
             $manager = resolve(Redirect\Classes\Contracts\RedirectManagerInterface::class);
 

classes/Condition.php

@@ -7,19 +7,8 @@
 use Vdlp\Redirect\Classes\Contracts\RedirectConditionInterface;
 use Vdlp\RedirectConditions\Models\ConditionParameter;
 
-/**
- * Class Condition
- *
- * @package Vdlp\RedirectConditions\Conditions
- */
 abstract class Condition implements RedirectConditionInterface
 {
-    /**
-     * Get the parameters from database.
-     *
-     * @param int $redirectId
-     * @return array
-     */
     protected function getParameters(int $redirectId): array
     {
         $conditionParameter = ConditionParameter::query()

models/ConditionParameter.php

@@ -7,33 +7,16 @@
 use October\Rain\Database\Model;
 use Vdlp\Redirect\Models\Redirect;
 
-/**
- * Class Parameter
- *
- * @package Vdlp\RedirectConditions\Models
- */
 class ConditionParameter extends Model
 {
-    /**
-     * {@inheritdoc}
-     */
     protected $table = 'vdlp_redirectconditions_condition_parameters';
 
-    /**
-     * {@inheritdoc}
-     */
     protected $guarded = [];
 
-    /**
-     * {@inheritdoc}
-     */
     public $belongsTo = [
         'redirect' => Redirect::class
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     protected $jsonable = [
         'parameters'
     ];

tests/factories/RedirectRuleFactory.php

@@ -8,16 +8,8 @@
 use Vdlp\Redirect\Classes\RedirectRule;
 use Vdlp\Redirect\Models\Redirect;
 
-/**
- * Class RedirectRuleFactory
- *
- * @package Vdlp\RedirectConditions\Tests\Factories
- */
 class RedirectRuleFactory
 {
-    /**
-     * @return RedirectRule
-     */
     public static function createRedirectRule(): RedirectRule
     {
         return new RedirectRule([

updates/20190201_0001_create_tables.php

@@ -1,25 +1,20 @@
 <?php
 
+/** @noinspection AutoloadingIssuesInspection */
+
 declare(strict_types=1);
 
 namespace Vdlp\RedirectConditions\Updates;
 
 use Illuminate\Database\Schema\Blueprint;
 use October\Rain\Database\Updates\Migration;
-use Schema;
-
-/** @noinspection AutoloadingIssuesInspection */
+use October\Rain\Support\Facades\Schema;
 
-/**
- * Class CreateTables
- *
- * @package Vdlp\Redirect\Updates
- */
 class CreateTables extends Migration
 {
-    public function up()
+    public function up(): void
     {
-        Schema::create('vdlp_redirectconditions_condition_parameters', function (Blueprint $table) {
+        Schema::create('vdlp_redirectconditions_condition_parameters', static function (Blueprint $table) {
             // Table configuration
             $table->engine = 'InnoDB';
 
@@ -46,12 +41,10 @@ public function up()
         });
     }
 
-    public function down()
+    public function down(): void
     {
         Schema::disableForeignKeyConstraints();
-
         Schema::dropIfExists('vdlp_redirectconditions_condition_parameters');
-
         Schema::enableForeignKeyConstraints();
     }
 }

updates/version.yaml

@@ -6,3 +6,5 @@
 1.1.0:
     - Add fix for deleted event (thanks to @NickolayCh)
     - Minimal version of PHP required is 7.1
+1.1.1:
+    - Fix save events which causes redirect condition parameters to be emptied.