Skip to content

Commit d013d04

Browse files
authored
Merge pull request #19 from Shadow243/correct-fatal-error-by-rename
Rename BaseSieveAction to BaseFilterAction
2 parents 5acbe4f + 5844184 commit d013d04

17 files changed

+18
-18
lines changed

src/Filters/Actions/AddHeaderFilterAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/**
66
* Please refer to https://datatracker.ietf.org/doc/html/rfc5293#section-4
77
*/
8-
class AddHeaderFilterAction extends BaseSieveAction
8+
class AddHeaderFilterAction extends BaseFilterAction
99
{
1010
public $require = ['editheader'];
1111

src/Filters/Actions/BaseFilterAction.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use PhpSieveManager\Exceptions\FilterActionParamException;
66

7-
abstract class BaseSieveAction implements FilterAction {
7+
abstract class BaseFilterAction implements FilterAction {
88
protected array $params;
99

1010
public function __construct(array $params = []) {
@@ -24,7 +24,7 @@ protected function validateParams() {
2424
protected function validateTypes() {
2525
$paramTypes = $this->getParamTypes();
2626
foreach ($this->params as $key => $value) {
27-
if (isset($paramTypes[$key]) && !$this->isValidType($key, $value)) {
27+
if (isset($paramTypes[$key]) && !$this->isValidType($value, $paramTypes[$key])) {
2828
throw new FilterActionParamException("Invalid type for parameter: $key. Expected " . $value);
2929
}
3030
}

src/Filters/Actions/BaseFlagFilterAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace PhpSieveManager\Filters\Actions;
44

5-
abstract class BaseFlagFilterAction extends BaseSieveAction
5+
abstract class BaseFlagFilterAction extends BaseFilterAction
66
{
77
public $require = ['imap4flags'];
88

src/Filters/Actions/BaseRejectFilterAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace PhpSieveManager\Filters\Actions;
44

5-
abstract class BaseRejectFilterAction extends BaseSieveAction
5+
abstract class BaseRejectFilterAction extends BaseFilterAction
66
{
77
public $require = [];
88

src/Filters/Actions/ConvertFilterAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/**
66
* Please refer to https://www.rfc-editor.org/rfc/rfc6558.html
77
*/
8-
class ConvertFilterAction extends BaseSieveAction
8+
class ConvertFilterAction extends BaseFilterAction
99
{
1010
public $require = ['convert'];
1111

src/Filters/Actions/DeleteHeaderFilterAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/**
66
* Please refer to https://datatracker.ietf.org/doc/html/rfc5293#section-5
77
*/
8-
class DeleteHeaderFilterAction extends BaseSieveAction
8+
class DeleteHeaderFilterAction extends BaseFilterAction
99
{
1010
public $require = ['editheader'];
1111

src/Filters/Actions/DiscardFilterAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace PhpSieveManager\Filters\Actions;
44

5-
class DiscardFilterAction extends BaseSieveAction
5+
class DiscardFilterAction extends BaseFilterAction
66
{
77
/**
88
* @return string

src/Filters/Actions/EncloseFilterAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/**
66
* Please refer to https://www.rfc-editor.org/rfc/rfc5703.html#section-6
77
*/
8-
class EncloseFilterAction extends BaseSieveAction
8+
class EncloseFilterAction extends BaseFilterAction
99
{
1010
public $require = ['enclose'];
1111

src/Filters/Actions/ExtractTextFilterAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/**
66
* Please refer to https://www.rfc-editor.org/rfc/rfc5703.html#page-11
77
*/
8-
class ExtractTextFilterAction extends BaseSieveAction
8+
class ExtractTextFilterAction extends BaseFilterAction
99
{
1010
public $require = ['extracttext'];
1111

src/Filters/Actions/FileIntoFilterAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace PhpSieveManager\Filters\Actions;
44

5-
class FileIntoFilterAction extends BaseSieveAction
5+
class FileIntoFilterAction extends BaseFilterAction
66
{
77
public $require = ['fileinto'];
88

src/Filters/Actions/KeepFilterAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace PhpSieveManager\Filters\Actions;
44

5-
class KeepFilterAction extends BaseSieveAction
5+
class KeepFilterAction extends BaseFilterAction
66
{
77
public $require = [];
88

src/Filters/Actions/NotifyFilterAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/**
66
* Please refer to https://datatracker.ietf.org/doc/rfc5435/
77
*/
8-
class NotifyFilterAction extends BaseSieveAction
8+
class NotifyFilterAction extends BaseFilterAction
99
{
1010
public $require = ['enotify'];
1111

src/Filters/Actions/RedirectFilterAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace PhpSieveManager\Filters\Actions;
44

5-
class RedirectFilterAction extends BaseSieveAction
5+
class RedirectFilterAction extends BaseFilterAction
66
{
77
public $require = [];
88

src/Filters/Actions/ReplaceFilterAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace PhpSieveManager\Filters\Actions;
44

5-
class Replace extends BaseSieveAction
5+
class ReplaceFilterAction extends BaseFilterAction
66
{
77
public $require = ['replace'];
88

src/Filters/Actions/SetFilterAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/**
66
* Please refer to https://www.rfc-editor.org/rfc/rfc5229.html
77
*/
8-
class SetFilterAction extends BaseSieveAction
8+
class SetFilterAction extends BaseFilterAction
99
{
1010
public $require = ['variables'];
1111

src/Filters/Actions/StopFilterAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace PhpSieveManager\Filters\Actions;
44

5-
class StopFilterAction extends BaseSieveAction
5+
class StopFilterAction extends BaseFilterAction
66
{
77
/**
88
* @return string

src/Filters/Actions/VacationFilterAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace PhpSieveManager\Filters\Actions;
44

5-
class VacationFilterAction extends BaseSieveAction
5+
class VacationFilterAction extends BaseFilterAction
66
{
77
public $require = ['vacation'];
88

0 commit comments

Comments
 (0)