Skip to content

Commit 6af891b

Browse files
mikebronnermikebronner
authored
Merge pull request #282 from GeneaLabs/feature/update-to-laravel-6
Add Laravel 6.0 support.
2 parents d47d7d9 + bfcf291 commit 6af891b

13 files changed

+71
-62
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/build
22
/vendor
33
composer.lock
4+
.phpunit.result.cache

‎.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ env:
1616

1717
matrix:
1818
include:
19-
- php: 7.1.3
2019
- php: 7.2
2120
- php: 7.3
2221

‎composer.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,22 @@
1010
],
1111
"require": {
1212
"genealabs/laravel-pivot-events": "*",
13-
"illuminate/cache": "5.8.*",
14-
"illuminate/config": "5.8.*",
15-
"illuminate/console": "5.8.*",
16-
"illuminate/container": "5.8.*",
17-
"illuminate/database": "5.8.*",
18-
"illuminate/support": "5.8.*",
19-
"illuminate/http": "5.8.*",
20-
"php": "^7.1.3"
13+
"illuminate/cache": "5.8 - 6.0",
14+
"illuminate/config": "5.8 - 6.0",
15+
"illuminate/console": "5.8 - 6.0",
16+
"illuminate/container": "5.8 - 6.0",
17+
"illuminate/database": "5.8 - 6.0",
18+
"illuminate/support": "5.8 - 6.0",
19+
"illuminate/http": "5.8 - 6.0"
2120
},
2221
"require-dev": {
2322
"fzaninotto/faker": "*",
2423
"mockery/mockery": "*",
25-
"orchestra/database": "3.8.*",
26-
"orchestra/testbench-browser-kit": "3.8.*",
27-
"orchestra/testbench": "3.8.*",
24+
"orchestra/testbench-browser-kit": "3.9.x-dev@dev",
25+
"orchestra/testbench": "3.9.x-dev@dev",
2826
"php-coveralls/php-coveralls" : "*",
2927
"phpmd/phpmd": "*",
30-
"phpunit/phpunit": "^7.5",
28+
"phpunit/phpunit": "*",
3129
"predis/predis": "*",
3230
"sebastian/phpcpd": "*",
3331
"symfony/thanks": "*"
@@ -52,5 +50,7 @@
5250
"GeneaLabs\\LaravelModelCaching\\Providers\\Service"
5351
]
5452
}
55-
}
53+
},
54+
"minimum-stability": "dev",
55+
"prefer-stable": true
5656
}

‎phpunit.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@
3434
<env name="SESSION_DRIVER" value="array"/>
3535
<env name="QUEUE_DRIVER" value="sync"/>
3636
<env name="DB_CONNECTION" value="sqlite"/>
37-
<env name="DB_HOST" value="127.0.0.1"/>
38-
<env name="DB_DATABASE" value="testing"/>
39-
<env name="DB_USERNAME" value="mike"/>
40-
<env name="DB_PASSWORD" value=""/>
37+
<env name="DB_DATABASE" value=":memory:"/>
4138
</php>
4239
</phpunit>

‎tests/CreatesApplication.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?php namespace GeneaLabs\LaravelModelCaching\Tests;
22

33
use GeneaLabs\LaravelModelCaching\Providers\Service as LaravelModelCachingService;
4-
use Orchestra\Database\ConsoleServiceProvider;
54

65
trait CreatesApplication
76
{
@@ -54,7 +53,6 @@ protected function getPackageProviders($app)
5453
{
5554
return [
5655
LaravelModelCachingService::class,
57-
ConsoleServiceProvider::class,
5856
];
5957
}
6058
}

‎tests/EnvironmentSetup.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ protected function getEnvironmentSetUp($app)
1313
]);
1414
$app['config']->set('database.redis.cache', [
1515
'host' => env('REDIS_HOST', '127.0.0.1'),
16+
'port' => env('REDIS_PORT', 6379),
1617
]);
1718
$app['config']->set('database.redis.default', [
1819
'host' => env('REDIS_HOST', '127.0.0.1'),
20+
'port' => env('REDIS_PORT', 6379),
1921
]);
2022
$app['config']->set('database.redis.model-cache', [
2123
'host' => env('REDIS_HOST', '127.0.0.1'),

‎tests/Feature/PaginationTest.php

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,27 @@
22

33
use GeneaLabs\LaravelModelCaching\Tests\FeatureTestCase;
44
use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
5+
use Illuminate\Support\Str;
56

67
class PaginationTest extends FeatureTestCase
78
{
89
public function testPaginationProvidesDifferentLinksOnDifferentPages()
910
{
10-
if (starts_with(app()->version(), "5.6")
11-
|| starts_with(app()->version(), "5.7")
12-
|| starts_with(app()->version(), "5.8")
11+
if (Str::startsWith(app()->version(), "5.6")
12+
|| Str::startsWith(app()->version(), "5.7")
13+
|| Str::startsWith(app()->version(), "5.8")
14+
|| Str::startsWith(app()->version(), "6.0")
1315
) {
1416
$page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
1517
$page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
1618
}
1719

18-
if (starts_with(app()->version(), "5.5")) {
20+
if (Str::startsWith(app()->version(), "5.5")) {
1921
$page1ActiveLink = '<li class="active"><span>1</span></li>';
2022
$page2ActiveLink = '<li class="active"><span>2</span></li>';
2123
}
2224

23-
if (starts_with(app()->version(), "5.4")) {
25+
if (Str::startsWith(app()->version(), "5.4")) {
2426
$page1ActiveLink = '<li class="active"><span>1</span></li>';
2527
$page2ActiveLink = '<li class="active"><span>2</span></li>';
2628
}
@@ -39,20 +41,21 @@ public function testPaginationProvidesDifferentLinksOnDifferentPages()
3941

4042
public function testAdvancedPagination()
4143
{
42-
if (starts_with(app()->version(), "5.6")
43-
|| starts_with(app()->version(), "5.7")
44-
|| starts_with(app()->version(), "5.8")
44+
if (Str::startsWith(app()->version(), "5.6")
45+
|| Str::startsWith(app()->version(), "5.7")
46+
|| Str::startsWith(app()->version(), "5.8")
47+
|| Str::startsWith(app()->version(), "6.0")
4548
) {
4649
$page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
4750
$page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
4851
}
4952

50-
if (starts_with(app()->version(), "5.5")) {
53+
if (Str::startsWith(app()->version(), "5.5")) {
5154
$page1ActiveLink = '<li class="active"><span>1</span></li>';
5255
$page2ActiveLink = '<li class="active"><span>2</span></li>';
5356
}
5457

55-
if (starts_with(app()->version(), "5.4")) {
58+
if (Str::startsWith(app()->version(), "5.4")) {
5659
$page1ActiveLink = '<li class="active"><span>1</span></li>';
5760
$page2ActiveLink = '<li class="active"><span>2</span></li>';
5861
}
@@ -64,20 +67,21 @@ public function testAdvancedPagination()
6467

6568
public function testCustomPagination()
6669
{
67-
if (starts_with(app()->version(), "5.6")
68-
|| starts_with(app()->version(), "5.7")
69-
|| starts_with(app()->version(), "5.8")
70+
if (Str::startsWith(app()->version(), "5.6")
71+
|| Str::startsWith(app()->version(), "5.7")
72+
|| Str::startsWith(app()->version(), "5.8")
73+
|| Str::startsWith(app()->version(), "6.0")
7074
) {
7175
$page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
7276
$page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
7377
}
7478

75-
if (starts_with(app()->version(), "5.5")) {
79+
if (Str::startsWith(app()->version(), "5.5")) {
7680
$page1ActiveLink = '<li class="active"><span>1</span></li>';
7781
$page2ActiveLink = '<li class="active"><span>2</span></li>';
7882
}
7983

80-
if (starts_with(app()->version(), "5.4")) {
84+
if (Str::startsWith(app()->version(), "5.4")) {
8185
$page1ActiveLink = '<li class="active"><span>1</span></li>';
8286
$page2ActiveLink = '<li class="active"><span>2</span></li>';
8387
}

‎tests/Integration/CachedBuilder/PaginateTest.php

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
<?php namespace GeneaLabs\LaravelModelCaching\Tests\Integration;
1+
<?php namespace GeneaLabs\LaravelModelCaching\Tests\Integration\CachedBuilder;
22

33
use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Author;
44
use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
55
use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedAuthor;
66
use GeneaLabs\LaravelModelCaching\Tests\IntegrationTestCase;
7+
use Illuminate\Support\Str;
78

89
/**
910
* @SuppressWarnings(PHPMD.TooManyPublicMethods)
@@ -35,22 +36,23 @@ public function testPaginationIsCached()
3536

3637
public function testPaginationReturnsCorrectLinks()
3738
{
38-
if (starts_with(app()->version(), "5.6")
39-
|| starts_with(app()->version(), "5.7")
40-
|| starts_with(app()->version(), "5.8")
39+
if (Str::startsWith(app()->version(), "5.6")
40+
|| Str::startsWith(app()->version(), "5.7")
41+
|| Str::startsWith(app()->version(), "5.8")
42+
|| Str::startsWith(app()->version(), "6.0")
4143
) {
4244
$page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
4345
$page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
4446
$page24ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">24</span></li>';
4547
}
4648

47-
if (starts_with(app()->version(), "5.5")) {
49+
if (Str::startsWith(app()->version(), "5.5")) {
4850
$page1ActiveLink = '<li class="active"><span>1</span></li>';
4951
$page2ActiveLink = '<li class="active"><span>2</span></li>';
5052
$page24ActiveLink = '<li class="active"><span>24</span></li>';
5153
}
5254

53-
if (starts_with(app()->version(), "5.4")) {
55+
if (Str::startsWith(app()->version(), "5.4")) {
5456
$page1ActiveLink = '<li class="active"><span>1</span></li>';
5557
$page2ActiveLink = '<li class="active"><span>2</span></li>';
5658
$page24ActiveLink = '<li class="active"><span>24</span></li>';
@@ -66,29 +68,30 @@ public function testPaginationReturnsCorrectLinks()
6668
$this->assertCount(2, $booksPage1);
6769
$this->assertCount(2, $booksPage2);
6870
$this->assertCount(2, $booksPage24);
69-
$this->assertContains($page1ActiveLink, (string) $booksPage1->links());
70-
$this->assertContains($page2ActiveLink, (string) $booksPage2->links());
71-
$this->assertContains($page24ActiveLink, (string) $booksPage24->links());
71+
$this->assertStringContainsString($page1ActiveLink, (string) $booksPage1->links());
72+
$this->assertStringContainsString($page2ActiveLink, (string) $booksPage2->links());
73+
$this->assertStringContainsString($page24ActiveLink, (string) $booksPage24->links());
7274
}
7375

7476
public function testPaginationWithOptionsReturnsCorrectLinks()
7577
{
76-
if (starts_with(app()->version(), "5.6")
77-
|| starts_with(app()->version(), "5.7")
78-
|| starts_with(app()->version(), "5.8")
78+
if (Str::startsWith(app()->version(), "5.6")
79+
|| Str::startsWith(app()->version(), "5.7")
80+
|| Str::startsWith(app()->version(), "5.8")
81+
|| Str::startsWith(app()->version(), "6.0")
7982
) {
8083
$page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
8184
$page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
8285
$page24ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">24</span></li>';
8386
}
8487

85-
if (starts_with(app()->version(), "5.5")) {
88+
if (Str::startsWith(app()->version(), "5.5")) {
8689
$page1ActiveLink = '<li class="active"><span>1</span></li>';
8790
$page2ActiveLink = '<li class="active"><span>2</span></li>';
8891
$page24ActiveLink = '<li class="active"><span>24</span></li>';
8992
}
9093

91-
if (starts_with(app()->version(), "5.4")) {
94+
if (Str::startsWith(app()->version(), "5.4")) {
9295
$page1ActiveLink = '<li class="active"><span>1</span></li>';
9396
$page2ActiveLink = '<li class="active"><span>2</span></li>';
9497
$page24ActiveLink = '<li class="active"><span>24</span></li>';
@@ -104,29 +107,30 @@ public function testPaginationWithOptionsReturnsCorrectLinks()
104107
$this->assertCount(2, $booksPage1);
105108
$this->assertCount(2, $booksPage2);
106109
$this->assertCount(2, $booksPage24);
107-
$this->assertContains($page1ActiveLink, (string) $booksPage1->links());
108-
$this->assertContains($page2ActiveLink, (string) $booksPage2->links());
109-
$this->assertContains($page24ActiveLink, (string) $booksPage24->links());
110+
$this->assertStringContainsString($page1ActiveLink, (string) $booksPage1->links());
111+
$this->assertStringContainsString($page2ActiveLink, (string) $booksPage2->links());
112+
$this->assertStringContainsString($page24ActiveLink, (string) $booksPage24->links());
110113
}
111114

112115
public function testPaginationWithCustomOptionsReturnsCorrectLinks()
113116
{
114-
if (starts_with(app()->version(), "5.6")
115-
|| starts_with(app()->version(), "5.7")
116-
|| starts_with(app()->version(), "5.8")
117+
if (Str::startsWith(app()->version(), "5.6")
118+
|| Str::startsWith(app()->version(), "5.7")
119+
|| Str::startsWith(app()->version(), "5.8")
120+
|| Str::startsWith(app()->version(), "6.0")
117121
) {
118122
$page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
119123
$page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
120124
$page24ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">24</span></li>';
121125
}
122126

123-
if (starts_with(app()->version(), "5.5")) {
127+
if (Str::startsWith(app()->version(), "5.5")) {
124128
$page1ActiveLink = '<li class="active"><span>1</span></li>';
125129
$page2ActiveLink = '<li class="active"><span>2</span></li>';
126130
$page24ActiveLink = '<li class="active"><span>24</span></li>';
127131
}
128132

129-
if (starts_with(app()->version(), "5.4")) {
133+
if (Str::startsWith(app()->version(), "5.4")) {
130134
$page1ActiveLink = '<li class="active"><span>1</span></li>';
131135
$page2ActiveLink = '<li class="active"><span>2</span></li>';
132136
$page24ActiveLink = '<li class="active"><span>24</span></li>';
@@ -142,9 +146,9 @@ public function testPaginationWithCustomOptionsReturnsCorrectLinks()
142146
$this->assertCount(2, $booksPage1);
143147
$this->assertCount(2, $booksPage2);
144148
$this->assertCount(2, $booksPage24);
145-
$this->assertContains($page1ActiveLink, (string) $booksPage1->links());
146-
$this->assertContains($page2ActiveLink, (string) $booksPage2->links());
147-
$this->assertContains($page24ActiveLink, (string) $booksPage24->links());
149+
$this->assertStringContainsString($page1ActiveLink, (string) $booksPage1->links());
150+
$this->assertStringContainsString($page2ActiveLink, (string) $booksPage2->links());
151+
$this->assertStringContainsString($page24ActiveLink, (string) $booksPage24->links());
148152
}
149153

150154
public function testCustomPageNamePagination()

‎tests/Integration/CachedBuilder/WhereJsonContainsTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ protected function getEnvironmentSetUp($app)
1414
parent::getEnvironmentSetUp($app);
1515

1616
$app['config']->set('database.default', 'pgsql');
17+
$app['config']->set('database.connections.pgsql.database', "testing");
18+
$app['config']->set('database.connections.pgsql.username', "mike");
1719
}
1820

1921
public function setUp() : void

‎tests/Integration/CachedBuilderTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedAuthor;
66
use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Http\Resources\Author as AuthorResource;
77
use GeneaLabs\LaravelModelCaching\Tests\IntegrationTestCase;
8+
use Illuminate\Support\Str;
89

910
/**
1011
* @SuppressWarnings(PHPMD.TooManyPublicMethods)
@@ -415,7 +416,7 @@ public function testLazyLoadedRelationshipResolvesThroughCachedBuilder()
415416

416417
public function testLazyLoadingOnResourceIsCached()
417418
{
418-
if (starts_with(app()->version(), "5.4")) {
419+
if (Str::startsWith(app()->version(), "5.4")) {
419420
$this->markTestIncomplete("Resources don't exist in Laravel 5.4.");
420421
}
421422

‎tests/Integration/Console/Commands/FlushTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedAuthor;
77
use GeneaLabs\LaravelModelCaching\Tests\Fixtures\PrefixedAuthor;
88
use GeneaLabs\LaravelModelCaching\Tests\IntegrationTestCase;
9+
use Illuminate\Support\Str;
910

1011
class FlushTest extends IntegrationTestCase
1112
{
1213
public function setUp() : void
1314
{
1415
parent::setUp();
1516

16-
if (starts_with($this->app->version(), '5.7')) {
17+
if (Str::startsWith($this->app->version(), '5.7')) {
1718
$this->withoutMockingConsoleOutput();
1819
}
1920
}

‎tests/database/baseline.sqlite

-8 KB
Binary file not shown.

‎tests/database/testing.sqlite

-8 KB
Binary file not shown.

0 commit comments

Comments
 (0)