From cdac75c8b1ed3f27f9c0a810ca6c72346e122d00 Mon Sep 17 00:00:00 2001 From: Stefan Meyer Date: Fri, 18 Nov 2022 14:47:09 +0100 Subject: [PATCH 01/15] fix: compatibility --- classes/Drivers/MySqliDriver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Drivers/MySqliDriver.php b/classes/Drivers/MySqliDriver.php index d266fc7..a654f20 100644 --- a/classes/Drivers/MySqliDriver.php +++ b/classes/Drivers/MySqliDriver.php @@ -82,7 +82,7 @@ public function createResultSet($resultSet) /** * @return MySqliResult */ - public function createResultDriver(mysqli_result $result): Drivers\MySqliResult + public function createResultDriver(/*mysqli_result*/ $result): Drivers\MySqliResult { return new MySqliResult($result); } From 8022547f4975f46774d3b0b1b44e46f83f0007ad Mon Sep 17 00:00:00 2001 From: tombrain Date: Thu, 24 Nov 2022 23:15:00 +0100 Subject: [PATCH 02/15] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4fde0d0..298577a 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "czukowski/phpunit-mock-dibi", + "name": "tombrain/phpunit-mock-dibi", "type": "library", "description": "Dibi mocking helpers for PHPUnit", "keywords": ["phpunit", "dibi", "database", "mock"], From ca360655140dd42a4acaa73b423584e270451751 Mon Sep 17 00:00:00 2001 From: tombrain Date: Thu, 24 Nov 2022 23:19:40 +0100 Subject: [PATCH 03/15] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 298577a..48644e8 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "require": { "czukowski/phpunit-mock-db": "^7.0 || >= 8.2", "czukowski/phpunit-sql": "^7.0.2 || ^8.0 || ^9.0", - "dibi/dibi": "4.2.x-dev" + "dibi/dibi": "^4.2.7" }, "autoload": { "psr-4": { From 4c5b5b1dc4ad83cdfd08737ced510526452cd492 Mon Sep 17 00:00:00 2001 From: tombrain Date: Sat, 28 Oct 2023 12:11:25 +0200 Subject: [PATCH 04/15] Update composer.json --- composer.json | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 48644e8..5877b49 100644 --- a/composer.json +++ b/composer.json @@ -11,13 +11,18 @@ "homepage": "http://xn----0tbl7bn.com" } ], - "support": { + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/tombrain/phpunit-mock-db.git" + } + ], "support": { "issues": "https://github.com/czukowski/phpunit-mock-dibi/issues" }, "require": { - "czukowski/phpunit-mock-db": "^7.0 || >= 8.2", + "tombrain/phpunit-mock-db": "dev-master", "czukowski/phpunit-sql": "^7.0.2 || ^8.0 || ^9.0", - "dibi/dibi": "^4.2.7" + "dibi/dibi": "^5.0" }, "autoload": { "psr-4": { From 46400f47f893064300f657ae2407fd6e82da15cc Mon Sep 17 00:00:00 2001 From: tombrain Date: Sat, 28 Oct 2023 12:27:45 +0200 Subject: [PATCH 05/15] Update composer.json --- composer.json | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 5877b49..06c6f2e 100644 --- a/composer.json +++ b/composer.json @@ -15,13 +15,18 @@ { "type": "vcs", "url": "https://github.com/tombrain/phpunit-mock-db.git" - } - ], "support": { + }, + { + "type": "vcs", + "url": "https://github.com/tombrain/phpunit-sql" + } + ], + "support": { "issues": "https://github.com/czukowski/phpunit-mock-dibi/issues" }, "require": { "tombrain/phpunit-mock-db": "dev-master", - "czukowski/phpunit-sql": "^7.0.2 || ^8.0 || ^9.0", + "tombrain/phpunit-sql": "dev-master", "dibi/dibi": "^5.0" }, "autoload": { From 1b1c76695e99268084b770799434768409a4b63c Mon Sep 17 00:00:00 2001 From: tombrain Date: Sun, 29 Oct 2023 15:39:29 +0100 Subject: [PATCH 06/15] Update composer.json --- composer.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/composer.json b/composer.json index 06c6f2e..dcf3fc7 100644 --- a/composer.json +++ b/composer.json @@ -15,10 +15,6 @@ { "type": "vcs", "url": "https://github.com/tombrain/phpunit-mock-db.git" - }, - { - "type": "vcs", - "url": "https://github.com/tombrain/phpunit-sql" } ], "support": { @@ -26,7 +22,6 @@ }, "require": { "tombrain/phpunit-mock-db": "dev-master", - "tombrain/phpunit-sql": "dev-master", "dibi/dibi": "^5.0" }, "autoload": { From 892754ab5a47f0c7eed4bb57da5988fd5f6e885e Mon Sep 17 00:00:00 2001 From: tombrain Date: Sun, 29 Oct 2023 23:17:56 +0100 Subject: [PATCH 07/15] Update phpunit.yml --- .github/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index c0ecd01..4580f38 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: - php: [7.3, 7.4] + php: [7.3, 7.4, 8.0, 8.1, 8.2] phpunit: ['default', '~8.5.0', '~8.4.0', '~8.2.0', '~7.0'] include: - php: 7.2 From 2b7eaaf8e600ff6df8711fc39be4a30d115c75d3 Mon Sep 17 00:00:00 2001 From: tombrain Date: Sun, 29 Oct 2023 23:20:20 +0100 Subject: [PATCH 08/15] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index dcf3fc7..bdbf701 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ }, "require": { "tombrain/phpunit-mock-db": "dev-master", - "dibi/dibi": "^5.0" + "dibi/dibi": "^4.2.x-dev" }, "autoload": { "psr-4": { From 0a2b92612f05b4f46637381a8a40c8ccac937873 Mon Sep 17 00:00:00 2001 From: tombrain Date: Sun, 29 Oct 2023 23:25:15 +0100 Subject: [PATCH 09/15] add ref sql --- composer.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/composer.json b/composer.json index bdbf701..ada2b06 100644 --- a/composer.json +++ b/composer.json @@ -12,6 +12,10 @@ } ], "repositories": [ + { + "type": "vcs", + "url": "https://github.com/tombrain/phpunit-sql.git" + }, { "type": "vcs", "url": "https://github.com/tombrain/phpunit-mock-db.git" @@ -21,6 +25,7 @@ "issues": "https://github.com/czukowski/phpunit-mock-dibi/issues" }, "require": { + "tombrain/phpunit-sql": "dev-master", "tombrain/phpunit-mock-db": "dev-master", "dibi/dibi": "^4.2.x-dev" }, From d060d2b1878b269e6ce7d6dea050e989317cdc8c Mon Sep 17 00:00:00 2001 From: tombrain Date: Sun, 29 Oct 2023 23:34:50 +0100 Subject: [PATCH 10/15] removed old versions --- .github/workflows/phpunit.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 4580f38..d302995 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -14,22 +14,14 @@ jobs: strategy: matrix: php: [7.3, 7.4, 8.0, 8.1, 8.2] - phpunit: ['default', '~8.5.0', '~8.4.0', '~8.2.0', '~7.0'] + phpunit: ['default', '~9.6.13'] include: - php: 7.2 - phpunit: '~7.0' - - php: 7.2 - phpunit: '~8.0' - - php: 7.2 - phpunit: '~8.2.0' - - php: 7.2 - phpunit: '~8.4.0' - - php: 7.2 - phpunit: '~8.5.0' + phpunit: '~9.6.13' steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup PHP ${{ matrix.php }} uses: shivammathur/setup-php@v2 @@ -45,7 +37,7 @@ jobs: - name: Cache Composer packages id: composer-cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: vendor key: ${{ runner.os }}-php-${{ matrix.php }}-${{ hashFiles('composer.json') }} From 3f35a425482ae215f2395b93ea32ec6bb6ac6af9 Mon Sep 17 00:00:00 2001 From: tombrain Date: Sun, 29 Oct 2023 23:37:15 +0100 Subject: [PATCH 11/15] failFast deactivated --- .github/workflows/phpunit.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index d302995..d2d0fc9 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -12,6 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: php: [7.3, 7.4, 8.0, 8.1, 8.2] phpunit: ['default', '~9.6.13'] From 2ca51b6f5136e8822e963945230a6a5b60747739 Mon Sep 17 00:00:00 2001 From: tombrain Date: Mon, 30 Oct 2023 15:30:46 +0100 Subject: [PATCH 12/15] fix: function-signature --- classes/Drivers/PdoDriver.php | 2 +- classes/Drivers/SqliteDriver.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Drivers/PdoDriver.php b/classes/Drivers/PdoDriver.php index 7bbc2ff..9a89250 100644 --- a/classes/Drivers/PdoDriver.php +++ b/classes/Drivers/PdoDriver.php @@ -74,7 +74,7 @@ public function createResultSet($resultSet) /** * @throws PdoResult */ - public function createResultDriver(PDOStatement $result): Drivers\PdoResult + public function createResultDriver(/*PDOStatement*/ $result): Drivers\PdoResult { return new PdoResult($result, $this->driverName); } diff --git a/classes/Drivers/SqliteDriver.php b/classes/Drivers/SqliteDriver.php index b99b440..3da0335 100644 --- a/classes/Drivers/SqliteDriver.php +++ b/classes/Drivers/SqliteDriver.php @@ -69,7 +69,7 @@ public function createResultSet($resultSet) * @param NativeSQLiteResult $result * @return SqliteResult */ - public function createResultDriver(NativeSQLiteResult $result): Drivers\SqliteResult + public function createResultDriver(/*NativeSQLiteResult*/ $result): Drivers\SqliteResult { return new SqliteResult($result); } From 86a3cd3603705a548abc04df6e9123e13a8b7bf1 Mon Sep 17 00:00:00 2001 From: tombrain Date: Mon, 30 Oct 2023 15:53:56 +0100 Subject: [PATCH 13/15] fix: corect phpunit-version (php72) --- .github/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index d2d0fc9..59a868f 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -18,7 +18,7 @@ jobs: phpunit: ['default', '~9.6.13'] include: - php: 7.2 - phpunit: '~9.6.13' + phpunit: '~9.0' steps: - name: Checkout code From 0f525e66fbcf04cc42fadbf95fc8b400e760d462 Mon Sep 17 00:00:00 2001 From: tombrain Date: Mon, 30 Oct 2023 15:58:44 +0100 Subject: [PATCH 14/15] remove php7.2 --- .github/workflows/phpunit.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 59a868f..741b0ac 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -16,9 +16,6 @@ jobs: matrix: php: [7.3, 7.4, 8.0, 8.1, 8.2] phpunit: ['default', '~9.6.13'] - include: - - php: 7.2 - phpunit: '~9.0' steps: - name: Checkout code From 011872f5f0bd8b4fedc4e0c41c0d80315b0bffb7 Mon Sep 17 00:00:00 2001 From: tombrain Date: Sun, 4 May 2025 14:07:38 +0200 Subject: [PATCH 15/15] fix: add .vscode settings and launch files to .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 19bdef3..cc8e973 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /vendor/ /tests/.phpunit.result.cache composer.lock +.vscode/settings.json +.vscode/launch.json