Skip to content

Commit cce98c8

Browse files
AdambeanAdambean
committed
Swapped array_key_exists() for isset() when needing to know about a null value isn't important, as isset() is a faster.
1 parent 8562949 commit cce98c8

File tree

1 file changed

+33
-33
lines changed

1 file changed

+33
-33
lines changed

‎src/LdapSyncCommand.php

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -243,10 +243,10 @@ private function validateConfig(array &$config, array &$problems = null): bool
243243
};
244244

245245
// << LDAP
246-
if (!array_key_exists("ldap", $config) || !is_array($config["ldap"])) {
246+
if (!isset($config["ldap"]) || !is_array($config["ldap"])) {
247247
$addProblem("error", "ldap missing.");
248248
} else {
249-
if (!array_key_exists("debug", $config["ldap"])) {
249+
if (!isset($config["ldap"]["debug"])) {
250250
$addProblem("warning", "ldap->debug missing. (Assuming false.)");
251251
$config["ldap"]["debug"] = false;
252252
} else if (null === $config["ldap"]["debug"]) {
@@ -257,16 +257,16 @@ private function validateConfig(array &$config, array &$problems = null): bool
257257
}
258258

259259
// << LDAP server
260-
if (!array_key_exists("server", $config["ldap"]) || !is_array($config["ldap"]["server"])) {
260+
if (!isset($config["ldap"]["server"]) || !is_array($config["ldap"]["server"])) {
261261
$addProblem("error", "ldap->server missing.");
262262
} else {
263-
if (!array_key_exists("host", $config["ldap"]["server"])) {
263+
if (!isset($config["ldap"]["server"]["host"])) {
264264
$addProblem("error", "ldap->server->host missing.");
265265
} else if (!$config["ldap"]["server"]["host"] = trim($config["ldap"]["server"]["host"])) {
266266
$addProblem("error", "ldap->server->host not specified.");
267267
}
268268

269-
if (!array_key_exists("port", $config["ldap"]["server"])) {
269+
if (!isset($config["ldap"]["server"]["port"])) {
270270
$addProblem("warning", "ldap->server->port missing. (It will be determined by the encryption setting.)");
271271
$config["ldap"]["server"]["port"] = null;
272272
} else if (!$config["ldap"]["server"]["port"] = intval($config["ldap"]["server"]["port"])) {
@@ -276,7 +276,7 @@ private function validateConfig(array &$config, array &$problems = null): bool
276276
$addProblem("error", "ldap->server->port out of range. (Must be 1-65535.)");
277277
}
278278

279-
if (!array_key_exists("version", $config["ldap"]["server"])) {
279+
if (!isset($config["ldap"]["server"]["version"])) {
280280
$addProblem("warning", "ldap->server->version missing. (Assuming 3.)");
281281
$config["ldap"]["server"]["version"] = 3;
282282
} else if (!$config["ldap"]["server"]["version"] = intval($config["ldap"]["server"]["version"])) {
@@ -286,7 +286,7 @@ private function validateConfig(array &$config, array &$problems = null): bool
286286
$addProblem("error", "ldap->server->version out of range. (Must be 1-3.)");
287287
}
288288

289-
if (!array_key_exists("encryption", $config["ldap"]["server"])) {
289+
if (!isset($config["ldap"]["server"]["encryption"])) {
290290
$addProblem("warning", "ldap->server->encryption missing. (Assuming none.)");
291291
$config["ldap"]["server"]["encryption"] = "none";
292292
} else if (!$config["ldap"]["server"]["encryption"] = trim($config["ldap"]["server"]["encryption"])) {
@@ -312,14 +312,14 @@ private function validateConfig(array &$config, array &$problems = null): bool
312312
}
313313
}
314314

315-
if (!array_key_exists("bindDn", $config["ldap"]["server"])) {
315+
if (!isset($config["ldap"]["server"]["bindDn"])) {
316316
$addProblem("warning", "ldap->server->bindDn missing. (Assuming anonymous access.)");
317317
$config["ldap"]["server"]["bindDn"] = null;
318318
} else if (!$config["ldap"]["server"]["bindDn"] = trim($config["ldap"]["server"]["bindDn"])) {
319319
$addProblem("warning", "ldap->server->bindDn not specified. (Assuming anonymous access.)");
320320
$config["ldap"]["server"]["bindDn"] = null;
321321
} else {
322-
if (!array_key_exists("bindPassword", $config["ldap"]["server"])) {
322+
if (!isset($config["ldap"]["server"]["bindPassword"])) {
323323
$addProblem("warning", "ldap->server->bindPassword missing. (Must be specified for non-anonymous access.)");
324324
} else if (!strlen($config["ldap"]["server"]["bindPassword"])) {
325325
$addProblem("warning", "ldap->server->bindPassword not specified. (Must be specified for non-anonymous access.)");
@@ -329,66 +329,66 @@ private function validateConfig(array &$config, array &$problems = null): bool
329329
// >> LDAP server
330330

331331
// << LDAP queries
332-
if (!array_key_exists("queries", $config["ldap"])) {
332+
if (!isset($config["ldap"]["queries"])) {
333333
$addProblem("error", "ldap->queries missing.");
334334
} else {
335-
if (!array_key_exists("baseDn", $config["ldap"]["queries"])) {
335+
if (!isset($config["ldap"]["queries"]["baseDn"])) {
336336
$addProblem("error", "ldap->queries->baseDn missing.");
337337
} else if (!$config["ldap"]["queries"]["baseDn"] = trim($config["ldap"]["queries"]["baseDn"])) {
338338
$addProblem("error", "ldap->queries->baseDn not specified.");
339339
}
340340

341-
if (!array_key_exists("userDn", $config["ldap"]["queries"])) {
341+
if (!isset($config["ldap"]["queries"]["userDn"])) {
342342
$addProblem("error", "ldap->queries->userDn missing.");
343343
} else if (!$config["ldap"]["queries"]["userDn"] = trim($config["ldap"]["queries"]["userDn"])) {
344344
// $addProblem("warning", "ldap->queries->userDn not specified.");
345345
// This is OK: Users will be looked for from the directory root.
346346
}
347347

348-
if (!array_key_exists("userFilter", $config["ldap"]["queries"])) {
348+
if (!isset($config["ldap"]["queries"]["userFilter"])) {
349349
$addProblem("error", "ldap->queries->userFilter missing.");
350350
} else if (!$config["ldap"]["queries"]["userFilter"] = trim($config["ldap"]["queries"]["userFilter"])) {
351351
$addProblem("error", "ldap->queries->userFilter not specified.");
352352
}
353353

354-
if (!array_key_exists("userUniqueAttribute", $config["ldap"]["queries"])) {
354+
if (!isset($config["ldap"]["queries"]["userUniqueAttribute"])) {
355355
$addProblem("error", "ldap->queries->userUniqueAttribute missing.");
356356
} else if (!$config["ldap"]["queries"]["userUniqueAttribute"] = trim($config["ldap"]["queries"]["userUniqueAttribute"])) {
357357
$addProblem("error", "ldap->queries->userUniqueAttribute not specified.");
358358
}
359359

360-
if (!array_key_exists("userNameAttribute", $config["ldap"]["queries"])) {
360+
if (!isset($config["ldap"]["queries"]["userNameAttribute"])) {
361361
$addProblem("error", "ldap->queries->userNameAttribute missing.");
362362
} else if (!$config["ldap"]["queries"]["userNameAttribute"] = trim($config["ldap"]["queries"]["userNameAttribute"])) {
363363
$addProblem("error", "ldap->queries->userNameAttribute not specified.");
364364
}
365365

366-
if (!array_key_exists("userEmailAttribute", $config["ldap"]["queries"])) {
366+
if (!isset($config["ldap"]["queries"]["userEmailAttribute"])) {
367367
$addProblem("error", "ldap->queries->userEmailAttribute missing.");
368368
} else if (!$config["ldap"]["queries"]["userEmailAttribute"] = trim($config["ldap"]["queries"]["userEmailAttribute"])) {
369369
$addProblem("error", "ldap->queries->userEmailAttribute not specified.");
370370
}
371371

372-
if (!array_key_exists("groupDn", $config["ldap"]["queries"])) {
372+
if (!isset($config["ldap"]["queries"]["groupDn"])) {
373373
$addProblem("error", "ldap->queries->groupDn missing.");
374374
} else if (!$config["ldap"]["queries"]["groupDn"] = trim($config["ldap"]["queries"]["groupDn"])) {
375375
// $addProblem("error", "ldap->queries->groupDn not specified.");
376376
// This is OK: Groups will be looked for from the directory root.
377377
}
378378

379-
if (!array_key_exists("groupFilter", $config["ldap"]["queries"])) {
379+
if (!isset($config["ldap"]["queries"]["groupFilter"])) {
380380
$addProblem("error", "ldap->queries->groupFilter missing.");
381381
} else if (!$config["ldap"]["queries"]["groupFilter"] = trim($config["ldap"]["queries"]["groupFilter"])) {
382382
$addProblem("error", "ldap->queries->groupFilter not specified.");
383383
}
384384

385-
if (!array_key_exists("groupUniqueAttribute", $config["ldap"]["queries"])) {
385+
if (!isset($config["ldap"]["queries"]["groupUniqueAttribute"])) {
386386
$addProblem("error", "ldap->queries->groupUniqueAttribute missing.");
387387
} else if (!$config["ldap"]["queries"]["groupUniqueAttribute"] = trim($config["ldap"]["queries"]["groupUniqueAttribute"])) {
388388
$addProblem("error", "ldap->queries->groupUniqueAttribute not specified.");
389389
}
390390

391-
if (!array_key_exists("groupMemberAttribute", $config["ldap"]["queries"])) {
391+
if (!isset($config["ldap"]["queries"]["groupMemberAttribute"])) {
392392
$addProblem("error", "ldap->queries->groupMemberAttribute missing.");
393393
} else if (!$config["ldap"]["queries"]["groupMemberAttribute"] = trim($config["ldap"]["queries"]["groupMemberAttribute"])) {
394394
$addProblem("error", "ldap->queries->groupMemberAttribute not specified.");
@@ -399,10 +399,10 @@ private function validateConfig(array &$config, array &$problems = null): bool
399399
// >> LDAP
400400

401401
// << Gitlab
402-
if (!array_key_exists("gitlab", $config) || !is_array($config["gitlab"])) {
402+
if (!isset($config["gitlab"]) || !is_array($config["gitlab"])) {
403403
$addProblem("error", "gitlab missing.");
404404
} else {
405-
if (!array_key_exists("debug", $config["gitlab"])) {
405+
if (!isset($config["gitlab"]["debug"])) {
406406
$addProblem("warning", "gitlab->debug missing. (Assuming false.)");
407407
$config["gitlab"]["debug"] = false;
408408
} else if (null === $config["gitlab"]["debug"]) {
@@ -413,10 +413,10 @@ private function validateConfig(array &$config, array &$problems = null): bool
413413
}
414414

415415
// << Gitlab options
416-
if (!array_key_exists("options", $config["gitlab"]) || !is_array($config["gitlab"]["options"])) {
416+
if (!isset($config["gitlab"]["options"]) || !is_array($config["gitlab"]["options"])) {
417417
$addProblem("error", "gitlab->options missing.");
418418
} else {
419-
if (!array_key_exists("userNamesToIgnore", $config["gitlab"]["options"])) {
419+
if (!isset($config["gitlab"]["options"]["userNamesToIgnore"])) {
420420
$addProblem("warning", "gitlab->options->userNamesToIgnore missing. (Assuming none.)");
421421
$config["gitlab"]["options"]["userNamesToIgnore"] = [];
422422
} else if (null === $config["gitlab"]["options"]["userNamesToIgnore"]) {
@@ -438,7 +438,7 @@ private function validateConfig(array &$config, array &$problems = null): bool
438438
}
439439
}
440440

441-
if (!array_key_exists("groupNamesToIgnore", $config["gitlab"]["options"])) {
441+
if (!isset($config["gitlab"]["options"]["groupNamesToIgnore"])) {
442442
$addProblem("warning", "gitlab->options->groupNamesToIgnore missing. (Assuming none.)");
443443
$config["gitlab"]["options"]["groupNamesToIgnore"] = [];
444444
} else if (null === $config["gitlab"]["options"]["groupNamesToIgnore"]) {
@@ -460,7 +460,7 @@ private function validateConfig(array &$config, array &$problems = null): bool
460460
}
461461
}
462462

463-
if (!array_key_exists("createEmptyGroups", $config["gitlab"]["options"])) {
463+
if (!isset($config["gitlab"]["options"]["createEmptyGroups"])) {
464464
$addProblem("warning", "gitlab->options->createEmptyGroups missing. (Assuming false.)");
465465
$config["gitlab"]["options"]["createEmptyGroups"] = false;
466466
} else if (null === $config["gitlab"]["options"]["createEmptyGroups"]) {
@@ -470,7 +470,7 @@ private function validateConfig(array &$config, array &$problems = null): bool
470470
$addProblem("error", "gitlab->options->createEmptyGroups is not a boolean.");
471471
}
472472

473-
if (!array_key_exists("deleteExtraGroups", $config["gitlab"]["options"])) {
473+
if (!isset($config["gitlab"]["options"]["deleteExtraGroups"])) {
474474
$addProblem("warning", "gitlab->options->deleteExtraGroups missing. (Assuming false.)");
475475
$config["gitlab"]["options"]["deleteExtraGroups"] = false;
476476
} else if (null === $config["gitlab"]["options"]["deleteExtraGroups"]) {
@@ -480,7 +480,7 @@ private function validateConfig(array &$config, array &$problems = null): bool
480480
$addProblem("error", "gitlab->options->deleteExtraGroups is not a boolean.");
481481
}
482482

483-
if (!array_key_exists("newMemberAccessLevel", $config["gitlab"]["options"])) {
483+
if (!isset($config["gitlab"]["options"]["newMemberAccessLevel"])) {
484484
$addProblem("warning", "gitlab->options->newMemberAccessLevel missing. (Assuming 30.)");
485485
$config["gitlab"]["options"]["newMemberAccessLevel"] = 30;
486486
} else if (null === $config["gitlab"]["options"]["newMemberAccessLevel"]) {
@@ -490,7 +490,7 @@ private function validateConfig(array &$config, array &$problems = null): bool
490490
$addProblem("error", "gitlab->options->newMemberAccessLevel is not an integer.");
491491
}
492492

493-
if (!array_key_exists("groupNamesOfAdministrators", $config["gitlab"]["options"])) {
493+
if (!isset($config["gitlab"]["options"]["groupNamesOfAdministrators"])) {
494494
// $addProblem("warning", "gitlab->options->groupNamesOfAdministrators missing. (Assuming none.)");
495495
$config["gitlab"]["options"]["groupNamesOfAdministrators"] = [];
496496
} else if (null === $config["gitlab"]["options"]["groupNamesOfAdministrators"]) {
@@ -512,7 +512,7 @@ private function validateConfig(array &$config, array &$problems = null): bool
512512
}
513513
}
514514

515-
if (!array_key_exists("groupNamesOfExternal", $config["gitlab"]["options"])) {
515+
if (!isset($config["gitlab"]["options"]["groupNamesOfExternal"])) {
516516
$addProblem("warning", "gitlab->options->groupNamesOfExternal missing. (Assuming none.)");
517517
$config["gitlab"]["options"]["groupNamesOfExternal"] = [];
518518
} else if (null === $config["gitlab"]["options"]["groupNamesOfExternal"]) {
@@ -537,17 +537,17 @@ private function validateConfig(array &$config, array &$problems = null): bool
537537
// >> Gitlab options
538538

539539
// << Gitlab instances
540-
if (!array_key_exists("instances", $config["gitlab"]) || !is_array($config["gitlab"]["instances"])) {
540+
if (!isset($config["gitlab"]["instances"]) || !is_array($config["gitlab"]["instances"])) {
541541
$addProblem("error", "gitlab->instances missing.");
542542
} else {
543543
foreach (array_keys($config["gitlab"]["instances"]) as $instance) {
544-
if (!array_key_exists("url", $config["gitlab"]["instances"][$instance])) {
544+
if (!isset($config["gitlab"]["instances"][$instance]["url"])) {
545545
$addProblem("error", sprintf("gitlab->instances->%s->url missing.", $instance));
546546
} else if (!$config["gitlab"]["instances"][$instance]["url"] = trim($config["gitlab"]["instances"][$instance]["url"])) {
547547
$addProblem("error", sprintf("gitlab->instances->%s->url not specified.", $instance));
548548
}
549549

550-
if (!array_key_exists("token", $config["gitlab"]["instances"][$instance])) {
550+
if (!isset($config["gitlab"]["instances"][$instance]["token"])) {
551551
$addProblem("error", sprintf("gitlab->instances->%s->token missing.", $instance));
552552
} else if (!$config["gitlab"]["instances"][$instance]["token"] = trim($config["gitlab"]["instances"][$instance]["token"])) {
553553
$addProblem("error", sprintf("gitlab->instances->%s->token not specified.", $instance));

0 commit comments

Comments
 (0)