From 906def3c9d32895d34aad397ddd0c03bab1aaad8 Mon Sep 17 00:00:00 2001 From: Sebastian Fix Date: Thu, 12 Jan 2023 10:39:57 +0100 Subject: [PATCH 01/18] WIP --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a78a21b5..6151e02e 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,8 @@ then optimize the processes that power the core of your business. - PHP: `^8.2` - Laravel: `^9.*` || Laravel: `^10.*` - DocuWare Cloud Access -- +- + ### > = v1.2 - PHP: `^8.1` @@ -609,6 +610,7 @@ cp phpunit.xml.dist phpunit.xml Modify environment variables in the phpunit.xml-file: ```xml + @@ -649,6 +651,7 @@ Please review [our security policy](.github/SECURITY.md) on how to report securi ## 🙏 Credits - [Sebastian Fix](https://github.com/StanBarrows) +- [Faissal Wahabali](https://github.com/faissaloux) - [Ruslan Steiger](https://github.com/SuddenlyRust) - [All Contributors](../../contributors) - [Skeleton Repository from Spatie](https://github.com/spatie/package-skeleton-laravel) From 855ed45a340d2db7466b52080f6ed590a6aeaae6 Mon Sep 17 00:00:00 2001 From: Sebastian Fix Date: Thu, 12 Jan 2023 13:09:59 +0100 Subject: [PATCH 02/18] Updated Testsuite --- .github/workflows/run-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index bcce1410..182e3076 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,8 +13,8 @@ jobs: fail-fast: true matrix: os: [ ubuntu-latest, windows-latest ] - php: [ 8.2 ] - laravel: [ 9.* ] + php: [ '8.1'.'8.2' ] + laravel: [ '9.*','10.*' ] stability: [ prefer-lowest, prefer-stable ] include: - laravel: 9.* From e67ac477840a2fbc881cafdadf48b05ed322388b Mon Sep 17 00:00:00 2001 From: Sebastian Fix Date: Thu, 12 Jan 2023 13:10:52 +0100 Subject: [PATCH 03/18] Fixed Wrong seperator --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 182e3076..0fc3e7e5 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,7 +13,7 @@ jobs: fail-fast: true matrix: os: [ ubuntu-latest, windows-latest ] - php: [ '8.1'.'8.2' ] + php: [ '8.1','8.2' ] laravel: [ '9.*','10.*' ] stability: [ prefer-lowest, prefer-stable ] include: From 60e86070dc1adfa69897a7083c740563c24b17de Mon Sep 17 00:00:00 2001 From: Sebastian Fix Date: Thu, 12 Jan 2023 13:18:16 +0100 Subject: [PATCH 04/18] Update composer.json --- .github/workflows/run-tests.yml | 5 +++-- composer.json | 15 ++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 0fc3e7e5..79b043dc 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,12 +13,13 @@ jobs: fail-fast: true matrix: os: [ ubuntu-latest, windows-latest ] - php: [ '8.1','8.2' ] - laravel: [ '9.*','10.*' ] + php: [ 8.2,8.1 ] + laravel: [9.* ] stability: [ prefer-lowest, prefer-stable ] include: - laravel: 9.* testbench: 7.* + carbon: ^2.63 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} diff --git a/composer.json b/composer.json index 3d6676c7..8ce905b9 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ } ], "require": { - "php": "^8.2", + "php": "^8.1", "guzzlehttp/guzzle": "^7.5", "illuminate/contracts": "^9.0", "spatie/laravel-ignition": "^1.6", @@ -33,9 +33,9 @@ "nesbot/carbon": "^2.64.0" }, "require-dev": { - "laravel/pint": "^1.3", + "laravel/pint": "^1.0", "nunomaduro/collision": "^6.0", - "nunomaduro/larastan": "^2.0", + "nunomaduro/larastan": "^2.0.1", "orchestra/testbench": "^7.0", "pestphp/pest": "^1.21", "pestphp/pest-plugin-laravel": "^1.1", @@ -57,10 +57,11 @@ } }, "scripts": { - "psalm": "vendor/bin/psalm", - "test": "./vendor/bin/testbench package:test --no-coverage", - "test-coverage": "vendor/bin/pest --coverage-html coverage", - "format": "vendor/bin/php-cs-fixer fix --allow-risky=yes" + "post-autoload-dump": "@php ./vendor/bin/testbench package:discover --ansi", + "analyse": "vendor/bin/phpstan analyse", + "test": "vendor/bin/pest", + "test-coverage": "vendor/bin/pest --coverage", + "format": "vendor/bin/pint" }, "config": { "sort-packages": true, From 738d6a5149b8b1470d05424a3175a92df895b906 Mon Sep 17 00:00:00 2001 From: Sebastian Fix Date: Thu, 12 Jan 2023 13:19:52 +0100 Subject: [PATCH 05/18] Updated readme.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6151e02e..93968455 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ then optimize the processes that power the core of your business. ### > = v2.0 -- PHP: `^8.2` +- PHP: `^8.1` |`^8.2` - Laravel: `^9.*` || Laravel: `^10.*` - DocuWare Cloud Access - From 18d932c07c88106d1fca3412636028dfa0eb77ba Mon Sep 17 00:00:00 2001 From: Sebastian Fix Date: Thu, 12 Jan 2023 13:22:29 +0100 Subject: [PATCH 06/18] WIP --- .github/workflows/run-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 79b043dc..6fd7d725 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -14,12 +14,14 @@ jobs: matrix: os: [ ubuntu-latest, windows-latest ] php: [ 8.2,8.1 ] - laravel: [9.* ] + laravel: [10.*, 9.*] stability: [ prefer-lowest, prefer-stable ] include: - laravel: 9.* testbench: 7.* carbon: ^2.63 + - laravel: 10.* + testbench: 8.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} From a20ec710e276a8e165476fbac16e03e4a12e4b4b Mon Sep 17 00:00:00 2001 From: Sebastian Fix Date: Thu, 12 Jan 2023 13:23:10 +0100 Subject: [PATCH 07/18] WIP --- .github/workflows/run-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 6fd7d725..d3725cf8 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -22,6 +22,7 @@ jobs: carbon: ^2.63 - laravel: 10.* testbench: 8.* + carbon: ^2.64 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} From 2f0b8aafce9511d9702af7fa8591a992b9d70e59 Mon Sep 17 00:00:00 2001 From: Sebastian Fix Date: Thu, 12 Jan 2023 13:24:20 +0100 Subject: [PATCH 08/18] WIP --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 8ce905b9..19534d81 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "require": { "php": "^8.1", "guzzlehttp/guzzle": "^7.5", - "illuminate/contracts": "^9.0", + "illuminate/contracts": "^9.28|^10.0", "spatie/laravel-ignition": "^1.6", "spatie/laravel-package-tools": "^1.13.0", "nesbot/carbon": "^2.64.0" @@ -36,7 +36,7 @@ "laravel/pint": "^1.0", "nunomaduro/collision": "^6.0", "nunomaduro/larastan": "^2.0.1", - "orchestra/testbench": "^7.0", + "orchestra/testbench": "^7.7|^8.0", "pestphp/pest": "^1.21", "pestphp/pest-plugin-laravel": "^1.1", "pestphp/pest-plugin-parallel": "^1.2", From cbac6d9a16554eb61b93824bb8c68171fa3ee60b Mon Sep 17 00:00:00 2001 From: Sebastian Fix Date: Thu, 12 Jan 2023 13:26:45 +0100 Subject: [PATCH 09/18] WIP --- CHANGELOG.md | 4 ++++ composer.json | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e8e08b5..c850e8bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to `laravel-docuware` will be documented in this file. +## 2.0.0 +- Added support for PHP 8.2 +- Added support for Laravel 10 + ## 1.3.0 - 2022-12-21 - Added support for Table Fields that have been implemented in Docuware >= 7.1 diff --git a/composer.json b/composer.json index 19534d81..18796bbe 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "require": { "php": "^8.1", "guzzlehttp/guzzle": "^7.5", - "illuminate/contracts": "^9.28|^10.0", + "illuminate/contracts": "^9.28|^10.x-dev", "spatie/laravel-ignition": "^1.6", "spatie/laravel-package-tools": "^1.13.0", "nesbot/carbon": "^2.64.0" @@ -36,7 +36,7 @@ "laravel/pint": "^1.0", "nunomaduro/collision": "^6.0", "nunomaduro/larastan": "^2.0.1", - "orchestra/testbench": "^7.7|^8.0", + "orchestra/testbench": "^7.7|^8.x-dev", "pestphp/pest": "^1.21", "pestphp/pest-plugin-laravel": "^1.1", "pestphp/pest-plugin-parallel": "^1.2", From d7a665a0e0cf64527be1b2170d11def883dbb7ad Mon Sep 17 00:00:00 2001 From: Sebastian Fix Date: Thu, 12 Jan 2023 13:28:06 +0100 Subject: [PATCH 10/18] WIP --- CHANGELOG.md | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c850e8bf..e250d092 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,31 @@ All notable changes to `laravel-docuware` will be documented in this file. -## 2.0.0 -- Added support for PHP 8.2 -- Added support for Laravel 10 +## 2.0.0 pre-release +### General +- Dropped support below PHP 8.1 +- Dropped Support below Laravel 9.0 +- Added Support for Laravel 10.0 + +### DocuWare +- Added dynamic timeout via the configuration file +``` + 'timeout' => env('DOCUWARE_TIMEOUT', 30), +``` + +- Dropped date methods dateFrom & dateUntil (**BREAKING**!) +``` + ->dateFrom(Carbon::create(2021, 3, 1)) + ->dateUntil(Carbon::create(2021, 4, 1)) +``` + +- Added a more flexible way to filter date fields + +``` + ->filterDate('DWSTOREDATETIME','>=',Carbon::create(2021, 3, 1)) + ->filterDate('DWSTOREDATETIME','<',Carbon::create(2021, 4, 1)) +``` + ## 1.3.0 - 2022-12-21 From c0dc3f7b42f433734a6c37535d9c6d2ba0ec1839 Mon Sep 17 00:00:00 2001 From: Sebastian Fix Date: Thu, 12 Jan 2023 13:30:05 +0100 Subject: [PATCH 11/18] WIP --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 18796bbe..e4cbd066 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "require": { "php": "^8.1", "guzzlehttp/guzzle": "^7.5", - "illuminate/contracts": "^9.28|^10.x-dev", + "illuminate/contracts": "^9.28|^10.0-dev", "spatie/laravel-ignition": "^1.6", "spatie/laravel-package-tools": "^1.13.0", "nesbot/carbon": "^2.64.0" @@ -36,7 +36,7 @@ "laravel/pint": "^1.0", "nunomaduro/collision": "^6.0", "nunomaduro/larastan": "^2.0.1", - "orchestra/testbench": "^7.7|^8.x-dev", + "orchestra/testbench": "^7.7|^8.0-dev", "pestphp/pest": "^1.21", "pestphp/pest-plugin-laravel": "^1.1", "pestphp/pest-plugin-parallel": "^1.2", From c0e7b02922aa262dfd07d9be37eb330ee02e5455 Mon Sep 17 00:00:00 2001 From: Sebastian Fix Date: Thu, 12 Jan 2023 13:30:44 +0100 Subject: [PATCH 12/18] WIP --- composer.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index e4cbd066..132da857 100644 --- a/composer.json +++ b/composer.json @@ -18,10 +18,13 @@ "homepage": "https://www.codebar.ch", "role": "Sofware-Engineer" }, + { + "name": "Faissal Wahabali", + "role": "Software-Developer" + }, { "name": "Ruslan Steiger", "role": "Software-Developer" - } ], "require": { @@ -69,7 +72,6 @@ "composer/package-versions-deprecated": true, "phpstan/extension-installer": true, "pestphp/pest-plugin": true - } }, "extra": { From 32bdb2480d9caf09979bb71d63928afb80c65fe2 Mon Sep 17 00:00:00 2001 From: Sebastian Fix Date: Thu, 12 Jan 2023 13:36:36 +0100 Subject: [PATCH 13/18] WIP --- .github/workflows/run-tests.yml | 8 ++++---- composer.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index d3725cf8..48de7996 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -10,19 +10,19 @@ jobs: test: runs-on: ${{ matrix.os }} strategy: - fail-fast: true + fail-fast: false matrix: os: [ ubuntu-latest, windows-latest ] php: [ 8.2,8.1 ] - laravel: [10.*, 9.*] + laravel: [ 10.*, 9.* ] stability: [ prefer-lowest, prefer-stable ] include: - laravel: 9.* + contracts: 9.* testbench: 7.* - carbon: ^2.63 - laravel: 10.* + contracts: 10.* testbench: 8.* - carbon: ^2.64 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} diff --git a/composer.json b/composer.json index 132da857..f6b9072f 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "require": { "php": "^8.1", "guzzlehttp/guzzle": "^7.5", - "illuminate/contracts": "^9.28|^10.0-dev", + "illuminate/contracts": "^9.28|^10.0", "spatie/laravel-ignition": "^1.6", "spatie/laravel-package-tools": "^1.13.0", "nesbot/carbon": "^2.64.0" @@ -39,7 +39,7 @@ "laravel/pint": "^1.0", "nunomaduro/collision": "^6.0", "nunomaduro/larastan": "^2.0.1", - "orchestra/testbench": "^7.7|^8.0-dev", + "orchestra/testbench": "^7.7|^8.0", "pestphp/pest": "^1.21", "pestphp/pest-plugin-laravel": "^1.1", "pestphp/pest-plugin-parallel": "^1.2", From 8de462452479ca76a1f4933035358ab93d1206f5 Mon Sep 17 00:00:00 2001 From: Sebastian Fix Date: Thu, 12 Jan 2023 13:39:33 +0100 Subject: [PATCH 14/18] WIP --- .github/workflows/run-tests.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 48de7996..2c01005e 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -18,10 +18,8 @@ jobs: stability: [ prefer-lowest, prefer-stable ] include: - laravel: 9.* - contracts: 9.* testbench: 7.* - laravel: 10.* - contracts: 10.* testbench: 8.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} From 5e93743ef60e6b48988ce5d11a715a9d0b266f1b Mon Sep 17 00:00:00 2001 From: Sebastian Fix Date: Thu, 12 Jan 2023 13:41:22 +0100 Subject: [PATCH 15/18] WIP --- .github/workflows/run-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 2c01005e..00bac8db 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -18,8 +18,10 @@ jobs: stability: [ prefer-lowest, prefer-stable ] include: - laravel: 9.* + contracts: 9.28 testbench: 7.* - laravel: 10.* + contracts: 10.* testbench: 8.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} @@ -42,7 +44,7 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "illuminate/contracts:${{ matrix.contracts }}" --no-interaction --no-update composer update --${{ matrix.stability }} --prefer-dist --no-interaction - name: Execute tests From 889f2c6a5322e56da7fb5a87594782d6628b7bd0 Mon Sep 17 00:00:00 2001 From: Sebastian Fix Date: Thu, 12 Jan 2023 13:45:14 +0100 Subject: [PATCH 16/18] WIP --- .github/workflows/run-tests.yml | 8 ++------ CHANGELOG.md | 1 - README.md | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 00bac8db..b032778f 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -14,15 +14,11 @@ jobs: matrix: os: [ ubuntu-latest, windows-latest ] php: [ 8.2,8.1 ] - laravel: [ 10.*, 9.* ] + laravel: [9.* ] stability: [ prefer-lowest, prefer-stable ] include: - laravel: 9.* - contracts: 9.28 testbench: 7.* - - laravel: 10.* - contracts: 10.* - testbench: 8.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} @@ -44,7 +40,7 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "illuminate/contracts:${{ matrix.contracts }}" --no-interaction --no-update + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update composer update --${{ matrix.stability }} --prefer-dist --no-interaction - name: Execute tests diff --git a/CHANGELOG.md b/CHANGELOG.md index e250d092..272543fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,6 @@ All notable changes to `laravel-docuware` will be documented in this file. ### General - Dropped support below PHP 8.1 - Dropped Support below Laravel 9.0 -- Added Support for Laravel 10.0 ### DocuWare - Added dynamic timeout via the configuration file diff --git a/README.md b/README.md index 93968455..5c921161 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ then optimize the processes that power the core of your business. ### > = v2.0 - PHP: `^8.1` |`^8.2` -- Laravel: `^9.*` || Laravel: `^10.*` +- Laravel: `^9.*` - DocuWare Cloud Access - From 68f216491555f4d478aca071b89224c1e32322d1 Mon Sep 17 00:00:00 2001 From: Sebastian Fix Date: Thu, 12 Jan 2023 13:45:30 +0100 Subject: [PATCH 17/18] WIP --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index f6b9072f..19600a58 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "require": { "php": "^8.1", "guzzlehttp/guzzle": "^7.5", - "illuminate/contracts": "^9.28|^10.0", + "illuminate/contracts": "^9.0", "spatie/laravel-ignition": "^1.6", "spatie/laravel-package-tools": "^1.13.0", "nesbot/carbon": "^2.64.0" @@ -39,7 +39,7 @@ "laravel/pint": "^1.0", "nunomaduro/collision": "^6.0", "nunomaduro/larastan": "^2.0.1", - "orchestra/testbench": "^7.7|^8.0", + "orchestra/testbench": "^7.7", "pestphp/pest": "^1.21", "pestphp/pest-plugin-laravel": "^1.1", "pestphp/pest-plugin-parallel": "^1.2", From 62a06f4790cc60b9638f4cf3b0f73146207bb937 Mon Sep 17 00:00:00 2001 From: Sebastian Fix Date: Thu, 12 Jan 2023 13:48:59 +0100 Subject: [PATCH 18/18] WIP --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 19600a58..4bfdacf4 100644 --- a/composer.json +++ b/composer.json @@ -30,16 +30,16 @@ "require": { "php": "^8.1", "guzzlehttp/guzzle": "^7.5", - "illuminate/contracts": "^9.0", + "illuminate/contracts": "^9.0|^10.0", "spatie/laravel-ignition": "^1.6", - "spatie/laravel-package-tools": "^1.13.0", + "spatie/laravel-package-tools": "^1.14.0", "nesbot/carbon": "^2.64.0" }, "require-dev": { "laravel/pint": "^1.0", "nunomaduro/collision": "^6.0", "nunomaduro/larastan": "^2.0.1", - "orchestra/testbench": "^7.7", + "orchestra/testbench": "^7.7|^8.0", "pestphp/pest": "^1.21", "pestphp/pest-plugin-laravel": "^1.1", "pestphp/pest-plugin-parallel": "^1.2",