mirror of
https://github.com/bitinflow/expose.git
synced 2026-03-13 13:35:54 +00:00
Apply fixes from StyleCI
This commit is contained in:
committed by
StyleCI Bot
parent
8be8aff802
commit
de9b85df49
@@ -72,7 +72,7 @@ class TunnelMessageController extends Controller
|
|||||||
{
|
{
|
||||||
$serverHost = $this->detectServerHost($request);
|
$serverHost = $this->detectServerHost($request);
|
||||||
|
|
||||||
$subdomain = Str::before($request->header('Host'), '.' . $serverHost);
|
$subdomain = Str::before($request->header('Host'), '.'.$serverHost);
|
||||||
|
|
||||||
return $subdomain === $request->header('Host') ? null : $subdomain;
|
return $subdomain === $request->header('Host') ? null : $subdomain;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ class DatabaseUserRepository implements UserRepository
|
|||||||
];
|
];
|
||||||
|
|
||||||
if ($searchQuery !== '') {
|
if ($searchQuery !== '') {
|
||||||
$query .= "WHERE name LIKE '%" . $searchQuery . "%' ";
|
$query .= "WHERE name LIKE '%".$searchQuery."%' ";
|
||||||
$bindings['search'] = $searchQuery;
|
$bindings['search'] = $searchQuery;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -104,7 +104,7 @@ class DatabaseUserRepository implements UserRepository
|
|||||||
->then(function (Result $result) use ($deferred) {
|
->then(function (Result $result) use ($deferred) {
|
||||||
$user = $result->rows[0] ?? null;
|
$user = $result->rows[0] ?? null;
|
||||||
|
|
||||||
if (!is_null($user)) {
|
if (! is_null($user)) {
|
||||||
$user = $this->getUserDetails($user);
|
$user = $this->getUserDetails($user);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -136,7 +136,7 @@ class DatabaseUserRepository implements UserRepository
|
|||||||
->then(function (Result $result) use ($deferred) {
|
->then(function (Result $result) use ($deferred) {
|
||||||
$user = $result->rows[0] ?? null;
|
$user = $result->rows[0] ?? null;
|
||||||
|
|
||||||
if (!is_null($user)) {
|
if (! is_null($user)) {
|
||||||
$user = $this->getUserDetails($user);
|
$user = $this->getUserDetails($user);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -164,7 +164,7 @@ class DatabaseUserRepository implements UserRepository
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
$this->database->query("
|
$this->database->query('
|
||||||
UPDATE users
|
UPDATE users
|
||||||
SET
|
SET
|
||||||
name = :name,
|
name = :name,
|
||||||
@@ -174,7 +174,7 @@ class DatabaseUserRepository implements UserRepository
|
|||||||
max_connections = :max_connections
|
max_connections = :max_connections
|
||||||
WHERE
|
WHERE
|
||||||
auth_token = :auth_token
|
auth_token = :auth_token
|
||||||
", $data)
|
', $data)
|
||||||
->then(function (Result $result) use ($existingUser, $deferred) {
|
->then(function (Result $result) use ($existingUser, $deferred) {
|
||||||
$this->database->query('SELECT * FROM users WHERE id = :id', ['id' => $existingUser['id']])
|
$this->database->query('SELECT * FROM users WHERE id = :id', ['id' => $existingUser['id']])
|
||||||
->then(function (Result $result) use ($deferred) {
|
->then(function (Result $result) use ($deferred) {
|
||||||
@@ -204,10 +204,10 @@ class DatabaseUserRepository implements UserRepository
|
|||||||
$deferred = new Deferred();
|
$deferred = new Deferred();
|
||||||
|
|
||||||
$authTokenString = collect($authTokens)->map(function ($token) {
|
$authTokenString = collect($authTokens)->map(function ($token) {
|
||||||
return '"' . $token . '"';
|
return '"'.$token.'"';
|
||||||
})->join(',');
|
})->join(',');
|
||||||
|
|
||||||
$this->database->query('SELECT * FROM users WHERE auth_token IN (' . $authTokenString . ')')
|
$this->database->query('SELECT * FROM users WHERE auth_token IN ('.$authTokenString.')')
|
||||||
->then(function (Result $result) use ($deferred) {
|
->then(function (Result $result) use ($deferred) {
|
||||||
$users = collect($result->rows)->map(function ($user) {
|
$users = collect($result->rows)->map(function ($user) {
|
||||||
return $this->getUserDetails($user);
|
return $this->getUserDetails($user);
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ class ApiTest extends TestCase
|
|||||||
'Content-Type' => 'application/json',
|
'Content-Type' => 'application/json',
|
||||||
], json_encode([
|
], json_encode([
|
||||||
'name' => 'Marcel',
|
'name' => 'Marcel',
|
||||||
'token' => 'my-token'
|
'token' => 'my-token',
|
||||||
])));
|
])));
|
||||||
|
|
||||||
/** @var Response $response */
|
/** @var Response $response */
|
||||||
@@ -104,7 +104,7 @@ class ApiTest extends TestCase
|
|||||||
'Content-Type' => 'application/json',
|
'Content-Type' => 'application/json',
|
||||||
], json_encode([
|
], json_encode([
|
||||||
'name' => 'Marcel',
|
'name' => 'Marcel',
|
||||||
'token' => 'my-token'
|
'token' => 'my-token',
|
||||||
])));
|
])));
|
||||||
|
|
||||||
/** @var Response $response */
|
/** @var Response $response */
|
||||||
|
|||||||
Reference in New Issue
Block a user