Skip to content

Commit 008ffa4

Browse files
antonkomarevantonkomarev
committed
Add Laravel 5.5 support
1 parent ca4ff4f commit 008ffa4

File tree

69 files changed

+195
-197
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+195
-197
lines changed

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ php:
66
- 5.6
77
- 7.0
88
- 7.1
9+
- 7.2
910

1011
env:
1112
global:

‎CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
All notable changes to `laravel-eloquent-flag` will be documented in this file.
44

5+
## [3.12.0] - 2017-09-09
6+
7+
### Added
8+
9+
- Laravel 5.5 support.
10+
511
## [3.11.0] - 2017-02-20
612

713
### Added

‎CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
5555
## Enforcement
5656

5757
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58-
reported by contacting the project team at oss@cybercog.su. All
58+
reported by contacting the project team at open@cybercog.su. All
5959
complaints will be reviewed and investigated and will result in a response that
6060
is deemed necessary and appropriate to the circumstances. The project team is
6161
obligated to maintain confidentiality with regard to the reporter of an incident.

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ vendor/bin/phpunit
116116

117117
## Security
118118

119-
If you discover any security related issues, please email oss@cybercog.su instead of using the issue tracker.
119+
If you discover any security related issues, please email open@cybercog.su instead of using the issue tracker.
120120

121121
## Credits
122122

‎composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,22 @@
4545
],
4646
"homepage": "https://github.com/cybercog/laravel-eloquent-flag",
4747
"support": {
48-
"email": "oss@cybercog.su",
48+
"email": "open@cybercog.su",
4949
"issues": "https://github.com/cybercog/laravel-eloquent-flag/issues",
5050
"wiki": "https://github.com/cybercog/laravel-eloquent-flag/wiki",
5151
"source": "https://github.com/cybercog/laravel-eloquent-flag",
5252
"docs": "https://github.com/cybercog/laravel-eloquent-flag/wiki"
5353
},
5454
"require": {
55-
"illuminate/database": "~5.2.0|~5.3.0|~5.4.0",
56-
"php": "^5.6|^7.0"
55+
"php": "^5.6|^7.0",
56+
"illuminate/database": "~5.2.0|~5.3.0|~5.4.0|~5.5.0"
5757
},
5858
"require-dev": {
5959
"friendsofphp/php-cs-fixer": "^1.11",
6060
"mockery/mockery": "^0.9.8",
61-
"orchestra/database": "~3.4.0",
62-
"orchestra/testbench": "~3.4.0",
63-
"phpunit/phpunit": "^5.7"
61+
"orchestra/database": "~3.4.0|~3.5.0",
62+
"orchestra/testbench": "~3.4.0|~3.5.0",
63+
"phpunit/phpunit": "^6.2"
6464
},
6565
"autoload": {
6666
"psr-4": {
@@ -69,7 +69,7 @@
6969
},
7070
"autoload-dev": {
7171
"psr-4": {
72-
"Cog\\Flag\\Tests\\": "tests/"
72+
"Cog\\Tests\\Flag\\": "tests/"
7373
}
7474
},
7575
"scripts": {

‎tests/stubs/Models/Classic/EntityWithAcceptedAt.php renamed to ‎tests/Stubs/Models/Classic/EntityWithAcceptedAt.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Cog\Flag\Tests\Stubs\Models\Classic;
12+
namespace Cog\Tests\Flag\Stubs\Models\Classic;
1313

1414
use Cog\Flag\Traits\Classic\HasAcceptedAt;
1515
use Illuminate\Database\Eloquent\Model;
1616

1717
/**
1818
* Class EntityWithAcceptedAt.
1919
*
20-
* @package Cog\Flag\Tests\Stubs\Models\Classic
20+
* @package Cog\Tests\Flag\Stubs\Models\Classic
2121
*/
2222
class EntityWithAcceptedAt extends Model
2323
{

‎tests/stubs/Models/Classic/EntityWithAcceptedFlag.php renamed to ‎tests/Stubs/Models/Classic/EntityWithAcceptedFlag.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Cog\Flag\Tests\Stubs\Models\Classic;
12+
namespace Cog\Tests\Flag\Stubs\Models\Classic;
1313

1414
use Cog\Flag\Traits\Classic\HasAcceptedFlag;
1515
use Illuminate\Database\Eloquent\Model;
1616

1717
/**
1818
* Class EntityWithAcceptedFlag.
1919
*
20-
* @package Cog\Flag\Tests\Stubs\Models\Classic
20+
* @package Cog\Tests\Flag\Stubs\Models\Classic
2121
*/
2222
class EntityWithAcceptedFlag extends Model
2323
{

‎tests/stubs/Models/Classic/EntityWithActiveFlag.php renamed to ‎tests/Stubs/Models/Classic/EntityWithActiveFlag.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Cog\Flag\Tests\Stubs\Models\Classic;
12+
namespace Cog\Tests\Flag\Stubs\Models\Classic;
1313

1414
use Cog\Flag\Traits\Classic\HasActiveFlag;
1515
use Illuminate\Database\Eloquent\Model;
1616

1717
/**
1818
* Class EntityWithActiveFlag.
1919
*
20-
* @package Cog\Flag\Tests\Stubs\Models\Classic
20+
* @package Cog\Tests\Flag\Stubs\Models\Classic
2121
*/
2222
class EntityWithActiveFlag extends Model
2323
{

‎tests/stubs/Models/Classic/EntityWithApprovedAt.php renamed to ‎tests/Stubs/Models/Classic/EntityWithApprovedAt.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Cog\Flag\Tests\Stubs\Models\Classic;
12+
namespace Cog\Tests\Flag\Stubs\Models\Classic;
1313

1414
use Cog\Flag\Traits\Classic\HasApprovedAt;
1515
use Illuminate\Database\Eloquent\Model;
1616

1717
/**
1818
* Class EntityWithApprovedAt.
1919
*
20-
* @package Cog\Flag\Tests\Stubs\Models\Classic
20+
* @package Cog\Tests\Flag\Stubs\Models\Classic
2121
*/
2222
class EntityWithApprovedAt extends Model
2323
{

‎tests/stubs/Models/Classic/EntityWithApprovedFlag.php renamed to ‎tests/Stubs/Models/Classic/EntityWithApprovedFlag.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Cog\Flag\Tests\Stubs\Models\Classic;
12+
namespace Cog\Tests\Flag\Stubs\Models\Classic;
1313

1414
use Cog\Flag\Traits\Classic\HasApprovedFlag;
1515
use Illuminate\Database\Eloquent\Model;
1616

1717
/**
1818
* Class EntityWithApprovedFlag.
1919
*
20-
* @package Cog\Flag\Tests\Stubs\Models\Classic
20+
* @package Cog\Tests\Flag\Stubs\Models\Classic
2121
*/
2222
class EntityWithApprovedFlag extends Model
2323
{

‎tests/stubs/Models/Classic/EntityWithKeptFlag.php renamed to ‎tests/Stubs/Models/Classic/EntityWithKeptFlag.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Cog\Flag\Tests\Stubs\Models\Classic;
12+
namespace Cog\Tests\Flag\Stubs\Models\Classic;
1313

1414
use Cog\Flag\Traits\Classic\HasKeptFlag;
1515
use Illuminate\Database\Eloquent\Model;
1616

1717
/**
1818
* Class EntityWithKeptFlag.
1919
*
20-
* @package Cog\Flag\Tests\Stubs\Models\Classic
20+
* @package Cog\Tests\Flag\Stubs\Models\Classic
2121
*/
2222
class EntityWithKeptFlag extends Model
2323
{

‎tests/stubs/Models/Classic/EntityWithPublishedAt.php renamed to ‎tests/Stubs/Models/Classic/EntityWithPublishedAt.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Cog\Flag\Tests\Stubs\Models\Classic;
12+
namespace Cog\Tests\Flag\Stubs\Models\Classic;
1313

1414
use Cog\Flag\Traits\Classic\HasPublishedAt;
1515
use Illuminate\Database\Eloquent\Model;
1616

1717
/**
1818
* Class EntityWithPublishedAt.
1919
*
20-
* @package Cog\Flag\Tests\Stubs\Models\Classic
20+
* @package Cog\Tests\Flag\Stubs\Models\Classic
2121
*/
2222
class EntityWithPublishedAt extends Model
2323
{

‎tests/stubs/Models/Classic/EntityWithPublishedAtUnapplied.php renamed to ‎tests/Stubs/Models/Classic/EntityWithPublishedAtUnapplied.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Cog\Flag\Tests\Stubs\Models\Classic;
12+
namespace Cog\Tests\Flag\Stubs\Models\Classic;
1313

1414
/**
1515
* Class EntityWithPublishedAtUnapplied.
1616
*
17-
* @package Cog\Flag\Tests\Stubs\Models\Classic
17+
* @package Cog\Tests\Flag\Stubs\Models\Classic
1818
*/
1919
class EntityWithPublishedAtUnapplied extends EntityWithPublishedAt
2020
{

‎tests/stubs/Models/Classic/EntityWithPublishedFlag.php renamed to ‎tests/Stubs/Models/Classic/EntityWithPublishedFlag.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Cog\Flag\Tests\Stubs\Models\Classic;
12+
namespace Cog\Tests\Flag\Stubs\Models\Classic;
1313

1414
use Cog\Flag\Traits\Classic\HasPublishedFlag;
1515
use Illuminate\Database\Eloquent\Model;
1616

1717
/**
1818
* Class EntityWithPublishedFlag.
1919
*
20-
* @package Cog\Flag\Tests\Stubs\Models\Classic
20+
* @package Cog\Tests\Flag\Stubs\Models\Classic
2121
*/
2222
class EntityWithPublishedFlag extends Model
2323
{

‎tests/stubs/Models/Classic/EntityWithPublishedFlagUnapplied.php renamed to ‎tests/Stubs/Models/Classic/EntityWithPublishedFlagUnapplied.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Cog\Flag\Tests\Stubs\Models\Classic;
12+
namespace Cog\Tests\Flag\Stubs\Models\Classic;
1313

1414
/**
1515
* Class EntityWithPublishedFlagUnapplied.
1616
*
17-
* @package Cog\Flag\Tests\Stubs\Models\Classic
17+
* @package Cog\Tests\Flag\Stubs\Models\Classic
1818
*/
1919
class EntityWithPublishedFlagUnapplied extends EntityWithPublishedFlag
2020
{

‎tests/stubs/Models/Classic/EntityWithVerifiedAt.php renamed to ‎tests/Stubs/Models/Classic/EntityWithVerifiedAt.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Cog\Flag\Tests\Stubs\Models\Classic;
12+
namespace Cog\Tests\Flag\Stubs\Models\Classic;
1313

1414
use Cog\Flag\Traits\Classic\HasVerifiedAt;
1515
use Illuminate\Database\Eloquent\Model;
1616

1717
/**
1818
* Class EntityWithVerifiedAt.
1919
*
20-
* @package Cog\Flag\Tests\Stubs\Models\Classic
20+
* @package Cog\Tests\Flag\Stubs\Models\Classic
2121
*/
2222
class EntityWithVerifiedAt extends Model
2323
{

‎tests/stubs/Models/Classic/EntityWithVerifiedAtUnapplied.php renamed to ‎tests/Stubs/Models/Classic/EntityWithVerifiedAtUnapplied.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Cog\Flag\Tests\Stubs\Models\Classic;
12+
namespace Cog\Tests\Flag\Stubs\Models\Classic;
1313

1414
/**
1515
* Class EntityWithVerifiedAtUnapplied.
1616
*
17-
* @package Cog\Flag\Tests\Stubs\Models\Classic
17+
* @package Cog\Tests\Flag\Stubs\Models\Classic
1818
*/
1919
class EntityWithVerifiedAtUnapplied extends EntityWithVerifiedAt
2020
{

‎tests/stubs/Models/Classic/EntityWithVerifiedFlag.php renamed to ‎tests/Stubs/Models/Classic/EntityWithVerifiedFlag.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Cog\Flag\Tests\Stubs\Models\Classic;
12+
namespace Cog\Tests\Flag\Stubs\Models\Classic;
1313

1414
use Cog\Flag\Traits\Classic\HasVerifiedFlag;
1515
use Illuminate\Database\Eloquent\Model;
1616

1717
/**
1818
* Class EntityWithVerifiedFlag.
1919
*
20-
* @package Cog\Flag\Tests\Stubs\Models\Classic
20+
* @package Cog\Tests\Flag\Stubs\Models\Classic
2121
*/
2222
class EntityWithVerifiedFlag extends Model
2323
{

‎tests/stubs/Models/Classic/EntityWithVerifiedFlagUnapplied.php renamed to ‎tests/Stubs/Models/Classic/EntityWithVerifiedFlagUnapplied.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Cog\Flag\Tests\Stubs\Models\Classic;
12+
namespace Cog\Tests\Flag\Stubs\Models\Classic;
1313

1414
/**
1515
* Class EntityWithVerifiedFlagUnapplied.
1616
*
17-
* @package Cog\Flag\Tests\Stubs\Models\Classic
17+
* @package Cog\Tests\Flag\Stubs\Models\Classic
1818
*/
1919
class EntityWithVerifiedFlagUnapplied extends EntityWithVerifiedFlag
2020
{

‎tests/stubs/Models/Inverse/EntityWithClosedAt.php renamed to ‎tests/Stubs/Models/Inverse/EntityWithClosedAt.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Cog\Flag\Tests\Stubs\Models\Inverse;
12+
namespace Cog\Tests\Flag\Stubs\Models\Inverse;
1313

1414
use Cog\Flag\Traits\Inverse\HasClosedAt;
1515
use Illuminate\Database\Eloquent\Model;
1616

1717
/**
1818
* Class EntityWithClosedAt.
1919
*
20-
* @package Cog\Flag\Tests\Stubs\Models\Inverse
20+
* @package Cog\Tests\Flag\Stubs\Models\Inverse
2121
*/
2222
class EntityWithClosedAt extends Model
2323
{

‎tests/stubs/Models/Inverse/EntityWithClosedFlag.php renamed to ‎tests/Stubs/Models/Inverse/EntityWithClosedFlag.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Cog\Flag\Tests\Stubs\Models\Inverse;
12+
namespace Cog\Tests\Flag\Stubs\Models\Inverse;
1313

1414
use Cog\Flag\Traits\Inverse\HasClosedFlag;
1515
use Illuminate\Database\Eloquent\Model;
1616

1717
/**
1818
* Class EntityWithClosedFlag.
1919
*
20-
* @package Cog\Flag\Tests\Stubs\Models\Inverse
20+
* @package Cog\Tests\Flag\Stubs\Models\Inverse
2121
*/
2222
class EntityWithClosedFlag extends Model
2323
{

‎tests/stubs/Models/Inverse/EntityWithExpiredAt.php renamed to ‎tests/Stubs/Models/Inverse/EntityWithExpiredAt.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Cog\Flag\Tests\Stubs\Models\Inverse;
12+
namespace Cog\Tests\Flag\Stubs\Models\Inverse;
1313

1414
use Cog\Flag\Traits\Inverse\HasExpiredAt;
1515
use Illuminate\Database\Eloquent\Model;
1616

1717
/**
1818
* Class EntityWithExpiredAt.
1919
*
20-
* @package Cog\Flag\Tests\Stubs\Models\Inverse
20+
* @package Cog\Tests\Flag\Stubs\Models\Inverse
2121
*/
2222
class EntityWithExpiredAt extends Model
2323
{

‎tests/stubs/Models/Inverse/EntityWithExpiredAtUnapplied.php renamed to ‎tests/Stubs/Models/Inverse/EntityWithExpiredAtUnapplied.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Cog\Flag\Tests\Stubs\Models\Inverse;
12+
namespace Cog\Tests\Flag\Stubs\Models\Inverse;
1313

1414
/**
1515
* Class EntityWithExpiredAtUnapplied.
1616
*
17-
* @package Cog\Flag\Tests\Stubs\Models\Inverse
17+
* @package Cog\Tests\Flag\Stubs\Models\Inverse
1818
*/
1919
class EntityWithExpiredAtUnapplied extends EntityWithExpiredAt
2020
{

0 commit comments

Comments
 (0)