Skip to content
This repository was archived by the owner on Jan 25, 2022. It is now read-only.

Commit 48e91e2

Browse files
author
Zachary Volpi
committed
fix style
1 parent e152876 commit 48e91e2

7 files changed

+43
-49
lines changed

‎tests/features/SearchTest/SingleKeyedAndTypedSearchOnRelationTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class SingleKeyedAndTypedSearchOnRelationTest extends BaseTestCase
1313
*/
1414
public function ItShouldProperlyApplyTheWhereClauseOnStringAttribute()
1515
{
16-
$first = TestRelatedModel::first();
16+
$first = TestRelatedModel::first();
1717
$compare = TestModel::whereHas('related', function ($query) use ($first) {
1818
return $query->where('string', $first->string);
1919
})->get()->toArray();
@@ -30,7 +30,7 @@ public function ItShouldProperlyApplyTheWhereClauseOnStringAttribute()
3030
*/
3131
public function ItShouldProperlyApplyTheWhereClauseOnCharAttribute()
3232
{
33-
$first = TestRelatedModel::first();
33+
$first = TestRelatedModel::first();
3434
$compare = TestModel::whereHas('related', function ($query) use ($first) {
3535
return $query->where('char', $first->char);
3636
})->get()->toArray();
@@ -47,7 +47,7 @@ public function ItShouldProperlyApplyTheWhereClauseOnCharAttribute()
4747
*/
4848
public function ItShouldProperlyApplyTheWhereClauseOnBoolAttribute()
4949
{
50-
$first = TestRelatedModel::first();
50+
$first = TestRelatedModel::first();
5151
$compare = TestModel::whereHas('related', function ($query) use ($first) {
5252
return $query->where('bool', $first->bool);
5353
})->get()->toArray();
@@ -64,7 +64,7 @@ public function ItShouldProperlyApplyTheWhereClauseOnBoolAttribute()
6464
*/
6565
public function ItShouldProperlyApplyTheWhereClauseOnIntAttribute()
6666
{
67-
$first = TestRelatedModel::first();
67+
$first = TestRelatedModel::first();
6868
$compare = TestModel::whereHas('related', function ($query) use ($first) {
6969
return $query->where('int', $first->int);
7070
})->get()->toArray();
@@ -81,7 +81,7 @@ public function ItShouldProperlyApplyTheWhereClauseOnIntAttribute()
8181
*/
8282
public function ItShouldProperlyApplyTheWhereClauseOnDoubleAttribute()
8383
{
84-
$first = TestRelatedModel::first();
84+
$first = TestRelatedModel::first();
8585
$compare = TestModel::whereHas('related', function ($query) use ($first) {
8686
return $query->where('double', $first->double);
8787
})->get()->toArray();
@@ -98,7 +98,7 @@ public function ItShouldProperlyApplyTheWhereClauseOnDoubleAttribute()
9898
*/
9999
public function ItShouldProperlyApplyTheWhereClauseOnDecimalAttribute()
100100
{
101-
$first = TestRelatedModel::first();
101+
$first = TestRelatedModel::first();
102102
$compare = TestModel::whereHas('related', function ($query) use ($first) {
103103
return $query->where('decimal', $first->decimal);
104104
})->get()->toArray();
@@ -115,7 +115,7 @@ public function ItShouldProperlyApplyTheWhereClauseOnDecimalAttribute()
115115
*/
116116
public function ItShouldProperlyApplyTheWhereClauseOnDatetimeAttribute()
117117
{
118-
$first = TestRelatedModel::first();
118+
$first = TestRelatedModel::first();
119119
$compare = TestModel::whereHas('related', function ($query) use ($first) {
120120
return $query->where('datetime', $first->datetime);
121121
})->get()->toArray();
@@ -132,7 +132,7 @@ public function ItShouldProperlyApplyTheWhereClauseOnDatetimeAttribute()
132132
*/
133133
public function ItShouldProperlyApplyTheWhereClauseOnDateAttribute()
134134
{
135-
$first = TestRelatedModel::first();
135+
$first = TestRelatedModel::first();
136136
$compare = TestModel::whereHas('related', function ($query) use ($first) {
137137
return $query->where('date', $first->date);
138138
})->get()->toArray();
@@ -149,7 +149,7 @@ public function ItShouldProperlyApplyTheWhereClauseOnDateAttribute()
149149
*/
150150
public function ItShouldProperlyApplyTheWhereClauseOnTimeAttribute()
151151
{
152-
$first = TestRelatedModel::first();
152+
$first = TestRelatedModel::first();
153153
$compare = TestModel::whereHas('related', function ($query) use ($first) {
154154
return $query->where('time', $first->time);
155155
})->get()->toArray();

‎tests/features/SearchTest/SingleKeyedAndTypedSearchTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class SingleKeyedAndTypedSearchTest extends BaseTestCase
1212
*/
1313
public function ItShouldProperlyApplyTheWhereClauseOnStringAttribute()
1414
{
15-
$first = TestModel::first();
15+
$first = TestModel::first();
1616
$compare = TestModel::where('string', $first->string)->get()->toArray();
1717

1818
$response = $this->callEndpoint([
@@ -27,7 +27,7 @@ public function ItShouldProperlyApplyTheWhereClauseOnStringAttribute()
2727
*/
2828
public function ItShouldProperlyApplyTheWhereClauseOnCharAttribute()
2929
{
30-
$first = TestModel::first();
30+
$first = TestModel::first();
3131
$compare = TestModel::where('char', $first->char)->get()->toArray();
3232

3333
$response = $this->callEndpoint([
@@ -42,7 +42,7 @@ public function ItShouldProperlyApplyTheWhereClauseOnCharAttribute()
4242
*/
4343
public function ItShouldProperlyApplyTheWhereClauseOnBoolAttribute()
4444
{
45-
$first = TestModel::first();
45+
$first = TestModel::first();
4646
$compare = TestModel::where('bool', $first->bool)->get()->toArray();
4747

4848
$response = $this->callEndpoint([
@@ -57,7 +57,7 @@ public function ItShouldProperlyApplyTheWhereClauseOnBoolAttribute()
5757
*/
5858
public function ItShouldProperlyApplyTheWhereClauseOnIntAttribute()
5959
{
60-
$first = TestModel::first();
60+
$first = TestModel::first();
6161
$compare = TestModel::where('int', $first->int)->get()->toArray();
6262

6363
$response = $this->callEndpoint([
@@ -72,7 +72,7 @@ public function ItShouldProperlyApplyTheWhereClauseOnIntAttribute()
7272
*/
7373
public function ItShouldProperlyApplyTheWhereClauseOnDoubleAttribute()
7474
{
75-
$first = TestModel::first();
75+
$first = TestModel::first();
7676
$compare = TestModel::where('double', $first->double)->get()->toArray();
7777

7878
$response = $this->callEndpoint([
@@ -87,7 +87,7 @@ public function ItShouldProperlyApplyTheWhereClauseOnDoubleAttribute()
8787
*/
8888
public function ItShouldProperlyApplyTheWhereClauseOnDecimalAttribute()
8989
{
90-
$first = TestModel::first();
90+
$first = TestModel::first();
9191
$compare = TestModel::where('decimal', $first->decimal)->get()->toArray();
9292

9393
$response = $this->callEndpoint([
@@ -102,7 +102,7 @@ public function ItShouldProperlyApplyTheWhereClauseOnDecimalAttribute()
102102
*/
103103
public function ItShouldProperlyApplyTheWhereClauseOnDatetimeAttribute()
104104
{
105-
$first = TestModel::first();
105+
$first = TestModel::first();
106106
$compare = TestModel::where('datetime', $first->datetime)->get()->toArray();
107107

108108
$response = $this->callEndpoint([
@@ -117,7 +117,7 @@ public function ItShouldProperlyApplyTheWhereClauseOnDatetimeAttribute()
117117
*/
118118
public function ItShouldProperlyApplyTheWhereClauseOnDateAttribute()
119119
{
120-
$first = TestModel::first();
120+
$first = TestModel::first();
121121
$compare = TestModel::where('date', $first->date)->get()->toArray();
122122

123123
$response = $this->callEndpoint([
@@ -132,7 +132,7 @@ public function ItShouldProperlyApplyTheWhereClauseOnDateAttribute()
132132
*/
133133
public function ItShouldProperlyApplyTheWhereClauseOnTimeAttribute()
134134
{
135-
$first = TestModel::first();
135+
$first = TestModel::first();
136136
$compare = TestModel::where('time', $first->time)->get()->toArray();
137137

138138
$response = $this->callEndpoint([

‎tests/features/SearchTest/SingleSearchQueryOnAllFieldsSearchTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class SingleSearchQueryOnAllFieldsSearchTest extends BaseTestCase
1212
*/
1313
public function ItShouldProperlyApplyTheWhereClauseOnStringAttribute()
1414
{
15-
$first = TestModel::first();
15+
$first = TestModel::first();
1616
$compare = TestModel::where('string', $first->string)->get()->toArray();
1717

1818
$response = $this->callEndpoint([
@@ -27,7 +27,7 @@ public function ItShouldProperlyApplyTheWhereClauseOnStringAttribute()
2727
*/
2828
public function ItShouldProperlyApplyTheWhereClauseOnCharAttribute()
2929
{
30-
$first = TestModel::first();
30+
$first = TestModel::first();
3131
$compare = TestModel::where('char', $first->char)->orWhereHas('related', function ($query) use ($first) {
3232
return $query->where('char', $first->char);
3333
})->get()->toArray();
@@ -44,7 +44,7 @@ public function ItShouldProperlyApplyTheWhereClauseOnCharAttribute()
4444
*/
4545
public function ItShouldProperlyApplyTheWhereClauseOnBoolAttribute()
4646
{
47-
$first = TestModel::first();
47+
$first = TestModel::first();
4848
$compare = TestModel::where('bool', $first->bool)->orWhereHas('related', function ($query) use ($first) {
4949
return $query->where('bool', $first->bool);
5050
})->get()->toArray();
@@ -61,7 +61,7 @@ public function ItShouldProperlyApplyTheWhereClauseOnBoolAttribute()
6161
*/
6262
public function ItShouldProperlyApplyTheWhereClauseOnIntAttribute()
6363
{
64-
$first = TestModel::first();
64+
$first = TestModel::first();
6565
$compare = TestModel::where('int', $first->int)->get()->toArray();
6666

6767
$response = $this->callEndpoint([
@@ -76,7 +76,7 @@ public function ItShouldProperlyApplyTheWhereClauseOnIntAttribute()
7676
*/
7777
public function ItShouldProperlyApplyTheWhereClauseOnDoubleAttribute()
7878
{
79-
$first = TestModel::first();
79+
$first = TestModel::first();
8080
$compare = TestModel::where('double', $first->double)->get()->toArray();
8181

8282
$response = $this->callEndpoint([
@@ -91,7 +91,7 @@ public function ItShouldProperlyApplyTheWhereClauseOnDoubleAttribute()
9191
*/
9292
public function ItShouldProperlyApplyTheWhereClauseOnDecimalAttribute()
9393
{
94-
$first = TestModel::first();
94+
$first = TestModel::first();
9595
$compare = TestModel::where('decimal', $first->decimal)->get()->toArray();
9696

9797
$response = $this->callEndpoint([
@@ -106,7 +106,7 @@ public function ItShouldProperlyApplyTheWhereClauseOnDecimalAttribute()
106106
*/
107107
public function ItShouldProperlyApplyTheWhereClauseOnDatetimeAttribute()
108108
{
109-
$first = TestModel::first();
109+
$first = TestModel::first();
110110
$compare = TestModel::where('datetime', $first->datetime)->get()->toArray();
111111

112112
$response = $this->callEndpoint([
@@ -121,7 +121,7 @@ public function ItShouldProperlyApplyTheWhereClauseOnDatetimeAttribute()
121121
*/
122122
public function ItShouldProperlyApplyTheWhereClauseOnDateAttribute()
123123
{
124-
$first = TestModel::first();
124+
$first = TestModel::first();
125125
$compare = TestModel::where('date', $first->date)->get()->toArray();
126126

127127
$response = $this->callEndpoint([
@@ -136,7 +136,7 @@ public function ItShouldProperlyApplyTheWhereClauseOnDateAttribute()
136136
*/
137137
public function ItShouldProperlyApplyTheWhereClauseOnTimeAttribute()
138138
{
139-
$first = TestModel::first();
139+
$first = TestModel::first();
140140
$compare = TestModel::where('time', $first->time)->get()->toArray();
141141

142142
$response = $this->callEndpoint([

‎tests/units/FullScopeTest.php

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22

33
namespace Goopil\RestFilter\Tests\Units;
44

5+
use Illuminate\Database\Eloquent\Model;
6+
use Illuminate\Database\Eloquent\Scope;
57
use Goopil\RestFilter\Scopes\FullScopes;
68
use Goopil\RestFilter\Scopes\SearchScope;
79
use Goopil\RestFilter\Tests\BaseTestCase;
810
use Illuminate\Database\Eloquent\Builder;
9-
use Illuminate\Database\Eloquent\Model;
10-
use Illuminate\Database\Eloquent\Scope;
11-
1211

1312
class FullScopeTest extends BaseTestCase
1413
{
@@ -25,7 +24,7 @@ class FullScopeTest extends BaseTestCase
2524
*/
2625
protected function getProtectedProperty($property)
2726
{
28-
$reflection = new \ReflectionClass($this->testedClass);
27+
$reflection = new \ReflectionClass($this->testedClass);
2928
$reflection_property = $reflection->getProperty($property);
3029
$reflection_property->setAccessible(true);
3130

@@ -38,7 +37,7 @@ protected function getProtectedProperty($property)
3837
public function ItShouldSetTheScopesWithAClassNameSpaceWithAnArrayAsArgument()
3938
{
4039
$this->testedClass = new FullScopes();
41-
$scope = SearchScope::class;
40+
$scope = SearchScope::class;
4241

4342
$this->testedClass->setScopes([$scope]);
4443

@@ -50,9 +49,9 @@ public function ItShouldSetTheScopesWithAClassNameSpaceWithAnArrayAsArgument()
5049
*/
5150
public function ItShouldSetTheScopesWithAClassInstanceSpaceWithAnArrayAsArgument()
5251
{
53-
$this->testedClass = new FullScopes();
52+
$this->testedClass = new FullScopes();
5453
$singleScopeAsArray = [
55-
new SearchScope
54+
new SearchScope,
5655
];
5756

5857
$this->testedClass->setScopes($singleScopeAsArray);
@@ -65,7 +64,7 @@ public function ItShouldSetTheScopesWithAClassInstanceSpaceWithAnArrayAsArgument
6564
*/
6665
public function ItShouldSetTheScopesWithAClassInstanceSpaceAsASingleArgument()
6766
{
68-
$this->testedClass = new FullScopes();
67+
$this->testedClass = new FullScopes();
6968
$singleScopeAsString = SearchScope::class;
7069

7170
$this->testedClass->setScopes($singleScopeAsString);
@@ -79,7 +78,7 @@ public function ItShouldSetTheScopesWithAClassInstanceSpaceAsASingleArgument()
7978
*/
8079
public function itShouldSetTheScopeToBeAppliedOnNextRequestFeedingItAString()
8180
{
82-
$this->testedClass = new FullScopes();
81+
$this->testedClass = new FullScopes();
8382
$singleScopeAsString = new SearchScope;
8483

8584
$this->testedClass->setScopes($singleScopeAsString);
@@ -92,8 +91,8 @@ public function itShouldSetTheScopeToBeAppliedOnNextRequestFeedingItAString()
9291
*/
9392
public function ItShouldKeepOnlyOneInstanceOfTheSameScope()
9493
{
95-
$this->testedClass = new FullScopes();
96-
$firstScopeAsString = new SearchScope;
94+
$this->testedClass = new FullScopes();
95+
$firstScopeAsString = new SearchScope;
9796
$secondScopeAsString = new SearchScope;
9897

9998
$this->testedClass->setScopes([$firstScopeAsString, $secondScopeAsString]);
@@ -107,7 +106,7 @@ public function ItShouldKeepOnlyOneInstanceOfTheSameScope()
107106
public function ItShouldTrowAnInvalidArgumentExceptionIfWhatYouInjectIsNotAScope()
108107
{
109108
$this->testedClass = new FullScopes();
110-
$scope = new \stdClass();
109+
$scope = new \stdClass();
111110
$this->expectException(\InvalidArgumentException::class);
112111

113112
$this->testedClass->setScopes($scope);
@@ -118,9 +117,8 @@ public function ItShouldTrowAnInvalidArgumentExceptionIfWhatYouInjectIsNotAScope
118117
*/
119118
public function ItShouldAddANewScopeToTheheap()
120119
{
121-
$this->testedClass = new FullScopes();
122-
$scope = new class implements Scope
123-
{
120+
$this->testedClass = new FullScopes();
121+
$scope = new class implements Scope {
124122
public function apply(Builder $builder, Model $model)
125123
{
126124
}

‎tests/units/QueryableTraitTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace Goopil\RestFilter\Tests\Units;
44

5-
use Goopil\RestFilter\Tests\BaseTestCase;
65
use Mockery as m;
6+
use Goopil\RestFilter\Tests\BaseTestCase;
77

88
class QueryableTraitTest extends BaseTestCase
99
{

‎tests/utils/TestModel.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
namespace Goopil\RestFilter\Tests\Utils;
44

5+
use Illuminate\Database\Eloquent\Model;
56
use Goopil\RestFilter\Contracts\Paginable;
67
use Goopil\RestFilter\Contracts\Searchable;
7-
use Illuminate\Database\Eloquent\Model;
88

99
class TestModel extends Model implements Searchable
1010
{
@@ -54,10 +54,6 @@ public static function searchable()
5454
];
5555
}
5656

57-
public function test () {
58-
// $this->related()
59-
}
60-
6157
public function related()
6258
{
6359
return $this->hasMany(TestRelatedModel::class);

‎tests/utils/TestQueryableModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace Goopil\RestFilter\Tests\Utils;
44

5-
use Goopil\RestFilter\Contracts\Queryable;
65
use Illuminate\Database\Eloquent\Model;
6+
use Goopil\RestFilter\Contracts\Queryable;
77

88
class TestQueryableModel extends Model
99
{

0 commit comments

Comments
 (0)