Skip to content

Commit e39a26b

Browse files
dominikzoggdominikzogg
committed
drop a to complicated solution for "only" providing a bit better deprecation message
1 parent d852d34 commit e39a26b

10 files changed

Lines changed: 46 additions & 306 deletions

‎src/Schema/ArraySchema.php‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
use Chubbyphp\Parsing\Error;
88
use Chubbyphp\Parsing\Errors;
99
use Chubbyphp\Parsing\ErrorsException;
10-
use Chubbyphp\Parsing\Variable;
1110

1211
final class ArraySchema extends AbstractSchemaInnerParse implements SchemaInterface
1312
{
@@ -110,11 +109,11 @@ public function maxItems(int $maxItems): static
110109
}
111110

112111
/**
113-
* @deprecated Use exactItems($length) instead
112+
* @deprecated Use exactItems($exactItems) instead
114113
*/
115114
public function length(int $length): static
116115
{
117-
@trigger_error('Use exactItems('.Variable::toCode($length).') instead', E_USER_DEPRECATED);
116+
@trigger_error('Use exactItems($exactItems) instead', E_USER_DEPRECATED);
118117

119118
return $this->postParse(static function (array $array) use ($length) {
120119
$arrayLength = \count($array);
@@ -134,11 +133,11 @@ public function length(int $length): static
134133
}
135134

136135
/**
137-
* @deprecated Use minItems($minLength) instead
136+
* @deprecated Use minItems($minItems) instead
138137
*/
139138
public function minLength(int $minLength): static
140139
{
141-
@trigger_error('Use minItems('.Variable::toCode($minLength).') instead', E_USER_DEPRECATED);
140+
@trigger_error('Use minItems($minItems) instead', E_USER_DEPRECATED);
142141

143142
return $this->postParse(static function (array $array) use ($minLength) {
144143
$arrayLength = \count($array);
@@ -158,11 +157,11 @@ public function minLength(int $minLength): static
158157
}
159158

160159
/**
161-
* @deprecated Use maxItems($maxLength) instead
160+
* @deprecated Use maxItems($maxItems) instead
162161
*/
163162
public function maxLength(int $maxLength): static
164163
{
165-
@trigger_error('Use maxItems('.Variable::toCode($maxLength).') instead', E_USER_DEPRECATED);
164+
@trigger_error('Use maxItems($maxItems) instead', E_USER_DEPRECATED);
166165

167166
return $this->postParse(static function (array $array) use ($maxLength) {
168167
$arrayLength = \count($array);
@@ -199,11 +198,11 @@ public function contains(mixed $contains, bool $strict = true): static
199198
}
200199

201200
/**
202-
* @deprecated use contains
201+
* @deprecated use contains($contains, $strict)
203202
*/
204203
public function includes(mixed $includes, bool $strict = true): static
205204
{
206-
@trigger_error('Use contains('.Variable::toCode($includes).', '.Variable::toCode($strict).') instead', E_USER_DEPRECATED);
205+
@trigger_error('Use contains($contains, $strict) instead', E_USER_DEPRECATED);
207206

208207
return $this->postParse(static function (array $array) use ($includes, $strict) {
209208
if (!\in_array($includes, $array, $strict)) {

‎src/Schema/FloatSchema.php‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
use Chubbyphp\Parsing\Error;
88
use Chubbyphp\Parsing\ErrorsException;
9-
use Chubbyphp\Parsing\Variable;
109

1110
final class FloatSchema extends AbstractSchemaInnerParse implements SchemaInterface
1211
{
@@ -121,11 +120,11 @@ public function maximum(float $maximum): static
121120
}
122121

123122
/**
124-
* @deprecated Use minimum($gte) instead
123+
* @deprecated Use minimum($minimum) instead
125124
*/
126125
public function gte(float $gte): static
127126
{
128-
@trigger_error('Use minimum('.Variable::toCode($gte).') instead', E_USER_DEPRECATED);
127+
@trigger_error('Use minimum($minimum) instead', E_USER_DEPRECATED);
129128

130129
return $this->postParse(static function (float $float) use ($gte) {
131130
if ($float >= $gte) {
@@ -143,11 +142,11 @@ public function gte(float $gte): static
143142
}
144143

145144
/**
146-
* @deprecated Use exclusiveMinimum($gt) instead
145+
* @deprecated Use exclusiveMinimum($exclusiveMinimum) instead
147146
*/
148147
public function gt(float $gt): static
149148
{
150-
@trigger_error('Use exclusiveMinimum('.Variable::toCode($gt).') instead', E_USER_DEPRECATED);
149+
@trigger_error('Use exclusiveMinimum($exclusiveMinimum) instead', E_USER_DEPRECATED);
151150

152151
return $this->postParse(static function (float $float) use ($gt) {
153152
if ($float > $gt) {
@@ -165,11 +164,11 @@ public function gt(float $gt): static
165164
}
166165

167166
/**
168-
* @deprecated Use exclusiveMaximum($lt) instead
167+
* @deprecated Use exclusiveMaximum($exclusiveMaximum) instead
169168
*/
170169
public function lt(float $lt): static
171170
{
172-
@trigger_error('Use exclusiveMaximum('.Variable::toCode($lt).') instead', E_USER_DEPRECATED);
171+
@trigger_error('Use exclusiveMaximum($exclusiveMaximum) instead', E_USER_DEPRECATED);
173172

174173
return $this->postParse(static function (float $float) use ($lt) {
175174
if ($float < $lt) {
@@ -187,11 +186,11 @@ public function lt(float $lt): static
187186
}
188187

189188
/**
190-
* @deprecated Use maximum($lte) instead
189+
* @deprecated Use maximum($maximum) instead
191190
*/
192191
public function lte(float $lte): static
193192
{
194-
@trigger_error('Use maximum('.Variable::toCode($lte).') instead', E_USER_DEPRECATED);
193+
@trigger_error('Use maximum($maximum) instead', E_USER_DEPRECATED);
195194

196195
return $this->postParse(static function (float $float) use ($lte) {
197196
if ($float <= $lte) {

‎src/Schema/IntSchema.php‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
use Chubbyphp\Parsing\Error;
88
use Chubbyphp\Parsing\ErrorsException;
9-
use Chubbyphp\Parsing\Variable;
109

1110
final class IntSchema extends AbstractSchemaInnerParse implements SchemaInterface
1211
{
@@ -118,11 +117,11 @@ public function maximum(int $maximum): static
118117
}
119118

120119
/**
121-
* @deprecated Use minimum($gte) instead
120+
* @deprecated Use minimum($minimum) instead
122121
*/
123122
public function gte(int $gte): static
124123
{
125-
@trigger_error('Use minimum('.Variable::toCode($gte).') instead', E_USER_DEPRECATED);
124+
@trigger_error('Use minimum($minimum) instead', E_USER_DEPRECATED);
126125

127126
return $this->postParse(static function (int $int) use ($gte) {
128127
if ($int >= $gte) {
@@ -140,11 +139,11 @@ public function gte(int $gte): static
140139
}
141140

142141
/**
143-
* @deprecated Use exclusiveMinimum($gt) instead
142+
* @deprecated Use exclusiveMinimum($exclusiveMinimum) instead
144143
*/
145144
public function gt(int $gt): static
146145
{
147-
@trigger_error('Use exclusiveMinimum('.Variable::toCode($gt).') instead', E_USER_DEPRECATED);
146+
@trigger_error('Use exclusiveMinimum($exclusiveMinimum) instead', E_USER_DEPRECATED);
148147

149148
return $this->postParse(static function (int $int) use ($gt) {
150149
if ($int > $gt) {
@@ -162,11 +161,11 @@ public function gt(int $gt): static
162161
}
163162

164163
/**
165-
* @deprecated Use exclusiveMaximum($lt) instead
164+
* @deprecated Use exclusiveMaximum($exclusiveMaximum) instead
166165
*/
167166
public function lt(int $lt): static
168167
{
169-
@trigger_error('Use exclusiveMaximum('.Variable::toCode($lt).') instead', E_USER_DEPRECATED);
168+
@trigger_error('Use exclusiveMaximum($exclusiveMaximum) instead', E_USER_DEPRECATED);
170169

171170
return $this->postParse(static function (int $int) use ($lt) {
172171
if ($int < $lt) {
@@ -184,11 +183,11 @@ public function lt(int $lt): static
184183
}
185184

186185
/**
187-
* @deprecated Use maximum($lte) instead
186+
* @deprecated Use maximum($maximum) instead
188187
*/
189188
public function lte(int $lte): static
190189
{
191-
@trigger_error('Use maximum('.Variable::toCode($lte).') instead', E_USER_DEPRECATED);
190+
@trigger_error('Use maximum($maximum) instead', E_USER_DEPRECATED);
192191

193192
return $this->postParse(static function (int $int) use ($lte) {
194193
if ($int <= $lte) {

‎src/Schema/StringSchema.php‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
use Chubbyphp\Parsing\Enum\Uuid;
88
use Chubbyphp\Parsing\Error;
99
use Chubbyphp\Parsing\ErrorsException;
10-
use Chubbyphp\Parsing\Variable;
1110

1211
final class StringSchema extends AbstractSchemaInnerParse implements SchemaInterface
1312
{
@@ -172,11 +171,11 @@ public function contains(string $contains): static
172171
}
173172

174173
/**
175-
* @deprecated Use contains($includes) instea
174+
* @deprecated Use contains($contains) instead
176175
*/
177176
public function includes(string $includes): static
178177
{
179-
@trigger_error('Use contains('.Variable::toCode($includes).') instead', E_USER_DEPRECATED);
178+
@trigger_error('Use contains($contains) instead', E_USER_DEPRECATED);
180179

181180
return $this->postParse(static function (string $string) use ($includes) {
182181
if (str_contains($string, $includes)) {
@@ -335,11 +334,11 @@ public function mac(): static
335334
}
336335

337336
/**
338-
* @deprecated: Use pattern($match) instead
337+
* @deprecated: Use pattern($pattern) instead
339338
*/
340339
public function match(string $match): static
341340
{
342-
@trigger_error('Use pattern('.Variable::toCode($match).') instead', E_USER_DEPRECATED);
341+
@trigger_error('Use pattern($pattern) instead', E_USER_DEPRECATED);
343342

344343
if (false === @preg_match($match, '')) {
345344
throw new \InvalidArgumentException(\sprintf('Invalid match "%s" given', $match));
@@ -386,11 +385,11 @@ public function pattern(string $pattern): static
386385
}
387386

388387
/**
389-
* @deprecated: Use pattern($regexp) instead
388+
* @deprecated: Use pattern($pattern) instead
390389
*/
391390
public function regexp(string $regexp): static
392391
{
393-
@@trigger_error('Use pattern('.Variable::toCode($regexp).') instead', E_USER_DEPRECATED);
392+
@@trigger_error('Use pattern($pattern) instead', E_USER_DEPRECATED);
394393

395394
if (false === @preg_match($regexp, '')) {
396395
throw new \InvalidArgumentException(\sprintf('Invalid regexp "%s" given', $regexp));

‎src/Variable.php‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎tests/Unit/Schema/ArraySchemaTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ public function testParseWithValidLength(): void
222222
self::assertArrayHasKey('type', $lastError);
223223
self::assertSame(E_USER_DEPRECATED, $lastError['type']);
224224
self::assertArrayHasKey('message', $lastError);
225-
self::assertSame('Use exactItems(4) instead', $lastError['message']);
225+
self::assertSame('Use exactItems($exactItems) instead', $lastError['message']);
226226

227227
self::assertSame($input, $schema->parse($input));
228228
}
@@ -304,7 +304,7 @@ public function testParseWithValidMinLength(): void
304304
self::assertArrayHasKey('type', $lastError);
305305
self::assertSame(E_USER_DEPRECATED, $lastError['type']);
306306
self::assertArrayHasKey('message', $lastError);
307-
self::assertSame('Use minItems(4) instead', $lastError['message']);
307+
self::assertSame('Use minItems($minItems) instead', $lastError['message']);
308308

309309
self::assertSame($input, $schema->parse($input));
310310
}
@@ -386,7 +386,7 @@ public function testParseWithValidMaxLength(): void
386386
self::assertArrayHasKey('type', $lastError);
387387
self::assertSame(E_USER_DEPRECATED, $lastError['type']);
388388
self::assertArrayHasKey('message', $lastError);
389-
self::assertSame('Use maxItems(4) instead', $lastError['message']);
389+
self::assertSame('Use maxItems($maxItems) instead', $lastError['message']);
390390

391391
self::assertSame($input, $schema->parse($input));
392392
}
@@ -566,7 +566,7 @@ public function testParseWithValidIncludes(): void
566566
self::assertArrayHasKey('type', $lastError);
567567
self::assertSame(E_USER_DEPRECATED, $lastError['type']);
568568
self::assertArrayHasKey('message', $lastError);
569-
self::assertSame("Use contains(new \\DateTimeImmutable('2024-01-21T09:15:00+00:00'), true) instead", $lastError['message']);
569+
self::assertSame('Use contains($contains, $strict) instead', $lastError['message']);
570570

571571
self::assertSame($input, $schema->parse($input));
572572
}

‎tests/Unit/Schema/FloatSchemaTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ public function testParseWithValidGte(): void
382382
self::assertArrayHasKey('type', $lastError);
383383
self::assertSame(E_USER_DEPRECATED, $lastError['type']);
384384
self::assertArrayHasKey('message', $lastError);
385-
self::assertSame('Use minimum(4.1) instead', $lastError['message']);
385+
self::assertSame('Use minimum($minimum) instead', $lastError['message']);
386386

387387
self::assertSame($input, $schema->parse($input));
388388
}
@@ -430,7 +430,7 @@ public function testParseWithValidGt(): void
430430
self::assertArrayHasKey('type', $lastError);
431431
self::assertSame(E_USER_DEPRECATED, $lastError['type']);
432432
self::assertArrayHasKey('message', $lastError);
433-
self::assertSame('Use exclusiveMinimum(4.1) instead', $lastError['message']);
433+
self::assertSame('Use exclusiveMinimum($exclusiveMinimum) instead', $lastError['message']);
434434

435435
self::assertSame($input, $schema->parse($input));
436436
}
@@ -512,7 +512,7 @@ public function testParseWithValidLt(): void
512512
self::assertArrayHasKey('type', $lastError);
513513
self::assertSame(E_USER_DEPRECATED, $lastError['type']);
514514
self::assertArrayHasKey('message', $lastError);
515-
self::assertSame('Use exclusiveMaximum(4.2) instead', $lastError['message']);
515+
self::assertSame('Use exclusiveMaximum($exclusiveMaximum) instead', $lastError['message']);
516516

517517
self::assertSame($input, $schema->parse($input));
518518
}
@@ -588,7 +588,7 @@ public function testParseWithValidLte(): void
588588
self::assertArrayHasKey('type', $lastError);
589589
self::assertSame(E_USER_DEPRECATED, $lastError['type']);
590590
self::assertArrayHasKey('message', $lastError);
591-
self::assertSame('Use maximum(4.1) instead', $lastError['message']);
591+
self::assertSame('Use maximum($maximum) instead', $lastError['message']);
592592

593593
self::assertSame($input, $schema->parse($input));
594594
}

0 commit comments

Comments
 (0)