Replace deprecated phpunit assertContains

...and require phpunit >7.5 for assertStringContainsString See sebastianbergmann/phpunit#3422
kontenta · Sep 20, 2019 · cc533f2 · cc533f2
1 parent a3d5f9a
commit cc533f2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -9,7 +9,8 @@
     "mockery/mockery": "^1.2",
     "orchestra/testbench-dusk": "~3.7.2 || ~3.8.2 || ^4.0.1",
     "squizlabs/php_codesniffer": "^3.3",
-    "timacdonald/log-fake": "^1.0"
+    "timacdonald/log-fake": "^1.0",
+    "phpunit/phpunit": ">7.5"
   },
   "autoload": {
     "psr-4": {

diff --git a/tests/Feature/ElementViewTests/TimeTest.php b/tests/Feature/ElementViewTests/TimeTest.php
@@ -14,7 +14,7 @@ public function test_displays_relative_time_by_default()
         $carbon = Carbon::now();
         $output = View::make('kontour::elements.time', compact('carbon'))->render();
 
-        $this->assertContains('datetime="' . $carbon->toAtomString() . '"', $output);
+        $this->assertStringContainsString('datetime="' . $carbon->toAtomString() . '"', $output);
         $this->assertRegExp('/>\d seconds? ago<\/time>$/', $output);
     }
 
@@ -24,8 +24,8 @@ public function test_can_format_time()
         $format = 'Y';
         $output = View::make('kontour::elements.time', compact('carbon', 'format'))->render();
 
-        $this->assertContains('datetime="' . $carbon->toAtomString() . '"', $output);
-        $this->assertContains('>' . $carbon->format($format) . '</time>', $output);
+        $this->assertStringContainsString('datetime="' . $carbon->toAtomString() . '"', $output);
+        $this->assertStringContainsString('>' . $carbon->format($format) . '</time>', $output);
     }
 
     public function test_can_use_default_format_from_config()
@@ -34,16 +34,16 @@ public function test_can_use_default_format_from_config()
         $format = true;
         $output = View::make('kontour::elements.time', compact('carbon', 'format'))->render();
 
-        $this->assertContains('datetime="' . $carbon->toAtomString() . '"', $output);
-        $this->assertContains('>' . $carbon->format(config('kontour.time_format')) . '</time>', $output);
+        $this->assertStringContainsString('datetime="' . $carbon->toAtomString() . '"', $output);
+        $this->assertStringContainsString('>' . $carbon->format(config('kontour.time_format')) . '</time>', $output);
     }
 
     public function test_can_display_time_interval()
     {
         $carbon = CarbonInterval::year();
         $output = View::make('kontour::elements.time', compact('carbon'))->render();
 
-        $this->assertContains('datetime="' . $carbon->spec() . '"', $output);
-        $this->assertContains('>' . $carbon->forHumans() . '</time>', $output);
+        $this->assertStringContainsString('datetime="' . $carbon->spec() . '"', $output);
+        $this->assertStringContainsString('>' . $carbon->forHumans() . '</time>', $output);
     }
 }
diff --git a/tests/Feature/UserlandServiceProviderTest.php b/tests/Feature/UserlandServiceProviderTest.php
@@ -15,12 +15,12 @@ public function test_routes_are_registered()
 
     public function test_routes_contain_userland_prefix()
     {
-        $this->assertContains('/userland-tool', route('userland.index'));
+        $this->assertStringContainsString('/userland-tool', route('userland.index'));
     }
 
     public function test_routes_contain_admin_prefix()
     {
-        $this->assertContains('/' . config('kontour.url_prefix'), route('userland.index'));
+        $this->assertStringContainsString('/' . config('kontour.url_prefix'), route('userland.index'));
     }
 
     public function test_widget_manager_contains_widget()