diff --git a/lam/lib/tools.inc b/lam/lib/tools.inc index 9e3f15e05..6da0be0e8 100644 --- a/lam/lib/tools.inc +++ b/lam/lib/tools.inc @@ -39,7 +39,7 @@ function getTools(): array { $entry = $toolsDir->read(); // include all files in the tools directory while ($entry) { - if ((substr($entry, strlen($entry) - 4, 4) == '.inc') && is_file($toolsDirName . '/' . $entry)) { + if ((substr($entry, strlen($entry) - 4, 4) === '.inc') && is_file($toolsDirName . '/' . $entry)) { include_once($toolsDirName . '/' . $entry); } $entry = $toolsDir->read(); diff --git a/lam/lib/types.inc b/lam/lib/types.inc index 39063eed7..355dd4389 100644 --- a/lam/lib/types.inc +++ b/lam/lib/types.inc @@ -256,21 +256,21 @@ class ConfiguredType { $units = ldap_get_entries($connection, $sr); cleanLDAPResult($units); // extract Dns - $count = sizeof($units); + $count = count($units); for ($i = 0; $i < $count; $i++) { - if (in_array('container', $units[$i]['objectclass'])) { - // Active Directory fix, hide system containers - if (preg_match('/.*cn=system,dc=.+/i', $units[$i]['dn']) || preg_match('/.*CN=program data,dc=.+/i', $units[$i]['dn'])) { - continue; - } + // Active Directory fix, hide system containers + if (in_array('container', $units[$i]['objectclass']) + && (preg_match('/.*cn=system,dc=.+/i', $units[$i]['dn']) + || preg_match('/.*CN=program data,dc=.+/i', $units[$i]['dn']))) { + continue; } $ret[] = $units[$i]['dn']; } } // add root suffix if needed $found = false; - for ($i = 0; $i < sizeof($ret); $i++) { // search suffix case-insensitive - if (strtolower($this->getSuffix()) == strtolower($ret[$i])) { + for ($i = 0; $i < count($ret); $i++) { // search suffix case-insensitive + if (strtolower($this->getSuffix()) === strtolower($ret[$i])) { $found = true; break; } diff --git a/rector.php b/rector.php index d701f1146..a67773e37 100644 --- a/rector.php +++ b/rector.php @@ -2,6 +2,7 @@ use Rector\CodeQuality\Rector\Empty_\SimplifyEmptyCheckOnEmptyArrayRector; use Rector\CodeQuality\Rector\For_\ForRepeatedCountToOwnVariableRector; +use Rector\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector; use Rector\Config\RectorConfig; use Rector\Php70\Rector\StaticCall\StaticCallOnNonStaticToInstanceCallRector; use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector; @@ -36,7 +37,8 @@ return RectorConfig::configure() RestoreDefaultNullToNullableTypePropertyRector::class, ForRepeatedCountToOwnVariableRector::class, SimplifyEmptyCheckOnEmptyArrayRector::class, - DisallowedEmptyRuleFixerRector::class + DisallowedEmptyRuleFixerRector::class, + FlipTypeControlToUseExclusiveTypeRector::class ]) ->withFileExtensions([ 'php',