|
26 | 26 | use function collect;
|
27 | 27 | use function method_exists;
|
28 | 28 | use function now;
|
| 29 | +use function sprintf; |
29 | 30 | use function var_export;
|
30 | 31 |
|
31 | 32 | class BuilderTest extends TestCase
|
32 | 33 | {
|
33 | 34 | #[DataProvider('provideQueryBuilderToMql')]
|
34 |
| - public function testMql(array $expected, Closure $build): void |
| 35 | + public function testMql(array $expected, Closure $build, ?string $requiredMethod = null): void |
35 | 36 | {
|
| 37 | + if ($requiredMethod && ! method_exists(Builder::class, $requiredMethod)) { |
| 38 | + $this->markTestSkipped(sprintf('Method "%s::%s()" does not exist.', Builder::class, $requiredMethod)); |
| 39 | + } |
| 40 | + |
36 | 41 | $builder = $build(self::getBuilder());
|
37 | 42 | $this->assertInstanceOf(Builder::class, $builder);
|
38 | 43 | $mql = $builder->toMql();
|
@@ -751,31 +756,37 @@ function (Builder $builder) {
|
751 | 756 | yield 'whereLike' => [
|
752 | 757 | ['find' => [['name' => new Regex('^1$', 'i')], []]],
|
753 | 758 | fn (Builder $builder) => $builder->whereLike('name', '1'),
|
| 759 | + 'whereLike', |
754 | 760 | ];
|
755 | 761 |
|
756 | 762 | yield 'whereLike case not sensitive' => [
|
757 | 763 | ['find' => [['name' => new Regex('^1$', 'i')], []]],
|
758 | 764 | fn (Builder $builder) => $builder->whereLike('name', '1', false),
|
| 765 | + 'whereLike', |
759 | 766 | ];
|
760 | 767 |
|
761 | 768 | yield 'whereLike case sensitive' => [
|
762 | 769 | ['find' => [['name' => new Regex('^1$', '')], []]],
|
763 | 770 | fn (Builder $builder) => $builder->whereLike('name', '1', true),
|
| 771 | + 'whereLike', |
764 | 772 | ];
|
765 | 773 |
|
766 | 774 | yield 'whereNotLike' => [
|
767 | 775 | ['find' => [['name' => ['$not' => new Regex('^1$', 'i')]], []]],
|
768 | 776 | fn (Builder $builder) => $builder->whereNotLike('name', '1'),
|
| 777 | + 'whereNotLike', |
769 | 778 | ];
|
770 | 779 |
|
771 | 780 | yield 'whereNotLike case not sensitive' => [
|
772 | 781 | ['find' => [['name' => ['$not' => new Regex('^1$', 'i')]], []]],
|
773 | 782 | fn (Builder $builder) => $builder->whereNotLike('name', '1', false),
|
| 783 | + 'whereNotLike', |
774 | 784 | ];
|
775 | 785 |
|
776 | 786 | yield 'whereNotLike case sensitive' => [
|
777 | 787 | ['find' => [['name' => ['$not' => new Regex('^1$', '')]], []]],
|
778 | 788 | fn (Builder $builder) => $builder->whereNotLike('name', '1', true),
|
| 789 | + 'whereNotLike', |
779 | 790 | ];
|
780 | 791 |
|
781 | 792 | $regex = new Regex('^acme$', 'si');
|
@@ -1191,142 +1202,154 @@ function (Builder $elemMatchQuery): void {
|
1191 | 1202 | ];
|
1192 | 1203 |
|
1193 | 1204 | // Method added in Laravel v10.47.0
|
1194 |
| - if (method_exists(Builder::class, 'whereAll')) { |
1195 |
| - /** @see DatabaseQueryBuilderTest::testWhereAll */ |
1196 |
| - yield 'whereAll' => [ |
1197 |
| - [ |
1198 |
| - 'find' => [ |
1199 |
| - ['$and' => [['last_name' => 'Doe'], ['email' => 'Doe']]], |
1200 |
| - [], // options |
1201 |
| - ], |
| 1205 | + /** @see DatabaseQueryBuilderTest::testWhereAll */ |
| 1206 | + yield 'whereAll' => [ |
| 1207 | + [ |
| 1208 | + 'find' => [ |
| 1209 | + ['$and' => [['last_name' => 'Doe'], ['email' => 'Doe']]], |
| 1210 | + [], // options |
1202 | 1211 | ],
|
1203 |
| - fn(Builder $builder) => $builder->whereAll(['last_name', 'email'], 'Doe'), |
1204 |
| - ]; |
1205 |
| - |
1206 |
| - yield 'whereAll operator' => [ |
1207 |
| - [ |
1208 |
| - 'find' => [ |
1209 |
| - [ |
1210 |
| - '$and' => [ |
1211 |
| - ['last_name' => ['$not' => new Regex('^.*Doe.*$', 'i')]], |
1212 |
| - ['email' => ['$not' => new Regex('^.*Doe.*$', 'i')]], |
1213 |
| - ], |
| 1212 | + ], |
| 1213 | + fn |
| 1214 | + (Builder $builder) => $builder->whereAll(['last_name', 'email'], 'Doe'), |
| 1215 | + 'whereAll', |
| 1216 | + ]; |
| 1217 | + |
| 1218 | + yield 'whereAll operator' => [ |
| 1219 | + [ |
| 1220 | + 'find' => [ |
| 1221 | + [ |
| 1222 | + '$and' => [ |
| 1223 | + ['last_name' => ['$not' => new Regex('^.*Doe.*$', 'i')]], |
| 1224 | + ['email' => ['$not' => new Regex('^.*Doe.*$', 'i')]], |
1214 | 1225 | ],
|
1215 |
| - [], // options |
1216 | 1226 | ],
|
| 1227 | + [], // options |
1217 | 1228 | ],
|
1218 |
| - fn(Builder $builder) => $builder->whereAll(['last_name', 'email'], 'not like', '%Doe%'), |
1219 |
| - ]; |
1220 |
| - |
1221 |
| - /** @see DatabaseQueryBuilderTest::testOrWhereAll */ |
1222 |
| - yield 'orWhereAll' => [ |
1223 |
| - [ |
1224 |
| - 'find' => [ |
1225 |
| - [ |
1226 |
| - '$or' => [ |
1227 |
| - ['first_name' => 'John'], |
1228 |
| - ['$and' => [['last_name' => 'Doe'], ['email' => 'Doe']]], |
1229 |
| - ], |
| 1229 | + ], |
| 1230 | + fn |
| 1231 | + (Builder $builder) => $builder->whereAll(['last_name', 'email'], 'not like', '%Doe%'), |
| 1232 | + 'whereAll', |
| 1233 | + ]; |
| 1234 | + |
| 1235 | + /** @see DatabaseQueryBuilderTest::testOrWhereAll */ |
| 1236 | + yield 'orWhereAll' => [ |
| 1237 | + [ |
| 1238 | + 'find' => [ |
| 1239 | + [ |
| 1240 | + '$or' => [ |
| 1241 | + ['first_name' => 'John'], |
| 1242 | + ['$and' => [['last_name' => 'Doe'], ['email' => 'Doe']]], |
1230 | 1243 | ],
|
1231 |
| - [], // options |
1232 | 1244 | ],
|
| 1245 | + [], // options |
1233 | 1246 | ],
|
1234 |
| - fn(Builder $builder) => $builder |
1235 |
| - ->where('first_name', 'John') |
1236 |
| - ->orWhereAll(['last_name', 'email'], 'Doe'), |
1237 |
| - ]; |
1238 |
| - |
1239 |
| - yield 'orWhereAll operator' => [ |
1240 |
| - [ |
1241 |
| - 'find' => [ |
1242 |
| - [ |
1243 |
| - '$or' => [ |
1244 |
| - ['first_name' => new Regex('^.*John.*$', 'i')], |
1245 |
| - [ |
1246 |
| - '$and' => [ |
1247 |
| - ['last_name' => ['$not' => new Regex('^.*Doe.*$', 'i')]], |
1248 |
| - ['email' => ['$not' => new Regex('^.*Doe.*$', 'i')]], |
1249 |
| - ], |
| 1247 | + ], |
| 1248 | + fn |
| 1249 | + (Builder $builder) => $builder |
| 1250 | + ->where('first_name', 'John') |
| 1251 | + ->orWhereAll(['last_name', 'email'], 'Doe'), |
| 1252 | + 'orWhereAll', |
| 1253 | + ]; |
| 1254 | + |
| 1255 | + yield 'orWhereAll operator' => [ |
| 1256 | + [ |
| 1257 | + 'find' => [ |
| 1258 | + [ |
| 1259 | + '$or' => [ |
| 1260 | + ['first_name' => new Regex('^.*John.*$', 'i')], |
| 1261 | + [ |
| 1262 | + '$and' => [ |
| 1263 | + ['last_name' => ['$not' => new Regex('^.*Doe.*$', 'i')]], |
| 1264 | + ['email' => ['$not' => new Regex('^.*Doe.*$', 'i')]], |
1250 | 1265 | ],
|
1251 | 1266 | ],
|
1252 | 1267 | ],
|
1253 |
| - [], // options |
1254 | 1268 | ],
|
| 1269 | + [], // options |
1255 | 1270 | ],
|
1256 |
| - fn(Builder $builder) => $builder |
1257 |
| - ->where('first_name', 'like', '%John%') |
1258 |
| - ->orWhereAll(['last_name', 'email'], 'not like', '%Doe%'), |
1259 |
| - ]; |
1260 |
| - } |
| 1271 | + ], |
| 1272 | + fn |
| 1273 | + (Builder $builder) => $builder |
| 1274 | + ->where('first_name', 'like', '%John%') |
| 1275 | + ->orWhereAll(['last_name', 'email'], 'not like', '%Doe%'), |
| 1276 | + 'orWhereAll', |
| 1277 | + ]; |
1261 | 1278 |
|
1262 | 1279 | // Method added in Laravel v10.47.0
|
1263 |
| - if (method_exists(Builder::class, 'whereAny')) { |
1264 |
| - /** @see DatabaseQueryBuilderTest::testWhereAny */ |
1265 |
| - yield 'whereAny' => [ |
1266 |
| - [ |
1267 |
| - 'find' => [ |
1268 |
| - ['$or' => [['last_name' => 'Doe'], ['email' => 'Doe']]], |
1269 |
| - [], // options |
1270 |
| - ], |
| 1280 | + /** @see DatabaseQueryBuilderTest::testWhereAny */ |
| 1281 | + yield 'whereAny' => [ |
| 1282 | + [ |
| 1283 | + 'find' => [ |
| 1284 | + ['$or' => [['last_name' => 'Doe'], ['email' => 'Doe']]], |
| 1285 | + [], // options |
1271 | 1286 | ],
|
1272 |
| - fn(Builder $builder) => $builder->whereAny(['last_name', 'email'], 'Doe'), |
1273 |
| - ]; |
1274 |
| - |
1275 |
| - yield 'whereAny operator' => [ |
1276 |
| - [ |
1277 |
| - 'find' => [ |
1278 |
| - [ |
1279 |
| - '$or' => [ |
1280 |
| - ['last_name' => ['$not' => new Regex('^.*Doe.*$', 'i')]], |
1281 |
| - ['email' => ['$not' => new Regex('^.*Doe.*$', 'i')]], |
1282 |
| - ], |
| 1287 | + ], |
| 1288 | + fn |
| 1289 | + (Builder $builder) => $builder->whereAny(['last_name', 'email'], 'Doe'), |
| 1290 | + 'whereAny', |
| 1291 | + ]; |
| 1292 | + |
| 1293 | + yield 'whereAny operator' => [ |
| 1294 | + [ |
| 1295 | + 'find' => [ |
| 1296 | + [ |
| 1297 | + '$or' => [ |
| 1298 | + ['last_name' => ['$not' => new Regex('^.*Doe.*$', 'i')]], |
| 1299 | + ['email' => ['$not' => new Regex('^.*Doe.*$', 'i')]], |
1283 | 1300 | ],
|
1284 |
| - [], // options |
1285 | 1301 | ],
|
| 1302 | + [], // options |
1286 | 1303 | ],
|
1287 |
| - fn(Builder $builder) => $builder->whereAny(['last_name', 'email'], 'not like', '%Doe%'), |
1288 |
| - ]; |
1289 |
| - |
1290 |
| - /** @see DatabaseQueryBuilderTest::testOrWhereAny */ |
1291 |
| - yield 'orWhereAny' => [ |
1292 |
| - [ |
1293 |
| - 'find' => [ |
1294 |
| - [ |
1295 |
| - '$or' => [ |
1296 |
| - ['first_name' => 'John'], |
1297 |
| - ['$or' => [['last_name' => 'Doe'], ['email' => 'Doe']]], |
1298 |
| - ], |
| 1304 | + ], |
| 1305 | + fn |
| 1306 | + (Builder $builder) => $builder->whereAny(['last_name', 'email'], 'not like', '%Doe%'), |
| 1307 | + 'whereAny', |
| 1308 | + ]; |
| 1309 | + |
| 1310 | + /** @see DatabaseQueryBuilderTest::testOrWhereAny */ |
| 1311 | + yield 'orWhereAny' => [ |
| 1312 | + [ |
| 1313 | + 'find' => [ |
| 1314 | + [ |
| 1315 | + '$or' => [ |
| 1316 | + ['first_name' => 'John'], |
| 1317 | + ['$or' => [['last_name' => 'Doe'], ['email' => 'Doe']]], |
1299 | 1318 | ],
|
1300 |
| - [], // options |
1301 | 1319 | ],
|
| 1320 | + [], // options |
1302 | 1321 | ],
|
1303 |
| - fn(Builder $builder) => $builder |
1304 |
| - ->where('first_name', 'John') |
1305 |
| - ->orWhereAny(['last_name', 'email'], 'Doe'), |
1306 |
| - ]; |
1307 |
| - |
1308 |
| - yield 'orWhereAny operator' => [ |
1309 |
| - [ |
1310 |
| - 'find' => [ |
1311 |
| - [ |
1312 |
| - '$or' => [ |
1313 |
| - ['first_name' => new Regex('^.*John.*$', 'i')], |
1314 |
| - [ |
1315 |
| - '$or' => [ |
1316 |
| - ['last_name' => ['$not' => new Regex('^.*Doe.*$', 'i')]], |
1317 |
| - ['email' => ['$not' => new Regex('^.*Doe.*$', 'i')]], |
1318 |
| - ], |
| 1322 | + ], |
| 1323 | + fn |
| 1324 | + (Builder $builder) => $builder |
| 1325 | + ->where('first_name', 'John') |
| 1326 | + ->orWhereAny(['last_name', 'email'], 'Doe'), |
| 1327 | + 'whereAny', |
| 1328 | + ]; |
| 1329 | + |
| 1330 | + yield 'orWhereAny operator' => [ |
| 1331 | + [ |
| 1332 | + 'find' => [ |
| 1333 | + [ |
| 1334 | + '$or' => [ |
| 1335 | + ['first_name' => new Regex('^.*John.*$', 'i')], |
| 1336 | + [ |
| 1337 | + '$or' => [ |
| 1338 | + ['last_name' => ['$not' => new Regex('^.*Doe.*$', 'i')]], |
| 1339 | + ['email' => ['$not' => new Regex('^.*Doe.*$', 'i')]], |
1319 | 1340 | ],
|
1320 | 1341 | ],
|
1321 | 1342 | ],
|
1322 |
| - [], // options |
1323 | 1343 | ],
|
| 1344 | + [], // options |
1324 | 1345 | ],
|
1325 |
| - fn(Builder $builder) => $builder |
1326 |
| - ->where('first_name', 'like', '%John%') |
1327 |
| - ->orWhereAny(['last_name', 'email'], 'not like', '%Doe%'), |
1328 |
| - ]; |
1329 |
| - } |
| 1346 | + ], |
| 1347 | + fn |
| 1348 | + (Builder $builder) => $builder |
| 1349 | + ->where('first_name', 'like', '%John%') |
| 1350 | + ->orWhereAny(['last_name', 'email'], 'not like', '%Doe%'), |
| 1351 | + 'orWhereAny', |
| 1352 | + ]; |
1330 | 1353 | }
|
1331 | 1354 |
|
1332 | 1355 | #[DataProvider('provideExceptions')]
|
|
0 commit comments