Merge pull request #5 from jhoff/6_0-upgrade

Upgrade to Laravel 6.0
jhoff · Sep 12, 2019 · ff779e9 · ff779e9
2 parents 469e0e0 + 926b7d7
commit ff779e9
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/composer.json b/composer.json
@@ -16,17 +16,17 @@
     ],
     "require": {
         "php": ">=7.0",
-        "laravel/framework": "^5.4"
+        "laravel/framework": "^5.4|6.*"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.13",
         "mockery/mockery": "^1.0",
-        "orchestra/testbench": "^3.7",
+        "orchestra/testbench": "^4.0",
         "phpmd/phpmd": "^2.6",
-        "phpunit/phpunit": "~7.4",
+        "phpunit/phpunit": "^8.0",
         "squizlabs/php_codesniffer": "^2.9",
-        "two-thirds/artisan-anywhere": "^1.1",
-        "two-thirds/laravel-test-suite": "^3.0"
+        "two-thirds/artisan-anywhere": "^1.2",
+        "two-thirds/laravel-test-suite": "^4.1"
     },
     "config": {
         "preferred-install": "dist",

diff --git a/tests/Integration/BladeTest.php b/tests/Integration/BladeTest.php
@@ -13,9 +13,9 @@ public function bladeRendersBasicVueDirective()
     {
         $output = $this->renderBasicBlade('"my-component"');
 
-        $this->assertContains('<component', $output);
-        $this->assertContains('is="my-component"', $output);
-        $this->assertContains('</component>', $output);
+        $this->assertStringContainsString('<component', $output);
+        $this->assertStringContainsString('is="my-component"', $output);
+        $this->assertStringContainsString('</component>', $output);
     }
 
     /**
@@ -25,10 +25,10 @@ public function bladeRendersAdvancedVueDirective()
     {
         $output = $this->renderBasicBlade('"my-component", ["foo" => "bar"]');
 
-        $this->assertContains('<component', $output);
-        $this->assertContains('is="my-component"', $output);
-        $this->assertContains('foo="bar"', $output);
-        $this->assertContains('</component>', $output);
+        $this->assertStringContainsString('<component', $output);
+        $this->assertStringContainsString('is="my-component"', $output);
+        $this->assertStringContainsString('foo="bar"', $output);
+        $this->assertStringContainsString('</component>', $output);
     }
     /**
      * @test
@@ -37,10 +37,10 @@ public function bladeRendersInlineVueDirective()
     {
         $output = $this->renderInlineBlade('"my-component"');
 
-        $this->assertContains('<component', $output);
-        $this->assertContains('inline-template', $output);
-        $this->assertContains('is="my-component"', $output);
-        $this->assertContains('</component>', $output);
+        $this->assertStringContainsString('<component', $output);
+        $this->assertStringContainsString('inline-template', $output);
+        $this->assertStringContainsString('is="my-component"', $output);
+        $this->assertStringContainsString('</component>', $output);
     }
 
     /**
@@ -50,11 +50,11 @@ public function bladeRendersAdvancedInlineVueDirective()
     {
         $output = $this->renderInlineBlade('"my-component", ["foo" => "bar"]');
 
-        $this->assertContains('<component', $output);
-        $this->assertContains('inline-template', $output);
-        $this->assertContains('is="my-component"', $output);
-        $this->assertContains('foo="bar"', $output);
-        $this->assertContains('</component>', $output);
+        $this->assertStringContainsString('<component', $output);
+        $this->assertStringContainsString('inline-template', $output);
+        $this->assertStringContainsString('is="my-component"', $output);
+        $this->assertStringContainsString('foo="bar"', $output);
+        $this->assertStringContainsString('</component>', $output);
     }
 
     /**

diff --git a/tests/Unit/ComponentTest.php b/tests/Unit/ComponentTest.php
@@ -68,7 +68,7 @@ public function nonArraySecondArgumentThrowsTypeError()
         try {
             Basic::start('foobar', 'this is invalid');
         } catch (TypeError $typeError) {
-            $this->assertContains('::start() must be of the type array', $typeError->getMessage());
+            $this->assertStringContainsString('::start() must be of the type array', $typeError->getMessage());
             return;
         }