diff --git a/.scrutinizer.yml b/.scrutinizer.yml deleted file mode 100644 index f8c1a1e..0000000 --- a/.scrutinizer.yml +++ /dev/null @@ -1,7 +0,0 @@ -filter: - excluded_paths: - - "tests/" -build: - environment: - variables: - REDIS_HOST: '127.0.0.1' diff --git a/composer.json b/composer.json index 9a96a22..8ccb2f4 100644 --- a/composer.json +++ b/composer.json @@ -16,27 +16,28 @@ ], "require": { "php": ">=7.3", - "genealabs/laravel-pivot-events": "^0.3.0", - "illuminate/cache": "^7.0", - "illuminate/config": "^7.0", - "illuminate/console": "^7.0", - "illuminate/container": "^7.0", - "illuminate/database": "^7.0", - "illuminate/http": "^7.0", - "illuminate/support": "^7.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" }, "require-dev": { "doctrine/dbal": "^2.10", "fzaninotto/faker": "^1.9", - "laravel/nova": "^3.0", - "orchestra/testbench-browser-kit": "^5.0", - "orchestra/testbench": "^5.0", + "laravel/nova": "^3.9", + "orchestra/testbench-browser-kit": "^6.0", + "orchestra/testbench": "^6.0", "php-coveralls/php-coveralls" : "^2.2", "phpmd/phpmd": "^2.7", "phpunit/phpunit": "^8.0", "sebastian/phpcpd": "^5.0", "squizlabs/php_codesniffer": "^3.4", - "symfony/thanks": "^1.2" + "symfony/thanks": "^1.2", + "laravel/legacy-factories": "^1.0" }, "autoload": { "psr-4": { diff --git a/tests/Feature/PaginationTest.php b/tests/Feature/PaginationTest.php index 9ce6585..ca0215e 100644 --- a/tests/Feature/PaginationTest.php +++ b/tests/Feature/PaginationTest.php @@ -7,6 +7,12 @@ class PaginationTest extends FeatureTestCase { public function testPaginationProvidesDifferentLinksOnDifferentPages() { + // Checking the version start with 8.0. + if (preg_match("/^(8\.)/", app()->version())) { + $page1ActiveLink = '1'; + $page2ActiveLink = '2'; + } + // Checking the version start with 5.6, 5.7, 5.8 or 6. if (preg_match("/^((5\.[6-8])|(6\.)|(7\.))/", app()->version())) { $page1ActiveLink = '
  • 1
  • '; @@ -33,6 +39,12 @@ public function testPaginationProvidesDifferentLinksOnDifferentPages() public function testAdvancedPagination() { + // Checking the version start with 8.0. + if (preg_match("/^(8\.)/", app()->version())) { + $page1ActiveLink = '1'; + $page2ActiveLink = '2'; + } + if (preg_match("/^((5\.[6-8])|(6\.)|(7\.))/", app()->version())) { $page1ActiveLink = '
  • 1
  • '; $page2ActiveLink = '
  • 2
  • '; @@ -50,6 +62,12 @@ public function testAdvancedPagination() public function testCustomPagination() { + // Checking the version start with 8.0. + if (preg_match("/^(8\.)/", app()->version())) { + $page1ActiveLink = '1'; + $page2ActiveLink = '2'; + } + if (preg_match("/^((5\.[6-8])|(6\.)|(7\.))/", app()->version())) { $page1ActiveLink = '
  • 1
  • '; $page2ActiveLink = '
  • 2
  • '; diff --git a/tests/Integration/CachedBuilder/PaginateTest.php b/tests/Integration/CachedBuilder/PaginateTest.php index 5318ca9..3c2fe26 100644 --- a/tests/Integration/CachedBuilder/PaginateTest.php +++ b/tests/Integration/CachedBuilder/PaginateTest.php @@ -36,6 +36,12 @@ public function testPaginationIsCached() public function testPaginationReturnsCorrectLinks() { + if (preg_match("/^(8\.)/", app()->version())) { + $page1ActiveLink = '1'; + $page2ActiveLink = '2'; + $page24ActiveLink = '24'; + } + if (preg_match("/^((5\.[6-8])|(6\.)|(7\.))/", app()->version())) { $page1ActiveLink = '
  • 1
  • '; $page2ActiveLink = '
  • 2
  • '; @@ -65,6 +71,12 @@ public function testPaginationReturnsCorrectLinks() public function testPaginationWithOptionsReturnsCorrectLinks() { + if (preg_match("/^(8\.)/", app()->version())) { + $page1ActiveLink = '1'; + $page2ActiveLink = '2'; + $page24ActiveLink = '24'; + } + if (preg_match("/^((5\.[6-8])|(6\.)|(7\.))/", app()->version())) { $page1ActiveLink = '
  • 1
  • '; $page2ActiveLink = '
  • 2
  • '; @@ -94,6 +106,12 @@ public function testPaginationWithOptionsReturnsCorrectLinks() public function testPaginationWithCustomOptionsReturnsCorrectLinks() { + if (preg_match("/^(8\.)/", app()->version())) { + $page1ActiveLink = '1'; + $page2ActiveLink = '2'; + $page24ActiveLink = '24'; + } + if (preg_match("/^((5\.[6-8])|(6\.)|(7\.))/", app()->version())) { $page1ActiveLink = '
  • 1
  • '; $page2ActiveLink = '
  • 2
  • ';