Skip to content

Commit

Permalink
Always prefer stricter string comparisons.
Browse files Browse the repository at this point in the history
  • Loading branch information
@lucasmichot
lucasmichot committed Oct 31, 2024
1 parent 79d5434 commit 601f1a4
Show file tree
Hide file tree
Showing 25 changed files with 55 additions and 55 deletions.
4 changes: 2 additions & 2 deletions app/Jobs/ScheduledTaskJob.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@ public function handle(): void

$this->server = $this->resource->destination->server;

if ($this->resource->type() == 'application') {
if ($this->resource->type() === 'application') {
$containers = getCurrentApplicationContainerStatus($this->server, $this->resource->id, 0);
if ($containers->count() > 0) {
$containers->each(function ($container) {
$this->containers[] = str_replace('/', '', $container['Names']);
});
}
} elseif ($this->resource->type() == 'service') {
} elseif ($this->resource->type() === 'service') {
$this->resource->applications()->get()->each(function ($application) {
if (str(data_get($application, 'status'))->contains('running')) {
$this->containers[] = data_get($application, 'name').'-'.data_get($this->resource, 'uuid');
Expand Down
2 changes: 1 addition & 1 deletion app/Livewire/Project/Application/Deployment/Show.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public function polling()
{
$this->dispatch('deploymentFinished');
$this->application_deployment_queue->refresh();
if (data_get($this->application_deployment_queue, 'status') == 'finished' || data_get($this->application_deployment_queue, 'status') == 'failed') {
if (data_get($this->application_deployment_queue, 'status') === 'finished' || data_get($this->application_deployment_queue, 'status') === 'failed') {
$this->isKeepAliveOn = false;
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/Livewire/Project/Database/BackupEdit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public function submit()
{
try {
$this->custom_validate();
if ($this->backup->databases_to_backup == '' || $this->backup->databases_to_backup === null) {
if ($this->backup->databases_to_backup === '' || $this->backup->databases_to_backup === null) {
$this->backup->databases_to_backup = null;
}
$this->backup->save();
Expand Down
10 changes: 5 additions & 5 deletions app/Livewire/Project/Database/Import.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ public function getContainers()
}

if (
$this->resource->getMorphClass() == \App\Models\StandaloneRedis::class ||
$this->resource->getMorphClass() == \App\Models\StandaloneKeydb::class ||
$this->resource->getMorphClass() == \App\Models\StandaloneDragonfly::class ||
$this->resource->getMorphClass() == \App\Models\StandaloneClickhouse::class
$this->resource->getMorphClass() === \App\Models\StandaloneRedis::class ||
$this->resource->getMorphClass() === \App\Models\StandaloneKeydb::class ||
$this->resource->getMorphClass() === \App\Models\StandaloneDragonfly::class ||
$this->resource->getMorphClass() === \App\Models\StandaloneClickhouse::class
) {
$this->unsupported = true;
}
Expand All @@ -89,7 +89,7 @@ public function getContainers()
public function runImport()
{

if ($this->filename == '') {
if ($this->filename === '') {
$this->dispatch('error', 'Please select a file to import.');

return;
Expand Down
2 changes: 1 addition & 1 deletion app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ private function get_git_source()
$this->git_host = $this->repository_url_parsed->getHost();
$this->git_repository = $this->repository_url_parsed->getSegment(1).'/'.$this->repository_url_parsed->getSegment(2);

if ($this->git_host == 'github.com') {
if ($this->git_host === 'github.com') {
$this->git_source = GithubApp::where('name', 'Public GitHub')->first();

return;
Expand Down
4 changes: 2 additions & 2 deletions app/Livewire/Project/New/PublicGitRepository.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ public function loadBranch()

return;
}
if (! $this->branchFound && $this->git_branch == 'main') {
if (! $this->branchFound && $this->git_branch === 'main') {
try {
$this->git_branch = 'master';
$this->getBranch();
Expand All @@ -197,7 +197,7 @@ private function getGitSource()
} else {
$this->git_branch = 'main';
}
if ($this->git_host == 'github.com') {
if ($this->git_host === 'github.com') {
$this->git_source = GithubApp::where('name', 'Public GitHub')->first();

return;
Expand Down
4 changes: 2 additions & 2 deletions app/Livewire/Project/Shared/ScheduledTask/Add.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ public function submit()

return;
}
if (empty($this->container) || $this->container == 'null') {
if ($this->type == 'service') {
if (empty($this->container) || $this->container === 'null') {
if ($this->type === 'service') {
$this->container = $this->subServiceName;
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/Livewire/Project/Shared/ScheduledTask/All.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ class All extends Component
public function mount()
{
$this->parameters = get_route_parameters();
if ($this->resource->type() == 'service') {
if ($this->resource->type() === 'service') {
$this->containerNames = $this->resource->applications()->pluck('name');
$this->containerNames = $this->containerNames->merge($this->resource->databases()->pluck('name'));
} elseif ($this->resource->type() == 'application') {
} elseif ($this->resource->type() === 'application') {
if ($this->resource->build_pack === 'dockercompose') {
$parsed = $this->resource->parse();
$containers = collect(data_get($parsed, 'services'))->keys();
Expand Down
2 changes: 1 addition & 1 deletion app/Livewire/Project/Shared/ScheduledTask/Show.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public function delete()
try {
$this->task->delete();

if ($this->type == 'application') {
if ($this->type === 'application') {
return redirect()->route('project.application.configuration', $this->parameters, $this->scheduledTaskName);
} else {
return redirect()->route('project.service.configuration', $this->parameters, $this->scheduledTaskName);
Expand Down
2 changes: 1 addition & 1 deletion app/Livewire/Tags/Index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public function updateDeployments($deployments)

public function tagUpdated()
{
if ($this->tag == '') {
if ($this->tag === '') {
return;
}
$sanitizedTag = htmlspecialchars($this->tag, ENT_QUOTES, 'UTF-8');
Expand Down
8 changes: 4 additions & 4 deletions app/Models/Application.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ class Application extends BaseModel
protected static function booted()
{
static::saving(function ($application) {
if ($application->fqdn == '') {
if ($application->fqdn === '') {
$application->fqdn = null;
}
$application->forceFill([
Expand Down Expand Up @@ -936,7 +936,7 @@ public function generateGitImportCommands(string $deployment_uuid, int $pull_req
$source_html_url_host = $url['host'];
$source_html_url_scheme = $url['scheme'];

if ($this->source->getMorphClass() == \App\Models\GithubApp::class) {
if ($this->source->getMorphClass() === \App\Models\GithubApp::class) {
if ($this->source->is_public) {
$fullRepoUrl = "{$this->source->html_url}/{$customRepository}";
$git_clone_command = "{$git_clone_command} {$this->source->html_url}/{$customRepository} {$baseDir}";
Expand Down Expand Up @@ -1407,7 +1407,7 @@ public function getCpuMetrics(int $mins = 5)
if (str($metrics)->contains('error')) {
$error = json_decode($metrics, true);
$error = data_get($error, 'error', 'Something is not okay, are you okay?');
if ($error == 'Unauthorized') {
if ($error === 'Unauthorized') {
$error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
}
throw new \Exception($error);
Expand All @@ -1431,7 +1431,7 @@ public function getMemoryMetrics(int $mins = 5)
if (str($metrics)->contains('error')) {
$error = json_decode($metrics, true);
$error = data_get($error, 'error', 'Something is not okay, are you okay?');
if ($error == 'Unauthorized') {
if ($error === 'Unauthorized') {
$error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
}
throw new \Exception($error);
Expand Down
4 changes: 2 additions & 2 deletions app/Models/EnvironmentVariable.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ protected function isShared(): Attribute

private function get_real_environment_variables(?string $environment_variable = null, $resource = null)
{
if ((is_null($environment_variable) && $environment_variable == '') || is_null($resource)) {
if ((is_null($environment_variable) && $environment_variable === '') || is_null($resource)) {
return null;
}
$environment_variable = trim($environment_variable);
Expand Down Expand Up @@ -202,7 +202,7 @@ private function get_environment_variables(?string $environment_variable = null)

private function set_environment_variables(?string $environment_variable = null): ?string
{
if (is_null($environment_variable) && $environment_variable == '') {
if (is_null($environment_variable) && $environment_variable === '') {
return null;
}
$environment_variable = trim($environment_variable);
Expand Down
10 changes: 5 additions & 5 deletions app/Models/LocalFileVolume.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,15 +113,15 @@ public function saveStorageOnServer()
}
$isFile = instant_remote_process(["test -f $path && echo OK || echo NOK"], $server);
$isDir = instant_remote_process(["test -d $path && echo OK || echo NOK"], $server);
if ($isFile == 'OK' && $this->is_directory) {
if ($isFile === 'OK' && $this->is_directory) {
$content = instant_remote_process(["cat $path"], $server, false);
$this->is_directory = false;
$this->content = $content;
$this->save();
FileStorageChanged::dispatch(data_get($server, 'team_id'));
throw new \Exception('The following file is a file on the server, but you are trying to mark it as a directory. Please delete the file on the server or mark it as directory.');
} elseif ($isDir == 'OK' && ! $this->is_directory) {
if ($path == '/' || $path == '.' || $path == '..' || $path == '' || str($path)->isEmpty() || is_null($path)) {
} elseif ($isDir === 'OK' && ! $this->is_directory) {
if ($path === '/' || $path === '.' || $path === '..' || $path === '' || str($path)->isEmpty() || is_null($path)) {
$this->is_directory = true;
$this->save();
throw new \Exception('The following file is a directory on the server, but you are trying to mark it as a file. <br><br>Please delete the directory on the server or mark it as directory.');
Expand All @@ -132,7 +132,7 @@ public function saveStorageOnServer()
], $server, false);
FileStorageChanged::dispatch(data_get($server, 'team_id'));
}
if ($isDir == 'NOK' && ! $this->is_directory) {
if ($isDir === 'NOK' && ! $this->is_directory) {
$chmod = data_get($this, 'chmod');
$chown = data_get($this, 'chown');
if ($content) {
Expand All @@ -148,7 +148,7 @@ public function saveStorageOnServer()
if ($chmod) {
$commands->push("chmod $chmod $path");
}
} elseif ($isDir == 'NOK' && $this->is_directory) {
} elseif ($isDir === 'NOK' && $this->is_directory) {
$commands->push("mkdir -p $path > /dev/null 2>&1 || true");
}

Expand Down
6 changes: 3 additions & 3 deletions app/Models/Server.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ public function setupDynamicProxyConfiguration()
"echo '$base64' | base64 -d | tee $file > /dev/null",
], $this);

if (config('app.env') == 'local') {
if (config('app.env') === 'local') {
// ray($yaml);
}
}
Expand Down Expand Up @@ -597,7 +597,7 @@ public function getCpuMetrics(int $mins = 5)
if (str($cpu)->contains('error')) {
$error = json_decode($cpu, true);
$error = data_get($error, 'error', 'Something is not okay, are you okay?');
if ($error == 'Unauthorized') {
if ($error === 'Unauthorized') {
$error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
}
throw new \Exception($error);
Expand All @@ -619,7 +619,7 @@ public function getMemoryMetrics(int $mins = 5)
if (str($memory)->contains('error')) {
$error = json_decode($memory, true);
$error = data_get($error, 'error', 'Something is not okay, are you okay?');
if ($error == 'Unauthorized') {
if ($error === 'Unauthorized') {
$error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
}
throw new \Exception($error);
Expand Down
4 changes: 2 additions & 2 deletions app/Models/StandaloneClickhouse.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ public function getCpuMetrics(int $mins = 5)
if (str($metrics)->contains('error')) {
$error = json_decode($metrics, true);
$error = data_get($error, 'error', 'Something is not okay, are you okay?');
if ($error == 'Unauthorized') {
if ($error === 'Unauthorized') {
$error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
}
throw new \Exception($error);
Expand All @@ -297,7 +297,7 @@ public function getMemoryMetrics(int $mins = 5)
if (str($metrics)->contains('error')) {
$error = json_decode($metrics, true);
$error = data_get($error, 'error', 'Something is not okay, are you okay?');
if ($error == 'Unauthorized') {
if ($error === 'Unauthorized') {
$error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
}
throw new \Exception($error);
Expand Down
4 changes: 2 additions & 2 deletions app/Models/StandaloneDragonfly.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ public function getCpuMetrics(int $mins = 5)
if (str($metrics)->contains('error')) {
$error = json_decode($metrics, true);
$error = data_get($error, 'error', 'Something is not okay, are you okay?');
if ($error == 'Unauthorized') {
if ($error === 'Unauthorized') {
$error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
}
throw new \Exception($error);
Expand All @@ -297,7 +297,7 @@ public function getMemoryMetrics(int $mins = 5)
if (str($metrics)->contains('error')) {
$error = json_decode($metrics, true);
$error = data_get($error, 'error', 'Something is not okay, are you okay?');
if ($error == 'Unauthorized') {
if ($error === 'Unauthorized') {
$error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
}
throw new \Exception($error);
Expand Down
4 changes: 2 additions & 2 deletions app/Models/StandaloneKeydb.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ public function getCpuMetrics(int $mins = 5)
if (str($metrics)->contains('error')) {
$error = json_decode($metrics, true);
$error = data_get($error, 'error', 'Something is not okay, are you okay?');
if ($error == 'Unauthorized') {
if ($error === 'Unauthorized') {
$error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
}
throw new \Exception($error);
Expand All @@ -297,7 +297,7 @@ public function getMemoryMetrics(int $mins = 5)
if (str($metrics)->contains('error')) {
$error = json_decode($metrics, true);
$error = data_get($error, 'error', 'Something is not okay, are you okay?');
if ($error == 'Unauthorized') {
if ($error === 'Unauthorized') {
$error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
}
throw new \Exception($error);
Expand Down
4 changes: 2 additions & 2 deletions app/Models/StandaloneMariadb.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ public function getCpuMetrics(int $mins = 5)
if (str($metrics)->contains('error')) {
$error = json_decode($metrics, true);
$error = data_get($error, 'error', 'Something is not okay, are you okay?');
if ($error == 'Unauthorized') {
if ($error === 'Unauthorized') {
$error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
}
throw new \Exception($error);
Expand All @@ -297,7 +297,7 @@ public function getMemoryMetrics(int $mins = 5)
if (str($metrics)->contains('error')) {
$error = json_decode($metrics, true);
$error = data_get($error, 'error', 'Something is not okay, are you okay?');
if ($error == 'Unauthorized') {
if ($error === 'Unauthorized') {
$error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
}
throw new \Exception($error);
Expand Down
4 changes: 2 additions & 2 deletions app/Models/StandaloneMongodb.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ public function getCpuMetrics(int $mins = 5)
if (str($metrics)->contains('error')) {
$error = json_decode($metrics, true);
$error = data_get($error, 'error', 'Something is not okay, are you okay?');
if ($error == 'Unauthorized') {
if ($error === 'Unauthorized') {
$error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
}
throw new \Exception($error);
Expand All @@ -317,7 +317,7 @@ public function getMemoryMetrics(int $mins = 5)
if (str($metrics)->contains('error')) {
$error = json_decode($metrics, true);
$error = data_get($error, 'error', 'Something is not okay, are you okay?');
if ($error == 'Unauthorized') {
if ($error === 'Unauthorized') {
$error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
}
throw new \Exception($error);
Expand Down
4 changes: 2 additions & 2 deletions app/Models/StandaloneMysql.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ public function getCpuMetrics(int $mins = 5)
if (str($metrics)->contains('error')) {
$error = json_decode($metrics, true);
$error = data_get($error, 'error', 'Something is not okay, are you okay?');
if ($error == 'Unauthorized') {
if ($error === 'Unauthorized') {
$error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
}
throw new \Exception($error);
Expand All @@ -298,7 +298,7 @@ public function getMemoryMetrics(int $mins = 5)
if (str($metrics)->contains('error')) {
$error = json_decode($metrics, true);
$error = data_get($error, 'error', 'Something is not okay, are you okay?');
if ($error == 'Unauthorized') {
if ($error === 'Unauthorized') {
$error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
}
throw new \Exception($error);
Expand Down
4 changes: 2 additions & 2 deletions app/Models/StandalonePostgresql.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ public function getCpuMetrics(int $mins = 5)
if (str($metrics)->contains('error')) {
$error = json_decode($metrics, true);
$error = data_get($error, 'error', 'Something is not okay, are you okay?');
if ($error == 'Unauthorized') {
if ($error === 'Unauthorized') {
$error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
}
throw new \Exception($error);
Expand All @@ -303,7 +303,7 @@ public function getMemoryMetrics(int $mins = 5)
if (str($metrics)->contains('error')) {
$error = json_decode($metrics, true);
$error = data_get($error, 'error', 'Something is not okay, are you okay?');
if ($error == 'Unauthorized') {
if ($error === 'Unauthorized') {
$error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
}
throw new \Exception($error);
Expand Down
Loading

0 comments on commit 601f1a4

Please sign in to comment.