Skip to content

Commit ce5ac87

Browse files
authored
Update code style (#44)
* Update package code style * Add PHP 7.3 tests
1 parent 566f464 commit ce5ac87

File tree

195 files changed

+240
-1009
lines changed

Some content is hidden

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

195 files changed

+240
-1009
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
language: php
22

3-
sudo: false
4-
53
php:
64
- 5.6
75
- 7.0
86
- 7.1
97
- 7.2
8+
- 7.3
109

1110
env:
1211
global:

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@
5454
},
5555
"require": {
5656
"php": "^5.6|^7.0",
57-
"illuminate/database": "~5.2.0|~5.3.0|~5.4.0|~5.5.0|~5.6.0|~5.7.0"
57+
"illuminate/database": "5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*"
5858
},
5959
"require-dev": {
6060
"friendsofphp/php-cs-fixer": "^2.10",
6161
"mockery/mockery": "^1.0",
6262
"orchestra/database": "~3.4.0|~3.5.0|~3.6.0|~3.7.0",
6363
"orchestra/testbench": "~3.4.0|~3.5.0|~3.6.0|~3.7.0",
64-
"phpunit/phpunit": "^5.7|^6.2|^7.0"
64+
"phpunit/phpunit": "^5.7|^6.2|^7.0|^8.0"
6565
},
6666
"autoload": {
6767
"psr-4": {

phpunit.xml.dist

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,11 @@
2323
<env name="QUEUE_DRIVER" value="sync"/>
2424
<env name="DB_CONNECTION" value="sqlite"/>
2525
<env name="DB_DATABASE" value=":memory:"/>
26+
<server name="APP_ENV" value="testing"/>
27+
<server name="CACHE_DRIVER" value="array"/>
28+
<server name="SESSION_DRIVER" value="array"/>
29+
<server name="QUEUE_DRIVER" value="sync"/>
30+
<server name="DB_CONNECTION" value="sqlite"/>
31+
<server name="DB_DATABASE" value=":memory:"/>
2632
</php>
2733
</phpunit>

src/Providers/FlagServiceProvider.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313

1414
use Illuminate\Support\ServiceProvider;
1515

16-
/**
17-
* Class FlagServiceProvider.
18-
*
19-
* @package Cog\Flag\Providers
20-
*/
2116
class FlagServiceProvider extends ServiceProvider
2217
{
2318
// :TODO: Register console commands to create migrations from stubs

src/Scopes/Classic/AcceptedAtScope.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,20 @@
1616
use Illuminate\Database\Eloquent\Model;
1717
use Illuminate\Database\Eloquent\Scope;
1818

19-
/**
20-
* Class AcceptedAtScope.
21-
*
22-
* @package Cog\Flag\Scopes\Classic
23-
*/
2419
class AcceptedAtScope implements Scope
2520
{
2621
/**
2722
* All of the extensions to be added to the builder.
2823
*
2924
* @var array
3025
*/
31-
protected $extensions = ['Accept', 'Reject', 'WithRejected', 'WithoutRejected', 'OnlyRejected'];
26+
protected $extensions = [
27+
'Accept',
28+
'Reject',
29+
'WithRejected',
30+
'WithoutRejected',
31+
'OnlyRejected',
32+
];
3233

3334
/**
3435
* Apply the scope to a given Eloquent query builder.

src/Scopes/Classic/AcceptedFlagScope.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,20 @@
1515
use Illuminate\Database\Eloquent\Model;
1616
use Illuminate\Database\Eloquent\Scope;
1717

18-
/**
19-
* Class AcceptedFlagScope.
20-
*
21-
* @package Cog\Flag\Scopes\Classic
22-
*/
2318
class AcceptedFlagScope implements Scope
2419
{
2520
/**
2621
* All of the extensions to be added to the builder.
2722
*
2823
* @var array
2924
*/
30-
protected $extensions = ['Accept', 'Reject', 'WithRejected', 'WithoutRejected', 'OnlyRejected'];
25+
protected $extensions = [
26+
'Accept',
27+
'Reject',
28+
'WithRejected',
29+
'WithoutRejected',
30+
'OnlyRejected',
31+
];
3132

3233
/**
3334
* Apply the scope to a given Eloquent query builder.

src/Scopes/Classic/ActiveFlagScope.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,20 @@
1515
use Illuminate\Database\Eloquent\Model;
1616
use Illuminate\Database\Eloquent\Scope;
1717

18-
/**
19-
* Class ActiveFlagScope.
20-
*
21-
* @package Cog\Flag\Scopes\Classic
22-
*/
2318
class ActiveFlagScope implements Scope
2419
{
2520
/**
2621
* All of the extensions to be added to the builder.
2722
*
2823
* @var array
2924
*/
30-
protected $extensions = ['Activate', 'Deactivate', 'WithDeactivated', 'WithoutDeactivated', 'OnlyDeactivated'];
25+
protected $extensions = [
26+
'Activate',
27+
'Deactivate',
28+
'WithDeactivated',
29+
'WithoutDeactivated',
30+
'OnlyDeactivated',
31+
];
3132

3233
/**
3334
* Apply the scope to a given Eloquent query builder.

src/Scopes/Classic/ApprovedAtScope.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,20 @@
1616
use Illuminate\Database\Eloquent\Model;
1717
use Illuminate\Database\Eloquent\Scope;
1818

19-
/**
20-
* Class ApprovedAtScope.
21-
*
22-
* @package Cog\Flag\Scopes\Classic
23-
*/
2419
class ApprovedAtScope implements Scope
2520
{
2621
/**
2722
* All of the extensions to be added to the builder.
2823
*
2924
* @var array
3025
*/
31-
protected $extensions = ['Approve', 'Disapprove', 'WithDisapproved', 'WithoutDisapproved', 'OnlyDisapproved'];
26+
protected $extensions = [
27+
'Approve',
28+
'Disapprove',
29+
'WithDisapproved',
30+
'WithoutDisapproved',
31+
'OnlyDisapproved',
32+
];
3233

3334
/**
3435
* Apply the scope to a given Eloquent query builder.

src/Scopes/Classic/ApprovedFlagScope.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,20 @@
1515
use Illuminate\Database\Eloquent\Model;
1616
use Illuminate\Database\Eloquent\Scope;
1717

18-
/**
19-
* Class ApprovedFlagScope.
20-
*
21-
* @package Cog\Flag\Scopes\Classic
22-
*/
2318
class ApprovedFlagScope implements Scope
2419
{
2520
/**
2621
* All of the extensions to be added to the builder.
2722
*
2823
* @var array
2924
*/
30-
protected $extensions = ['Approve', 'Disapprove', 'WithDisapproved', 'WithoutDisapproved', 'OnlyDisapproved'];
25+
protected $extensions = [
26+
'Approve',
27+
'Disapprove',
28+
'WithDisapproved',
29+
'WithoutDisapproved',
30+
'OnlyDisapproved',
31+
];
3132

3233
/**
3334
* Apply the scope to a given Eloquent query builder.

src/Scopes/Classic/InvitedAtScope.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,20 @@
1616
use Illuminate\Database\Eloquent\Model;
1717
use Illuminate\Database\Eloquent\Scope;
1818

19-
/**
20-
* Class InvitedAtScope.
21-
*
22-
* @package Cog\Flag\Scopes\Classic
23-
*/
2419
class InvitedAtScope implements Scope
2520
{
2621
/**
2722
* All of the extensions to be added to the builder.
2823
*
2924
* @var array
3025
*/
31-
protected $extensions = ['Invite', 'Uninvite', 'WithUninvited', 'WithoutUninvited', 'OnlyUninvited'];
26+
protected $extensions = [
27+
'Invite',
28+
'Uninvite',
29+
'WithUninvited',
30+
'WithoutUninvited',
31+
'OnlyUninvited',
32+
];
3233

3334
/**
3435
* Apply the scope to a given Eloquent query builder.

0 commit comments

Comments
 (0)