Merge pull request #4862 from samsonasik/apply-rector-r

[Rector] Apply Rector: RemoveExtraParametersRector
codeigniter4 · Jun 23, 2021 · e73f750 · e73f750
2 parents 007c66f + 3e0c343
commit e73f750
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/rector.php b/rector.php
@@ -26,6 +26,7 @@
 use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector;
 use Rector\EarlyReturn\Rector\Return_\PreparedValueToEarlyReturnRector;
 use Rector\Php70\Rector\Ternary\TernaryToNullCoalescingRector;
+use Rector\Php71\Rector\FuncCall\RemoveExtraParametersRector;
 use Rector\Php71\Rector\List_\ListToArrayDestructRector;
 use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
 use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
@@ -97,4 +98,5 @@
  $services->set(RemoveVarTagFromClassConstantRector::class);
  $services->set(AddPregQuoteDelimiterRector::class);
  $services->set(SimplifyRegexPatternRector::class);
+ $services->set(RemoveExtraParametersRector::class);
 };
diff --git a/tests/system/Database/Builder/InsertTest.php b/tests/system/Database/Builder/InsertTest.php
@@ -117,7 +117,7 @@ public function testInsertBatchThrowsExceptionOnNoData()
  {
  $builder = $this->db->table('jobs');
 
- $this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException', 'You must use the "set" method to update an entry.');
+ $this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException');
  $this->expectExceptionMessage('You must use the "set" method to update an entry.');
  $builder->insertBatch();
  }

diff --git a/tests/system/Database/Builder/UpdateTest.php b/tests/system/Database/Builder/UpdateTest.php
@@ -91,9 +91,10 @@ public function testUpdateThrowsExceptionWithNoData()
  {
  $builder = new BaseBuilder('jobs', $this->db);
 
- $this->expectException('CodeIgniter\Database\Exceptions\DatabaseException', 'You must use the "set" method to update an entry.');
+ $this->expectException('CodeIgniter\Database\Exceptions\DatabaseException');
+ $this->expectExceptionMessage('You must use the "set" method to update an entry.');
 
- $builder->update(null, null, null, true);
+ $builder->update(null, null, null);
  }
 
  public function testUpdateBatch()

diff --git a/tests/system/Helpers/URLHelper/SiteUrlTest.php b/tests/system/Helpers/URLHelper/SiteUrlTest.php
@@ -266,6 +266,6 @@ public function testBaseURLService()
  Services::injectMock('request', $request);
 
  $this->assertEquals('http://example.com/ci/v4/index.php/controller/method', site_url('controller/method', null, $this->config));
- $this->assertEquals('http://example.com/ci/v4/controller/method', base_url('controller/method', null, $this->config));
+ $this->assertEquals('http://example.com/ci/v4/controller/method', base_url('controller/method', null));
  }
 }
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
@@ -181,7 +181,7 @@ public function testClosures()
  {
  $router = new Router($this->collection, $this->request);
 
- $router->handle('closure/123/alpha', $this->request);
+ $router->handle('closure/123/alpha');
 
  $closure = $router->controllerName();