@@ -25,7 +25,7 @@ |
||
| 25 | 25 | private readonly CoreInterface $validationCore, |
| 26 | 26 | private readonly FilterFactory $filterFactory, |
| 27 | 27 | private readonly SchemaProviderInterface $schemaProvider |
| 28 | - ) { |
|
| 28 | + ){ |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | public function createFilter(string $name, InputInterface $input): FilterInterface |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | { |
| 15 | 15 | public function __construct( |
| 16 | 16 | private readonly ResolverInterface $resolver, |
| 17 | - ) { |
|
| 17 | + ){ |
|
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | public function createFilterInstance(string $name): FilterInterface |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | $class = new \ReflectionClass($name); |
| 23 | 23 | |
| 24 | 24 | $args = []; |
| 25 | - if ($constructor = $class->getConstructor()) { |
|
| 25 | + if ($constructor = $class->getConstructor()){ |
|
| 26 | 26 | $args = $this->resolver->resolveArguments($constructor); |
| 27 | 27 | } |
| 28 | 28 | |
@@ -22,7 +22,8 @@ |
||
| 22 | 22 | $class = new \ReflectionClass($name); |
| 23 | 23 | |
| 24 | 24 | $args = []; |
| 25 | - if ($constructor = $class->getConstructor()) { |
|
| 25 | + if ($constructor = $class->getConstructor()) |
|
| 26 | + { |
|
| 26 | 27 | $args = $this->resolver->resolveArguments($constructor); |
| 27 | 28 | } |
| 28 | 29 | |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | private readonly ContainerInterface $container, |
| 53 | 53 | private readonly BinderInterface $binder, |
| 54 | 54 | private readonly ConfiguratorInterface $config |
| 55 | - ) { |
|
| 55 | + ){ |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | /** |
@@ -106,12 +106,12 @@ discard block |
||
| 106 | 106 | ?EventDispatcherInterface $dispatcher = null |
| 107 | 107 | ): FilterProvider { |
| 108 | 108 | $core = new InterceptableCore(new Core(), $dispatcher); |
| 109 | - foreach ($config->getInterceptors() as $interceptor) { |
|
| 109 | + foreach ($config->getInterceptors() as $interceptor){ |
|
| 110 | 110 | $core->addInterceptor($container->get($interceptor)); |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | $validationCode = new InterceptableCore(new ValidationCore($container), $dispatcher); |
| 114 | - foreach ($config->getValidationInterceptors() as $interceptor) { |
|
| 114 | + foreach ($config->getValidationInterceptors() as $interceptor){ |
|
| 115 | 115 | $validationCode->addInterceptor($container->get($interceptor)); |
| 116 | 116 | } |
| 117 | 117 | |
@@ -106,12 +106,14 @@ |
||
| 106 | 106 | ?EventDispatcherInterface $dispatcher = null |
| 107 | 107 | ): FilterProvider { |
| 108 | 108 | $core = new InterceptableCore(new Core(), $dispatcher); |
| 109 | - foreach ($config->getInterceptors() as $interceptor) { |
|
| 109 | + foreach ($config->getInterceptors() as $interceptor) |
|
| 110 | + { |
|
| 110 | 111 | $core->addInterceptor($container->get($interceptor)); |
| 111 | 112 | } |
| 112 | 113 | |
| 113 | 114 | $validationCode = new InterceptableCore(new ValidationCore($container), $dispatcher); |
| 114 | - foreach ($config->getValidationInterceptors() as $interceptor) { |
|
| 115 | + foreach ($config->getValidationInterceptors() as $interceptor) |
|
| 116 | + { |
|
| 115 | 117 | $validationCode->addInterceptor($container->get($interceptor)); |
| 116 | 118 | } |
| 117 | 119 | |
@@ -42,18 +42,18 @@ discard block |
||
| 42 | 42 | */ |
| 43 | 43 | public function makeSchema(string $name, array $schema): array |
| 44 | 44 | { |
| 45 | - if (empty($schema)) { |
|
| 45 | + if (empty($schema)){ |
|
| 46 | 46 | throw new SchemaException(\sprintf('Filter `%s` does not define any schema', $name)); |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | $result = []; |
| 50 | - foreach ($schema as $field => $definition) { |
|
| 50 | + foreach ($schema as $field => $definition){ |
|
| 51 | 51 | $optional = false; |
| 52 | 52 | |
| 53 | 53 | // short definition |
| 54 | - if (\is_string($definition)) { |
|
| 54 | + if (\is_string($definition)){ |
|
| 55 | 55 | // simple scalar field definition |
| 56 | - if (!\class_exists($definition)) { |
|
| 56 | + if (!\class_exists($definition)){ |
|
| 57 | 57 | [$source, $origin] = $this->parseDefinition($field, $definition); |
| 58 | 58 | $result[$field] = [ |
| 59 | 59 | self::SCHEMA_SOURCE => $source, |
@@ -74,25 +74,25 @@ discard block |
||
| 74 | 74 | continue; |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - if (!\is_array($definition) || $definition === []) { |
|
| 77 | + if (!\is_array($definition) || $definition === []){ |
|
| 78 | 78 | throw new SchemaException( |
| 79 | 79 | \sprintf('Invalid schema definition at `%s`->`%s`', $name, $field) |
| 80 | 80 | ); |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | // complex definition |
| 84 | - if (!empty($definition[self::ORIGIN])) { |
|
| 84 | + if (!empty($definition[self::ORIGIN])){ |
|
| 85 | 85 | $origin = $definition[self::ORIGIN]; |
| 86 | 86 | |
| 87 | 87 | // [class, 'data:something.*'] vs [class, 'data:something'] |
| 88 | 88 | $iterate = \str_contains((string)$origin, '.*') || !empty($definition[self::ITERATE]); |
| 89 | 89 | $origin = \rtrim($origin, '.*'); |
| 90 | - } else { |
|
| 90 | + }else{ |
|
| 91 | 91 | $origin = $field; |
| 92 | 92 | $iterate = true; |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | - if (!empty($definition[self::OPTIONAL])) { |
|
| 95 | + if (!empty($definition[self::OPTIONAL])){ |
|
| 96 | 96 | $optional = true; |
| 97 | 97 | } |
| 98 | 98 | |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | self::SCHEMA_OPTIONAL => $optional, |
| 106 | 106 | ]; |
| 107 | 107 | |
| 108 | - if ($iterate) { |
|
| 108 | + if ($iterate){ |
|
| 109 | 109 | [$source, $origin] = $this->parseDefinition($field, $definition[self::ITERATE] ?? $origin); |
| 110 | 110 | |
| 111 | 111 | $map[self::SCHEMA_ITERATE_SOURCE] = $source; |
@@ -137,11 +137,11 @@ discard block |
||
| 137 | 137 | 'path', |
| 138 | 138 | 'remoteAddress', |
| 139 | 139 | 'uri', |
| 140 | - ], true)) { |
|
| 140 | + ], true)){ |
|
| 141 | 141 | return [$definition, $field]; |
| 142 | 142 | } |
| 143 | 143 | |
| 144 | - if (!\str_contains($definition, ':')) { |
|
| 144 | + if (!\str_contains($definition, ':')){ |
|
| 145 | 145 | return ['data', empty($definition) ? $field : $definition]; |
| 146 | 146 | } |
| 147 | 147 | |
@@ -42,18 +42,22 @@ discard block |
||
| 42 | 42 | */ |
| 43 | 43 | public function makeSchema(string $name, array $schema): array |
| 44 | 44 | { |
| 45 | - if (empty($schema)) { |
|
| 45 | + if (empty($schema)) |
|
| 46 | + { |
|
| 46 | 47 | throw new SchemaException(\sprintf('Filter `%s` does not define any schema', $name)); |
| 47 | 48 | } |
| 48 | 49 | |
| 49 | 50 | $result = []; |
| 50 | - foreach ($schema as $field => $definition) { |
|
| 51 | + foreach ($schema as $field => $definition) |
|
| 52 | + { |
|
| 51 | 53 | $optional = false; |
| 52 | 54 | |
| 53 | 55 | // short definition |
| 54 | - if (\is_string($definition)) { |
|
| 56 | + if (\is_string($definition)) |
|
| 57 | + { |
|
| 55 | 58 | // simple scalar field definition |
| 56 | - if (!\class_exists($definition)) { |
|
| 59 | + if (!\class_exists($definition)) |
|
| 60 | + { |
|
| 57 | 61 | [$source, $origin] = $this->parseDefinition($field, $definition); |
| 58 | 62 | $result[$field] = [ |
| 59 | 63 | self::SCHEMA_SOURCE => $source, |
@@ -74,25 +78,30 @@ discard block |
||
| 74 | 78 | continue; |
| 75 | 79 | } |
| 76 | 80 | |
| 77 | - if (!\is_array($definition) || $definition === []) { |
|
| 81 | + if (!\is_array($definition) || $definition === []) |
|
| 82 | + { |
|
| 78 | 83 | throw new SchemaException( |
| 79 | 84 | \sprintf('Invalid schema definition at `%s`->`%s`', $name, $field) |
| 80 | 85 | ); |
| 81 | 86 | } |
| 82 | 87 | |
| 83 | 88 | // complex definition |
| 84 | - if (!empty($definition[self::ORIGIN])) { |
|
| 89 | + if (!empty($definition[self::ORIGIN])) |
|
| 90 | + { |
|
| 85 | 91 | $origin = $definition[self::ORIGIN]; |
| 86 | 92 | |
| 87 | 93 | // [class, 'data:something.*'] vs [class, 'data:something'] |
| 88 | 94 | $iterate = \str_contains((string)$origin, '.*') || !empty($definition[self::ITERATE]); |
| 89 | 95 | $origin = \rtrim($origin, '.*'); |
| 90 | - } else { |
|
| 96 | + } |
|
| 97 | + else |
|
| 98 | + { |
|
| 91 | 99 | $origin = $field; |
| 92 | 100 | $iterate = true; |
| 93 | 101 | } |
| 94 | 102 | |
| 95 | - if (!empty($definition[self::OPTIONAL])) { |
|
| 103 | + if (!empty($definition[self::OPTIONAL])) |
|
| 104 | + { |
|
| 96 | 105 | $optional = true; |
| 97 | 106 | } |
| 98 | 107 | |
@@ -105,7 +114,8 @@ discard block |
||
| 105 | 114 | self::SCHEMA_OPTIONAL => $optional, |
| 106 | 115 | ]; |
| 107 | 116 | |
| 108 | - if ($iterate) { |
|
| 117 | + if ($iterate) |
|
| 118 | + { |
|
| 109 | 119 | [$source, $origin] = $this->parseDefinition($field, $definition[self::ITERATE] ?? $origin); |
| 110 | 120 | |
| 111 | 121 | $map[self::SCHEMA_ITERATE_SOURCE] = $source; |
@@ -137,11 +147,13 @@ discard block |
||
| 137 | 147 | 'path', |
| 138 | 148 | 'remoteAddress', |
| 139 | 149 | 'uri', |
| 140 | - ], true)) { |
|
| 150 | + ], true)) |
|
| 151 | + { |
|
| 141 | 152 | return [$definition, $field]; |
| 142 | 153 | } |
| 143 | 154 | |
| 144 | - if (!\str_contains($definition, ':')) { |
|
| 155 | + if (!\str_contains($definition, ':')) |
|
| 156 | + { |
|
| 145 | 157 | return ['data', empty($definition) ? $field : $definition]; |
| 146 | 158 | } |
| 147 | 159 | |
@@ -16,7 +16,7 @@ |
||
| 16 | 16 | public function setValue(FilterInterface $filter, \ReflectionProperty $property, mixed $value): void |
| 17 | 17 | { |
| 18 | 18 | $type = $property->getType(); |
| 19 | - if ($type === null || !$type instanceof \ReflectionNamedType) { |
|
| 19 | + if ($type === null || !$type instanceof \ReflectionNamedType){ |
|
| 20 | 20 | return; |
| 21 | 21 | } |
| 22 | 22 | |
@@ -16,7 +16,8 @@ |
||
| 16 | 16 | public function setValue(FilterInterface $filter, \ReflectionProperty $property, mixed $value): void |
| 17 | 17 | { |
| 18 | 18 | $type = $property->getType(); |
| 19 | - if ($type === null || !$type instanceof \ReflectionNamedType) { |
|
| 19 | + if ($type === null || !$type instanceof \ReflectionNamedType) |
|
| 20 | + { |
|
| 20 | 21 | return; |
| 21 | 22 | } |
| 22 | 23 | |