Fix styling

Nielsvanpach · actions-user · commit 62a9ff93c41c · 2021-09-07T07:50:22.000Z
diff --git a/src/AllowedInclude.php b/src/AllowedInclude.php
@@ -36,7 +36,7 @@ public static function relationship(string $name, ?string $internalName = null):
                 [$relationship, $alias] = $args;
 
                 $includes = collect([
-                    new self($alias, new IncludedRelationship, $relationship),
+                    new self($alias, new IncludedRelationship(), $relationship),
                 ]);
 
                 if (! Str::contains($relationship, '.')) {
diff --git a/src/AllowedSort.php b/src/AllowedSort.php
@@ -47,7 +47,7 @@ public function sort(QueryBuilder $query, ?bool $descending = null): void
 
     public static function field(string $name, ?string $internalName = null): self
     {
-        return new static($name, new SortsField, $internalName);
+        return new static($name, new SortsField(), $internalName);
     }
 
     public static function custom(string $name, Sort $sortClass, ?string $internalName = null): self
diff --git a/tests/FilterTest.php b/tests/FilterTest.php
@@ -291,7 +291,7 @@ public function it_can_filter_results_by_a_custom_filter_class()
     {
         $testModel = $this->models->first();
 
-        $filterClass = new class implements FilterInterface {
+        $filterClass = new class() implements FilterInterface {
             public function __invoke(Builder $query, $value, string $property): Builder
             {
                 return $query->where('name', $value);
@@ -468,7 +468,7 @@ public function it_should_apply_the_filter_on_the_subset_of_allowed_values()
     /** @test */
     public function it_can_take_an_argument_for_custom_column_name_resolution()
     {
-        $filter = AllowedFilter::custom('property_name', new FiltersExact, 'property_column_name');
+        $filter = AllowedFilter::custom('property_name', new FiltersExact(), 'property_column_name');
 
         $this->assertInstanceOf(AllowedFilter::class, $filter);
         $this->assertClassHasAttribute('internalName', get_class($filter));
@@ -477,15 +477,15 @@ public function it_can_take_an_argument_for_custom_column_name_resolution()
     /** @test */
     public function it_sets_property_column_name_to_property_name_by_default()
     {
-        $filter = AllowedFilter::custom('property_name', new FiltersExact);
+        $filter = AllowedFilter::custom('property_name', new FiltersExact());
 
         $this->assertEquals($filter->getName(), $filter->getInternalName());
     }
 
     /** @test */
     public function it_resolves_queries_using_property_column_name()
     {
-        $filter = AllowedFilter::custom('nickname', new FiltersExact, 'name');
+        $filter = AllowedFilter::custom('nickname', new FiltersExact(), 'name');
 
         TestModel::create(['name' => 'abcdef']);
 
diff --git a/tests/IncludeTest.php b/tests/IncludeTest.php
@@ -348,7 +348,7 @@ public function it_can_alias_multiple_allowed_includes()
     /** @test */
     public function it_can_include_custom_include_class()
     {
-        $includeClass = new class implements IncludeInterface {
+        $includeClass = new class() implements IncludeInterface {
             public function __invoke(Builder $query, string $include): Builder
             {
                 // TODO:
@@ -369,7 +369,7 @@ public function __invoke(Builder $query, string $include): Builder
     /** @test */
     public function it_can_include_custom_include_class_by_alias()
     {
-        $includeClass = new class implements IncludeInterface {
+        $includeClass = new class() implements IncludeInterface {
             public function __invoke(Builder $query, string $include): Builder
             {
                 // TODO:
@@ -390,7 +390,7 @@ public function __invoke(Builder $query, string $include): Builder
     /** @test */
     public function it_can_take_an_argument_for_custom_column_name_resolution()
     {
-        $include = AllowedInclude::custom('property_name', new IncludedCount, 'property_column_name');
+        $include = AllowedInclude::custom('property_name', new IncludedCount(), 'property_column_name');
 
         $this->assertInstanceOf(Collection::class, $include);
         $this->assertInstanceOf(AllowedInclude::class, $include->first());
@@ -405,7 +405,7 @@ public function it_can_include_a_custom_base_query_with_select()
         ]);
 
         $modelResult = QueryBuilder::for(TestModel::select('id', 'name'), $request)
-            ->allowedIncludes(AllowedInclude::custom('relatedModelsCount', new IncludedCount, 'relatedModels'))
+            ->allowedIncludes(AllowedInclude::custom('relatedModelsCount', new IncludedCount(), 'relatedModels'))
             ->first();
 
         $this->assertNotNull($modelResult->related_models_count);
diff --git a/tests/QueryBuilderTest.php b/tests/QueryBuilderTest.php
@@ -204,7 +204,7 @@ public function it_can_query_local_scopes()
     /** @test */
     public function it_executes_the_same_query_regardless_of_the_order_of_applied_filters_or_sorts()
     {
-        $customSort = new class implements Sort {
+        $customSort = new class() implements Sort {
             public function __invoke(Builder $query, $descending, string $property): Builder
             {
                 return $query->join(
@@ -237,7 +237,7 @@ public function __invoke(Builder $query, $descending, string $property): Builder
     /** @test */
     public function it_can_filter_when_sorting_by_joining_a_related_model_which_contains_the_same_field_name()
     {
-        $customSort = new class implements Sort {
+        $customSort = new class() implements Sort {
             public function __invoke(Builder $query, $descending, string $property): Builder
             {
                 return $query->join(
@@ -297,13 +297,13 @@ public function it_does_not_lose_pivot_values_with_belongs_to_many_relation()
             $foundTestModel->pivot->location
         );
     }
-    
-    
+
+
     /** @test */
     public function it_clones_the_subject_upon_cloning()
     {
         $queryBuilder = QueryBuilder::for(TestModel::class);
-        
+
         $queryBuilder1 = (clone $queryBuilder)->where('id', 1);
         $queryBuilder2 = (clone $queryBuilder)->where('name', 'John Doe');
 
@@ -312,12 +312,12 @@ public function it_clones_the_subject_upon_cloning()
             $queryBuilder2->toSql()
         );
     }
-    
+
     /** @test */
     public function it_supports_clone_as_method()
     {
         $queryBuilder = QueryBuilder::for(TestModel::class);
-        
+
         $queryBuilder1 = $queryBuilder->clone()->where('id', 1);
         $queryBuilder2 = $queryBuilder->clone()->where('name', 'John Doe');
 
diff --git a/tests/SortTest.php b/tests/SortTest.php
@@ -235,7 +235,7 @@ public function it_doesnt_use_the_default_sort_parameter_when_a_sort_was_request
     /** @test */
     public function it_allows_default_custom_sort_class_parameter()
     {
-        $sortClass = new class implements SortInterface {
+        $sortClass = new class() implements SortInterface {
             public function __invoke(Builder $query, bool $descending, string $property): Builder
             {
                 return $query->orderBy('name', $descending ? 'desc' : 'asc');
@@ -266,7 +266,7 @@ public function it_uses_default_descending_sort_parameter()
     /** @test */
     public function it_allows_multiple_default_sort_parameters()
     {
-        $sortClass = new class implements SortInterface {
+        $sortClass = new class() implements SortInterface {
             public function __invoke(Builder $query, $descending, string $property): Builder
             {
                 return $query->orderBy('name', $descending ? 'desc' : 'asc');
@@ -324,7 +324,7 @@ public function it_can_sort_by_multiple_columns()
     /** @test */
     public function it_can_sort_by_a_custom_sort_class()
     {
-        $sortClass = new class implements SortInterface {
+        $sortClass = new class() implements SortInterface {
             public function __invoke(Builder $query, $descending, string $property): Builder
             {
                 return $query->orderBy('name', $descending ? 'desc' : 'asc');
@@ -343,7 +343,7 @@ public function __invoke(Builder $query, $descending, string $property): Builder
     /** @test */
     public function it_can_take_an_argument_for_custom_column_name_resolution()
     {
-        $sort = AllowedSort::custom('property_name', new SortsField, 'property_column_name');
+        $sort = AllowedSort::custom('property_name', new SortsField(), 'property_column_name');
 
         $this->assertInstanceOf(AllowedSort::class, $sort);
         $this->assertClassHasAttribute('internalName', get_class($sort));
@@ -352,15 +352,15 @@ public function it_can_take_an_argument_for_custom_column_name_resolution()
     /** @test */
     public function it_sets_property_column_name_to_property_name_by_default()
     {
-        $sort = AllowedSort::custom('property_name', new SortsField);
+        $sort = AllowedSort::custom('property_name', new SortsField());
 
         $this->assertEquals($sort->getName(), $sort->getInternalName());
     }
 
     /** @test */
     public function it_resolves_queries_using_property_column_name()
     {
-        $sort = AllowedSort::custom('nickname', new SortsField, 'name');
+        $sort = AllowedSort::custom('nickname', new SortsField(), 'name');
 
         $testModel = TestModel::create(['name' => 'zzzzzzzz']);
 
@@ -419,7 +419,7 @@ public function late_specified_sorts_still_check_for_allowance()
     /** @test */
     public function it_can_sort_and_use_scoped_filters_at_the_same_time()
     {
-        $sortClass = new class implements SortInterface {
+        $sortClass = new class() implements SortInterface {
             public function __invoke(Builder $query, $descending, string $property): Builder
             {
                 return $query->orderBy('name', $descending ? 'desc' : 'asc');
@@ -472,7 +472,7 @@ public function raw_sorts_do_not_get_purged_when_specifying_allowed_sorts()
     /** @test */
     public function the_default_direction_of_an_allow_sort_can_be_set()
     {
-        $sortClass = new class implements SortInterface {
+        $sortClass = new class() implements SortInterface {
             public function __invoke(Builder $query, bool $descending, string $property): Builder
             {
                 return $query->orderBy('name', $descending ? 'desc' : 'asc');

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function sort(QueryBuilder $query, ?bool $descending = null): void`
`47`	`47`
`48`	`48`	`public static function field(string $name, ?string $internalName = null): self`
`49`	`49`	`{`
`50`		`- return new static($name, new SortsField, $internalName);`
	`50`	`+ return new static($name, new SortsField(), $internalName);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`public static function custom(string $name, Sort $sortClass, ?string $internalName = null): self`
Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ public function it_can_filter_results_by_a_custom_filter_class()`
`291`	`291`	`{`
`292`	`292`	`$testModel = $this->models->first();`
`293`	`293`
`294`		`- $filterClass = new class implements FilterInterface {`
	`294`	`+ $filterClass = new class() implements FilterInterface {`
`295`	`295`	`public function __invoke(Builder $query, $value, string $property): Builder`
`296`	`296`	`{`
`297`	`297`	`return $query->where('name', $value);`
`@@ -468,7 +468,7 @@ public function it_should_apply_the_filter_on_the_subset_of_allowed_values()`
`468`	`468`	`/** @test */`
`469`	`469`	`public function it_can_take_an_argument_for_custom_column_name_resolution()`
`470`	`470`	`{`
`471`		`- $filter = AllowedFilter::custom('property_name', new FiltersExact, 'property_column_name');`
	`471`	`+ $filter = AllowedFilter::custom('property_name', new FiltersExact(), 'property_column_name');`
`472`	`472`
`473`	`473`	`$this->assertInstanceOf(AllowedFilter::class, $filter);`
`474`	`474`	`$this->assertClassHasAttribute('internalName', get_class($filter));`
`@@ -477,15 +477,15 @@ public function it_can_take_an_argument_for_custom_column_name_resolution()`
`477`	`477`	`/** @test */`
`478`	`478`	`public function it_sets_property_column_name_to_property_name_by_default()`
`479`	`479`	`{`
`480`		`- $filter = AllowedFilter::custom('property_name', new FiltersExact);`
	`480`	`+ $filter = AllowedFilter::custom('property_name', new FiltersExact());`
`481`	`481`
`482`	`482`	`$this->assertEquals($filter->getName(), $filter->getInternalName());`
`483`	`483`	`}`
`484`	`484`
`485`	`485`	`/** @test */`
`486`	`486`	`public function it_resolves_queries_using_property_column_name()`
`487`	`487`	`{`
`488`		`- $filter = AllowedFilter::custom('nickname', new FiltersExact, 'name');`
	`488`	`+ $filter = AllowedFilter::custom('nickname', new FiltersExact(), 'name');`
`489`	`489`
`490`	`490`	`TestModel::create(['name' => 'abcdef']);`
`491`	`491`
Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ public function it_doesnt_use_the_default_sort_parameter_when_a_sort_was_request`
`235`	`235`	`/** @test */`
`236`	`236`	`public function it_allows_default_custom_sort_class_parameter()`
`237`	`237`	`{`
`238`		`- $sortClass = new class implements SortInterface {`
	`238`	`+ $sortClass = new class() implements SortInterface {`
`239`	`239`	`public function __invoke(Builder $query, bool $descending, string $property): Builder`
`240`	`240`	`{`
`241`	`241`	`return $query->orderBy('name', $descending ? 'desc' : 'asc');`
`@@ -266,7 +266,7 @@ public function it_uses_default_descending_sort_parameter()`
`266`	`266`	`/** @test */`
`267`	`267`	`public function it_allows_multiple_default_sort_parameters()`
`268`	`268`	`{`
`269`		`- $sortClass = new class implements SortInterface {`
	`269`	`+ $sortClass = new class() implements SortInterface {`
`270`	`270`	`public function __invoke(Builder $query, $descending, string $property): Builder`
`271`	`271`	`{`
`272`	`272`	`return $query->orderBy('name', $descending ? 'desc' : 'asc');`
`@@ -324,7 +324,7 @@ public function it_can_sort_by_multiple_columns()`
`324`	`324`	`/** @test */`
`325`	`325`	`public function it_can_sort_by_a_custom_sort_class()`
`326`	`326`	`{`
`327`		`- $sortClass = new class implements SortInterface {`
	`327`	`+ $sortClass = new class() implements SortInterface {`
`328`	`328`	`public function __invoke(Builder $query, $descending, string $property): Builder`
`329`	`329`	`{`
`330`	`330`	`return $query->orderBy('name', $descending ? 'desc' : 'asc');`
`@@ -343,7 +343,7 @@ public function __invoke(Builder $query, $descending, string $property): Builder`
`343`	`343`	`/** @test */`
`344`	`344`	`public function it_can_take_an_argument_for_custom_column_name_resolution()`
`345`	`345`	`{`
`346`		`- $sort = AllowedSort::custom('property_name', new SortsField, 'property_column_name');`
	`346`	`+ $sort = AllowedSort::custom('property_name', new SortsField(), 'property_column_name');`
`347`	`347`
`348`	`348`	`$this->assertInstanceOf(AllowedSort::class, $sort);`
`349`	`349`	`$this->assertClassHasAttribute('internalName', get_class($sort));`
`@@ -352,15 +352,15 @@ public function it_can_take_an_argument_for_custom_column_name_resolution()`
`352`	`352`	`/** @test */`
`353`	`353`	`public function it_sets_property_column_name_to_property_name_by_default()`
`354`	`354`	`{`
`355`		`- $sort = AllowedSort::custom('property_name', new SortsField);`
	`355`	`+ $sort = AllowedSort::custom('property_name', new SortsField());`
`356`	`356`
`357`	`357`	`$this->assertEquals($sort->getName(), $sort->getInternalName());`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`/** @test */`
`361`	`361`	`public function it_resolves_queries_using_property_column_name()`
`362`	`362`	`{`
`363`		`- $sort = AllowedSort::custom('nickname', new SortsField, 'name');`
	`363`	`+ $sort = AllowedSort::custom('nickname', new SortsField(), 'name');`
`364`	`364`
`365`	`365`	`$testModel = TestModel::create(['name' => 'zzzzzzzz']);`
`366`	`366`
`@@ -419,7 +419,7 @@ public function late_specified_sorts_still_check_for_allowance()`
`419`	`419`	`/** @test */`
`420`	`420`	`public function it_can_sort_and_use_scoped_filters_at_the_same_time()`
`421`	`421`	`{`
`422`		`- $sortClass = new class implements SortInterface {`
	`422`	`+ $sortClass = new class() implements SortInterface {`
`423`	`423`	`public function __invoke(Builder $query, $descending, string $property): Builder`
`424`	`424`	`{`
`425`	`425`	`return $query->orderBy('name', $descending ? 'desc' : 'asc');`
`@@ -472,7 +472,7 @@ public function raw_sorts_do_not_get_purged_when_specifying_allowed_sorts()`
`472`	`472`	`/** @test */`
`473`	`473`	`public function the_default_direction_of_an_allow_sort_can_be_set()`
`474`	`474`	`{`
`475`		`- $sortClass = new class implements SortInterface {`
	`475`	`+ $sortClass = new class() implements SortInterface {`
`476`	`476`	`public function __invoke(Builder $query, bool $descending, string $property): Builder`
`477`	`477`	`{`
`478`	`478`	`return $query->orderBy('name', $descending ? 'desc' : 'asc');`