Refactor uses to be filter specific

Author: chadicus

src/Filterer.php

@@ -142,7 +142,6 @@ public function execute(array $input) : FilterResponse
             unset($filters[FilterOptions::IS_REQUIRED]);//doesn't matter if required since we have this one
             unset($filters[FilterOptions::DEFAULT_VALUE]);//doesn't matter if there is a default since we have a value
             $conflicts = self::extractConflicts($filters, $field, $conflicts);
-            $uses = self::extractUses($filters);
 
             foreach ($filters as $filter) {
                 self::assertFilterIsNotArray($filter, $field);
@@ -151,6 +150,8 @@ public function execute(array $input) : FilterResponse
                     continue;
                 }
 
+                $uses = self::extractUses($filter);
+
                 $function = array_shift($filter);
                 $function = self::handleFilterAliases($function, $filterAliases);
 

tests/FiltererTest.php

@@ -300,9 +300,9 @@ public function provideValidFilterData() : array
                 'spec' => [
                     'fieldOne' => [['uint']],
                     'fieldTwo' => [
-                        FilterOptions::USES => ['fieldOne'],
                         ['uint'],
                         [
+                            FilterOptions::USES => ['fieldOne'],
                             function (int $input, int $fieldOneValue) : int {
                                 return $input * $fieldOneValue;
                             },
@@ -328,9 +328,9 @@ function (int $input, int $fieldOneValue) : int {
                 'spec' => [
                     'fieldOne' => [['uint']],
                     'fieldTwo' => [
-                        FilterOptions::USES => ['fieldOne'],
                         ['uint'],
                         [
+                            FilterOptions::USES => ['fieldOne'],
                             function (int $input, int $fieldOneValue) : int {
                                 return $input * $fieldOneValue;
                             },
@@ -356,9 +356,9 @@ function (int $input, int $fieldOneValue) : int {
                 'spec' => [
                     'fieldOne' => [['uint']],
                     'fieldTwo' => [
-                        FilterOptions::USES => ['fieldOne'],
                         ['uint'],
                         [
+                            FilterOptions::USES => ['fieldOne'],
                             function (int $input, int $fieldOneValue) : int {
                                 return $input * $fieldOneValue;
                             },