@@ -26,9 +26,9 @@ discard block |
||
26 | 26 | public function testFromEntity(): void |
27 | 27 | { |
28 | 28 | $line = __LINE__; |
29 | - $className = __NAMESPACE__ . "\\App\\Request\\Sample{$line}Request"; |
|
29 | + $className = __NAMESPACE__."\\App\\Request\\Sample{$line}Request"; |
|
30 | 30 | $output = $this->console()->run('create:filter', [ |
31 | - 'name' => 'sample' . $line, |
|
31 | + 'name' => 'sample'.$line, |
|
32 | 32 | '--entity' => SourceEntity74::class |
33 | 33 | ]); |
34 | 34 | |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | |
40 | 40 | $reflection = new ReflectionClass($className); |
41 | 41 | |
42 | - try { |
|
42 | + try{ |
|
43 | 43 | $schema = $reflection->getConstant('SCHEMA'); |
44 | 44 | $this->assertSame('data:typedBool', $schema['typedBool']); |
45 | 45 | $this->assertSame('data:noTypeString', $schema['noTypeString']); |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | $this->assertSame(['notEmpty', 'string'], $validates['obj']); |
54 | 54 | $this->assertSame(['notEmpty', 'integer'], $validates['intFromPhpDoc']); |
55 | 55 | $this->assertSame(['notEmpty', 'float'], $validates['noTypeWithFloatDefault']); |
56 | - } finally { |
|
56 | + }finally{ |
|
57 | 57 | $this->deleteDeclaration($className); |
58 | 58 | } |
59 | 59 | } |
@@ -39,7 +39,8 @@ discard block |
||
39 | 39 | |
40 | 40 | $reflection = new ReflectionClass($className); |
41 | 41 | |
42 | - try { |
|
42 | + try |
|
43 | + { |
|
43 | 44 | $schema = $reflection->getConstant('SCHEMA'); |
44 | 45 | $this->assertSame('data:typedBool', $schema['typedBool']); |
45 | 46 | $this->assertSame('data:noTypeString', $schema['noTypeString']); |
@@ -53,7 +54,9 @@ discard block |
||
53 | 54 | $this->assertSame(['notEmpty', 'string'], $validates['obj']); |
54 | 55 | $this->assertSame(['notEmpty', 'integer'], $validates['intFromPhpDoc']); |
55 | 56 | $this->assertSame(['notEmpty', 'float'], $validates['noTypeWithFloatDefault']); |
56 | - } finally { |
|
57 | + } |
|
58 | + finally |
|
59 | + { |
|
57 | 60 | $this->deleteDeclaration($className); |
58 | 61 | } |
59 | 62 | } |
@@ -26,7 +26,7 @@ |
||
26 | 26 | public function testFromEntity(): void |
27 | 27 | { |
28 | 28 | $line = __LINE__; |
29 | - $className = __NAMESPACE__ . "\\App\\Request\\Sample{$line}Request"; |
|
29 | + $className = __NAMESPACE__ . "\\App\\Request\\Sample{$line}request"; |
|
30 | 30 | $output = $this->console()->run('create:filter', [ |
31 | 31 | 'name' => 'sample' . $line, |
32 | 32 | '--entity' => SourceEntity74::class |
@@ -38,14 +38,14 @@ discard block |
||
38 | 38 | $input = clone $this; |
39 | 39 | |
40 | 40 | $namespace = trim($namespace); |
41 | - if ($namespace === '') { |
|
41 | + if ($namespace === ''){ |
|
42 | 42 | return $input; |
43 | 43 | } |
44 | 44 | |
45 | 45 | $input->data = []; |
46 | 46 | |
47 | 47 | $data = $this->getValue($namespace, []); |
48 | - if (is_array($data)) { |
|
48 | + if (is_array($data)){ |
|
49 | 49 | $input->data = $data; |
50 | 50 | } |
51 | 51 | |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | */ |
58 | 58 | public function getValue(string $option, $default = null) |
59 | 59 | { |
60 | - if (!$this->hasValue($option)) { |
|
60 | + if (!$this->hasValue($option)){ |
|
61 | 61 | return $default; |
62 | 62 | } |
63 | 63 |
@@ -38,14 +38,16 @@ discard block |
||
38 | 38 | $input = clone $this; |
39 | 39 | |
40 | 40 | $namespace = trim($namespace); |
41 | - if ($namespace === '') { |
|
41 | + if ($namespace === '') |
|
42 | + { |
|
42 | 43 | return $input; |
43 | 44 | } |
44 | 45 | |
45 | 46 | $input->data = []; |
46 | 47 | |
47 | 48 | $data = $this->getValue($namespace, []); |
48 | - if (is_array($data)) { |
|
49 | + if (is_array($data)) |
|
50 | + { |
|
49 | 51 | $input->data = $data; |
50 | 52 | } |
51 | 53 | |
@@ -57,7 +59,8 @@ discard block |
||
57 | 59 | */ |
58 | 60 | public function getValue(string $option, $default = null) |
59 | 61 | { |
60 | - if (!$this->hasValue($option)) { |
|
62 | + if (!$this->hasValue($option)) |
|
63 | + { |
|
61 | 64 | return $default; |
62 | 65 | } |
63 | 66 |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | */ |
41 | 41 | public function addFilter(string $name, FilterInterface $filter): void |
42 | 42 | { |
43 | - if ($this->hasFilter($name)) { |
|
43 | + if ($this->hasFilter($name)){ |
|
44 | 44 | throw new SchemaException("Filter `$name` is already defined"); |
45 | 45 | } |
46 | 46 | |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | */ |
66 | 66 | public function getFilter(string $name): FilterInterface |
67 | 67 | { |
68 | - if (!$this->hasFilter($name)) { |
|
68 | + if (!$this->hasFilter($name)){ |
|
69 | 69 | throw new SchemaException("No such filter `$name`"); |
70 | 70 | } |
71 | 71 | |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | */ |
90 | 90 | public function addSorter(string $name, SorterInterface $sorter): void |
91 | 91 | { |
92 | - if ($this->hasSorter($name)) { |
|
92 | + if ($this->hasSorter($name)){ |
|
93 | 93 | throw new SchemaException("Sorter `$name` is already defined"); |
94 | 94 | } |
95 | 95 | |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | */ |
115 | 115 | public function getSorter(string $name): SorterInterface |
116 | 116 | { |
117 | - if (!$this->hasSorter($name)) { |
|
117 | + if (!$this->hasSorter($name)){ |
|
118 | 118 | throw new SchemaException("No such sorter `$name`"); |
119 | 119 | } |
120 | 120 |
@@ -40,7 +40,8 @@ discard block |
||
40 | 40 | */ |
41 | 41 | public function addFilter(string $name, FilterInterface $filter): void |
42 | 42 | { |
43 | - if ($this->hasFilter($name)) { |
|
43 | + if ($this->hasFilter($name)) |
|
44 | + { |
|
44 | 45 | throw new SchemaException("Filter `$name` is already defined"); |
45 | 46 | } |
46 | 47 | |
@@ -65,7 +66,8 @@ discard block |
||
65 | 66 | */ |
66 | 67 | public function getFilter(string $name): FilterInterface |
67 | 68 | { |
68 | - if (!$this->hasFilter($name)) { |
|
69 | + if (!$this->hasFilter($name)) |
|
70 | + { |
|
69 | 71 | throw new SchemaException("No such filter `$name`"); |
70 | 72 | } |
71 | 73 | |
@@ -89,7 +91,8 @@ discard block |
||
89 | 91 | */ |
90 | 92 | public function addSorter(string $name, SorterInterface $sorter): void |
91 | 93 | { |
92 | - if ($this->hasSorter($name)) { |
|
94 | + if ($this->hasSorter($name)) |
|
95 | + { |
|
93 | 96 | throw new SchemaException("Sorter `$name` is already defined"); |
94 | 97 | } |
95 | 98 | |
@@ -114,7 +117,8 @@ discard block |
||
114 | 117 | */ |
115 | 118 | public function getSorter(string $name): SorterInterface |
116 | 119 | { |
117 | - if (!$this->hasSorter($name)) { |
|
120 | + if (!$this->hasSorter($name)) |
|
121 | + { |
|
118 | 122 | throw new SchemaException("No such sorter `$name`"); |
119 | 123 | } |
120 | 124 |
@@ -36,7 +36,7 @@ |
||
36 | 36 | $sorter = clone $this; |
37 | 37 | $sorter->sorters = []; |
38 | 38 | |
39 | - foreach ($this->sorters as $s) { |
|
39 | + foreach ($this->sorters as $s){ |
|
40 | 40 | $sorter->sorters[] = $s->withDirection($direction); |
41 | 41 | } |
42 | 42 |
@@ -36,7 +36,8 @@ |
||
36 | 36 | $sorter = clone $this; |
37 | 37 | $sorter->sorters = []; |
38 | 38 | |
39 | - foreach ($this->sorters as $s) { |
|
39 | + foreach ($this->sorters as $s) |
|
40 | + { |
|
40 | 41 | $sorter->sorters[] = $s->withDirection($direction); |
41 | 42 | } |
42 | 43 |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | $sorter = clone $this; |
48 | 48 | $sorter->direction = $sorter->checkDirection($direction); |
49 | 49 | |
50 | - switch ($sorter->direction) { |
|
50 | + switch ($sorter->direction){ |
|
51 | 51 | case self::ASC: |
52 | 52 | $sorter->sorter = $sorter->asc->withDirection(self::ASC); |
53 | 53 | break; |
@@ -76,21 +76,21 @@ discard block |
||
76 | 76 | */ |
77 | 77 | private function checkDirection($direction): ?string |
78 | 78 | { |
79 | - if (is_string($direction)) { |
|
80 | - if (strtolower($direction) === self::DESC) { |
|
79 | + if (is_string($direction)){ |
|
80 | + if (strtolower($direction) === self::DESC){ |
|
81 | 81 | return self::DESC; |
82 | 82 | } |
83 | 83 | |
84 | - if (strtolower($direction) === self::ASC) { |
|
84 | + if (strtolower($direction) === self::ASC){ |
|
85 | 85 | return self::ASC; |
86 | 86 | } |
87 | 87 | } |
88 | 88 | |
89 | - if (in_array($direction, ['-1', -1, SORT_DESC], true)) { |
|
89 | + if (in_array($direction, ['-1', -1, SORT_DESC], true)){ |
|
90 | 90 | return self::DESC; |
91 | 91 | } |
92 | 92 | |
93 | - if (in_array($direction, ['1', 1, SORT_ASC], true)) { |
|
93 | + if (in_array($direction, ['1', 1, SORT_ASC], true)){ |
|
94 | 94 | return self::ASC; |
95 | 95 | } |
96 | 96 |
@@ -47,7 +47,8 @@ discard block |
||
47 | 47 | $sorter = clone $this; |
48 | 48 | $sorter->direction = $sorter->checkDirection($direction); |
49 | 49 | |
50 | - switch ($sorter->direction) { |
|
50 | + switch ($sorter->direction) |
|
51 | + { |
|
51 | 52 | case self::ASC: |
52 | 53 | $sorter->sorter = $sorter->asc->withDirection(self::ASC); |
53 | 54 | break; |
@@ -76,21 +77,26 @@ discard block |
||
76 | 77 | */ |
77 | 78 | private function checkDirection($direction): ?string |
78 | 79 | { |
79 | - if (is_string($direction)) { |
|
80 | - if (strtolower($direction) === self::DESC) { |
|
80 | + if (is_string($direction)) |
|
81 | + { |
|
82 | + if (strtolower($direction) === self::DESC) |
|
83 | + { |
|
81 | 84 | return self::DESC; |
82 | 85 | } |
83 | 86 | |
84 | - if (strtolower($direction) === self::ASC) { |
|
87 | + if (strtolower($direction) === self::ASC) |
|
88 | + { |
|
85 | 89 | return self::ASC; |
86 | 90 | } |
87 | 91 | } |
88 | 92 | |
89 | - if (in_array($direction, ['-1', -1, SORT_DESC], true)) { |
|
93 | + if (in_array($direction, ['-1', -1, SORT_DESC], true)) |
|
94 | + { |
|
90 | 95 | return self::DESC; |
91 | 96 | } |
92 | 97 | |
93 | - if (in_array($direction, ['1', 1, SORT_ASC], true)) { |
|
98 | + if (in_array($direction, ['1', 1, SORT_ASC], true)) |
|
99 | + { |
|
94 | 100 | return self::ASC; |
95 | 101 | } |
96 | 102 |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | */ |
38 | 38 | public function __construct(string $expression, $value, bool $includeFrom = true, bool $includeTo = true) |
39 | 39 | { |
40 | - if (!$value instanceof ValueInterface && !$this->isValidArray($value)) { |
|
40 | + if (!$value instanceof ValueInterface && !$this->isValidArray($value)){ |
|
41 | 41 | throw new ValueException(sprintf( |
42 | 42 | 'Value expected to be instance of `%s` or an array of 2 different elements, got %s.', |
43 | 43 | ValueInterface::class, |
@@ -58,18 +58,18 @@ discard block |
||
58 | 58 | public function withValue($value): ?SpecificationInterface |
59 | 59 | { |
60 | 60 | $between = clone $this; |
61 | - if (!$between->value instanceof ValueInterface) { |
|
61 | + if (!$between->value instanceof ValueInterface){ |
|
62 | 62 | // constant value |
63 | 63 | return $between; |
64 | 64 | } |
65 | 65 | |
66 | - if (!$this->isValidArray($value)) { |
|
66 | + if (!$this->isValidArray($value)){ |
|
67 | 67 | // only array of 2 values is expected |
68 | 68 | return null; |
69 | 69 | } |
70 | 70 | |
71 | 71 | [$from, $to] = $this->convertValue($value); |
72 | - if (!$between->value->accepts($from) || !$between->value->accepts($to)) { |
|
72 | + if (!$between->value->accepts($from) || !$between->value->accepts($to)){ |
|
73 | 73 | return null; |
74 | 74 | } |
75 | 75 | |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | */ |
102 | 102 | public function getFilters(bool $asOriginal = false): array |
103 | 103 | { |
104 | - if ($asOriginal && $this->includeFrom && $this->includeTo) { |
|
104 | + if ($asOriginal && $this->includeFrom && $this->includeTo){ |
|
105 | 105 | return [$this]; |
106 | 106 | } |
107 | 107 | |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | */ |
116 | 116 | private function isValidArray($value): bool |
117 | 117 | { |
118 | - if (!is_array($value) || count($value) !== 2) { |
|
118 | + if (!is_array($value) || count($value) !== 2){ |
|
119 | 119 | return false; |
120 | 120 | } |
121 | 121 | |
@@ -130,17 +130,17 @@ discard block |
||
130 | 130 | */ |
131 | 131 | private function invalidValueType($value): string |
132 | 132 | { |
133 | - if (is_object($value)) { |
|
133 | + if (is_object($value)){ |
|
134 | 134 | return get_class($value); |
135 | 135 | } |
136 | 136 | |
137 | - if (is_array($value)) { |
|
137 | + if (is_array($value)){ |
|
138 | 138 | $count = count($value); |
139 | - if ($count === 0) { |
|
139 | + if ($count === 0){ |
|
140 | 140 | return 'empty array'; |
141 | 141 | } |
142 | 142 | |
143 | - if ($count !== 2) { |
|
143 | + if ($count !== 2){ |
|
144 | 144 | return "array of $count elements"; |
145 | 145 | } |
146 | 146 | |
@@ -156,12 +156,12 @@ discard block |
||
156 | 156 | */ |
157 | 157 | private function convertValue($value) |
158 | 158 | { |
159 | - if ($value instanceof ValueInterface) { |
|
159 | + if ($value instanceof ValueInterface){ |
|
160 | 160 | return $value; |
161 | 161 | } |
162 | 162 | |
163 | 163 | $values = array_values($value); |
164 | - if ($values[1] < $values[0]) { |
|
164 | + if ($values[1] < $values[0]){ |
|
165 | 165 | return [$values[1], $values[0]]; |
166 | 166 | } |
167 | 167 |
@@ -37,7 +37,8 @@ discard block |
||
37 | 37 | */ |
38 | 38 | public function __construct(string $expression, $value, bool $includeFrom = true, bool $includeTo = true) |
39 | 39 | { |
40 | - if (!$value instanceof ValueInterface && !$this->isValidArray($value)) { |
|
40 | + if (!$value instanceof ValueInterface && !$this->isValidArray($value)) |
|
41 | + { |
|
41 | 42 | throw new ValueException(sprintf( |
42 | 43 | 'Value expected to be instance of `%s` or an array of 2 different elements, got %s.', |
43 | 44 | ValueInterface::class, |
@@ -58,18 +59,21 @@ discard block |
||
58 | 59 | public function withValue($value): ?SpecificationInterface |
59 | 60 | { |
60 | 61 | $between = clone $this; |
61 | - if (!$between->value instanceof ValueInterface) { |
|
62 | + if (!$between->value instanceof ValueInterface) |
|
63 | + { |
|
62 | 64 | // constant value |
63 | 65 | return $between; |
64 | 66 | } |
65 | 67 | |
66 | - if (!$this->isValidArray($value)) { |
|
68 | + if (!$this->isValidArray($value)) |
|
69 | + { |
|
67 | 70 | // only array of 2 values is expected |
68 | 71 | return null; |
69 | 72 | } |
70 | 73 | |
71 | 74 | [$from, $to] = $this->convertValue($value); |
72 | - if (!$between->value->accepts($from) || !$between->value->accepts($to)) { |
|
75 | + if (!$between->value->accepts($from) || !$between->value->accepts($to)) |
|
76 | + { |
|
73 | 77 | return null; |
74 | 78 | } |
75 | 79 | |
@@ -101,7 +105,8 @@ discard block |
||
101 | 105 | */ |
102 | 106 | public function getFilters(bool $asOriginal = false): array |
103 | 107 | { |
104 | - if ($asOriginal && $this->includeFrom && $this->includeTo) { |
|
108 | + if ($asOriginal && $this->includeFrom && $this->includeTo) |
|
109 | + { |
|
105 | 110 | return [$this]; |
106 | 111 | } |
107 | 112 | |
@@ -115,7 +120,8 @@ discard block |
||
115 | 120 | */ |
116 | 121 | private function isValidArray($value): bool |
117 | 122 | { |
118 | - if (!is_array($value) || count($value) !== 2) { |
|
123 | + if (!is_array($value) || count($value) !== 2) |
|
124 | + { |
|
119 | 125 | return false; |
120 | 126 | } |
121 | 127 | |
@@ -130,17 +136,21 @@ discard block |
||
130 | 136 | */ |
131 | 137 | private function invalidValueType($value): string |
132 | 138 | { |
133 | - if (is_object($value)) { |
|
139 | + if (is_object($value)) |
|
140 | + { |
|
134 | 141 | return get_class($value); |
135 | 142 | } |
136 | 143 | |
137 | - if (is_array($value)) { |
|
144 | + if (is_array($value)) |
|
145 | + { |
|
138 | 146 | $count = count($value); |
139 | - if ($count === 0) { |
|
147 | + if ($count === 0) |
|
148 | + { |
|
140 | 149 | return 'empty array'; |
141 | 150 | } |
142 | 151 | |
143 | - if ($count !== 2) { |
|
152 | + if ($count !== 2) |
|
153 | + { |
|
144 | 154 | return "array of $count elements"; |
145 | 155 | } |
146 | 156 | |
@@ -156,12 +166,14 @@ discard block |
||
156 | 166 | */ |
157 | 167 | private function convertValue($value) |
158 | 168 | { |
159 | - if ($value instanceof ValueInterface) { |
|
169 | + if ($value instanceof ValueInterface) |
|
170 | + { |
|
160 | 171 | return $value; |
161 | 172 | } |
162 | 173 | |
163 | 174 | $values = array_values($value); |
164 | - if ($values[1] < $values[0]) { |
|
175 | + if ($values[1] < $values[0]) |
|
176 | + { |
|
165 | 177 | return [$values[1], $values[0]]; |
166 | 178 | } |
167 | 179 |
@@ -31,10 +31,10 @@ |
||
31 | 31 | public function withValue($value): ?SpecificationInterface |
32 | 32 | { |
33 | 33 | $any = $this->clone($value); |
34 | - foreach ($this->filters as $filter) { |
|
34 | + foreach ($this->filters as $filter){ |
|
35 | 35 | $applied = $filter->withValue($value); |
36 | 36 | |
37 | - if ($applied === null) { |
|
37 | + if ($applied === null){ |
|
38 | 38 | // all nested filters must be configured |
39 | 39 | continue; |
40 | 40 | } |
@@ -31,10 +31,12 @@ |
||
31 | 31 | public function withValue($value): ?SpecificationInterface |
32 | 32 | { |
33 | 33 | $any = $this->clone($value); |
34 | - foreach ($this->filters as $filter) { |
|
34 | + foreach ($this->filters as $filter) |
|
35 | + { |
|
35 | 36 | $applied = $filter->withValue($value); |
36 | 37 | |
37 | - if ($applied === null) { |
|
38 | + if ($applied === null) |
|
39 | + { |
|
38 | 40 | // all nested filters must be configured |
39 | 41 | continue; |
40 | 42 | } |
@@ -38,16 +38,16 @@ |
||
38 | 38 | $select = $this->clone($value); |
39 | 39 | $value = (array)$value; |
40 | 40 | |
41 | - foreach ($this->filters as $name => $filter) { |
|
41 | + foreach ($this->filters as $name => $filter){ |
|
42 | 42 | $name = (string)$name; |
43 | - if (!hasValue($value, $name)) { |
|
43 | + if (!hasValue($value, $name)){ |
|
44 | 44 | continue; |
45 | 45 | } |
46 | 46 | |
47 | 47 | $select->filters[$name] = $filter; |
48 | 48 | } |
49 | 49 | |
50 | - if (empty($select->filters)) { |
|
50 | + if (empty($select->filters)){ |
|
51 | 51 | return null; |
52 | 52 | } |
53 | 53 |
@@ -38,16 +38,19 @@ |
||
38 | 38 | $select = $this->clone($value); |
39 | 39 | $value = (array)$value; |
40 | 40 | |
41 | - foreach ($this->filters as $name => $filter) { |
|
41 | + foreach ($this->filters as $name => $filter) |
|
42 | + { |
|
42 | 43 | $name = (string)$name; |
43 | - if (!hasValue($value, $name)) { |
|
44 | + if (!hasValue($value, $name)) |
|
45 | + { |
|
44 | 46 | continue; |
45 | 47 | } |
46 | 48 | |
47 | 49 | $select->filters[$name] = $filter; |
48 | 50 | } |
49 | 51 | |
50 | - if (empty($select->filters)) { |
|
52 | + if (empty($select->filters)) |
|
53 | + { |
|
51 | 54 | return null; |
52 | 55 | } |
53 | 56 |
@@ -31,10 +31,10 @@ |
||
31 | 31 | public function withValue($value): ?SpecificationInterface |
32 | 32 | { |
33 | 33 | $all = $this->clone($value); |
34 | - foreach ($this->filters as $filter) { |
|
34 | + foreach ($this->filters as $filter){ |
|
35 | 35 | $applied = $filter->withValue($value); |
36 | 36 | |
37 | - if ($applied === null) { |
|
37 | + if ($applied === null){ |
|
38 | 38 | // all nested filters must be configured |
39 | 39 | return null; |
40 | 40 | } |
@@ -31,10 +31,12 @@ |
||
31 | 31 | public function withValue($value): ?SpecificationInterface |
32 | 32 | { |
33 | 33 | $all = $this->clone($value); |
34 | - foreach ($this->filters as $filter) { |
|
34 | + foreach ($this->filters as $filter) |
|
35 | + { |
|
35 | 36 | $applied = $filter->withValue($value); |
36 | 37 | |
37 | - if ($applied === null) { |
|
38 | + if ($applied === null) |
|
39 | + { |
|
38 | 40 | // all nested filters must be configured |
39 | 41 | return null; |
40 | 42 | } |