Skip to content

Add Laravel 6.0 support. #282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 29, 2019
Merged

Add Laravel 6.0 support. #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/build
/vendor
composer.lock
.phpunit.result.cache
1 change: 0 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ env:

matrix:
include:
- php: 7.1.3
- php: 7.2
- php: 7.3

Expand Down
26 changes: 13 additions & 13 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,22 @@
],
"require": {
"genealabs/laravel-pivot-events": "*",
"illuminate/cache": "5.8.*",
"illuminate/config": "5.8.*",
"illuminate/console": "5.8.*",
"illuminate/container": "5.8.*",
"illuminate/database": "5.8.*",
"illuminate/support": "5.8.*",
"illuminate/http": "5.8.*",
"php": "^7.1.3"
"illuminate/cache": "5.8 - 6.0",
"illuminate/config": "5.8 - 6.0",
"illuminate/console": "5.8 - 6.0",
"illuminate/container": "5.8 - 6.0",
"illuminate/database": "5.8 - 6.0",
"illuminate/support": "5.8 - 6.0",
"illuminate/http": "5.8 - 6.0"
},
"require-dev": {
"fzaninotto/faker": "*",
"mockery/mockery": "*",
"orchestra/database": "3.8.*",
"orchestra/testbench-browser-kit": "3.8.*",
"orchestra/testbench": "3.8.*",
"orchestra/testbench-browser-kit": "3.9.x-dev@dev",
"orchestra/testbench": "3.9.x-dev@dev",
"php-coveralls/php-coveralls" : "*",
"phpmd/phpmd": "*",
"phpunit/phpunit": "^7.5",
"phpunit/phpunit": "*",
"predis/predis": "*",
"sebastian/phpcpd": "*",
"symfony/thanks": "*"
Expand All @@ -52,5 +50,7 @@
"GeneaLabs\\LaravelModelCaching\\Providers\\Service"
]
}
}
},
"minimum-stability": "dev",
"prefer-stable": true
}
5 changes: 1 addition & 4 deletions phpunit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@
<env name="SESSION_DRIVER" value="array"/>
<env name="QUEUE_DRIVER" value="sync"/>
<env name="DB_CONNECTION" value="sqlite"/>
<env name="DB_HOST" value="127.0.0.1"/>
<env name="DB_DATABASE" value="testing"/>
<env name="DB_USERNAME" value="mike"/>
<env name="DB_PASSWORD" value=""/>
<env name="DB_DATABASE" value=":memory:"/>
</php>
</phpunit>
2 changes: 0 additions & 2 deletions tests/CreatesApplication.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?php namespace GeneaLabs\LaravelModelCaching\Tests;

use GeneaLabs\LaravelModelCaching\Providers\Service as LaravelModelCachingService;
use Orchestra\Database\ConsoleServiceProvider;

trait CreatesApplication
{
Expand Down Expand Up @@ -54,7 +53,6 @@ protected function getPackageProviders($app)
{
return [
LaravelModelCachingService::class,
ConsoleServiceProvider::class,
];
}
}
2 changes: 2 additions & 0 deletions tests/EnvironmentSetup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@ protected function getEnvironmentSetUp($app)
]);
$app['config']->set('database.redis.cache', [
'host' => env('REDIS_HOST', '127.0.0.1'),
'port' => env('REDIS_PORT', 6379),
]);
$app['config']->set('database.redis.default', [
'host' => env('REDIS_HOST', '127.0.0.1'),
'port' => env('REDIS_PORT', 6379),
]);
$app['config']->set('database.redis.model-cache', [
'host' => env('REDIS_HOST', '127.0.0.1'),
Expand Down
34 changes: 19 additions & 15 deletions tests/Feature/PaginationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,27 @@

use GeneaLabs\LaravelModelCaching\Tests\FeatureTestCase;
use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
use Illuminate\Support\Str;

class PaginationTest extends FeatureTestCase
{
public function testPaginationProvidesDifferentLinksOnDifferentPages()
{
if (starts_with(app()->version(), "5.6")
|| starts_with(app()->version(), "5.7")
|| starts_with(app()->version(), "5.8")
if (Str::startsWith(app()->version(), "5.6")
|| Str::startsWith(app()->version(), "5.7")
|| Str::startsWith(app()->version(), "5.8")
|| Str::startsWith(app()->version(), "6.0")
) {
$page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
$page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
}

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

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

public function testAdvancedPagination()
{
if (starts_with(app()->version(), "5.6")
|| starts_with(app()->version(), "5.7")
|| starts_with(app()->version(), "5.8")
if (Str::startsWith(app()->version(), "5.6")
|| Str::startsWith(app()->version(), "5.7")
|| Str::startsWith(app()->version(), "5.8")
|| Str::startsWith(app()->version(), "6.0")
) {
$page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
$page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
}

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

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

public function testCustomPagination()
{
if (starts_with(app()->version(), "5.6")
|| starts_with(app()->version(), "5.7")
|| starts_with(app()->version(), "5.8")
if (Str::startsWith(app()->version(), "5.6")
|| Str::startsWith(app()->version(), "5.7")
|| Str::startsWith(app()->version(), "5.8")
|| Str::startsWith(app()->version(), "6.0")
) {
$page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
$page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
}

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

if (starts_with(app()->version(), "5.4")) {
if (Str::startsWith(app()->version(), "5.4")) {
$page1ActiveLink = '<li class="active"><span>1</span></li>';
$page2ActiveLink = '<li class="active"><span>2</span></li>';
}
Expand Down
54 changes: 29 additions & 25 deletions tests/Integration/CachedBuilder/PaginateTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<?php namespace GeneaLabs\LaravelModelCaching\Tests\Integration;
<?php namespace GeneaLabs\LaravelModelCaching\Tests\Integration\CachedBuilder;

use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Author;
use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedAuthor;
use GeneaLabs\LaravelModelCaching\Tests\IntegrationTestCase;
use Illuminate\Support\Str;

/**
* @SuppressWarnings(PHPMD.TooManyPublicMethods)
Expand Down Expand Up @@ -35,22 +36,23 @@ public function testPaginationIsCached()

public function testPaginationReturnsCorrectLinks()
{
if (starts_with(app()->version(), "5.6")
|| starts_with(app()->version(), "5.7")
|| starts_with(app()->version(), "5.8")
if (Str::startsWith(app()->version(), "5.6")
|| Str::startsWith(app()->version(), "5.7")
|| Str::startsWith(app()->version(), "5.8")
|| Str::startsWith(app()->version(), "6.0")
) {
$page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
$page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
$page24ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">24</span></li>';
}

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

if (starts_with(app()->version(), "5.4")) {
if (Str::startsWith(app()->version(), "5.4")) {
$page1ActiveLink = '<li class="active"><span>1</span></li>';
$page2ActiveLink = '<li class="active"><span>2</span></li>';
$page24ActiveLink = '<li class="active"><span>24</span></li>';
Expand All @@ -66,29 +68,30 @@ public function testPaginationReturnsCorrectLinks()
$this->assertCount(2, $booksPage1);
$this->assertCount(2, $booksPage2);
$this->assertCount(2, $booksPage24);
$this->assertContains($page1ActiveLink, (string) $booksPage1->links());
$this->assertContains($page2ActiveLink, (string) $booksPage2->links());
$this->assertContains($page24ActiveLink, (string) $booksPage24->links());
$this->assertStringContainsString($page1ActiveLink, (string) $booksPage1->links());
$this->assertStringContainsString($page2ActiveLink, (string) $booksPage2->links());
$this->assertStringContainsString($page24ActiveLink, (string) $booksPage24->links());
}

public function testPaginationWithOptionsReturnsCorrectLinks()
{
if (starts_with(app()->version(), "5.6")
|| starts_with(app()->version(), "5.7")
|| starts_with(app()->version(), "5.8")
if (Str::startsWith(app()->version(), "5.6")
|| Str::startsWith(app()->version(), "5.7")
|| Str::startsWith(app()->version(), "5.8")
|| Str::startsWith(app()->version(), "6.0")
) {
$page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
$page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
$page24ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">24</span></li>';
}

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

if (starts_with(app()->version(), "5.4")) {
if (Str::startsWith(app()->version(), "5.4")) {
$page1ActiveLink = '<li class="active"><span>1</span></li>';
$page2ActiveLink = '<li class="active"><span>2</span></li>';
$page24ActiveLink = '<li class="active"><span>24</span></li>';
Expand All @@ -104,29 +107,30 @@ public function testPaginationWithOptionsReturnsCorrectLinks()
$this->assertCount(2, $booksPage1);
$this->assertCount(2, $booksPage2);
$this->assertCount(2, $booksPage24);
$this->assertContains($page1ActiveLink, (string) $booksPage1->links());
$this->assertContains($page2ActiveLink, (string) $booksPage2->links());
$this->assertContains($page24ActiveLink, (string) $booksPage24->links());
$this->assertStringContainsString($page1ActiveLink, (string) $booksPage1->links());
$this->assertStringContainsString($page2ActiveLink, (string) $booksPage2->links());
$this->assertStringContainsString($page24ActiveLink, (string) $booksPage24->links());
}

public function testPaginationWithCustomOptionsReturnsCorrectLinks()
{
if (starts_with(app()->version(), "5.6")
|| starts_with(app()->version(), "5.7")
|| starts_with(app()->version(), "5.8")
if (Str::startsWith(app()->version(), "5.6")
|| Str::startsWith(app()->version(), "5.7")
|| Str::startsWith(app()->version(), "5.8")
|| Str::startsWith(app()->version(), "6.0")
) {
$page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
$page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
$page24ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">24</span></li>';
}

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

if (starts_with(app()->version(), "5.4")) {
if (Str::startsWith(app()->version(), "5.4")) {
$page1ActiveLink = '<li class="active"><span>1</span></li>';
$page2ActiveLink = '<li class="active"><span>2</span></li>';
$page24ActiveLink = '<li class="active"><span>24</span></li>';
Expand All @@ -142,9 +146,9 @@ public function testPaginationWithCustomOptionsReturnsCorrectLinks()
$this->assertCount(2, $booksPage1);
$this->assertCount(2, $booksPage2);
$this->assertCount(2, $booksPage24);
$this->assertContains($page1ActiveLink, (string) $booksPage1->links());
$this->assertContains($page2ActiveLink, (string) $booksPage2->links());
$this->assertContains($page24ActiveLink, (string) $booksPage24->links());
$this->assertStringContainsString($page1ActiveLink, (string) $booksPage1->links());
$this->assertStringContainsString($page2ActiveLink, (string) $booksPage2->links());
$this->assertStringContainsString($page24ActiveLink, (string) $booksPage24->links());
}

public function testCustomPageNamePagination()
Expand Down
2 changes: 2 additions & 0 deletions tests/Integration/CachedBuilder/WhereJsonContainsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ protected function getEnvironmentSetUp($app)
parent::getEnvironmentSetUp($app);

$app['config']->set('database.default', 'pgsql');
$app['config']->set('database.connections.pgsql.database', "testing");
$app['config']->set('database.connections.pgsql.username', "mike");
}

public function setUp() : void
Expand Down
3 changes: 2 additions & 1 deletion tests/Integration/CachedBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedAuthor;
use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Http\Resources\Author as AuthorResource;
use GeneaLabs\LaravelModelCaching\Tests\IntegrationTestCase;
use Illuminate\Support\Str;

/**
* @SuppressWarnings(PHPMD.TooManyPublicMethods)
Expand Down Expand Up @@ -415,7 +416,7 @@ public function testLazyLoadedRelationshipResolvesThroughCachedBuilder()

public function testLazyLoadingOnResourceIsCached()
{
if (starts_with(app()->version(), "5.4")) {
if (Str::startsWith(app()->version(), "5.4")) {
$this->markTestIncomplete("Resources don't exist in Laravel 5.4.");
}

Expand Down
3 changes: 2 additions & 1 deletion tests/Integration/Console/Commands/FlushTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@
use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedAuthor;
use GeneaLabs\LaravelModelCaching\Tests\Fixtures\PrefixedAuthor;
use GeneaLabs\LaravelModelCaching\Tests\IntegrationTestCase;
use Illuminate\Support\Str;

class FlushTest extends IntegrationTestCase
{
public function setUp() : void
{
parent::setUp();

if (starts_with($this->app->version(), '5.7')) {
if (Str::startsWith($this->app->version(), '5.7')) {
$this->withoutMockingConsoleOutput();
}
}
Expand Down
Binary file modified tests/database/baseline.sqlite
View file
Open in desktop
Binary file not shown.
Binary file modified tests/database/testing.sqlite
View file
Open in desktop
Binary file not shown.