Update code standards

TavoNiievez · TavoNiievez · commit 539544a62cbe · 2021-11-21T16:06:53.000-05:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -52,8 +52,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require laravel/framework=${{ matrix.laravel }} --ignore-platform-req=php --no-update
-          composer install --prefer-dist --no-progress --ignore-platform-req=php
+          composer require laravel/framework=${{ matrix.laravel }} --no-update
+          composer install --prefer-dist --no-progress
 
       - name: Validate composer.json and composer.lock
         run: composer validate
@@ -74,6 +74,4 @@ jobs:
         working-directory: framework-tests
 
       - name: Run test suite
-        run: |
-          php vendor/bin/codecept build -c framework-tests
-          php vendor/bin/codecept run Functional -c framework-tests
+        run: php vendor/bin/codecept run Functional -c framework-tests
diff --git a/composer.json b/composer.json
@@ -27,6 +27,7 @@
     "require-dev": {
         "codeception/module-asserts": "^1.3",
         "codeception/module-rest": "^1.2",
+        "laravel/framework": "^6.0 | ^7.0 | ^8.0",
         "vlucas/phpdotenv": "^3.6 | ^4.1 | ^5.2"
     },
     "autoload": {
diff --git a/readme.md b/readme.md
@@ -10,7 +10,7 @@ A Codeception module for Laravel framework.
 ## Requirements
 
 * `Laravel 6` or higher.
-* `PHP 7.3` or higher.
+* `PHP 7.4` or higher.
 
 ## Installation
 
diff --git a/src/Codeception/Module/Laravel/InteractsWithAuthentication.php b/src/Codeception/Module/Laravel/InteractsWithAuthentication.php
@@ -57,7 +57,7 @@ public function amLoggedAs($user, string $guardName = null): void
         $guard = $this->getAuth()->guard($guardName);
         $this->assertTrue(
             $guard->attempt($user)
-            , 'Failed to login with credentials ' . json_encode($user)
+            , 'Failed to login with credentials ' . json_encode($user, JSON_THROW_ON_ERROR)
         );
     }
 
diff --git a/src/Codeception/Module/Laravel/InteractsWithEloquent.php b/src/Codeception/Module/Laravel/InteractsWithEloquent.php
@@ -43,7 +43,7 @@ public function dontSeeRecord($table, $attributes = []): void
 
         if (class_exists($table)) {
             if ($foundMatchingRecord = (bool)$this->findModel($table, $attributes)) {
-                $this->fail("Unexpectedly found matching {$table} with " . json_encode($attributes));
+                $this->fail("Unexpectedly found matching {$table} with " . json_encode($attributes, JSON_THROW_ON_ERROR));
             }
         } elseif ($foundMatchingRecord = (bool)$this->findRecord($table, $attributes)) {
             $this->fail("Unexpectedly found matching record in table '{$table}'");
@@ -89,7 +89,7 @@ public function grabRecord($table, $attributes = [])
     {
         if (class_exists($table)) {
             if (!$model = $this->findModel($table, $attributes)) {
-                $this->fail("Could not find {$table} with " . json_encode($attributes));
+                $this->fail("Could not find {$table} with " . json_encode($attributes, JSON_THROW_ON_ERROR));
             }
 
             return $model;
@@ -275,14 +275,14 @@ public function seeNumRecords(int $expectedNum, string $table, array $attributes
             $this->assertSame(
                 $expectedNum,
                 $currentNum,
-                "The number of found {$table} ({$currentNum}) does not match expected number {$expectedNum} with " . json_encode($attributes)
+                "The number of found {$table} ({$currentNum}) does not match expected number {$expectedNum} with " . json_encode($attributes, JSON_THROW_ON_ERROR)
             );
         } else {
             $currentNum = $this->countRecords($table, $attributes);
             $this->assertSame(
                 $expectedNum,
                 $currentNum,
-                "The number of found records in table {$table} ({$currentNum}) does not match expected number $expectedNum with " . json_encode($attributes)
+                "The number of found records in table {$table} ({$currentNum}) does not match expected number $expectedNum with " . json_encode($attributes, JSON_THROW_ON_ERROR)
             );
         }
     }
@@ -310,7 +310,7 @@ public function seeRecord($table, $attributes = []): void
 
         if (class_exists($table)) {
             if (!$foundMatchingRecord = (bool)$this->findModel($table, $attributes)) {
-                $this->fail("Could not find {$table} with " . json_encode($attributes));
+                $this->fail("Could not find {$table} with " . json_encode($attributes, JSON_THROW_ON_ERROR));
             }
         } elseif (!$foundMatchingRecord = (bool)$this->findRecord($table, $attributes)) {
             $this->fail("Could not find matching record in table '{$table}'");

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function amLoggedAs($user, string $guardName = null): void`
`57`	`57`	`$guard = $this->getAuth()->guard($guardName);`
`58`	`58`	`$this->assertTrue(`
`59`	`59`	`$guard->attempt($user)`
`60`		`- , 'Failed to login with credentials ' . json_encode($user)`
	`60`	`+ , 'Failed to login with credentials ' . json_encode($user, JSON_THROW_ON_ERROR)`
`61`	`61`	`);`
`62`	`62`	`}`
`63`	`63`