Skip to content

Commit

Permalink
Merge branch 'master' of github.com:elbgoods/laravel-sync-one-to-many
Browse files Browse the repository at this point in the history
  • Loading branch information
eisfeuer committed Apr 8, 2020
2 parents f7cd3b1 + e29367a commit 9601dc8
Show file tree
Hide file tree
Showing 8 changed files with 68 additions and 36 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/composer-normalize.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: normalize composer.json

on:
push:
paths:
- 'composer.json'

jobs:
normalize:
runs-on: ubuntu-latest
steps:
- name: Git checkout
uses: actions/checkout@v2

- name: normalize composer.json
run: |
composer global require ergebnis/composer-normalize
composer normalize
- uses: stefanzweifel/[email protected]
with:
commit_message: normalize composer.json
2 changes: 1 addition & 1 deletion .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
matrix:
os: [ubuntu-latest]
php: [7.4]
laravel: [6.*]
laravel: [7.*, 6.*]
dependency-version: [prefer-lowest, prefer-stable]

name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Changelog

All notable changes to `laravel-sync-one-to-many` will be documented in this file
All notable changes to `eloquent-sync-one-to-many` will be documented in this file

## 0.2.0 - 2020-04-06

- add Laravel 7 support

## 0.1.0 - 2013-03-04

Expand Down
50 changes: 29 additions & 21 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,33 +1,44 @@
{
"name": "elbgoods/eloquent-sync-one-to-many",
"type": "library",
"description": "",
"keywords": [
"elbgoods",
"laravel-sync-one-to-many"
],
"homepage": "https://github.com/elbgoods/laravel-sync-one-to-many",
"license": "MIT",
"type": "library",
"authors": [
{
"name": "Niclas Schirrmeister",
"email": "[email protected]",
"role": "Developer"
}, {
},
{
"name": "Tom Witkowski",
"email": "[email protected]",
"homepage": "https://gummibeer.de",
"role": "Developer"
}
],
"require": {
"php": "^7.4",
"illuminate/support": "^6.0"
"illuminate/support": "^6.0 || ^7.0"
},
"require-dev": {
"elbgoods/ci-test-tools": "^1.6",
"orchestra/database": "^4.3",
"orchestra/testbench": "^4.0",
"phpunit/phpunit": "^8.0"
"bamarni/composer-bin-plugin": "^1.3",
"orchestra/testbench": "^4.0 || ^5.0",
"phpunit/phpunit": "^8.0 || ^9.0"
},
"config": {
"sort-packages": true
},
"extra": {
"laravel": {
"providers": [
"Elbgoods\\SyncOneToMany\\SyncOneToManyServiceProvider"
]
}
},
"autoload": {
"psr-4": {
Expand All @@ -36,30 +47,27 @@
},
"autoload-dev": {
"psr-4": {
"Elbgoods\\SyncOneToMany\\Tests\\": "tests"
"Elbgoods\\SyncOneToMany\\Tests\\": "tests",
"Elbgoods\\CiTestTools\\": "vendor-bin/elbgoods/vendor/elbgoods/ci-test-tools/src"
}
},
"scripts": {
"post-install-cmd": [
"@composer bin all install --ansi"
],
"post-update-cmd": [
"@composer bin all update --ansi"
],
"bin": "echo 'bin not installed'",
"test": [
"vendor/bin/phpunit",
"vendor/bin/php-cs-test",
"vendor/bin/php-tlint-test .",
"vendor/bin/php-tlint-test ./src",
"vendor/bin/php-md-test ./src",
"vendor/bin/php-insights-test",
"vendor/bin/php-mn-test",
"vendor/bin/php-mn-test ./src",
"vendor/bin/php-stan-test"
],
"test-coverage": "vendor/bin/phpunit --coverage-html coverage"

},
"config": {
"sort-packages": true
},
"extra": {
"laravel": {
"providers": [
"Elbgoods\\SyncOneToMany\\SyncOneToManyServiceProvider"
]
}
}
}
4 changes: 2 additions & 2 deletions phpstan.neon.dist
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
includes:
- ./vendor/nunomaduro/larastan/extension.neon
- ./vendor/elbgoods/ci-test-tools/configs/phpstan.neon.dist
- ./vendor-bin/elbgoods/vendor/nunomaduro/larastan/extension.neon
- ./vendor-bin/elbgoods/vendor/elbgoods/ci-test-tools/configs/phpstan.neon.dist

parameters:
paths:
Expand Down
4 changes: 4 additions & 0 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,8 @@
<directory suffix=".php">src/</directory>
</whitelist>
</filter>
<php>
<env name="APP_ENV" value="testing" force="true"/>
<env name="DB_CONNECTION" value="testing"/>
</php>
</phpunit>
11 changes: 0 additions & 11 deletions tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,6 @@ protected function getPackageProviders($app)
];
}

protected function getEnvironmentSetUp($app)
{
// Setup default database to use sqlite :memory:
$app['config']->set('database.default', 'testbench');
$app['config']->set('database.connections.testbench', [
'driver' => 'sqlite',
'database' => ':memory:',
'prefix' => '',
]);
}

protected function assertAttached(array $expectedIds, array $syncResult): void
{
$this->assertArrayHasKey('attached', $syncResult);
Expand Down
5 changes: 5 additions & 0 deletions vendor-bin/elbgoods/composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"require-dev": {
"elbgoods/ci-test-tools": "^1.9.2"
}
}

0 comments on commit 9601dc8

Please sign in to comment.