Merge pull request #19 from Shadow243/correct-fatal-error-by-rename

Rename BaseSieveAction to BaseFilterAction
cypht-org · Jun 17, 2024 · d013d04 · d013d04
2 parents 5acbe4f + 5844184
commit d013d04
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 18 deletions.
diff --git a/src/Filters/Actions/AddHeaderFilterAction.php b/src/Filters/Actions/AddHeaderFilterAction.php
@@ -5,7 +5,7 @@
 /**
  * Please refer to https://datatracker.ietf.org/doc/html/rfc5293#section-4
  */
-class AddHeaderFilterAction extends BaseSieveAction
+class AddHeaderFilterAction extends BaseFilterAction
 {
     public $require = ['editheader'];
 

diff --git a/src/Filters/Actions/BaseFilterAction.php b/src/Filters/Actions/BaseFilterAction.php
@@ -4,7 +4,7 @@
 
 use PhpSieveManager\Exceptions\FilterActionParamException;
 
-abstract class BaseSieveAction implements FilterAction {
+abstract class BaseFilterAction implements FilterAction {
     protected array $params;
 
     public function __construct(array $params = []) {
@@ -24,7 +24,7 @@ protected function validateParams() {
     protected function validateTypes() {
         $paramTypes = $this->getParamTypes();
         foreach ($this->params as $key => $value) {
-            if (isset($paramTypes[$key]) && !$this->isValidType($key, $value)) {
+            if (isset($paramTypes[$key]) && !$this->isValidType($value, $paramTypes[$key])) {
                 throw new FilterActionParamException("Invalid type for parameter: $key. Expected " . $value);
             }
         }

diff --git a/src/Filters/Actions/BaseFlagFilterAction.php b/src/Filters/Actions/BaseFlagFilterAction.php
@@ -2,7 +2,7 @@
 
 namespace PhpSieveManager\Filters\Actions;
 
-abstract class BaseFlagFilterAction extends BaseSieveAction
+abstract class BaseFlagFilterAction extends BaseFilterAction
 {
     public $require = ['imap4flags'];
 

diff --git a/src/Filters/Actions/BaseRejectFilterAction.php b/src/Filters/Actions/BaseRejectFilterAction.php
@@ -2,7 +2,7 @@
 
 namespace PhpSieveManager\Filters\Actions;
 
-abstract class BaseRejectFilterAction extends BaseSieveAction
+abstract class BaseRejectFilterAction extends BaseFilterAction
 {
     public $require = [];
 

diff --git a/src/Filters/Actions/ConvertFilterAction.php b/src/Filters/Actions/ConvertFilterAction.php
@@ -5,7 +5,7 @@
 /**
  * Please refer to https://www.rfc-editor.org/rfc/rfc6558.html
  */
-class ConvertFilterAction extends BaseSieveAction
+class ConvertFilterAction extends BaseFilterAction
 {
     public $require = ['convert'];
 

diff --git a/src/Filters/Actions/DeleteHeaderFilterAction.php b/src/Filters/Actions/DeleteHeaderFilterAction.php
@@ -5,7 +5,7 @@
 /**
  * Please refer to https://datatracker.ietf.org/doc/html/rfc5293#section-5
  */
-class DeleteHeaderFilterAction extends BaseSieveAction
+class DeleteHeaderFilterAction extends BaseFilterAction
 {
     public $require = ['editheader'];
 

diff --git a/src/Filters/Actions/DiscardFilterAction.php b/src/Filters/Actions/DiscardFilterAction.php
@@ -2,7 +2,7 @@
 
 namespace PhpSieveManager\Filters\Actions;
 
-class DiscardFilterAction extends BaseSieveAction
+class DiscardFilterAction extends BaseFilterAction
 {
     /**
      * @return string

diff --git a/src/Filters/Actions/EncloseFilterAction.php b/src/Filters/Actions/EncloseFilterAction.php
@@ -5,7 +5,7 @@
 /**
  * Please refer to https://www.rfc-editor.org/rfc/rfc5703.html#section-6
  */
-class EncloseFilterAction extends BaseSieveAction
+class EncloseFilterAction extends BaseFilterAction
 {
     public $require = ['enclose'];
 

diff --git a/src/Filters/Actions/ExtractTextFilterAction.php b/src/Filters/Actions/ExtractTextFilterAction.php
@@ -5,7 +5,7 @@
 /**
  * Please refer to https://www.rfc-editor.org/rfc/rfc5703.html#page-11
  */
-class ExtractTextFilterAction extends BaseSieveAction
+class ExtractTextFilterAction extends BaseFilterAction
 {
     public $require = ['extracttext'];
 

diff --git a/src/Filters/Actions/FileIntoFilterAction.php b/src/Filters/Actions/FileIntoFilterAction.php
@@ -2,7 +2,7 @@
 
 namespace PhpSieveManager\Filters\Actions;
 
-class FileIntoFilterAction extends BaseSieveAction
+class FileIntoFilterAction extends BaseFilterAction
 {
     public $require = ['fileinto'];
 

diff --git a/src/Filters/Actions/KeepFilterAction.php b/src/Filters/Actions/KeepFilterAction.php
@@ -2,7 +2,7 @@
 
 namespace PhpSieveManager\Filters\Actions;
 
-class KeepFilterAction extends BaseSieveAction
+class KeepFilterAction extends BaseFilterAction
 {
     public $require = [];
 

diff --git a/src/Filters/Actions/NotifyFilterAction.php b/src/Filters/Actions/NotifyFilterAction.php
@@ -5,7 +5,7 @@
 /**
  * Please refer to https://datatracker.ietf.org/doc/rfc5435/
  */
-class NotifyFilterAction extends BaseSieveAction
+class NotifyFilterAction extends BaseFilterAction
 {
     public $require = ['enotify'];
 

diff --git a/src/Filters/Actions/RedirectFilterAction.php b/src/Filters/Actions/RedirectFilterAction.php
@@ -2,7 +2,7 @@
 
 namespace PhpSieveManager\Filters\Actions;
 
-class RedirectFilterAction extends BaseSieveAction
+class RedirectFilterAction extends BaseFilterAction
 {
     public $require = [];
 

diff --git a/src/Filters/Actions/ReplaceFilterAction.php b/src/Filters/Actions/ReplaceFilterAction.php
@@ -2,7 +2,7 @@
 
 namespace PhpSieveManager\Filters\Actions;
 
-class Replace extends BaseSieveAction
+class ReplaceFilterAction extends BaseFilterAction
 {
     public $require = ['replace'];
 

diff --git a/src/Filters/Actions/SetFilterAction.php b/src/Filters/Actions/SetFilterAction.php
@@ -5,7 +5,7 @@
 /**
  * Please refer to https://www.rfc-editor.org/rfc/rfc5229.html
  */
-class SetFilterAction extends BaseSieveAction
+class SetFilterAction extends BaseFilterAction
 {
     public $require = ['variables'];
 

diff --git a/src/Filters/Actions/StopFilterAction.php b/src/Filters/Actions/StopFilterAction.php
@@ -2,7 +2,7 @@
 
 namespace PhpSieveManager\Filters\Actions;
 
-class StopFilterAction extends BaseSieveAction
+class StopFilterAction extends BaseFilterAction
 {
     /**
      * @return string

diff --git a/src/Filters/Actions/VacationFilterAction.php b/src/Filters/Actions/VacationFilterAction.php
@@ -2,7 +2,7 @@
 
 namespace PhpSieveManager\Filters\Actions;
 
-class VacationFilterAction extends BaseSieveAction
+class VacationFilterAction extends BaseFilterAction
 {
     public $require = ['vacation'];