Skip to content

Commit cb818c9

Browse files
committed
update csfixer and composer
1 parent 2eb23fc commit cb818c9

File tree

9 files changed

+51
-22
lines changed

9 files changed

+51
-22
lines changed

.github/workflows/test.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Test
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- master
8+
9+
jobs:
10+
test:
11+
runs-on: ubuntu-latest
12+
strategy:
13+
matrix:
14+
php_version: [7.2]
15+
laravel_version: [5.5.*,6.*, 7.*]
16+
17+
steps:
18+
- name: Checkout commit
19+
uses: actions/checkout@v2
20+
21+
- name: Setup PHP
22+
uses: shivammathur/setup-php@v1
23+
with:
24+
php-version: ${{ matrix.php_version }}
25+
26+
- name: Validate composer.json
27+
run: composer validate
28+
29+
- name: Run composer install
30+
run: composer install --no-interaction --no-suggest
31+
32+
- name: Install Laravel
33+
run: composer update --no-interaction illuminate/database:^${{ matrix.laravel_version }}
34+
35+
- name: Run PHPUnit
36+
run: ./vendor/bin/phpunit

.php_cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ return Config::create()
2121
->setRules([
2222
'@PSR2' => true,
2323
'@Symfony' => true,
24-
25-
'align_multiline_comment' => true,
26-
'blank_line_after_opening_tag' => true,
27-
'single_blank_line_before_namespace' => true,
28-
'no_unused_imports' => true,
29-
'binary_operator_spaces' => ['default' => null],
3024
])
3125
->setFinder($finder)
3226
;

.phpunit.result.cache

Lines changed: 0 additions & 1 deletion
This file was deleted.

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
}
2525
],
2626
"require": {
27-
"laravel/framework": "5.* || 6.*"
27+
"illuminate/database": "^5.5|^6.0|^7.0"
2828
},
2929
"require-dev": {
30-
"orchestra/testbench": ">3.0",
31-
"friendsofphp/php-cs-fixer" : ">2.0"
30+
"orchestra/testbench": "*",
31+
"friendsofphp/php-cs-fixer" : "*"
3232
},
3333
"suggest": {
3434
"fico7489/laravel-pivot": "Cover pivot changes."

src/Events/ModelChanged.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ class ModelChanged
1010

1111
public function __construct($id, $model, $name)
1212
{
13-
$this->id = $id;
13+
$this->id = $id;
1414
$this->model = $model;
15-
$this->name = $name;
15+
$this->name = $name;
1616
}
1717

1818
public function getId()

src/Services/UpdateRelated.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace Fico7489\Laravel\UpdatedRelated\Services;
44

5-
use Fico7489\Laravel\UpdatedRelated\Events\ModelChanged;
65
use Config;
6+
use Fico7489\Laravel\UpdatedRelated\Events\ModelChanged;
77

88
class UpdateRelated
99
{

tests/EventServiceProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace Fico7489\Laravel\UpdatedRelated\Tests;
44

5-
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
65
use Fico7489\Laravel\UpdatedRelated\Events\ModelChanged;
6+
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
77

88
class EventServiceProvider extends ServiceProvider
99
{

tests/LaravelUpdatedRelatedTest.php

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

33
namespace Fico7489\Laravel\UpdatedRelated\Tests;
44

5-
use Fico7489\Laravel\UpdatedRelated\Tests\Models\User;
5+
use Fico7489\Laravel\UpdatedRelated\Services\UpdateRelated;
6+
use Fico7489\Laravel\UpdatedRelated\Tests\Models\Address;
67
use Fico7489\Laravel\UpdatedRelated\Tests\Models\Order;
78
use Fico7489\Laravel\UpdatedRelated\Tests\Models\OrderItem;
89
use Fico7489\Laravel\UpdatedRelated\Tests\Models\Seller;
9-
use Fico7489\Laravel\UpdatedRelated\Tests\Models\Address;
10-
use Fico7489\Laravel\UpdatedRelated\Services\UpdateRelated;
10+
use Fico7489\Laravel\UpdatedRelated\Tests\Models\User;
1111

1212
class LaravelUpdatedRelatedTest extends TestCase
1313
{
@@ -40,7 +40,7 @@ public function setUp(): void
4040
private function startListening()
4141
{
4242
UpdateRelated::$events = [];
43-
TestListener::$events = [];
43+
TestListener::$events = [];
4444
}
4545

4646
public function test_create()

tests/TestCase.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ protected function getEnvironmentSetUp($app)
1414
// Setup default database to use sqlite :memory:
1515
$app['config']->set('database.default', 'testbench');
1616
$app['config']->set('database.connections.testbench', [
17-
'driver' => 'sqlite',
17+
'driver' => 'sqlite',
1818
'database' => ':memory:',
19-
'prefix' => '',
19+
'prefix' => '',
2020
]);
2121
$app['config']->set('laravel-updated-related', [
2222
\Fico7489\Laravel\UpdatedRelated\Tests\Models\User::class => [
2323
[
24-
\Fico7489\Laravel\UpdatedRelated\Tests\Models\Order::class => 'orders',
24+
\Fico7489\Laravel\UpdatedRelated\Tests\Models\Order::class => 'orders',
2525
\Fico7489\Laravel\UpdatedRelated\Tests\Models\OrderItem::class => 'orders.items',
26-
\Fico7489\Laravel\UpdatedRelated\Tests\Models\Address::class => 'addresses',
26+
\Fico7489\Laravel\UpdatedRelated\Tests\Models\Address::class => 'addresses',
2727
],
2828
[
2929
'name' => 'special',

0 commit comments

Comments
 (0)