From a1ae9854086088374beeb1158c4f2dd7110ae78d Mon Sep 17 00:00:00 2001 From: Tom Witkowski Date: Wed, 4 Mar 2020 13:40:00 +0100 Subject: [PATCH 1/6] switch ci-test-tools to vendor-bin --- .github/workflows/composer-normalize.yml | 22 ++++++++++++++++++++++ .phpunit.result.cache | 1 - composer.json | 14 ++++++++++---- phpstan.neon.dist | 4 ++-- vendor-bin/elbgoods/composer.json | 5 +++++ 5 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/composer-normalize.yml delete mode 100644 .phpunit.result.cache create mode 100644 vendor-bin/elbgoods/composer.json diff --git a/.github/workflows/composer-normalize.yml b/.github/workflows/composer-normalize.yml new file mode 100644 index 0000000..560c42b --- /dev/null +++ b/.github/workflows/composer-normalize.yml @@ -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/git-auto-commit-action@v4.0.0 + with: + commit_message: normalize composer.json diff --git a/.phpunit.result.cache b/.phpunit.result.cache deleted file mode 100644 index b8a0622..0000000 --- a/.phpunit.result.cache +++ /dev/null @@ -1 +0,0 @@ -C:37:"PHPUnit\Runner\DefaultTestResultCache":9466:{a:2:{s:7:"defects";a:42:{s:74:"Elbgoods\LaravelSyncOneToMany\Tests\OneToManySyncTest::it_attaches_a_model";i:4;s:102:"Elbgoods\LaravelSyncOneToMany\Tests\OneToManySyncTest::it_attaches_a_model_with_a_changes_given_fields";i:4;s:77:"Elbgoods\LaravelSyncOneToMany\Tests\OneToManySyncTest::it_attaches_two_models";i:4;s:76:"Elbgoods\LaravelSyncOneToMany\Tests\OneToManySyncTest::it_changes_model_data";i:3;s:76:"Elbgoods\LaravelSyncOneToMany\Tests\OneToManySyncTest::it_changes_two_models";i:3;s:74:"Elbgoods\LaravelSyncOneToMany\Tests\OneToManySyncTest::it_detaches_a_model";i:3;s:84:"Elbgoods\LaravelSyncOneToMany\Tests\OneToManySyncTest::it_detaches_one_of_two_models";i:3;s:87:"Elbgoods\LaravelSyncOneToMany\Tests\OneToManySyncTest::it_set_default_data_after_detach";i:3;s:77:"Elbgoods\LaravelSyncOneToMany\Tests\OneToManySyncTest::it_detaches_two_models";i:3;s:99:"Elbgoods\LaravelSyncOneToMany\Tests\OneToManySyncTest::it_attaches_a_model_and_detaches_another_one";i:4;s:118:"Elbgoods\LaravelSyncOneToMany\Tests\OneToManySyncTest::it_attaches_a_model_and_does_not_detach_when_detaching_is_false";i:4;s:126:"Elbgoods\LaravelSyncOneToMany\Tests\OneToManySyncTest::it_attaches_a_model_and_does_not_detach_when_using_syncWithoutDetaching";i:4;s:92:"Elbgoods\LaravelSyncOneToMany\Tests\OneToManySyncTest::it_attaches_changes_and_detach_models";i:3;s:89:"Elbgoods\LaravelSyncOneToMany\Tests\RelatedRowInputDataTest::it_shows_id_from_array_input";i:4;s:122:"Elbgoods\LaravelSyncOneToMany\Tests\RelatedRowInputDataTest::it_shows_empty_additional_attributes_when_input_is_from_array";i:4;s:96:"Elbgoods\LaravelSyncOneToMany\Tests\RelatedRowInputDataTest::it_shows_key_from_assoc_array_as_id";i:4;s:117:"Elbgoods\LaravelSyncOneToMany\Tests\RelatedRowInputDataTest::it_shows_value_from_assoc_array_as_additional_attributes";i:4;s:102:"Elbgoods\LaravelSyncOneToMany\Tests\IdAndAttributesCollectionTest::it_inherits_from_laravel_collection";i:4;s:81:"Elbgoods\LaravelSyncOneToMany\Tests\IdAndAttributesCollectionTest::it_returns_ids";i:4;s:103:"Elbgoods\LaravelSyncOneToMany\Tests\IdAndAttributesCollectionTest::it_returns_keys_of_assoc_array_as_id";i:4;s:119:"Elbgoods\LaravelSyncOneToMany\Tests\IdAndAttributesCollectionTest::it_converts_items_to_IdAndAttributeContainer_objects";i:4;s:95:"Elbgoods\SyncOneToMany\Tests\IdAndAttributesCollectionTest::it_inherits_from_laravel_collection";i:4;s:74:"Elbgoods\SyncOneToMany\Tests\IdAndAttributesCollectionTest::it_returns_ids";i:4;s:96:"Elbgoods\SyncOneToMany\Tests\IdAndAttributesCollectionTest::it_returns_keys_of_assoc_array_as_id";i:4;s:112:"Elbgoods\SyncOneToMany\Tests\IdAndAttributesCollectionTest::it_converts_items_to_IdAndAttributeContainer_objects";i:4;s:87:"Elbgoods\SyncOneToMany\Tests\IdAndAttributesContainerTest::it_shows_id_from_array_input";i:4;s:120:"Elbgoods\SyncOneToMany\Tests\IdAndAttributesContainerTest::it_shows_empty_additional_attributes_when_input_is_from_array";i:4;s:94:"Elbgoods\SyncOneToMany\Tests\IdAndAttributesContainerTest::it_shows_key_from_assoc_array_as_id";i:4;s:115:"Elbgoods\SyncOneToMany\Tests\IdAndAttributesContainerTest::it_shows_value_from_assoc_array_as_additional_attributes";i:4;s:67:"Elbgoods\SyncOneToMany\Tests\OneToManySyncTest::it_attaches_a_model";i:4;s:95:"Elbgoods\SyncOneToMany\Tests\OneToManySyncTest::it_attaches_a_model_with_a_changes_given_fields";i:4;s:70:"Elbgoods\SyncOneToMany\Tests\OneToManySyncTest::it_attaches_two_models";i:4;s:69:"Elbgoods\SyncOneToMany\Tests\OneToManySyncTest::it_changes_model_data";i:4;s:69:"Elbgoods\SyncOneToMany\Tests\OneToManySyncTest::it_changes_two_models";i:4;s:67:"Elbgoods\SyncOneToMany\Tests\OneToManySyncTest::it_detaches_a_model";i:4;s:77:"Elbgoods\SyncOneToMany\Tests\OneToManySyncTest::it_detaches_one_of_two_models";i:4;s:80:"Elbgoods\SyncOneToMany\Tests\OneToManySyncTest::it_set_default_data_after_detach";i:4;s:70:"Elbgoods\SyncOneToMany\Tests\OneToManySyncTest::it_detaches_two_models";i:4;s:92:"Elbgoods\SyncOneToMany\Tests\OneToManySyncTest::it_attaches_a_model_and_detaches_another_one";i:4;s:111:"Elbgoods\SyncOneToMany\Tests\OneToManySyncTest::it_attaches_a_model_and_does_not_detach_when_detaching_is_false";i:4;s:119:"Elbgoods\SyncOneToMany\Tests\OneToManySyncTest::it_attaches_a_model_and_does_not_detach_when_using_syncWithoutDetaching";i:4;s:85:"Elbgoods\SyncOneToMany\Tests\OneToManySyncTest::it_attaches_changes_and_detach_models";i:4;}s:5:"times";a:46:{s:74:"Elbgoods\LaravelSyncOneToMany\Tests\OneToManySyncTest::it_attaches_a_model";d:0.016;s:102:"Elbgoods\LaravelSyncOneToMany\Tests\OneToManySyncTest::it_attaches_a_model_with_a_changes_given_fields";d:0.009;s:77:"Elbgoods\LaravelSyncOneToMany\Tests\OneToManySyncTest::it_attaches_two_models";d:0.009;s:76:"Elbgoods\LaravelSyncOneToMany\Tests\OneToManySyncTest::it_changes_model_data";d:0.009;s:76:"Elbgoods\LaravelSyncOneToMany\Tests\OneToManySyncTest::it_changes_two_models";d:0.01;s:74:"Elbgoods\LaravelSyncOneToMany\Tests\OneToManySyncTest::it_detaches_a_model";d:0.008;s:84:"Elbgoods\LaravelSyncOneToMany\Tests\OneToManySyncTest::it_detaches_one_of_two_models";d:0.009;s:87:"Elbgoods\LaravelSyncOneToMany\Tests\OneToManySyncTest::it_set_default_data_after_detach";d:0.009;s:77:"Elbgoods\LaravelSyncOneToMany\Tests\OneToManySyncTest::it_detaches_two_models";d:0.012;s:99:"Elbgoods\LaravelSyncOneToMany\Tests\OneToManySyncTest::it_attaches_a_model_and_detaches_another_one";d:0.009;s:118:"Elbgoods\LaravelSyncOneToMany\Tests\OneToManySyncTest::it_attaches_a_model_and_does_not_detach_when_detaching_is_false";d:0.01;s:126:"Elbgoods\LaravelSyncOneToMany\Tests\OneToManySyncTest::it_attaches_a_model_and_does_not_detach_when_using_syncWithoutDetaching";d:0.009;s:92:"Elbgoods\LaravelSyncOneToMany\Tests\OneToManySyncTest::it_attaches_changes_and_detach_models";d:0.011;s:89:"Elbgoods\LaravelSyncOneToMany\Tests\RelatedRowInputDataTest::it_shows_id_from_array_input";d:0.007;s:122:"Elbgoods\LaravelSyncOneToMany\Tests\RelatedRowInputDataTest::it_shows_empty_additional_attributes_when_input_is_from_array";d:0.006;s:96:"Elbgoods\LaravelSyncOneToMany\Tests\RelatedRowInputDataTest::it_shows_key_from_assoc_array_as_id";d:0.006;s:117:"Elbgoods\LaravelSyncOneToMany\Tests\RelatedRowInputDataTest::it_shows_value_from_assoc_array_as_additional_attributes";d:0.006;s:94:"Elbgoods\LaravelSyncOneToMany\Tests\IdAndAttributesContainerTest::it_shows_id_from_array_input";d:0.006;s:127:"Elbgoods\LaravelSyncOneToMany\Tests\IdAndAttributesContainerTest::it_shows_empty_additional_attributes_when_input_is_from_array";d:0.006;s:101:"Elbgoods\LaravelSyncOneToMany\Tests\IdAndAttributesContainerTest::it_shows_key_from_assoc_array_as_id";d:0.006;s:122:"Elbgoods\LaravelSyncOneToMany\Tests\IdAndAttributesContainerTest::it_shows_value_from_assoc_array_as_additional_attributes";d:0.007;s:102:"Elbgoods\LaravelSyncOneToMany\Tests\IdAndAttributesCollectionTest::it_inherits_from_laravel_collection";d:0.084;s:81:"Elbgoods\LaravelSyncOneToMany\Tests\IdAndAttributesCollectionTest::it_returns_ids";d:0.007;s:103:"Elbgoods\LaravelSyncOneToMany\Tests\IdAndAttributesCollectionTest::it_returns_keys_of_assoc_array_as_id";d:0.007;s:119:"Elbgoods\LaravelSyncOneToMany\Tests\IdAndAttributesCollectionTest::it_converts_items_to_IdAndAttributeContainer_objects";d:0.007;s:95:"Elbgoods\SyncOneToMany\Tests\IdAndAttributesCollectionTest::it_inherits_from_laravel_collection";d:0.086;s:74:"Elbgoods\SyncOneToMany\Tests\IdAndAttributesCollectionTest::it_returns_ids";d:0.006;s:96:"Elbgoods\SyncOneToMany\Tests\IdAndAttributesCollectionTest::it_returns_keys_of_assoc_array_as_id";d:0.006;s:112:"Elbgoods\SyncOneToMany\Tests\IdAndAttributesCollectionTest::it_converts_items_to_IdAndAttributeContainer_objects";d:0.008;s:87:"Elbgoods\SyncOneToMany\Tests\IdAndAttributesContainerTest::it_shows_id_from_array_input";d:0.006;s:120:"Elbgoods\SyncOneToMany\Tests\IdAndAttributesContainerTest::it_shows_empty_additional_attributes_when_input_is_from_array";d:0.006;s:94:"Elbgoods\SyncOneToMany\Tests\IdAndAttributesContainerTest::it_shows_key_from_assoc_array_as_id";d:0.006;s:115:"Elbgoods\SyncOneToMany\Tests\IdAndAttributesContainerTest::it_shows_value_from_assoc_array_as_additional_attributes";d:0.007;s:67:"Elbgoods\SyncOneToMany\Tests\OneToManySyncTest::it_attaches_a_model";d:0.015;s:95:"Elbgoods\SyncOneToMany\Tests\OneToManySyncTest::it_attaches_a_model_with_a_changes_given_fields";d:0.008;s:70:"Elbgoods\SyncOneToMany\Tests\OneToManySyncTest::it_attaches_two_models";d:0.011;s:69:"Elbgoods\SyncOneToMany\Tests\OneToManySyncTest::it_changes_model_data";d:0.009;s:69:"Elbgoods\SyncOneToMany\Tests\OneToManySyncTest::it_changes_two_models";d:0.009;s:67:"Elbgoods\SyncOneToMany\Tests\OneToManySyncTest::it_detaches_a_model";d:0.008;s:77:"Elbgoods\SyncOneToMany\Tests\OneToManySyncTest::it_detaches_one_of_two_models";d:0.01;s:80:"Elbgoods\SyncOneToMany\Tests\OneToManySyncTest::it_set_default_data_after_detach";d:0.009;s:70:"Elbgoods\SyncOneToMany\Tests\OneToManySyncTest::it_detaches_two_models";d:0.012;s:92:"Elbgoods\SyncOneToMany\Tests\OneToManySyncTest::it_attaches_a_model_and_detaches_another_one";d:0.011;s:111:"Elbgoods\SyncOneToMany\Tests\OneToManySyncTest::it_attaches_a_model_and_does_not_detach_when_detaching_is_false";d:0.009;s:119:"Elbgoods\SyncOneToMany\Tests\OneToManySyncTest::it_attaches_a_model_and_does_not_detach_when_using_syncWithoutDetaching";d:0.009;s:85:"Elbgoods\SyncOneToMany\Tests\OneToManySyncTest::it_attaches_changes_and_detach_models";d:0.012;}}} \ No newline at end of file diff --git a/composer.json b/composer.json index 965261c..56bb809 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "illuminate/support": "^6.0" }, "require-dev": { - "elbgoods/ci-test-tools": "^1.6", + "bamarni/composer-bin-plugin": "^1.3", "orchestra/database": "^4.3", "orchestra/testbench": "^4.0", "phpunit/phpunit": "^8.0" @@ -36,7 +36,8 @@ }, "autoload-dev": { "psr-4": { - "Elbgoods\\SyncOneToMany\\Tests\\": "tests" + "Elbgoods\\SyncOneToMany\\Tests\\": "tests", + "Elbgoods\\CiTestTools\\": "vendor-bin/elbgoods/vendor/elbgoods/ci-test-tools/src" } }, "scripts": { @@ -49,8 +50,13 @@ "vendor/bin/php-mn-test", "vendor/bin/php-stan-test" ], - "test-coverage": "vendor/bin/phpunit --coverage-html coverage" - + "test-coverage": "vendor/bin/phpunit --coverage-html coverage", + "post-install-cmd": [ + "@composer bin all install --ansi" + ], + "post-update-cmd": [ + "@composer bin all update --ansi" + ] }, "config": { "sort-packages": true diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 97496f0..bd9094b 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -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: diff --git a/vendor-bin/elbgoods/composer.json b/vendor-bin/elbgoods/composer.json new file mode 100644 index 0000000..7fdde29 --- /dev/null +++ b/vendor-bin/elbgoods/composer.json @@ -0,0 +1,5 @@ +{ + "require-dev": { + "elbgoods/ci-test-tools": "^1.7.2" + } +} From 8089d4f50562715c834d30ce9c89815db0488848 Mon Sep 17 00:00:00 2001 From: Gummibeer Date: Wed, 4 Mar 2020 12:40:40 +0000 Subject: [PATCH 2/6] normalize composer.json --- composer.json | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/composer.json b/composer.json index 56bb809..0909876 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,6 @@ { "name": "elbgoods/eloquent-sync-one-to-many", + "type": "library", "description": "", "keywords": [ "elbgoods", @@ -7,13 +8,13 @@ ], "homepage": "https://github.com/elbgoods/laravel-sync-one-to-many", "license": "MIT", - "type": "library", "authors": [ { "name": "Niclas Schirrmeister", "email": "nschirrmeister@elbgoods.de", "role": "Developer" - }, { + }, + { "name": "Tom Witkowski", "email": "twitkowski@elbgoods.de", "role": "Developer" @@ -29,6 +30,16 @@ "orchestra/testbench": "^4.0", "phpunit/phpunit": "^8.0" }, + "config": { + "sort-packages": true + }, + "extra": { + "laravel": { + "providers": [ + "Elbgoods\\SyncOneToMany\\SyncOneToManyServiceProvider" + ] + } + }, "autoload": { "psr-4": { "Elbgoods\\SyncOneToMany\\": "src" @@ -41,6 +52,12 @@ } }, "scripts": { + "post-install-cmd": [ + "@composer bin all install --ansi" + ], + "post-update-cmd": [ + "@composer bin all update --ansi" + ], "test": [ "vendor/bin/phpunit", "vendor/bin/php-cs-test", @@ -50,22 +67,6 @@ "vendor/bin/php-mn-test", "vendor/bin/php-stan-test" ], - "test-coverage": "vendor/bin/phpunit --coverage-html coverage", - "post-install-cmd": [ - "@composer bin all install --ansi" - ], - "post-update-cmd": [ - "@composer bin all update --ansi" - ] - }, - "config": { - "sort-packages": true - }, - "extra": { - "laravel": { - "providers": [ - "Elbgoods\\SyncOneToMany\\SyncOneToManyServiceProvider" - ] - } + "test-coverage": "vendor/bin/phpunit --coverage-html coverage" } } From 7b52b9e3183b19e949de635bf6051d66ffcf1bb2 Mon Sep 17 00:00:00 2001 From: Tom Witkowski Date: Mon, 6 Apr 2020 10:24:35 +0200 Subject: [PATCH 3/6] add laravel 7 support --- .github/workflows/run-tests.yml | 2 +- composer.json | 45 +++++++++++++++++---------------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 5947968..82d62c5 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -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 }} diff --git a/composer.json b/composer.json index 0909876..88fa4c5 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,5 @@ { "name": "elbgoods/eloquent-sync-one-to-many", - "type": "library", "description": "", "keywords": [ "elbgoods", @@ -8,6 +7,7 @@ ], "homepage": "https://github.com/elbgoods/laravel-sync-one-to-many", "license": "MIT", + "type": "library", "authors": [ { "name": "Niclas Schirrmeister", @@ -17,28 +17,18 @@ { "name": "Tom Witkowski", "email": "twitkowski@elbgoods.de", + "homepage": "https://gummibeer.de", "role": "Developer" } ], "require": { "php": "^7.4", - "illuminate/support": "^6.0" + "illuminate/support": "^6.0|^7.0" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.3", - "orchestra/database": "^4.3", - "orchestra/testbench": "^4.0", - "phpunit/phpunit": "^8.0" - }, - "config": { - "sort-packages": true - }, - "extra": { - "laravel": { - "providers": [ - "Elbgoods\\SyncOneToMany\\SyncOneToManyServiceProvider" - ] - } + "orchestra/testbench": "^4.0|^5.0", + "phpunit/phpunit": "^8.0|^9.0" }, "autoload": { "psr-4": { @@ -52,12 +42,7 @@ } }, "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", @@ -67,6 +52,22 @@ "vendor/bin/php-mn-test", "vendor/bin/php-stan-test" ], - "test-coverage": "vendor/bin/phpunit --coverage-html coverage" + "test-coverage": "vendor/bin/phpunit --coverage-html coverage", + "post-install-cmd": [ + "@composer bin all install --ansi" + ], + "post-update-cmd": [ + "@composer bin all update --ansi" + ] + }, + "config": { + "sort-packages": true + }, + "extra": { + "laravel": { + "providers": [ + "Elbgoods\\SyncOneToMany\\SyncOneToManyServiceProvider" + ] + } } } From 0c3249a3ed593f8d002662a5e0d8f8da59e29604 Mon Sep 17 00:00:00 2001 From: Gummibeer Date: Mon, 6 Apr 2020 08:25:14 +0000 Subject: [PATCH 4/6] normalize composer.json --- composer.json | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/composer.json b/composer.json index 88fa4c5..99930ae 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,6 @@ { "name": "elbgoods/eloquent-sync-one-to-many", + "type": "library", "description": "", "keywords": [ "elbgoods", @@ -7,7 +8,6 @@ ], "homepage": "https://github.com/elbgoods/laravel-sync-one-to-many", "license": "MIT", - "type": "library", "authors": [ { "name": "Niclas Schirrmeister", @@ -23,12 +23,22 @@ ], "require": { "php": "^7.4", - "illuminate/support": "^6.0|^7.0" + "illuminate/support": "^6.0 || ^7.0" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.3", - "orchestra/testbench": "^4.0|^5.0", - "phpunit/phpunit": "^8.0|^9.0" + "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": { @@ -42,6 +52,12 @@ } }, "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", @@ -52,22 +68,6 @@ "vendor/bin/php-mn-test", "vendor/bin/php-stan-test" ], - "test-coverage": "vendor/bin/phpunit --coverage-html coverage", - "post-install-cmd": [ - "@composer bin all install --ansi" - ], - "post-update-cmd": [ - "@composer bin all update --ansi" - ] - }, - "config": { - "sort-packages": true - }, - "extra": { - "laravel": { - "providers": [ - "Elbgoods\\SyncOneToMany\\SyncOneToManyServiceProvider" - ] - } + "test-coverage": "vendor/bin/phpunit --coverage-html coverage" } } From 73db1bbc66670ca988a0e7ee08129bb39352f0e8 Mon Sep 17 00:00:00 2001 From: Tom Witkowski Date: Mon, 6 Apr 2020 10:25:54 +0200 Subject: [PATCH 5/6] v0.2.0 --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77d8625..13ae1da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 From e29367a6bae7c7ba615fa2c3cee96861b500dbb1 Mon Sep 17 00:00:00 2001 From: Tom Witkowski Date: Mon, 6 Apr 2020 10:55:19 +0200 Subject: [PATCH 6/6] fix tests --- composer.json | 4 ++-- phpunit.xml.dist | 4 ++++ tests/TestCase.php | 11 ----------- vendor-bin/elbgoods/composer.json | 2 +- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index 99930ae..6a8238f 100644 --- a/composer.json +++ b/composer.json @@ -62,10 +62,10 @@ "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" diff --git a/phpunit.xml.dist b/phpunit.xml.dist index f2eebe0..1304bb0 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -19,4 +19,8 @@ src/ + + + + diff --git a/tests/TestCase.php b/tests/TestCase.php index c5e2135..2fc111f 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -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); diff --git a/vendor-bin/elbgoods/composer.json b/vendor-bin/elbgoods/composer.json index 7fdde29..f442f82 100644 --- a/vendor-bin/elbgoods/composer.json +++ b/vendor-bin/elbgoods/composer.json @@ -1,5 +1,5 @@ { "require-dev": { - "elbgoods/ci-test-tools": "^1.7.2" + "elbgoods/ci-test-tools": "^1.9.2" } }