From d9990b09b892e101e584df7f35ba02ff6e5dd708 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Thu, 16 Apr 2020 09:25:17 +0200 Subject: [PATCH] PHP-CS-Fixer green Signed-off-by: Roeland Jago Douma --- apps/user_ldap/lib/Access.php | 28 +++++++++---------- apps/user_ldap/lib/LDAP.php | 4 +-- apps/user_ldap/lib/PagedResults/IAdapter.php | 2 +- apps/user_ldap/lib/PagedResults/Php54.php | 9 +++--- apps/user_ldap/lib/PagedResults/Php73.php | 11 ++++---- apps/user_ldap/lib/PagedResults/TLinkId.php | 6 ++-- apps/user_ldap/tests/User/UserTest.php | 6 ++-- .../Http/Client/LocalServerException.php | 1 + 8 files changed, 35 insertions(+), 32 deletions(-) diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php index aba1d7a419..1b3a97cef9 100644 --- a/apps/user_ldap/lib/Access.php +++ b/apps/user_ldap/lib/Access.php @@ -74,7 +74,7 @@ class Access extends LDAPUtility { protected $pagedSearchedSuccessful; /** - protected $cookies = []; + * protected $cookies = []; * @var AbstractMapping $userMapper */ protected $userMapper; @@ -1174,7 +1174,7 @@ class Access extends LDAPUtility { $sr = $this->invokeLDAPMethod('search', $cr, $base, $filter, $attr); // cannot use $cr anymore, might have changed in the previous call! $error = $this->ldap->errno($this->connection->getConnectionResource()); - if(!$this->ldap->isResource($sr) || $error !== 0) { + if (!$this->ldap->isResource($sr) || $error !== 0) { \OCP\Util::writeLog('user_ldap', 'Attempt for Paging? '.print_r($pagedSearchOK, true), ILogger::ERROR); return false; } @@ -1204,7 +1204,7 @@ class Access extends LDAPUtility { $cookie = null; if ($pagedSearchOK) { $cr = $this->connection->getConnectionResource(); - if($this->ldap->controlPagedResultResponse($cr, $sr, $cookie)) { + if ($this->ldap->controlPagedResultResponse($cr, $sr, $cookie)) { $this->lastCookie = $cookie; } @@ -1215,7 +1215,7 @@ class Access extends LDAPUtility { // if count is bigger, then the server does not support // paged search. Instead, he did a normal search. We set a // flag here, so the callee knows how to deal with it. - if($foundItems <= $limit) { + if ($foundItems <= $limit) { $this->pagedSearchedSuccessful = true; } } else { @@ -1261,8 +1261,8 @@ class Access extends LDAPUtility { 'filter' => $filter ]); - if(!is_null($attr) && !is_array($attr)) { - $attr = array(mb_strtolower($attr, 'UTF-8')); + if (!is_null($attr) && !is_array($attr)) { + $attr = [mb_strtolower($attr, 'UTF-8')]; } $limitPerPage = (int)$this->connection->ldapPagingSize; @@ -1274,10 +1274,10 @@ class Access extends LDAPUtility { $count = null; $this->connection->getConnectionResource(); - foreach($bases as $base) { + foreach ($bases as $base) { do { $search = $this->executeSearch($filter, $base, $attr, $limitPerPage, $offset); - if ($search === false) { + if ($search === false) { return $counter > 0 ? $counter : false; } list($sr, $pagedSearchOK) = $search; @@ -1295,7 +1295,7 @@ class Access extends LDAPUtility { * Continue now depends on $hasMorePages value */ $continue = $pagedSearchOK && $hasMorePages; - } while ($continue && (is_null($limit) || $limit <= 0 || $limit > $counter)); + } while ($continue && (is_null($limit) || $limit <= 0 || $limit > $counter)); } return $counter; @@ -1328,7 +1328,7 @@ class Access extends LDAPUtility { $limitPerPage = $limit; } - if(!is_null($attr) && !is_array($attr)) { + if (!is_null($attr) && !is_array($attr)) { $attr = [mb_strtolower($attr, 'UTF-8')]; } @@ -1671,7 +1671,7 @@ class Access extends LDAPUtility { break; } } - if(!isset($hasFound) || !$hasFound) { + if (!isset($hasFound) || !$hasFound) { throw new \Exception('Cannot determine UUID attribute'); } } else { @@ -1962,7 +1962,7 @@ class Access extends LDAPUtility { * @throws ServerNotAvailableException */ private function abandonPagedSearch() { - if($this->lastCookie === '') { + if ($this->lastCookie === '') { return; } $cr = $this->connection->getConnectionResource(); @@ -2033,14 +2033,14 @@ class Access extends LDAPUtility { ] ); //get the cookie from the search for the previous search, required by LDAP - if(empty($this->lastCookie) && $this->lastCookie !== "0" && ($offset > 0)) { + if (empty($this->lastCookie) && $this->lastCookie !== "0" && ($offset > 0)) { // no cookie known from a potential previous search. We need // to start from 0 to come to the desired page. cookie value // of '0' is valid, because 389ds $reOffset = ($offset - $limit) < 0 ? 0 : $offset - $limit; $this->search($filter, $base, $attr, $limit, $reOffset, true); } - if($this->lastCookie !== '' && $offset === 0) { + if ($this->lastCookie !== '' && $offset === 0) { //since offset = 0, this is a new search. We abandon other searches that might be ongoing. $this->abandonPagedSearch(); } diff --git a/apps/user_ldap/lib/LDAP.php b/apps/user_ldap/lib/LDAP.php index bc91fb0ded..e53dc08b76 100644 --- a/apps/user_ldap/lib/LDAP.php +++ b/apps/user_ldap/lib/LDAP.php @@ -45,7 +45,7 @@ class LDAP implements ILDAPWrapper { protected $pagedResultsAdapter; public function __construct() { - if(version_compare(PHP_VERSION, '7.3', '<') === true) { + if (version_compare(PHP_VERSION, '7.3', '<') === true) { $this->pagedResultsAdapter = new Php54(); } else { $this->pagedResultsAdapter = new Php73(); @@ -103,7 +103,7 @@ class LDAP implements ILDAPWrapper { public function controlPagedResult($link, $pageSize, $isCritical) { $fn = $this->pagedResultsAdapter->getRequestCallFunc(); $this->pagedResultsAdapter->setRequestParameters($link, $pageSize, $isCritical); - if($fn === null) { + if ($fn === null) { return true; } diff --git a/apps/user_ldap/lib/PagedResults/IAdapter.php b/apps/user_ldap/lib/PagedResults/IAdapter.php index 54f165381b..95034a1e39 100644 --- a/apps/user_ldap/lib/PagedResults/IAdapter.php +++ b/apps/user_ldap/lib/PagedResults/IAdapter.php @@ -1,4 +1,5 @@ @@ -126,5 +127,4 @@ interface IAdapter { * @return string */ public function getCookie($link): string; - } diff --git a/apps/user_ldap/lib/PagedResults/Php54.php b/apps/user_ldap/lib/PagedResults/Php54.php index cecaff99b3..7880229f51 100644 --- a/apps/user_ldap/lib/PagedResults/Php54.php +++ b/apps/user_ldap/lib/PagedResults/Php54.php @@ -1,4 +1,5 @@ @@ -48,7 +49,7 @@ class Php54 implements IAdapter { public function getResponseCallArgs(array $originalArgs): array { $linkId = $this->getLinkId($originalArgs[0]); - if(!isset($this->linkData[$linkId])) { + if (!isset($this->linkData[$linkId])) { throw new \LogicException('There should be a request before the response'); } $this->linkData[$linkId]['responseArgs'] = &$originalArgs; @@ -68,7 +69,7 @@ class Php54 implements IAdapter { public function setRequestParameters($link, int $pageSize, bool $isCritical): void { $linkId = $this->getLinkId($link); - if($pageSize === 0 || !isset($this->linkData[$linkId]['cookie'])) { + if ($pageSize === 0 || !isset($this->linkData[$linkId]['cookie'])) { // abandons a previous paged search $this->linkData[$linkId]['cookie'] = ''; } @@ -100,7 +101,7 @@ class Php54 implements IAdapter { int $limit ): void { $linkId = $this->getLinkId($link); - if(!isset($this->linkData[$linkId])) { + if (!isset($this->linkData[$linkId])) { $this->linkData[$linkId] = []; } $this->linkData[$linkId]['searchArgs'] = func_get_args(); @@ -113,7 +114,7 @@ class Php54 implements IAdapter { public function setReadArgs($link, string $baseDN, string $filter, array $attr): void { $linkId = $this->getLinkId($link); - if(!isset($this->linkData[$linkId])) { + if (!isset($this->linkData[$linkId])) { $this->linkData[$linkId] = []; } $this->linkData[$linkId]['readArgs'] = func_get_args(); diff --git a/apps/user_ldap/lib/PagedResults/Php73.php b/apps/user_ldap/lib/PagedResults/Php73.php index a4b7455e53..f431365ff1 100644 --- a/apps/user_ldap/lib/PagedResults/Php73.php +++ b/apps/user_ldap/lib/PagedResults/Php73.php @@ -1,4 +1,5 @@ @@ -50,7 +51,7 @@ class Php73 implements IAdapter { $link = array_shift($originalArgs); $linkId = $this->getLinkId($link); - if(!isset($this->linkData[$linkId])) { + if (!isset($this->linkData[$linkId])) { $this->linkData[$linkId] = []; } @@ -85,7 +86,7 @@ class Php73 implements IAdapter { public function setRequestParameters($link, int $pageSize, bool $isCritical): void { $linkId = $this->getLinkId($link); - if(!isset($this->linkData[$linkId])) { + if (!isset($this->linkData[$linkId])) { $this->linkData[$linkId] = []; } $this->linkData[$linkId]['requestArgs'] = []; @@ -112,7 +113,7 @@ class Php73 implements IAdapter { int $limit ): void { $linkId = $this->getLinkId($link); - if(!isset($this->linkData[$linkId])) { + if (!isset($this->linkData[$linkId])) { $this->linkData[$linkId] = []; } @@ -127,7 +128,7 @@ class Php73 implements IAdapter { public function setReadArgs($link, string $baseDN, string $filter, array $attr): void { $linkId = $this->getLinkId($link); - if(!isset($this->linkData[$linkId])) { + if (!isset($this->linkData[$linkId])) { $this->linkData[$linkId] = []; } @@ -143,7 +144,7 @@ class Php73 implements IAdapter { } protected function preparePagesResultsArgs(int $linkId, string $methodKey): void { - if(!isset($this->linkData[$linkId]['requestArgs'])) { + if (!isset($this->linkData[$linkId]['requestArgs'])) { return; } diff --git a/apps/user_ldap/lib/PagedResults/TLinkId.php b/apps/user_ldap/lib/PagedResults/TLinkId.php index 3128307ad5..410838a4ae 100644 --- a/apps/user_ldap/lib/PagedResults/TLinkId.php +++ b/apps/user_ldap/lib/PagedResults/TLinkId.php @@ -1,4 +1,5 @@ @@ -24,12 +25,11 @@ declare(strict_types=1); namespace OCA\User_LDAP\PagedResults; - trait TLinkId { public function getLinkId($link) { - if(is_resource($link)) { + if (is_resource($link)) { return (int)$link; - } else if(is_array($link) && isset($link[0]) && is_resource($link[0])) { + } elseif (is_array($link) && isset($link[0]) && is_resource($link[0])) { return (int)$link[0]; } throw new \RuntimeException('No resource provided'); diff --git a/apps/user_ldap/tests/User/UserTest.php b/apps/user_ldap/tests/User/UserTest.php index afefaf04c7..373f5cc932 100644 --- a/apps/user_ldap/tests/User/UserTest.php +++ b/apps/user_ldap/tests/User/UserTest.php @@ -1197,7 +1197,7 @@ class UserTest extends \Test\TestCase { $this->access->expects($this->any()) ->method('search') ->willReturnCallback(function ($filter, $base) { - if($base === $this->dn) { + if ($base === $this->dn) { return [ [ 'pwdchangedtime' => [(new \DateTime())->sub(new \DateInterval('P28D'))->format('Ymdhis').'Z'], @@ -1205,7 +1205,7 @@ class UserTest extends \Test\TestCase { ], ]; } - if($base === 'cn=default,ou=policies,dc=foo,dc=bar') { + if ($base === 'cn=default,ou=policies,dc=foo,dc=bar') { return [ [ 'pwdmaxage' => ['2592000'], @@ -1260,7 +1260,7 @@ class UserTest extends \Test\TestCase { $this->access->expects($this->any()) ->method('search') ->willReturnCallback(function ($filter, $base) { - if($base === $this->dn) { + if ($base === $this->dn) { return [ [ 'pwdpolicysubentry' => ['cn=custom,ou=policies,dc=foo,dc=bar'], diff --git a/lib/public/Http/Client/LocalServerException.php b/lib/public/Http/Client/LocalServerException.php index 22e533bf19..9fcf50a049 100644 --- a/lib/public/Http/Client/LocalServerException.php +++ b/lib/public/Http/Client/LocalServerException.php @@ -1,4 +1,5 @@