Always prefer stricter comparisons and assertions. (#317)

lucasmichot · iget-esoares · commit 2dcb620ae6c5 · 2019-12-28T19:25:19.000-03:00
diff --git a/src/Builders/FilterBuilder.php b/src/Builders/FilterBuilder.php
@@ -83,7 +83,7 @@ public function where($field, $value)
     {
         $args = func_get_args();
 
-        if (count($args) == 3) {
+        if (count($args) === 3) {
             [$field, $operator, $value] = $args;
         } else {
             $operator = '=';
@@ -397,7 +397,7 @@ public function whereGeoShape($field, array $shape, $relation = 'INTERSECTS')
     public function orderBy($field, $direction = 'asc')
     {
         $this->orders[] = [
-            $field => strtolower($direction) == 'asc' ? 'asc' : 'desc',
+            $field => strtolower($direction) === 'asc' ? 'asc' : 'desc',
         ];
 
         return $this;
diff --git a/src/ElasticEngine.php b/src/ElasticEngine.php
@@ -291,7 +291,7 @@ public function mapIds($results)
      */
     public function map(Builder $builder, $results, $model)
     {
-        if ($this->getTotalCount($results) == 0) {
+        if ($this->getTotalCount($results) === 0) {
             return Collection::make();
         }
 
diff --git a/src/Highlight.php b/src/Highlight.php
@@ -35,7 +35,7 @@ public function __get($key)
         if (isset($this->highlight[$field])) {
             $value = $this->highlight[$field];
 
-            return $field == $key ? $value : implode(' ', $value);
+            return $field === $key ? $value : implode(' ', $value);
         } else {
             return;
         }
diff --git a/src/Searchable.php b/src/Searchable.php
@@ -84,7 +84,7 @@ public static function search($query, $callback = null)
     {
         $softDelete = static::usesSoftDelete() && config('scout.soft_delete', false);
 
-        if ($query == '*') {
+        if ($query === '*') {
             return new FilterBuilder(new static, $callback, $softDelete);
         } else {
             return new SearchBuilder(new static, $query, $callback, $softDelete);
diff --git a/tests/Builders/FilterBuilderTest.php b/tests/Builders/FilterBuilderTest.php
@@ -14,7 +14,7 @@ public function testCreationWithSoftDelete()
     {
         $builder = new FilterBuilder($this->mockModel(), null, true);
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 'must' => [
                     [
@@ -33,7 +33,7 @@ public function testCreationWithoutSoftDelete()
     {
         $builder = new FilterBuilder($this->mockModel(), null, false);
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 'must' => [],
                 'must_not' => [],
@@ -48,7 +48,7 @@ public function testWhereEq()
             ->where('foo', 0)
             ->where('bar', '=', 1);
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 'must' => [
                     ['term' => ['foo' => 0]],
@@ -65,7 +65,7 @@ public function testWhereNotEq()
         $builder = (new FilterBuilder($this->mockModel()))
             ->where('foo', '!=', 'bar');
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 'must' => [],
                 'must_not' => [
@@ -81,7 +81,7 @@ public function testWhereGt()
         $builder = (new FilterBuilder($this->mockModel()))
             ->where('foo', '>', 0);
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 'must' => [
                     ['range' => ['foo' => ['gt' => 0]]],
@@ -97,7 +97,7 @@ public function testWhereGte()
         $builder = (new FilterBuilder($this->mockModel()))
             ->where('foo', '>=', 0);
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 'must' => [
                     ['range' => ['foo' => ['gte' => 0]]],
@@ -113,7 +113,7 @@ public function testWhereLt()
         $builder = (new FilterBuilder($this->mockModel()))
             ->where('foo', '<', 0);
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 'must' => [
                     ['range' => ['foo' => ['lt' => 0]]],
@@ -129,7 +129,7 @@ public function testWhereLte()
         $builder = (new FilterBuilder($this->mockModel()))
             ->where('foo', '>=', 0);
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 'must' => [
                     ['range' => ['foo' => ['gte' => 0]]],
@@ -145,7 +145,7 @@ public function testWhereIn()
         $builder = (new FilterBuilder($this->mockModel()))
             ->whereIn('foo', [0, 1]);
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 'must' => [
                     ['terms' => ['foo' => [0, 1]]],
@@ -161,7 +161,7 @@ public function testWhereNotIn()
         $builder = (new FilterBuilder($this->mockModel()))
             ->whereNotIn('foo', [0, 1]);
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 'must' => [],
                 'must_not' => [
@@ -177,7 +177,7 @@ public function testWhereBetween()
         $builder = (new FilterBuilder($this->mockModel()))
             ->whereBetween('foo', [0, 10]);
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 'must' => [
                     ['range' => ['foo' => ['gte' => 0, 'lte' => 10]]],
@@ -193,7 +193,7 @@ public function testWhereNotBetween()
         $builder = (new FilterBuilder($this->mockModel()))
             ->whereNotBetween('foo', [0, 10]);
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 'must' => [],
                 'must_not' => [
@@ -209,7 +209,7 @@ public function testWhereExists()
         $builder = (new FilterBuilder($this->mockModel()))
             ->whereExists('foo');
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 'must' => [
                     ['exists' => ['field' => 'foo']],
@@ -225,7 +225,7 @@ public function testWhereNotExists()
         $builder = (new FilterBuilder($this->mockModel()))
             ->whereNotExists('foo');
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 'must' => [],
                 'must_not' => [
@@ -242,7 +242,7 @@ public function testWhereRegexp()
             ->whereRegexp('foo', '.*')
             ->whereRegexp('bar', '^test.*', 'EMPTY|NONE');
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 'must' => [
                     ['regexp' => ['foo' => ['value' => '.*', 'flags' => 'ALL']]],
@@ -279,7 +279,7 @@ function (FilterBuilder $builder) {
                 }
             );
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 'must' => [
                     ['term' => ['case2' => 2]],
@@ -296,7 +296,7 @@ public function testWhereGeoDistance()
         $builder = (new FilterBuilder($this->mockModel()))
             ->whereGeoDistance('foo', [-20, 30], '10m');
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 'must' => [
                     ['geo_distance' => ['distance' => '10m', 'foo' => [-20, 30]]],
@@ -312,7 +312,7 @@ public function testWhereGeoBoundingBox()
         $builder = (new FilterBuilder($this->mockModel()))
             ->whereGeoBoundingBox('foo', ['top_left' => [-5, 10], 'bottom_right' => [-20, 30]]);
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 'must' => [
                     ['geo_bounding_box' => ['foo' => ['top_left' => [-5, 10], 'bottom_right' => [-20, 30]]]],
@@ -328,7 +328,7 @@ public function testWhereGeoPolygon()
         $builder = (new FilterBuilder($this->mockModel()))
             ->whereGeoPolygon('foo', [[-70, 40], [-80, 30], [-90, 20]]);
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 'must' => [
                     ['geo_polygon' => ['foo' => ['points' => [[-70, 40], [-80, 30], [-90, 20]]]]],
@@ -355,7 +355,7 @@ public function testWhereGeoShape()
         $builder = (new FilterBuilder($this->mockModel()))
             ->whereGeoShape('foo', $shape, $relation);
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 'must' => [
                     [
@@ -379,7 +379,7 @@ public function testOrderBy()
             ->orderBy('foo')
             ->orderBy('bar', 'DESC');
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 ['foo' => 'asc'],
                 ['bar' => 'desc'],
@@ -393,7 +393,7 @@ public function testWith()
         $builder = (new FilterBuilder($this->mockModel()))
             ->with('RelatedModel');
 
-        $this->assertEquals(
+        $this->assertSame(
             'RelatedModel',
             $builder->with
         );
@@ -403,14 +403,13 @@ public function testFrom()
     {
         $builder = new FilterBuilder($this->mockModel());
 
-        $this->assertEquals(
-            0,
+        $this->assertNull(
             $builder->offset
         );
 
         $builder->from(100);
 
-        $this->assertEquals(
+        $this->assertSame(
             100,
             $builder->offset
         );
@@ -421,7 +420,7 @@ public function testCollapse()
         $builder = (new FilterBuilder($this->mockModel()))
             ->collapse('foo');
 
-        $this->assertEquals(
+        $this->assertSame(
             'foo',
             $builder->collapse
         );
@@ -432,7 +431,7 @@ public function testSelect()
         $builder = (new FilterBuilder($this->mockModel()))
             ->select(['foo', 'bar']);
 
-        $this->assertEquals(
+        $this->assertSame(
             ['foo', 'bar'],
             $builder->select
         );
@@ -444,7 +443,7 @@ public function testWithTrashed()
             ->withTrashed()
             ->where('foo', 'bar');
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 'must' => [
                     [
@@ -465,7 +464,7 @@ public function testOnlyTrashed()
             ->onlyTrashed()
             ->where('foo', 'bar');
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 'must' => [
                     [
diff --git a/tests/Builders/SearchBuilderTest.php b/tests/Builders/SearchBuilderTest.php
@@ -27,7 +27,7 @@ public function testRule()
 
         $builder->rule(SearchRule::class)->rule($ruleFunc);
 
-        $this->assertEquals([
+        $this->assertSame([
             SearchRule::class,
             $ruleFunc,
         ], $builder->rules);
diff --git a/tests/ElasticEngineTest.php b/tests/ElasticEngineTest.php
@@ -298,7 +298,7 @@ public function testMapIds()
             ],
         ];
 
-        $this->assertEquals(
+        $this->assertSame(
             [1, 2],
             $this->engine->mapIds($results)->all()
         );
@@ -366,7 +366,7 @@ public function testMapWithoutTrashed()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->assertEquals(
+        $this->assertSame(
             [$model],
             $this->engine->map($builder, $results, $model)->all()
         );
@@ -434,7 +434,7 @@ public function testMapWithTrashed()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->assertEquals(
+        $this->assertSame(
             [$model],
             $this->engine->map($builder, $results, $model)->all()
         );
@@ -451,7 +451,7 @@ public function testGetTotalCount()
             ],
         ];
 
-        $this->assertEquals(
+        $this->assertSame(
             100,
             $this->engine->getTotalCount($results)
         );
diff --git a/tests/HighlightTest.php b/tests/HighlightTest.php
@@ -13,12 +13,12 @@ public function testGetter()
             'description' => ['Description snippet 1', 'Description snippet 2'],
         ]);
 
-        $this->assertEquals(
+        $this->assertSame(
             ['Title snippet 1'],
             $highlight->title
         );
 
-        $this->assertEquals(
+        $this->assertSame(
             'Description snippet 1 Description snippet 2',
             $highlight->descriptionAsString
         );
diff --git a/tests/Payloads/DocumentPayloadTest.php b/tests/Payloads/DocumentPayloadTest.php
@@ -16,7 +16,7 @@ public function testDefault()
 
         $payload = new DocumentPayload($model);
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 'index' => 'test',
                 'type' => 'test',
@@ -43,7 +43,7 @@ public function testSet()
             ->set('id', 2)
             ->set('body', []);
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 'index' => 'foo',
                 'type' => 'bar',
diff --git a/tests/Payloads/IndexPayloadTest.php b/tests/Payloads/IndexPayloadTest.php
diff --git a/tests/Payloads/RawPayloadTest.php b/tests/Payloads/RawPayloadTest.php
diff --git a/tests/Payloads/TypePayloadTest.php b/tests/Payloads/TypePayloadTest.php

Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ public function mapIds($results)`
`291`	`291`	`*/`
`292`	`292`	`public function map(Builder $builder, $results, $model)`
`293`	`293`	`{`
`294`		`- if ($this->getTotalCount($results) == 0) {`
	`294`	`+ if ($this->getTotalCount($results) === 0) {`
`295`	`295`	`return Collection::make();`
`296`	`296`	`}`
`297`	`297`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function __get($key)`
`35`	`35`	`if (isset($this->highlight[$field])) {`
`36`	`36`	`$value = $this->highlight[$field];`
`37`	`37`
`38`		`- return $field == $key ? $value : implode(' ', $value);`
	`38`	`+ return $field === $key ? $value : implode(' ', $value);`
`39`	`39`	`} else {`
`40`	`40`	`return;`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public static function search($query, $callback = null)`
`84`	`84`	`{`
`85`	`85`	`$softDelete = static::usesSoftDelete() && config('scout.soft_delete', false);`
`86`	`86`
`87`		`- if ($query == '*') {`
	`87`	`+ if ($query === '*') {`
`88`	`88`	`return new FilterBuilder(new static, $callback, $softDelete);`
`89`	`89`	`} else {`
`90`	`90`	`return new SearchBuilder(new static, $query, $callback, $softDelete);`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public function testDefault()`
`16`	`16`
`17`	`17`	`$payload = new DocumentPayload($model);`
`18`	`18`
`19`		`- $this->assertEquals(`
	`19`	`+ $this->assertSame(`
`20`	`20`	`[`
`21`	`21`	`'index' => 'test',`
`22`	`22`	`'type' => 'test',`
`@@ -43,7 +43,7 @@ public function testSet()`
`43`	`43`	`->set('id', 2)`
`44`	`44`	`->set('body', []);`
`45`	`45`
`46`		`- $this->assertEquals(`
	`46`	`+ $this->assertSame(`
`47`	`47`	`[`
`48`	`48`	`'index' => 'foo',`
`49`	`49`	`'type' => 'bar',`