Fix unit tests

Author: jissereitsma

Test/Unit/Filter/CapitalizeTest.php

@@ -2,15 +2,17 @@
 
 namespace Loki\Components\Test\Unit\Filter;
 
+use Loki\Components\Filter\FilterScope;
 use PHPUnit\Framework\TestCase;
 use Loki\Components\Filter\Capitalize;
 
 class CapitalizeTest extends TestCase
 {
     public function testFilter()
     {
+        $filterScope = new FilterScope();
         $filter = new Capitalize();
-        $this->assertEquals('Foobar', $filter->filter('foobar'));
-        $this->assertEquals('1foobar', $filter->filter('1foobar'));
+        $this->assertEquals('Foobar', $filter->filter('foobar', $filterScope));
+        $this->assertEquals('1foobar', $filter->filter('1foobar', $filterScope));
     }
 }

Test/Unit/Filter/LowercaseTest.php

@@ -2,14 +2,16 @@
 
 namespace Loki\Components\Test\Unit\Filter;
 
+use Loki\Components\Filter\FilterScope;
 use PHPUnit\Framework\TestCase;
 use Loki\Components\Filter\Lowercase;
 
 class LowercaseTest extends TestCase
 {
     public function testFilter()
     {
+        $filterScope = new FilterScope();
         $filter = new Lowercase();
-        $this->assertEquals('foobar', $filter->filter('Foobar'));
+        $this->assertEquals('foobar', $filter->filter('Foobar', $filterScope));
     }
 }

Test/Unit/Filter/NumberTest.php

@@ -2,16 +2,18 @@
 
 namespace Loki\Components\Test\Unit\Filter;
 
+use Loki\Components\Filter\FilterScope;
 use PHPUnit\Framework\TestCase;
 use Loki\Components\Filter\Number;
 
 class NumberTest extends TestCase
 {
     public function testFilter()
     {
+        $filterScope = new FilterScope();
         $filter = new Number();
-        $this->assertEquals(42, $filter->filter('42'));
-        $this->assertEquals(0, $filter->filter([]));
-        $this->assertEquals(0, $filter->filter('Foobar'));
+        $this->assertEquals(42, $filter->filter('42', $filterScope));
+        $this->assertEquals(0, $filter->filter([], $filterScope));
+        $this->assertEquals(0, $filter->filter('Foobar', $filterScope));
     }
 }

Test/Unit/Filter/PositiveNumberTest.php

@@ -2,16 +2,18 @@
 
 namespace Loki\Components\Test\Unit\Filter;
 
+use Loki\Components\Filter\FilterScope;
 use PHPUnit\Framework\TestCase;
 use Loki\Components\Filter\PositiveNumber;
 
 class PositiveNumberTest extends TestCase
 {
     public function testFilter()
     {
+        $filterScope = new FilterScope();
         $filter = new PositiveNumber();
-        $this->assertEquals(0, $filter->filter(-42));
-        $this->assertEquals(0, $filter->filter('-42'));
-        $this->assertEquals(42, $filter->filter('42'));
+        $this->assertEquals(0, $filter->filter(-42, $filterScope));
+        $this->assertEquals(0, $filter->filter('-42', $filterScope));
+        $this->assertEquals(42, $filter->filter('42', $filterScope));
     }
 }

Test/Unit/Filter/SecurityTest.php

@@ -2,14 +2,16 @@
 
 namespace Loki\Components\Test\Unit\Filter;
 
+use Loki\Components\Filter\FilterScope;
 use PHPUnit\Framework\TestCase;
 use Loki\Components\Filter\Security;
 
 class SecurityTest extends TestCase
 {
     public function testFilter()
     {
+        $filterScope = new FilterScope();
         $filter = new Security();
-        $this->assertEquals('foobar', $filter->filter('<script>foobar</script>'));
+        $this->assertEquals('foobar', $filter->filter('<script>foobar</script>', $filterScope));
     }
 }

Test/Unit/Filter/TrimTest.php

@@ -2,15 +2,17 @@
 
 namespace Loki\Components\Test\Unit\Filter;
 
+use Loki\Components\Filter\FilterScope;
 use PHPUnit\Framework\TestCase;
 use Loki\Components\Filter\Trim;
 
 class TrimTest extends TestCase
 {
     public function testFilter()
     {
+        $filterScope = new FilterScope();
         $filter = new Trim();
-        $this->assertEquals('foobar', $filter->filter(' foobar '));
-        $this->assertEquals('42', $filter->filter(42));
+        $this->assertEquals('foobar', $filter->filter(' foobar ', $filterScope));
+        $this->assertEquals('42', $filter->filter(42, $filterScope));
     }
 }

Test/Unit/Filter/UppercaseTest.php

@@ -2,14 +2,16 @@
 
 namespace Loki\Components\Test\Unit\Filter;
 
+use Loki\Components\Filter\FilterScope;
 use PHPUnit\Framework\TestCase;
 use Loki\Components\Filter\Uppercase;
 
 class UppercaseTest extends TestCase
 {
     public function testFilter()
     {
+        $filterScope = new FilterScope();
         $filter = new Uppercase();
-        $this->assertEquals('FOOBAR', $filter->filter('Foobar'));
+        $this->assertEquals('FOOBAR', $filter->filter('Foobar', $filterScope));
     }
 }

Test/Unit/Validator/RequiredValidatorTest.php

@@ -14,7 +14,7 @@ public function testWithNoSimpleValues(): void
     {
         $component = $this->createMock(ComponentInterface::class);
         $ajax = $this->createMock(Ajax::class);
-        $ajax->method('isEmpty')->willReturn(true);
+        $ajax->method('isAjax')->willReturn(true);
 
         $validator = new RequiredValidator(new IsEmpty(), $ajax);
         $this->assertTrue($validator->validate(1, $component));