From 0ba40fece8f8b610d8923fb689dc566155cfd8c3 Mon Sep 17 00:00:00 2001 From: LaravelFreelancerNL Date: Tue, 17 Sep 2024 22:13:51 +0000 Subject: [PATCH] Fix styling --- .../2019_11_15_000000_create_characters_table.php | 2 +- .../2019_11_15_000000_create_children_edge_table.php | 2 +- .../2019_11_15_000000_create_houses_table.php | 2 +- .../2019_11_15_000000_create_locations_table.php | 2 +- .../2019_11_15_000000_create_taggables_table.php | 2 +- .../2019_11_15_000000_create_tags_table.php | 2 +- .../2021_11_22_145621_create_house_view.php | 2 +- ...4_01_04_145621_create_house_search_alias_view.php | 2 +- .../2024_08_05_145621_create_events_table.php | 2 +- src/Connection.php | 4 ++-- src/Eloquent/Casts/AsArrayObject.php | 2 +- src/Providers/MigrationServiceProvider.php | 2 +- src/Query/Concerns/BuildsGroups.php | 2 +- src/Query/Concerns/BuildsSearches.php | 2 +- src/Query/Concerns/BuildsUpdates.php | 6 +++--- src/Query/Concerns/BuildsWheres.php | 2 +- src/Query/Concerns/CompilesColumns.php | 2 +- src/Query/Concerns/CompilesDataManipulations.php | 10 +++++----- src/Query/Concerns/CompilesGroups.php | 2 +- src/Query/Concerns/ConvertsIdToKey.php | 2 +- src/Query/Concerns/HandlesAqlGrammar.php | 12 ++++++------ src/Query/Grammar.php | 2 +- src/Testing/DatabaseMigrations.php | 2 +- src/Testing/DatabaseTruncation.php | 2 +- src/Testing/RefreshDatabase.php | 2 +- src/helpers.php | 2 +- tests/Console/ModelMakeCommandTest.php | 4 ++-- tests/Migrations/MigrationRepositoryTest.php | 4 ++-- tests/Query/DataRetrievalTest.php | 2 +- tests/Query/DebugTest.php | 4 ++-- tests/Schema/SchemaBuilderTest.php | 2 +- tests/Schema/TableTest.php | 2 +- tests/TestCase.php | 2 +- 33 files changed, 48 insertions(+), 48 deletions(-) diff --git a/TestSetup/Database/Migrations/2019_11_15_000000_create_characters_table.php b/TestSetup/Database/Migrations/2019_11_15_000000_create_characters_table.php index 986926f..64dd563 100644 --- a/TestSetup/Database/Migrations/2019_11_15_000000_create_characters_table.php +++ b/TestSetup/Database/Migrations/2019_11_15_000000_create_characters_table.php @@ -6,7 +6,7 @@ use LaravelFreelancerNL\Aranguent\Facades\Schema; use LaravelFreelancerNL\Aranguent\Schema\Blueprint; -return new class () extends Migration { +return new class extends Migration { /** * Run the migrations. * diff --git a/TestSetup/Database/Migrations/2019_11_15_000000_create_children_edge_table.php b/TestSetup/Database/Migrations/2019_11_15_000000_create_children_edge_table.php index 21c7b48..1adefa1 100644 --- a/TestSetup/Database/Migrations/2019_11_15_000000_create_children_edge_table.php +++ b/TestSetup/Database/Migrations/2019_11_15_000000_create_children_edge_table.php @@ -6,7 +6,7 @@ use LaravelFreelancerNL\Aranguent\Facades\Schema; use LaravelFreelancerNL\Aranguent\Schema\Blueprint; -return new class () extends Migration { +return new class extends Migration { public const EDGE_COLLECTION = 3; /** diff --git a/TestSetup/Database/Migrations/2019_11_15_000000_create_houses_table.php b/TestSetup/Database/Migrations/2019_11_15_000000_create_houses_table.php index 21c9949..020c698 100644 --- a/TestSetup/Database/Migrations/2019_11_15_000000_create_houses_table.php +++ b/TestSetup/Database/Migrations/2019_11_15_000000_create_houses_table.php @@ -6,7 +6,7 @@ use LaravelFreelancerNL\Aranguent\Facades\Schema; use LaravelFreelancerNL\Aranguent\Schema\Blueprint; -return new class () extends Migration { +return new class extends Migration { /** * Run the migrations. * diff --git a/TestSetup/Database/Migrations/2019_11_15_000000_create_locations_table.php b/TestSetup/Database/Migrations/2019_11_15_000000_create_locations_table.php index 972eadf..7e722ea 100644 --- a/TestSetup/Database/Migrations/2019_11_15_000000_create_locations_table.php +++ b/TestSetup/Database/Migrations/2019_11_15_000000_create_locations_table.php @@ -6,7 +6,7 @@ use LaravelFreelancerNL\Aranguent\Facades\Schema; use LaravelFreelancerNL\Aranguent\Schema\Blueprint; -return new class () extends Migration { +return new class extends Migration { /** * Run the migrations. * diff --git a/TestSetup/Database/Migrations/2019_11_15_000000_create_taggables_table.php b/TestSetup/Database/Migrations/2019_11_15_000000_create_taggables_table.php index 75b9fff..ea23729 100644 --- a/TestSetup/Database/Migrations/2019_11_15_000000_create_taggables_table.php +++ b/TestSetup/Database/Migrations/2019_11_15_000000_create_taggables_table.php @@ -6,7 +6,7 @@ use LaravelFreelancerNL\Aranguent\Facades\Schema; use LaravelFreelancerNL\Aranguent\Schema\Blueprint; -return new class () extends Migration { +return new class extends Migration { /** * Run the migrations. * diff --git a/TestSetup/Database/Migrations/2019_11_15_000000_create_tags_table.php b/TestSetup/Database/Migrations/2019_11_15_000000_create_tags_table.php index fd1c6ce..f59fd70 100644 --- a/TestSetup/Database/Migrations/2019_11_15_000000_create_tags_table.php +++ b/TestSetup/Database/Migrations/2019_11_15_000000_create_tags_table.php @@ -6,7 +6,7 @@ use LaravelFreelancerNL\Aranguent\Facades\Schema; use LaravelFreelancerNL\Aranguent\Schema\Blueprint; -return new class () extends Migration { +return new class extends Migration { /** * Run the migrations. * diff --git a/TestSetup/Database/Migrations/2021_11_22_145621_create_house_view.php b/TestSetup/Database/Migrations/2021_11_22_145621_create_house_view.php index dc29fbb..64ca0c6 100644 --- a/TestSetup/Database/Migrations/2021_11_22_145621_create_house_view.php +++ b/TestSetup/Database/Migrations/2021_11_22_145621_create_house_view.php @@ -5,7 +5,7 @@ use Illuminate\Database\Migrations\Migration; use LaravelFreelancerNL\Aranguent\Facades\Schema; -return new class () extends Migration { +return new class extends Migration { /** * Run the migrations. * diff --git a/TestSetup/Database/Migrations/2024_01_04_145621_create_house_search_alias_view.php b/TestSetup/Database/Migrations/2024_01_04_145621_create_house_search_alias_view.php index e306ba6..3fa21e5 100644 --- a/TestSetup/Database/Migrations/2024_01_04_145621_create_house_search_alias_view.php +++ b/TestSetup/Database/Migrations/2024_01_04_145621_create_house_search_alias_view.php @@ -6,7 +6,7 @@ use LaravelFreelancerNL\Aranguent\Facades\Schema; use LaravelFreelancerNL\Aranguent\Schema\Blueprint; -return new class () extends Migration { +return new class extends Migration { /** * Run the migrations. * diff --git a/TestSetup/Database/Migrations/2024_08_05_145621_create_events_table.php b/TestSetup/Database/Migrations/2024_08_05_145621_create_events_table.php index c90a64f..58c1c92 100644 --- a/TestSetup/Database/Migrations/2024_08_05_145621_create_events_table.php +++ b/TestSetup/Database/Migrations/2024_08_05_145621_create_events_table.php @@ -6,7 +6,7 @@ use LaravelFreelancerNL\Aranguent\Facades\Schema; use LaravelFreelancerNL\Aranguent\Schema\Blueprint; -return new class () extends Migration { +return new class extends Migration { /** * Run the migrations. * diff --git a/src/Connection.php b/src/Connection.php index bf2584b..d9c1cde 100644 --- a/src/Connection.php +++ b/src/Connection.php @@ -202,7 +202,7 @@ protected function escapeBinary($value) */ public function escape($value, $binary = false) { - return match(gettype($value)) { + return match (gettype($value)) { 'array' => $this->escapeArray($value), 'boolean' => $this->escapeBool($value), 'double' => (string) $value, @@ -249,7 +249,7 @@ protected function escapeString($value, bool $binary = false) */ protected function escapeArray(array $array): string { - foreach($array as $key => $value) { + foreach ($array as $key => $value) { $array[$key] = $this->escape($value); } diff --git a/src/Eloquent/Casts/AsArrayObject.php b/src/Eloquent/Casts/AsArrayObject.php index 79592f1..7cb56fe 100644 --- a/src/Eloquent/Casts/AsArrayObject.php +++ b/src/Eloquent/Casts/AsArrayObject.php @@ -21,7 +21,7 @@ class AsArrayObject extends IlluminateAsArrayObject */ public static function castUsing(array $arguments) { - return new class () implements CastsAttributes { + return new class implements CastsAttributes { public function get($model, $key, $value, $attributes) { if (! isset($attributes[$key])) { diff --git a/src/Providers/MigrationServiceProvider.php b/src/Providers/MigrationServiceProvider.php index 919b412..01f2920 100644 --- a/src/Providers/MigrationServiceProvider.php +++ b/src/Providers/MigrationServiceProvider.php @@ -40,7 +40,7 @@ public function __construct($app) { parent::__construct($app); - foreach($this->aliases as $key => $alias) { + foreach ($this->aliases as $key => $alias) { $this->aliases[$key] = $alias; } } diff --git a/src/Query/Concerns/BuildsGroups.php b/src/Query/Concerns/BuildsGroups.php index 8929433..45922ab 100644 --- a/src/Query/Concerns/BuildsGroups.php +++ b/src/Query/Concerns/BuildsGroups.php @@ -144,7 +144,7 @@ public function havingRaw($sql, array $bindings = [], $boolean = 'and') public function forNestedWhere($aliases = []) { $query = $this->newQuery(); - foreach($aliases as $alias) { + foreach ($aliases as $alias) { $query->groups[] = $alias; } diff --git a/src/Query/Concerns/BuildsSearches.php b/src/Query/Concerns/BuildsSearches.php index 9ed55b5..acaaf08 100644 --- a/src/Query/Concerns/BuildsSearches.php +++ b/src/Query/Concerns/BuildsSearches.php @@ -26,7 +26,7 @@ public function searchView( ): IlluminateQueryBuilder { assert($this->grammar instanceof Grammar); - if(!is_array($fields)) { + if (!is_array($fields)) { $fields = Arr::wrap($fields); } $fields = $this->grammar->convertJsonFields($fields); diff --git a/src/Query/Concerns/BuildsUpdates.php b/src/Query/Concerns/BuildsUpdates.php index 3d904eb..e2688bf 100644 --- a/src/Query/Concerns/BuildsUpdates.php +++ b/src/Query/Concerns/BuildsUpdates.php @@ -22,7 +22,7 @@ trait BuildsUpdates */ protected function prepareValuesForUpdate(array $values) { - foreach($values as $key => $value) { + foreach ($values as $key => $value) { if ($value instanceof Expression) { $values[$key] = $value->getValue($this->grammar); @@ -160,13 +160,13 @@ public function upsert(array $values, $uniqueBy, $update = null) $values = [$values]; } - foreach($values as $key => $value) { + foreach ($values as $key => $value) { $values[$key] = $this->grammar->convertJsonFields($value); $values[$key] = $this->convertIdToKey($values[$key]); $values[$key] = Arr::undot($values[$key]); } - foreach($values as $key => $value) { + foreach ($values as $key => $value) { foreach ($value as $dataKey => $data) { $values[$key][$dataKey] = $this->bindValue($data, 'upsert'); } diff --git a/src/Query/Concerns/BuildsWheres.php b/src/Query/Concerns/BuildsWheres.php index d516543..e4dec60 100644 --- a/src/Query/Concerns/BuildsWheres.php +++ b/src/Query/Concerns/BuildsWheres.php @@ -92,7 +92,7 @@ public function validateOperator(mixed $operator, mixed $value): array if ($this->invalidOperator($operator)) { [$value, $operator] = [$operator, '==']; } - return array($value, $operator); + return [$value, $operator]; } /** diff --git a/src/Query/Concerns/CompilesColumns.php b/src/Query/Concerns/CompilesColumns.php index 8270da8..93e8358 100644 --- a/src/Query/Concerns/CompilesColumns.php +++ b/src/Query/Concerns/CompilesColumns.php @@ -211,7 +211,7 @@ protected function cleanAlias(IlluminateQueryBuilder $query, int|null|string $al $elements = explode('.', $alias); - if( + if ( !$query->isTable($elements[0]) && !$query->isVariable($elements[0]) ) { diff --git a/src/Query/Concerns/CompilesDataManipulations.php b/src/Query/Concerns/CompilesDataManipulations.php index 9d0a7b7..aa726e7 100644 --- a/src/Query/Concerns/CompilesDataManipulations.php +++ b/src/Query/Concerns/CompilesDataManipulations.php @@ -107,7 +107,7 @@ public function compileInsertUsing(IlluminateQueryBuilder $query, array $columns if ($insertDoc === '') { $insertValues = []; - foreach($columns as $column) { + foreach ($columns as $column) { $insertValues[$column] = $this->normalizeColumnReferences($query, $column, 'docs'); } $insertDoc = $this->generateAqlObject($insertValues); @@ -129,7 +129,7 @@ public function compileInsertUsing(IlluminateQueryBuilder $query, array $columns protected function createUpdateObject($values) { $valueStrings = []; - foreach($values as $key => $value) { + foreach ($values as $key => $value) { if (is_array($value)) { $valueStrings[] = $key . ': ' . $this->createUpdateObject($value); @@ -188,19 +188,19 @@ public function compileUpdate(IlluminateQueryBuilder $query, array|string $value public function compileUpsert(IlluminateQueryBuilder $query, array $values, array $uniqueBy, array $update) { $searchFields = []; - foreach($uniqueBy as $field) { + foreach ($uniqueBy as $field) { $searchFields[$field] = 'doc.' . $field; } $searchObject = $this->generateAqlObject($searchFields); $updateFields = []; - foreach($update as $field) { + foreach ($update as $field) { $updateFields[$field] = 'doc.' . $field; } $updateObject = $this->generateAqlObject($updateFields); $valueObjects = []; - foreach($values as $data) { + foreach ($values as $data) { $valueObjects[] = $this->generateAqlObject($data); } diff --git a/src/Query/Concerns/CompilesGroups.php b/src/Query/Concerns/CompilesGroups.php index 4fe54ad..b5ad17c 100644 --- a/src/Query/Concerns/CompilesGroups.php +++ b/src/Query/Concerns/CompilesGroups.php @@ -64,7 +64,7 @@ protected function keepColumns(IlluminateQueryBuilder $query, $groups) return []; } $tempGroups = []; - foreach($groups as $group) { + foreach ($groups as $group) { if ($group instanceof Expression) { $tempGroups[] = $this->extractGroupVariable($group); continue; diff --git a/src/Query/Concerns/ConvertsIdToKey.php b/src/Query/Concerns/ConvertsIdToKey.php index 59ab076..d3a48d6 100644 --- a/src/Query/Concerns/ConvertsIdToKey.php +++ b/src/Query/Concerns/ConvertsIdToKey.php @@ -9,7 +9,7 @@ trait ConvertsIdToKey public function convertIdToKey(mixed $data): mixed { if (is_array($data) && array_is_list($data)) { - foreach($data as $key => $value) { + foreach ($data as $key => $value) { $data[$key] = $this->convertIdInString($value); } return $data; diff --git a/src/Query/Concerns/HandlesAqlGrammar.php b/src/Query/Concerns/HandlesAqlGrammar.php index 6028e0a..cfc0794 100644 --- a/src/Query/Concerns/HandlesAqlGrammar.php +++ b/src/Query/Concerns/HandlesAqlGrammar.php @@ -125,7 +125,7 @@ public function wrap($value) } if (is_array($value)) { - foreach($value as $key => $subvalue) { + foreach ($value as $key => $subvalue) { $value[$key] = $this->wrap($subvalue); } return $value; @@ -220,7 +220,7 @@ public function generateAqlObject(array $data): string */ protected function generateAqlObjectString(array $data): string { - foreach($data as $key => $value) { + foreach ($data as $key => $value) { $prefix = $this->wrapAttribute($key) . ': '; if (is_numeric($key)) { @@ -269,7 +269,7 @@ public function substituteBindingsIntoRawSql($aql, $bindings) $bindings = array_reverse($bindings); - foreach($bindings as $key => $value) { + foreach ($bindings as $key => $value) { $pattern = '/(@' . $key . ')(?![^a-zA-Z_ ,\}\]])/'; $aql = (string) preg_replace( $pattern, @@ -289,7 +289,7 @@ public function substituteBindingsIntoRawSql($aql, $bindings) */ public function isJsonSelector($value) { - if(!is_string($value)) { + if (!is_string($value)) { return false; } @@ -319,7 +319,7 @@ public function convertJsonFields(mixed $data): mixed */ public function convertJsonValuesToDotNotation(array $fields): array { - foreach($fields as $key => $value) { + foreach ($fields as $key => $value) { if ($this->isJsonSelector($value)) { $fields[$key] = str_replace('->', '.', $value); } @@ -333,7 +333,7 @@ public function convertJsonValuesToDotNotation(array $fields): array */ public function convertJsonKeysToDotNotation(array $fields): array { - foreach($fields as $key => $value) { + foreach ($fields as $key => $value) { if ($this->isJsonSelector($key)) { $fields[str_replace('->', '.', $key)] = $value; unset($fields[$key]); diff --git a/src/Query/Grammar.php b/src/Query/Grammar.php index 12a106b..189ba82 100644 --- a/src/Query/Grammar.php +++ b/src/Query/Grammar.php @@ -419,7 +419,7 @@ public function compileSearch(IlluminateQueryBuilder $query, array $search) } $predicates = []; - foreach($search['fields'] as $field) { + foreach ($search['fields'] as $field) { $predicates[] = $this->normalizeColumn($query, $field) . ' IN TOKENS(' . $search['searchText'] . ', \'' . $search['analyzer'] . '\')'; } diff --git a/src/Testing/DatabaseMigrations.php b/src/Testing/DatabaseMigrations.php index ea3363b..aaedcac 100644 --- a/src/Testing/DatabaseMigrations.php +++ b/src/Testing/DatabaseMigrations.php @@ -40,7 +40,7 @@ protected function setMigrationPaths() { $migrationSettings = []; - if(property_exists($this, 'realPath')) { + if (property_exists($this, 'realPath')) { $migrationSettings['--realpath'] = $this->realPath ?? false; } diff --git a/src/Testing/DatabaseTruncation.php b/src/Testing/DatabaseTruncation.php index 04bb172..7edf921 100644 --- a/src/Testing/DatabaseTruncation.php +++ b/src/Testing/DatabaseTruncation.php @@ -40,7 +40,7 @@ protected function setMigrationPaths() { $migrationSettings = []; - if(property_exists($this, 'realPath')) { + if (property_exists($this, 'realPath')) { $migrationSettings['--realpath'] = $this->realPath ?? false; } diff --git a/src/Testing/RefreshDatabase.php b/src/Testing/RefreshDatabase.php index 1cfece4..9762dd7 100644 --- a/src/Testing/RefreshDatabase.php +++ b/src/Testing/RefreshDatabase.php @@ -79,7 +79,7 @@ protected function setMigrationPaths() { $migrationSettings = []; - if(property_exists($this, 'realPath')) { + if (property_exists($this, 'realPath')) { $migrationSettings['--realpath'] = $this->realPath ?? false; } diff --git a/src/helpers.php b/src/helpers.php index df6aad5..0b0085e 100644 --- a/src/helpers.php +++ b/src/helpers.php @@ -49,7 +49,7 @@ function isDotString(string $string): bool if (!function_exists('mapObjectToArray')) { function mapObjectToArray(mixed $value): mixed { - if(!is_object($value) && !is_array($value)) { + if (!is_object($value) && !is_array($value)) { return $value; } diff --git a/tests/Console/ModelMakeCommandTest.php b/tests/Console/ModelMakeCommandTest.php index 11b6e12..f9ac39d 100644 --- a/tests/Console/ModelMakeCommandTest.php +++ b/tests/Console/ModelMakeCommandTest.php @@ -71,7 +71,7 @@ $migrationFiles = scandir($migrationPath); - foreach($migrationFiles as $file) { + foreach ($migrationFiles as $file) { if (in_array($file, ['.', '..', '.gitkeep'])) { continue; } @@ -90,7 +90,7 @@ $migrationFiles = scandir($migrationPath); - foreach($migrationFiles as $file) { + foreach ($migrationFiles as $file) { if (in_array($file, ['.', '..', '.gitkeep'])) { continue; } diff --git a/tests/Migrations/MigrationRepositoryTest.php b/tests/Migrations/MigrationRepositoryTest.php index e548f95..d2f0fa0 100644 --- a/tests/Migrations/MigrationRepositoryTest.php +++ b/tests/Migrations/MigrationRepositoryTest.php @@ -11,7 +11,7 @@ afterEach(function () { $migrations = $this->databaseMigrationRepository->getMigrations(12); - foreach($migrations as $migration) { + foreach ($migrations as $migration) { $this->databaseMigrationRepository->delete($migration); } }); @@ -92,7 +92,7 @@ "getMigrationBatches2" => 33, ]; - foreach($batches as $migration => $batch) { + foreach ($batches as $migration => $batch) { $this->databaseMigrationRepository->log($migration, $batch); } diff --git a/tests/Query/DataRetrievalTest.php b/tests/Query/DataRetrievalTest.php index 845c310..c3df3c8 100644 --- a/tests/Query/DataRetrievalTest.php +++ b/tests/Query/DataRetrievalTest.php @@ -101,7 +101,7 @@ function ($query) use ($residenceId) { foreach ($characters as $character) { $count++; } - if($count > 20) { + if ($count > 20) { return false; } return true; diff --git a/tests/Query/DebugTest.php b/tests/Query/DebugTest.php index b555077..209c827 100644 --- a/tests/Query/DebugTest.php +++ b/tests/Query/DebugTest.php @@ -68,14 +68,14 @@ $query = DB::table('characters'); $query->where('name', 'Gilly'); - for($i = 0; $i < 9; $i++) { + for ($i = 0; $i < 9; $i++) { $query->orWhere('name', $names[$i]); } $aql = $query->toRawSql(); $rawAql = 'FOR characterDoc IN characters FILTER `characterDoc`.`name` == "Gilly"'; - for($i = 0; $i < 9; $i++) { + for ($i = 0; $i < 9; $i++) { $rawAql .= ' or `characterDoc`.`name` == "' . $names[$i] . '"'; } $rawAql .= ' RETURN characterDoc'; diff --git a/tests/Schema/SchemaBuilderTest.php b/tests/Schema/SchemaBuilderTest.php index a94ecca..dbf5f55 100644 --- a/tests/Schema/SchemaBuilderTest.php +++ b/tests/Schema/SchemaBuilderTest.php @@ -28,7 +28,7 @@ try { Schema::hasTable('dummy'); - } catch(QueryException $e) { + } catch (QueryException $e) { expect($e)->toBeInstanceOf(QueryException::class); } config()->set('database.connections.arangodb.database', $oldDatabase); diff --git a/tests/Schema/TableTest.php b/tests/Schema/TableTest.php index f4eaa0a..516d297 100644 --- a/tests/Schema/TableTest.php +++ b/tests/Schema/TableTest.php @@ -1,7 +1,7 @@ getSchemaBuilder(); diff --git a/tests/TestCase.php b/tests/TestCase.php index e712c43..208e1e3 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -208,7 +208,7 @@ protected function defineEnvironment($app) public function clearDatabase() { $collections = $this->schemaManager->getCollections(true); - foreach($collections as $collection) { + foreach ($collections as $collection) { $this->schemaManager->deleteCollection($collection->name); } }