From bf1856dc57f2ea24144487a485672be731ae9260 Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Wed, 9 Feb 2022 20:41:59 +0000
Subject: [PATCH] Brought tests to green.

---
 .github/workflows/laravel.yml                 |  2 +-
 composer.json                                 | 42 +++++++++++--------
 tests/Feature/PaginationTest.php              |  6 +--
 .../CachedBuilder/PaginateTest.php            |  6 +--
 4 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
index 43663e4..4db00ff 100644
--- a/.github/workflows/laravel.yml
+++ b/.github/workflows/laravel.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.3, 7.4, 8.0]
+        php: [7.4, 8.0, 8.1]
 
     name: PHP ${{ matrix.php }}
 
diff --git a/composer.json b/composer.json
index c35e30f..e93821d 100644
--- a/composer.json
+++ b/composer.json
@@ -15,29 +15,29 @@
         }
     ],
     "require": {
-        "php": "^7.3|^8.0",
-        "genealabs/laravel-pivot-events": "^8.0",
-        "illuminate/cache": "^8.0",
-        "illuminate/config": "^8.0",
-        "illuminate/console": "^8.0",
-        "illuminate/container": "^8.0",
-        "illuminate/database": "^8.0",
-        "illuminate/http": "^8.0",
-        "illuminate/support": "^8.0"
+        "php": "^7.4|^8.0",
+        "genealabs/laravel-pivot-events": "^9.0",
+        "illuminate/cache": "^9.0",
+        "illuminate/config": "^9.0",
+        "illuminate/console": "^9.0",
+        "illuminate/container": "^9.0",
+        "illuminate/database": "^9.0",
+        "illuminate/http": "^9.0",
+        "illuminate/support": "^9.0"
     },
     "require-dev": {
-        "doctrine/dbal": "^2.10",
+        "doctrine/dbal": "^3.3",
         "fakerphp/faker": "^1.11",
         "laravel/nova": "^3.9",
-        "orchestra/testbench-browser-kit": "^6.0",
-        "orchestra/testbench": "^6.0",
+        "orchestra/testbench-browser-kit": "^7.0",
+        "orchestra/testbench": "^7.0",
         "php-coveralls/php-coveralls" : "^2.2",
-        "phpmd/phpmd": "^2.7",
-        "phpunit/phpunit": "^9.0",
-        "slevomat/coding-standard": "^6.4",
-        "squizlabs/php_codesniffer": "^3.4",
+        "phpmd/phpmd": "^2.11",
+        "phpunit/phpunit": "^9.5",
+        "slevomat/coding-standard": "^7.0",
+        "squizlabs/php_codesniffer": "^3.6",
         "symfony/thanks": "^1.2",
-        "laravel/legacy-factories": "^1.0"
+        "laravel/legacy-factories": "^1.3"
     },
     "autoload": {
         "psr-4": {
@@ -61,5 +61,11 @@
         }
     },
     "minimum-stability": "dev",
-    "prefer-stable": true
+    "prefer-stable": true,
+    "config": {
+        "allow-plugins": {
+            "symfony/thanks": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
+    }
 }
diff --git a/tests/Feature/PaginationTest.php b/tests/Feature/PaginationTest.php
index ca0215e..b122b23 100644
--- a/tests/Feature/PaginationTest.php
+++ b/tests/Feature/PaginationTest.php
@@ -8,7 +8,7 @@ class PaginationTest extends FeatureTestCase
     public function testPaginationProvidesDifferentLinksOnDifferentPages()
     {
         // Checking the version start with 8.0.
-        if (preg_match("/^(8\.)/", app()->version())) {
+        if (preg_match("/^([8|9]\.)/", app()->version())) {
             $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">1</span>';
             $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">2</span>';
         }
@@ -40,7 +40,7 @@ public function testPaginationProvidesDifferentLinksOnDifferentPages()
     public function testAdvancedPagination()
     {
         // Checking the version start with 8.0.
-        if (preg_match("/^(8\.)/", app()->version())) {
+        if (preg_match("/^([8|9]\.)/", app()->version())) {
             $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">1</span>';
             $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">2</span>';
         }
@@ -63,7 +63,7 @@ public function testAdvancedPagination()
     public function testCustomPagination()
     {
         // Checking the version start with 8.0.
-        if (preg_match("/^(8\.)/", app()->version())) {
+        if (preg_match("/^([8|9]\.)/", app()->version())) {
             $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">1</span>';
             $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">2</span>';
         }
diff --git a/tests/Integration/CachedBuilder/PaginateTest.php b/tests/Integration/CachedBuilder/PaginateTest.php
index 3c2fe26..8f24ebb 100644
--- a/tests/Integration/CachedBuilder/PaginateTest.php
+++ b/tests/Integration/CachedBuilder/PaginateTest.php
@@ -36,7 +36,7 @@ public function testPaginationIsCached()
 
     public function testPaginationReturnsCorrectLinks()
     {
-        if (preg_match("/^(8\.)/", app()->version())) {
+        if (preg_match("/^([8|9]\.)/", app()->version())) {
             $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">1</span>';
             $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">2</span>';
             $page24ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">24</span>';
@@ -71,7 +71,7 @@ public function testPaginationReturnsCorrectLinks()
 
     public function testPaginationWithOptionsReturnsCorrectLinks()
     {
-        if (preg_match("/^(8\.)/", app()->version())) {
+        if (preg_match("/^([8|9]\.)/", app()->version())) {
             $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">1</span>';
             $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">2</span>';
             $page24ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">24</span>';
@@ -106,7 +106,7 @@ public function testPaginationWithOptionsReturnsCorrectLinks()
 
     public function testPaginationWithCustomOptionsReturnsCorrectLinks()
     {
-        if (preg_match("/^(8\.)/", app()->version())) {
+        if (preg_match("/^([8|9]\.)/", app()->version())) {
             $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">1</span>';
             $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">2</span>';
             $page24ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">24</span>';