Skip to content

Commit 6720c15

Browse files
committed
[CODESTYLE] Autoreformat code and import Exception
1 parent 0ef4f2e commit 6720c15

File tree

3 files changed

+29
-18
lines changed

3 files changed

+29
-18
lines changed

Classes/SecurityService.php

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public function processDatamap_beforeStart(DataHandler $dataHandler)
6161

6262
/**
6363
* @param string $token
64+
*
6465
* @return bool
6566
*/
6667
public function isValid($token)
@@ -74,9 +75,11 @@ public function isValid($token)
7475
return (bool)$queryBuilder
7576
->count('*')
7677
->from('tx_t3amserver_client')
77-
->where($queryBuilder
78-
->expr()
79-
->eq('token', $queryBuilder->createNamedParameter($token)))
78+
->where(
79+
$queryBuilder
80+
->expr()
81+
->eq('token', $queryBuilder->createNamedParameter($token))
82+
)
8083
->execute()
8184
->fetchColumn();
8285
}
@@ -86,26 +89,26 @@ public function isValid($token)
8689
*/
8790
public function createEncryptionKey()
8891
{
89-
$config = array(
92+
$config = [
9093
'digest_alg' => 'sha512',
9194
'private_key_bits' => 1024,
9295
'private_key_type' => OPENSSL_KEYTYPE_RSA,
93-
);
96+
];
9497

9598
$res = openssl_pkey_new($config);
9699
openssl_pkey_export($res, $privateKey);
97100
$pubKey = openssl_pkey_get_details($res);
98101

99102
$this->getKeysQueryBuilder()
100-
->insert('tx_t3amserver_keys')
101-
->values(['key_value' => base64_encode($privateKey)])
102-
->execute();
103+
->insert('tx_t3amserver_keys')
104+
->values(['key_value' => base64_encode($privateKey)])
105+
->execute();
103106

104107
return [
105108
'pubKey' => base64_encode($pubKey['key']),
106109
'encryptionId' => $this->connectionPool
107110
->getConnectionForTable('tx_t3amserver_keys')
108-
->lastInsertId()
111+
->lastInsertId(),
109112
];
110113
}
111114

@@ -149,8 +152,8 @@ public function authUser($user, $password, $encryptionId)
149152
$userRow = GeneralUtility::makeInstance(UserRepository::class)->getUser($user);
150153

151154
return GeneralUtility::makeInstance(PasswordHashFactory::class)
152-
->get($userRow['password'], 'BE')
153-
->checkPassword($decryptedPassword, $userRow['password']);
155+
->get($userRow['password'], 'BE')
156+
->checkPassword($decryptedPassword, $userRow['password']);
154157
}
155158

156159
/**

Classes/Server.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* GNU General Public License for more details.
1616
*/
1717

18+
use Exception;
1819
use ReflectionException;
1920
use ReflectionMethod;
2021
use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -85,7 +86,7 @@ protected function dispatch($token, $route)
8586
try {
8687
$arguments = $this->mapParametersToArguments($class, $action);
8788
$result = call_user_func_array([GeneralUtility::makeInstance($class), $action], $arguments);
88-
} catch (\Exception $exception) {
89+
} catch (Exception $exception) {
8990
throw new ServerException('Exception: ' . $exception->getMessage(), 1496395387, $exception);
9091
}
9192

Classes/UserRepository.php

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ public function getUser($user)
128128
/**
129129
* @param $queryBuilder QueryBuilder
130130
* @param $userName
131+
*
131132
* @return String
132133
*/
133134
protected function getWhereForUserName($queryBuilder, $userName)
@@ -160,26 +161,31 @@ public function getUserImage($user)
160161
'sys_file_reference',
161162
$queryBuilder
162163
->expr()
163-
->eq('sys_file_reference.uid_local', $queryBuilder->quoteIdentifier('sys_file.uid')))
164+
->eq('sys_file_reference.uid_local', $queryBuilder->quoteIdentifier('sys_file.uid'))
165+
)
164166
->rightJoin(
165167
'sys_file',
166168
'be_users',
167169
'be_users',
168170
$queryBuilder
169171
->expr()
170-
->eq('be_users.uid', $queryBuilder->quoteIdentifier('sys_file_reference.uid_foreign')))
172+
->eq('be_users.uid', $queryBuilder->quoteIdentifier('sys_file_reference.uid_foreign'))
173+
)
171174
->where(
172175
$queryBuilder
173176
->expr()
174-
->eq('be_users.username', $queryBuilder->createNamedParameter($user)))
177+
->eq('be_users.username', $queryBuilder->createNamedParameter($user))
178+
)
175179
->andWhere(
176180
$queryBuilder
177181
->expr()
178-
->eq('sys_file_reference.tablenames', $queryBuilder->createNamedParameter('be_users')))
182+
->eq('sys_file_reference.tablenames', $queryBuilder->createNamedParameter('be_users'))
183+
)
179184
->andWhere(
180185
$queryBuilder
181186
->expr()
182-
->eq('sys_file_reference.fieldname', $queryBuilder->createNamedParameter('avatar')))
187+
->eq('sys_file_reference.fieldname', $queryBuilder->createNamedParameter('avatar'))
188+
)
183189
->execute()
184190
->fetch();
185191

@@ -203,7 +209,8 @@ public function getUserImage($user)
203209
/**
204210
* @return QueryBuilder
205211
*/
206-
private function getBeUserQueryBuilder() {
212+
private function getBeUserQueryBuilder()
213+
{
207214
return $this->connectionPool->getQueryBuilderForTable('be_users');
208215
}
209216
}

0 commit comments

Comments
 (0)