Skip to content

Commit 83fb9ca

Browse files
committed
Fix package dependency to work with L5.5
1 parent d003028 commit 83fb9ca

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
}
1010
],
1111
"require": {
12+
"fico7489/laravel-pivot": "*",
1213
"illuminate/cache": "5.5 - 5.6",
1314
"illuminate/config": "5.5 - 5.6",
1415
"illuminate/console": "5.5 - 5.6",
1516
"illuminate/database": "5.5 - 5.6",
1617
"illuminate/support": "5.5 - 5.6",
17-
"php": ">=7.1.3",
18-
"fico7489/laravel-pivot": "^2.2"
18+
"php": ">=7.1.3"
1919
},
2020
"require-dev": {
2121
"codedungeon/phpunit-result-printer": "*",

tests/Integration/CachedBuilderPaginationTest.php

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,16 @@ public function testPaginationIsCached()
4444

4545
public function testPaginationReturnsCorrectLinks()
4646
{
47+
$page1ActiveLink = starts_with(app()->version(), "5.5")
48+
? '<li class="active"><span>1</span></li>'
49+
: '<li class="page-item active"><span class="page-link">1</span></li>';
50+
$page2ActiveLink = starts_with(app()->version(), "5.5")
51+
? '<li class="active"><span>2</span></li>'
52+
: '<li class="page-item active"><span class="page-link">2</span></li>';
53+
$page24ActiveLink = starts_with(app()->version(), "5.5")
54+
? '<li class="active"><span>24</span></li>'
55+
: '<li class="page-item active"><span class="page-link">24</span></li>';
56+
4757
$booksPage1 = (new Book)
4858
->paginate(2);
4959
$booksPage2 = (new Book)
@@ -54,17 +64,8 @@ public function testPaginationReturnsCorrectLinks()
5464
$this->assertCount(2, $booksPage1);
5565
$this->assertCount(2, $booksPage2);
5666
$this->assertCount(2, $booksPage24);
57-
$this->assertContains(
58-
'<li class="page-item active"><span class="page-link">1</span></li>',
59-
(string) $booksPage1->links()
60-
);
61-
$this->assertContains(
62-
'<li class="page-item active"><span class="page-link">2</span></li>',
63-
(string) $booksPage2->links()
64-
);
65-
$this->assertContains(
66-
'<li class="page-item active"><span class="page-link">24</span></li>',
67-
(string) $booksPage24->links()
68-
);
67+
$this->assertContains($page1ActiveLink, (string) $booksPage1->links());
68+
$this->assertContains($page2ActiveLink, (string) $booksPage2->links());
69+
$this->assertContains($page24ActiveLink, (string) $booksPage24->links());
6970
}
7071
}

0 commit comments

Comments
 (0)