@@ -7,4 +7,4 @@ |
||
7 | 7 | * @author Anton Titov (Wolfy-J) |
8 | 8 | */ |
9 | 9 | |
10 | -return ; |
|
10 | +return; |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | bool $useMicroSeconds = false |
23 | 23 | ): bool { |
24 | 24 | $compare = $this->compare($this->date($value), $this->date($threshold), $useMicroSeconds); |
25 | - if (is_bool($compare)) { |
|
25 | + if (is_bool($compare)){ |
|
26 | 26 | return $compare; |
27 | 27 | } |
28 | 28 | |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | bool $useMicroSeconds = false |
46 | 46 | ): bool { |
47 | 47 | $compare = $this->compare($this->date($value), $this->date($threshold), $useMicroSeconds); |
48 | - if (is_bool($compare)) { |
|
48 | + if (is_bool($compare)){ |
|
49 | 49 | return $compare; |
50 | 50 | } |
51 | 51 | |
@@ -58,11 +58,11 @@ discard block |
||
58 | 58 | */ |
59 | 59 | private function date($value): ?\DateTimeImmutable |
60 | 60 | { |
61 | - if ($value instanceof \DateTimeImmutable) { |
|
61 | + if ($value instanceof \DateTimeImmutable){ |
|
62 | 62 | return $value; |
63 | 63 | } |
64 | 64 | |
65 | - if ($value instanceof \DateTime) { |
|
65 | + if ($value instanceof \DateTime){ |
|
66 | 66 | return \DateTimeImmutable::createFromMutable($value); |
67 | 67 | } |
68 | 68 | |
@@ -77,15 +77,15 @@ discard block |
||
77 | 77 | */ |
78 | 78 | private function compare(?\DateTimeImmutable $date, ?\DateTimeImmutable $threshold, bool $useMicroseconds) |
79 | 79 | { |
80 | - if ($date === null) { |
|
80 | + if ($date === null){ |
|
81 | 81 | return false; |
82 | 82 | } |
83 | 83 | |
84 | - if ($threshold === null) { |
|
84 | + if ($threshold === null){ |
|
85 | 85 | return true; |
86 | 86 | } |
87 | 87 | |
88 | - if (!$useMicroseconds) { |
|
88 | + if (!$useMicroseconds){ |
|
89 | 89 | $date = $this->dropMicroSeconds($date); |
90 | 90 | $threshold = $this->dropMicroSeconds($threshold); |
91 | 91 | } |
@@ -22,7 +22,8 @@ discard block |
||
22 | 22 | bool $useMicroSeconds = false |
23 | 23 | ): bool { |
24 | 24 | $compare = $this->compare($this->date($value), $this->date($threshold), $useMicroSeconds); |
25 | - if (is_bool($compare)) { |
|
25 | + if (is_bool($compare)) |
|
26 | + { |
|
26 | 27 | return $compare; |
27 | 28 | } |
28 | 29 | |
@@ -45,7 +46,8 @@ discard block |
||
45 | 46 | bool $useMicroSeconds = false |
46 | 47 | ): bool { |
47 | 48 | $compare = $this->compare($this->date($value), $this->date($threshold), $useMicroSeconds); |
48 | - if (is_bool($compare)) { |
|
49 | + if (is_bool($compare)) |
|
50 | + { |
|
49 | 51 | return $compare; |
50 | 52 | } |
51 | 53 | |
@@ -58,11 +60,13 @@ discard block |
||
58 | 60 | */ |
59 | 61 | private function date($value): ?\DateTimeImmutable |
60 | 62 | { |
61 | - if ($value instanceof \DateTimeImmutable) { |
|
63 | + if ($value instanceof \DateTimeImmutable) |
|
64 | + { |
|
62 | 65 | return $value; |
63 | 66 | } |
64 | 67 | |
65 | - if ($value instanceof \DateTime) { |
|
68 | + if ($value instanceof \DateTime) |
|
69 | + { |
|
66 | 70 | return \DateTimeImmutable::createFromMutable($value); |
67 | 71 | } |
68 | 72 | |
@@ -77,15 +81,18 @@ discard block |
||
77 | 81 | */ |
78 | 82 | private function compare(?\DateTimeImmutable $date, ?\DateTimeImmutable $threshold, bool $useMicroseconds) |
79 | 83 | { |
80 | - if ($date === null) { |
|
84 | + if ($date === null) |
|
85 | + { |
|
81 | 86 | return false; |
82 | 87 | } |
83 | 88 | |
84 | - if ($threshold === null) { |
|
89 | + if ($threshold === null) |
|
90 | + { |
|
85 | 91 | return true; |
86 | 92 | } |
87 | 93 | |
88 | - if (!$useMicroseconds) { |
|
94 | + if (!$useMicroseconds) |
|
95 | + { |
|
89 | 96 | $date = $this->dropMicroSeconds($date); |
90 | 97 | $threshold = $this->dropMicroSeconds($threshold); |
91 | 98 | } |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | */ |
20 | 20 | public static function assertRegExp(string $pattern, string $string, string $message = ''): void |
21 | 21 | { |
22 | - if (\method_exists(Assert::class, 'assertMatchesRegularExpression')) { |
|
22 | + if (\method_exists(Assert::class, 'assertMatchesRegularExpression')){ |
|
23 | 23 | Assert::assertMatchesRegularExpression($pattern, $string, $message); |
24 | 24 | |
25 | 25 | return; |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | */ |
36 | 36 | public static function assertNotRegExp(string $pattern, string $string, string $message = ''): void |
37 | 37 | { |
38 | - if (\method_exists(Assert::class, 'assertDoesNotMatchRegularExpression')) { |
|
38 | + if (\method_exists(Assert::class, 'assertDoesNotMatchRegularExpression')){ |
|
39 | 39 | Assert::assertDoesNotMatchRegularExpression($pattern, $string, $message); |
40 | 40 | |
41 | 41 | return; |
@@ -19,7 +19,8 @@ discard block |
||
19 | 19 | */ |
20 | 20 | public static function assertRegExp(string $pattern, string $string, string $message = ''): void |
21 | 21 | { |
22 | - if (\method_exists(Assert::class, 'assertMatchesRegularExpression')) { |
|
22 | + if (\method_exists(Assert::class, 'assertMatchesRegularExpression')) |
|
23 | + { |
|
23 | 24 | Assert::assertMatchesRegularExpression($pattern, $string, $message); |
24 | 25 | |
25 | 26 | return; |
@@ -35,7 +36,8 @@ discard block |
||
35 | 36 | */ |
36 | 37 | public static function assertNotRegExp(string $pattern, string $string, string $message = ''): void |
37 | 38 | { |
38 | - if (\method_exists(Assert::class, 'assertDoesNotMatchRegularExpression')) { |
|
39 | + if (\method_exists(Assert::class, 'assertDoesNotMatchRegularExpression')) |
|
40 | + { |
|
39 | 41 | Assert::assertDoesNotMatchRegularExpression($pattern, $string, $message); |
40 | 42 | |
41 | 43 | return; |
@@ -27,7 +27,8 @@ discard block |
||
27 | 27 | |
28 | 28 | public function setUp(): void |
29 | 29 | { |
30 | - if ((string)ini_get('zend.assertions') === 1) { |
|
30 | + if ((string)ini_get('zend.assertions') === 1) |
|
31 | + { |
|
31 | 32 | ini_set('zend.assertions', 0); |
32 | 33 | } |
33 | 34 | } |
@@ -75,15 +76,21 @@ discard block |
||
75 | 76 | $noPhpDoc |
76 | 77 | ); |
77 | 78 | |
78 | - if ($expectedTypedProperty) { |
|
79 | + if ($expectedTypedProperty) |
|
80 | + { |
|
79 | 81 | $this->assertStringContainsString('private TestClass $testClass;', $printed); |
80 | - } else { |
|
82 | + } |
|
83 | + else |
|
84 | + { |
|
81 | 85 | $this->assertStringNotContainsString('private TestClass $testClass;', $printed); |
82 | 86 | } |
83 | 87 | |
84 | - if ($expectedPhpDoc) { |
|
88 | + if ($expectedPhpDoc) |
|
89 | + { |
|
85 | 90 | $this->assertRegExp('/@var TestClass[\s|\r\n]/', $printed); |
86 | - } else { |
|
91 | + } |
|
92 | + else |
|
93 | + { |
|
87 | 94 | $this->assertNotRegExp('/@var TestClass[\s|\r\n]/', $printed); |
88 | 95 | } |
89 | 96 | } |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | |
28 | 28 | public function setUp(): void |
29 | 29 | { |
30 | - if ((string)ini_get('zend.assertions') === 1) { |
|
30 | + if ((string)ini_get('zend.assertions') === 1){ |
|
31 | 31 | ini_set('zend.assertions', 0); |
32 | 32 | } |
33 | 33 | } |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | { |
41 | 41 | $i = new Injector(); |
42 | 42 | |
43 | - $filename = __DIR__ . '/Fixtures/TestClass.php'; |
|
43 | + $filename = __DIR__.'/Fixtures/TestClass.php'; |
|
44 | 44 | $printed = $i->injectDependencies( |
45 | 45 | file_get_contents($filename), |
46 | 46 | $this->getDefinition($filename, ['testClass' => TestClass::class]) |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | ): void { |
67 | 67 | $i = new Injector(); |
68 | 68 | |
69 | - $filename = __DIR__ . '/Fixtures/TestClass.php'; |
|
69 | + $filename = __DIR__.'/Fixtures/TestClass.php'; |
|
70 | 70 | $printed = $i->injectDependencies( |
71 | 71 | file_get_contents($filename), |
72 | 72 | $this->getDefinition($filename, ['testClass' => TestClass::class]), |
@@ -75,15 +75,15 @@ discard block |
||
75 | 75 | $noPhpDoc |
76 | 76 | ); |
77 | 77 | |
78 | - if ($expectedTypedProperty) { |
|
78 | + if ($expectedTypedProperty){ |
|
79 | 79 | $this->assertStringContainsString('private TestClass $testClass;', $printed); |
80 | - } else { |
|
80 | + }else{ |
|
81 | 81 | $this->assertStringNotContainsString('private TestClass $testClass;', $printed); |
82 | 82 | } |
83 | 83 | |
84 | - if ($expectedPhpDoc) { |
|
84 | + if ($expectedPhpDoc){ |
|
85 | 85 | $this->assertRegExp('/@var TestClass[\s|\r\n]/', $printed); |
86 | - } else { |
|
86 | + }else{ |
|
87 | 87 | $this->assertNotRegExp('/@var TestClass[\s|\r\n]/', $printed); |
88 | 88 | } |
89 | 89 | } |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | { |
107 | 107 | $i = new Injector(); |
108 | 108 | |
109 | - $filename = __DIR__ . '/Fixtures/TestEmptyClass.php'; |
|
109 | + $filename = __DIR__.'/Fixtures/TestEmptyClass.php'; |
|
110 | 110 | $content = file_get_contents($filename); |
111 | 111 | $printed = $i->injectDependencies( |
112 | 112 | file_get_contents($filename), |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | { |
125 | 125 | $i = new Injector(); |
126 | 126 | |
127 | - $filename = __DIR__ . '/Fixtures/TestClass.php'; |
|
127 | + $filename = __DIR__.'/Fixtures/TestClass.php'; |
|
128 | 128 | $r = $i->injectDependencies( |
129 | 129 | file_get_contents($filename), |
130 | 130 | $this->getDefinition($filename, ['testClass' => TestClass::class]) |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | { |
150 | 150 | $i = new Injector(); |
151 | 151 | |
152 | - $filename = __DIR__ . '/Fixtures/ChildClass.php'; |
|
152 | + $filename = __DIR__.'/Fixtures/ChildClass.php'; |
|
153 | 153 | $r = $i->injectDependencies( |
154 | 154 | file_get_contents($filename), |
155 | 155 | $this->getDefinition($filename, ['testClass' => TestClass::class]) |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | { |
168 | 168 | $i = new Injector(); |
169 | 169 | |
170 | - $filename = __DIR__ . '/Fixtures/ChildWithConstructorClass.php'; |
|
170 | + $filename = __DIR__.'/Fixtures/ChildWithConstructorClass.php'; |
|
171 | 171 | $r = $i->injectDependencies( |
172 | 172 | file_get_contents($filename), |
173 | 173 | $this->getDefinition($filename, ['testClass' => TestClass::class]) |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | */ |
184 | 184 | public function testModifyConstructor(): void |
185 | 185 | { |
186 | - $filename = __DIR__ . '/Fixtures/WithConstructor.php'; |
|
186 | + $filename = __DIR__.'/Fixtures/WithConstructor.php'; |
|
187 | 187 | $extractor = new Traverse\Extractor(); |
188 | 188 | |
189 | 189 | $parameters = $extractor->extractFromFilename($filename); |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | */ |
210 | 210 | public function testPriorOptionalConstructorParameters(): void |
211 | 211 | { |
212 | - $filename = __DIR__ . '/Fixtures/OptionalConstructorArgsClass.php'; |
|
212 | + $filename = __DIR__.'/Fixtures/OptionalConstructorArgsClass.php'; |
|
213 | 213 | $extractor = new Traverse\Extractor(); |
214 | 214 | |
215 | 215 | $parameters = $extractor->extractFromFilename($filename); |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | { |
241 | 241 | $i = new Injector(); |
242 | 242 | |
243 | - $filename = __DIR__ . '/ClassNode/ConflictResolver/Fixtures/ChildClass.php'; |
|
243 | + $filename = __DIR__.'/ClassNode/ConflictResolver/Fixtures/ChildClass.php'; |
|
244 | 244 | $printed = $i->injectDependencies( |
245 | 245 | file_get_contents($filename), |
246 | 246 | $this->getDefinition( |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | { |
24 | 24 | $i = new Injector(); |
25 | 25 | |
26 | - $filename = __DIR__ . '/Fixtures/TestClass.php'; |
|
26 | + $filename = __DIR__.'/Fixtures/TestClass.php'; |
|
27 | 27 | $r = $i->injectDependencies( |
28 | 28 | file_get_contents($filename), |
29 | 29 | $this->getDefinition( |
@@ -36,16 +36,16 @@ discard block |
||
36 | 36 | ) |
37 | 37 | ); |
38 | 38 | |
39 | - $this->assertStringContainsString(Fixtures\Test::class . ';', $r); |
|
39 | + $this->assertStringContainsString(Fixtures\Test::class.';', $r); |
|
40 | 40 | $this->assertRegExp('/@var Test[\s|\r\n]/', $r); |
41 | 41 | $this->assertStringContainsString('@param Test $test', $r); |
42 | 42 | |
43 | - $this->assertStringContainsString(Fixtures\SubFolder\Test::class . ' as Test2;', $r); |
|
44 | - $this->assertStringNotContainsString(Fixtures\SubFolder\Test::class . ';', $r); |
|
43 | + $this->assertStringContainsString(Fixtures\SubFolder\Test::class.' as Test2;', $r); |
|
44 | + $this->assertStringNotContainsString(Fixtures\SubFolder\Test::class.';', $r); |
|
45 | 45 | $this->assertRegExp('/@var Test2[\s|\r\n]/', $r); |
46 | 46 | $this->assertStringContainsString('@param Test2 $test2', $r); |
47 | 47 | |
48 | - $this->assertStringContainsString(Fixtures\ATest3::class . ';', $r); |
|
48 | + $this->assertStringContainsString(Fixtures\ATest3::class.';', $r); |
|
49 | 49 | $this->assertRegExp('/@var ATest3[\s|\r\n]/', $r); |
50 | 50 | $this->assertStringContainsString('@param ATest3 $test3', $r); |
51 | 51 | } |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | { |
58 | 58 | $i = new Injector(); |
59 | 59 | |
60 | - $filename = __DIR__ . '/Fixtures/TestClassWithImports.php'; |
|
60 | + $filename = __DIR__.'/Fixtures/TestClassWithImports.php'; |
|
61 | 61 | $r = $i->injectDependencies( |
62 | 62 | file_get_contents($filename), |
63 | 63 | $this->getDefinition( |
@@ -70,18 +70,18 @@ discard block |
||
70 | 70 | ) |
71 | 71 | ); |
72 | 72 | |
73 | - $this->assertStringContainsString(Fixtures\Test::class . ' as FTest;', $r); |
|
74 | - $this->assertStringNotContainsString(Fixtures\Test::class . ';', $r); |
|
73 | + $this->assertStringContainsString(Fixtures\Test::class.' as FTest;', $r); |
|
74 | + $this->assertStringNotContainsString(Fixtures\Test::class.';', $r); |
|
75 | 75 | $this->assertRegExp('/@var FTest[\s|\r\n]/', $r); |
76 | 76 | $this->assertStringContainsString('@param FTest $test', $r); |
77 | 77 | |
78 | - $this->assertStringContainsString(Fixtures\SubFolder\Test::class . ' as TestAlias;', $r); |
|
79 | - $this->assertStringNotContainsString(Fixtures\SubFolder\Test::class . ';', $r); |
|
78 | + $this->assertStringContainsString(Fixtures\SubFolder\Test::class.' as TestAlias;', $r); |
|
79 | + $this->assertStringNotContainsString(Fixtures\SubFolder\Test::class.';', $r); |
|
80 | 80 | $this->assertRegExp('/@var TestAlias[\s|\r\n]/', $r); |
81 | 81 | $this->assertStringContainsString('@param TestAlias $test2', $r); |
82 | 82 | |
83 | - $this->assertStringContainsString(Fixtures\ATest3::class . ' as ATest;', $r); |
|
84 | - $this->assertStringNotContainsString(Fixtures\ATest3::class . ';', $r); |
|
83 | + $this->assertStringContainsString(Fixtures\ATest3::class.' as ATest;', $r); |
|
84 | + $this->assertStringNotContainsString(Fixtures\ATest3::class.';', $r); |
|
85 | 85 | $this->assertRegExp('/@var ATest[\s|\r\n]/', $r); |
86 | 86 | $this->assertStringContainsString('@param ATest $test3', $r); |
87 | 87 | } |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | { |
94 | 94 | $i = new Injector(); |
95 | 95 | |
96 | - $filename = __DIR__ . '/Fixtures/ChildClass.php'; |
|
96 | + $filename = __DIR__.'/Fixtures/ChildClass.php'; |
|
97 | 97 | $r = $i->injectDependencies( |
98 | 98 | file_get_contents($filename), |
99 | 99 | $this->getDefinition( |
@@ -106,17 +106,17 @@ discard block |
||
106 | 106 | ) |
107 | 107 | ); |
108 | 108 | |
109 | - $this->assertStringContainsString(Fixtures\Test::class . ';', $r); |
|
109 | + $this->assertStringContainsString(Fixtures\Test::class.';', $r); |
|
110 | 110 | $this->assertRegExp('/@var Test[\s|\r\n]/', $r); |
111 | 111 | $this->assertStringContainsString('@param Test $test', $r); |
112 | 112 | |
113 | - $this->assertStringContainsString(Fixtures\SubFolder\Test::class . ' as Test2;', $r); |
|
114 | - $this->assertStringNotContainsString(Fixtures\SubFolder\Test::class . ';', $r); |
|
113 | + $this->assertStringContainsString(Fixtures\SubFolder\Test::class.' as Test2;', $r); |
|
114 | + $this->assertStringNotContainsString(Fixtures\SubFolder\Test::class.';', $r); |
|
115 | 115 | $this->assertRegExp('/@var Test2[\s|\r\n]/', $r); |
116 | 116 | $this->assertStringContainsString('@param Test2 $test2', $r); |
117 | 117 | |
118 | - $this->assertStringContainsString(Fixtures\ATest3::class . ' as ATestAlias;', $r); |
|
119 | - $this->assertStringNotContainsString(Fixtures\ATest3::class . ';', $r); |
|
118 | + $this->assertStringContainsString(Fixtures\ATest3::class.' as ATestAlias;', $r); |
|
119 | + $this->assertStringNotContainsString(Fixtures\ATest3::class.';', $r); |
|
120 | 120 | $this->assertRegExp('/@var ATestAlias[\s|\r\n]/', $r); |
121 | 121 | $this->assertStringContainsString('@param ATestAlias $test3', $r); |
122 | 122 | } |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | { |
126 | 126 | $i = new Injector(); |
127 | 127 | |
128 | - $filename = __DIR__ . '/Fixtures/DuplicatePropertyClass.php'; |
|
128 | + $filename = __DIR__.'/Fixtures/DuplicatePropertyClass.php'; |
|
129 | 129 | $r = $i->injectDependencies( |
130 | 130 | file_get_contents($filename), |
131 | 131 | $this->getDefinition( |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | ) |
137 | 137 | ); |
138 | 138 | |
139 | - $this->assertStringContainsString(Fixtures\Test::class . ';', $r); |
|
139 | + $this->assertStringContainsString(Fixtures\Test::class.';', $r); |
|
140 | 140 | $this->assertRegExp('/@var Test[\s|\r\n]/', $r); |
141 | 141 | $this->assertStringContainsString('@param Test $test', $r); |
142 | 142 | $this->assertStringContainsString('__construct(Test $test)', $r); |
@@ -112,30 +112,30 @@ |
||
112 | 112 | */ |
113 | 113 | final protected function validate(): void |
114 | 114 | { |
115 | - if ($this->errors !== []) { |
|
115 | + if ($this->errors !== []){ |
|
116 | 116 | // already validated |
117 | 117 | return; |
118 | 118 | } |
119 | 119 | |
120 | 120 | $this->errors = []; |
121 | 121 | |
122 | - foreach ($this->rules as $field => $rules) { |
|
122 | + foreach ($this->rules as $field => $rules){ |
|
123 | 123 | $hasValue = $this->hasValue($field); |
124 | 124 | $value = $this->getValue($field); |
125 | 125 | |
126 | - foreach ($this->provider->getRules($rules) as $rule) { |
|
127 | - if (!$hasValue && $rule->ignoreEmpty($value) && !$rule->hasConditions()) { |
|
126 | + foreach ($this->provider->getRules($rules) as $rule){ |
|
127 | + if (!$hasValue && $rule->ignoreEmpty($value) && !$rule->hasConditions()){ |
|
128 | 128 | continue; |
129 | 129 | } |
130 | 130 | |
131 | - foreach ($rule->getConditions() as $condition) { |
|
132 | - if (!$condition->isMet($this, $field, $value)) { |
|
131 | + foreach ($rule->getConditions() as $condition){ |
|
132 | + if (!$condition->isMet($this, $field, $value)){ |
|
133 | 133 | // condition is not met, skipping validation |
134 | 134 | continue 2; |
135 | 135 | } |
136 | 136 | } |
137 | 137 | |
138 | - if (!$rule->validate($this, $field, $value)) { |
|
138 | + if (!$rule->validate($this, $field, $value)){ |
|
139 | 139 | // got error, jump to next field |
140 | 140 | $this->errors[$field] = $rule->getMessage($field, $value); |
141 | 141 | break; |
@@ -112,30 +112,37 @@ |
||
112 | 112 | */ |
113 | 113 | final protected function validate(): void |
114 | 114 | { |
115 | - if ($this->errors !== []) { |
|
115 | + if ($this->errors !== []) |
|
116 | + { |
|
116 | 117 | // already validated |
117 | 118 | return; |
118 | 119 | } |
119 | 120 | |
120 | 121 | $this->errors = []; |
121 | 122 | |
122 | - foreach ($this->rules as $field => $rules) { |
|
123 | + foreach ($this->rules as $field => $rules) |
|
124 | + { |
|
123 | 125 | $hasValue = $this->hasValue($field); |
124 | 126 | $value = $this->getValue($field); |
125 | 127 | |
126 | - foreach ($this->provider->getRules($rules) as $rule) { |
|
127 | - if (!$hasValue && $rule->ignoreEmpty($value) && !$rule->hasConditions()) { |
|
128 | + foreach ($this->provider->getRules($rules) as $rule) |
|
129 | + { |
|
130 | + if (!$hasValue && $rule->ignoreEmpty($value) && !$rule->hasConditions()) |
|
131 | + { |
|
128 | 132 | continue; |
129 | 133 | } |
130 | 134 | |
131 | - foreach ($rule->getConditions() as $condition) { |
|
132 | - if (!$condition->isMet($this, $field, $value)) { |
|
135 | + foreach ($rule->getConditions() as $condition) |
|
136 | + { |
|
137 | + if (!$condition->isMet($this, $field, $value)) |
|
138 | + { |
|
133 | 139 | // condition is not met, skipping validation |
134 | 140 | continue 2; |
135 | 141 | } |
136 | 142 | } |
137 | 143 | |
138 | - if (!$rule->validate($this, $field, $value)) { |
|
144 | + if (!$rule->validate($this, $field, $value)) |
|
145 | + { |
|
139 | 146 | // got error, jump to next field |
140 | 147 | $this->errors[$field] = $rule->getMessage($field, $value); |
141 | 148 | break; |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | { |
56 | 56 | $value = $this->data[$field] ?? $default; |
57 | 57 | |
58 | - if (is_object($value) && method_exists($value, 'getValue')) { |
|
58 | + if (is_object($value) && method_exists($value, 'getValue')){ |
|
59 | 59 | return $value->getValue(); |
60 | 60 | } |
61 | 61 | |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | */ |
68 | 68 | public function hasValue(string $field): bool |
69 | 69 | { |
70 | - if (is_array($this->data)) { |
|
70 | + if (is_array($this->data)){ |
|
71 | 71 | return array_key_exists($field, $this->data); |
72 | 72 | } |
73 | 73 |
@@ -55,7 +55,8 @@ discard block |
||
55 | 55 | { |
56 | 56 | $value = $this->data[$field] ?? $default; |
57 | 57 | |
58 | - if (is_object($value) && method_exists($value, 'getValue')) { |
|
58 | + if (is_object($value) && method_exists($value, 'getValue')) |
|
59 | + { |
|
59 | 60 | return $value->getValue(); |
60 | 61 | } |
61 | 62 | |
@@ -67,7 +68,8 @@ discard block |
||
67 | 68 | */ |
68 | 69 | public function hasValue(string $field): bool |
69 | 70 | { |
70 | - if (is_array($this->data)) { |
|
71 | + if (is_array($this->data)) |
|
72 | + { |
|
71 | 73 | return array_key_exists($field, $this->data); |
72 | 74 | } |
73 | 75 |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | public function perform(): void |
23 | 23 | { |
24 | 24 | $prototyped = $this->locator->getTargetClasses(); |
25 | - if ($prototyped === []) { |
|
25 | + if ($prototyped === []){ |
|
26 | 26 | $this->writeln('<comment>No prototyped classes found.</comment>'); |
27 | 27 | |
28 | 28 | return; |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | |
31 | 31 | $grid = $this->table(['Class:', 'Property:', 'Target:']); |
32 | 32 | |
33 | - foreach ($prototyped as $class) { |
|
33 | + foreach ($prototyped as $class){ |
|
34 | 34 | $proto = $this->getPrototypeProperties($class, $prototyped); |
35 | 35 | |
36 | 36 | $grid->addRow([$class->getName(), $this->mergeNames($proto), $this->mergeTargets($proto)]); |
@@ -22,7 +22,8 @@ discard block |
||
22 | 22 | public function perform(): void |
23 | 23 | { |
24 | 24 | $prototyped = $this->locator->getTargetClasses(); |
25 | - if ($prototyped === []) { |
|
25 | + if ($prototyped === []) |
|
26 | + { |
|
26 | 27 | $this->writeln('<comment>No prototyped classes found.</comment>'); |
27 | 28 | |
28 | 29 | return; |
@@ -30,7 +31,8 @@ discard block |
||
30 | 31 | |
31 | 32 | $grid = $this->table(['Class:', 'Property:', 'Target:']); |
32 | 33 | |
33 | - foreach ($prototyped as $class) { |
|
34 | + foreach ($prototyped as $class) |
|
35 | + { |
|
34 | 36 | $proto = $this->getPrototypeProperties($class, $prototyped); |
35 | 37 | |
36 | 38 | $grid->addRow([$class->getName(), $this->mergeNames($proto), $this->mergeTargets($proto)]); |
@@ -75,13 +75,13 @@ discard block |
||
75 | 75 | ['emails' => ['[email protected]']] |
76 | 76 | ); |
77 | 77 | |
78 | - try { |
|
78 | + try{ |
|
79 | 79 | $this->getHandler()->handle( |
80 | 80 | MailQueue::JOB_NAME, |
81 | 81 | 'id', |
82 | 82 | json_encode(MessageSerializer::pack($this->getMail())) |
83 | 83 | ); |
84 | - } catch (TransportException $e) { |
|
84 | + }catch (TransportException $e){ |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | $this->logger->mockery_verify(); |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | private function expectRenderer(Email $email): void |
99 | 99 | { |
100 | 100 | $this->renderer->expects('render')->withArgs( |
101 | - function (Message $message) { |
|
101 | + function (Message $message){ |
|
102 | 102 | $this->assertSame($message->getSubject(), 'test'); |
103 | 103 | return true; |
104 | 104 | } |
@@ -75,13 +75,16 @@ discard block |
||
75 | 75 | ['emails' => ['[email protected]']] |
76 | 76 | ); |
77 | 77 | |
78 | - try { |
|
78 | + try |
|
79 | + { |
|
79 | 80 | $this->getHandler()->handle( |
80 | 81 | MailQueue::JOB_NAME, |
81 | 82 | 'id', |
82 | 83 | json_encode(MessageSerializer::pack($this->getMail())) |
83 | 84 | ); |
84 | - } catch (TransportException $e) { |
|
85 | + } |
|
86 | + catch (TransportException $e) |
|
87 | + { |
|
85 | 88 | } |
86 | 89 | |
87 | 90 | $this->logger->mockery_verify(); |
@@ -98,7 +101,8 @@ discard block |
||
98 | 101 | private function expectRenderer(Email $email): void |
99 | 102 | { |
100 | 103 | $this->renderer->expects('render')->withArgs( |
101 | - function (Message $message) { |
|
104 | + function (Message $message) |
|
105 | + { |
|
102 | 106 | $this->assertSame($message->getSubject(), 'test'); |
103 | 107 | return true; |
104 | 108 | } |