Skip to content

Commit ca92a13

Browse files
committed
Renamed Touch to DoesTouch due to overlap with Model::Touch
1 parent 6253470 commit ca92a13

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/Eloquent/SpatialTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public function scopeOverlaps($query, $geometryColumn, $geometry)
161161
return $this->scopeComparison($query, $geometryColumn, $geometry, 'overlaps');
162162
}
163163

164-
public function scopeTouches($query, $geometryColumn, $geometry)
164+
public function scopeDoesTouch($query, $geometryColumn, $geometry)
165165
{
166166
return $this->scopeComparison($query, $geometryColumn, $geometry, 'touches');
167167
}

tests/Unit/Eloquent/SpatialTraitTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,9 +391,9 @@ public function testScopeOverlaps()
391391
$this->assertContains("st_overlaps(`point`, GeomFromText('POLYGON((1 1,2 1),(2 1,2 2),(2 2,1 1))'))", $q->wheres[0]['sql']);
392392
}
393393

394-
public function testScopeTouches()
394+
public function testScopeDoesTouch()
395395
{
396-
$query = TestModel::Touches('point',$this->buildTestPolygon());
396+
$query = TestModel::DoesTouches('point',$this->buildTestPolygon());
397397

398398
$this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
399399
$q = $query->getQuery();

0 commit comments

Comments
 (0)