From 7e6dd39b8bac40fd82a87a03e1630a730014a043 Mon Sep 17 00:00:00 2001 From: Maxim Tyugaev Date: Thu, 9 Nov 2023 12:22:04 +0300 Subject: [PATCH 01/13] Test codecov --- .github/workflows/test.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 35015b6..ef59348 100755 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,4 +29,9 @@ jobs: uses: "ramsey/composer-install@v1" - name: "Phpunit" - run: "vendor/bin/phpunit" + run: "vendor/bin/phpunit --coverage-clover coverage.xml ." + + - name: "Upload coverage to Codecov" + uses: "codecov/codecov-action@v3" + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} From 567e0e97f262f6c5a4b3424161404784f03c0137 Mon Sep 17 00:00:00 2001 From: Maxim Tyugaev Date: Thu, 9 Nov 2023 12:48:58 +0300 Subject: [PATCH 02/13] Test codecov --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ef59348..8ff9763 100755 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,7 +26,7 @@ jobs: php-version: "${{ matrix.php-version }}" - name: "Install dependencies with Composer" - uses: "ramsey/composer-install@v1" + uses: "ramsey/composer-install@v2" - name: "Phpunit" run: "vendor/bin/phpunit --coverage-clover coverage.xml ." From fe21c9bb945aab9ae6a83b0f6dbf3046d755cd01 Mon Sep 17 00:00:00 2001 From: Maxim Tyugaev Date: Thu, 9 Nov 2023 12:51:51 +0300 Subject: [PATCH 03/13] Test codecov --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8ff9763..6033a5f 100755 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v2" + uses: "actions/checkout@v4" - name: "Install PHP" uses: "shivammathur/setup-php@v2" From 1f197d82a8aae7158221035b9811a91a59dc6da4 Mon Sep 17 00:00:00 2001 From: Maxim Tyugaev Date: Thu, 9 Nov 2023 12:59:54 +0300 Subject: [PATCH 04/13] Test codecov --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6033a5f..75a8364 100755 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,7 +29,7 @@ jobs: uses: "ramsey/composer-install@v2" - name: "Phpunit" - run: "vendor/bin/phpunit --coverage-clover coverage.xml ." + run: "vendor/bin/phpunit" - name: "Upload coverage to Codecov" uses: "codecov/codecov-action@v3" From 9803416872e9a703cbb5e843c7025870115b4951 Mon Sep 17 00:00:00 2001 From: Maxim Tyugaev Date: Thu, 9 Nov 2023 13:01:05 +0300 Subject: [PATCH 05/13] Test codecov --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 75a8364..6033a5f 100755 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,7 +29,7 @@ jobs: uses: "ramsey/composer-install@v2" - name: "Phpunit" - run: "vendor/bin/phpunit" + run: "vendor/bin/phpunit --coverage-clover coverage.xml ." - name: "Upload coverage to Codecov" uses: "codecov/codecov-action@v3" From e7956f66c4245d2c8754458bcb2894395f56ab39 Mon Sep 17 00:00:00 2001 From: Maxim Tyugaev Date: Thu, 9 Nov 2023 13:04:47 +0300 Subject: [PATCH 06/13] Test codecov --- .github/workflows/test.yml | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6033a5f..9037e0e 100755 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,12 +26,22 @@ jobs: php-version: "${{ matrix.php-version }}" - name: "Install dependencies with Composer" - uses: "ramsey/composer-install@v2" + uses: "php-actions/composer@v6" - - name: "Phpunit" - run: "vendor/bin/phpunit --coverage-clover coverage.xml ." - - - name: "Upload coverage to Codecov" - uses: "codecov/codecov-action@v3" + - name: PHPUnit Tests + uses: php-actions/phpunit@v3 env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + XDEBUG_MODE: coverage + with: + bootstrap: vendor/autoload.php + configuration: phpunit.xml + php_extensions: xdebug + args: tests --coverage-clover ./coverage.xml + + - name: Upload to Codecov + uses: codecov/codecov-action@v2 + with: + token: ${{ secrets.CODE_COV_TOKEN }} + files: ./coverage.xml + verbose: true + From d55dd29272985e4399e4a0a9d13241589ed57796 Mon Sep 17 00:00:00 2001 From: Maxim Tyugaev Date: Thu, 9 Nov 2023 13:28:31 +0300 Subject: [PATCH 07/13] Test codecov --- tests/Locking/LockingWalkerWalkerTest.php | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tests/Locking/LockingWalkerWalkerTest.php b/tests/Locking/LockingWalkerWalkerTest.php index 9576d7b..b7d0a00 100644 --- a/tests/Locking/LockingWalkerWalkerTest.php +++ b/tests/Locking/LockingWalkerWalkerTest.php @@ -30,6 +30,9 @@ use Tugmaks\DoctrineWalkers\Locking\LockStrength; use Tugmaks\DoctrineWalkers\Locking\Option; +/** + * @coversDefaultClass LockingWalker + */ final class LockingWalkerWalkerTest extends TestCase { private EntityManager $entityManager; @@ -59,7 +62,12 @@ protected function setUp(): void $this->entityManager = new EntityManager($connectionMock, $config); } - #[DataProvider('lockingClauseAndSql')] + + /** + * + * @dataProvider lockingClauseAndSql + * @covers ::walkSelectStatement + */ public function testHints(LockingClause $lockingClause, string $producedSql): void { $dql = \sprintf('SELECT d FROM %s d WHERE d.id = 1', DummyEntity::class); @@ -85,6 +93,9 @@ public static function lockingClauseAndSql(): Generator ]; } + /** + * @covers ::walkSelectStatement + */ public function testItThrowsExceptionIfLockingClauseNotProvided(): void { self::expectException(LockingWalkerException::class); @@ -99,6 +110,9 @@ public function testItThrowsExceptionIfLockingClauseNotProvided(): void $query->getSQL(); } + /** + * @covers ::walkSelectStatement + */ public function testItThrowsExceptionIfAnotherLockSet(): void { self::expectException(LockingWalkerException::class); From 65e4ef12396a14180b674be7fa09dd20a897b988 Mon Sep 17 00:00:00 2001 From: Maxim Tyugaev Date: Thu, 9 Nov 2023 13:32:12 +0300 Subject: [PATCH 08/13] Test codecov --- tests/Locking/LockingWalkerWalkerTest.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/Locking/LockingWalkerWalkerTest.php b/tests/Locking/LockingWalkerWalkerTest.php index b7d0a00..360b0d9 100644 --- a/tests/Locking/LockingWalkerWalkerTest.php +++ b/tests/Locking/LockingWalkerWalkerTest.php @@ -20,7 +20,6 @@ use Doctrine\ORM\EntityManager; use Doctrine\ORM\Mapping\Driver\AttributeDriver; use Doctrine\ORM\Query; -use Generator; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; @@ -31,7 +30,7 @@ use Tugmaks\DoctrineWalkers\Locking\Option; /** - * @coversDefaultClass LockingWalker + * @coversDefaultClass \LockingWalker */ final class LockingWalkerWalkerTest extends TestCase { @@ -62,11 +61,10 @@ protected function setUp(): void $this->entityManager = new EntityManager($connectionMock, $config); } - /** + * @covers ::walkSelectStatement * * @dataProvider lockingClauseAndSql - * @covers ::walkSelectStatement */ public function testHints(LockingClause $lockingClause, string $producedSql): void { @@ -80,7 +78,7 @@ public function testHints(LockingClause $lockingClause, string $producedSql): vo self::assertSame($producedSql, $query->getSQL()); } - public static function lockingClauseAndSql(): Generator + public static function lockingClauseAndSql(): iterable { yield [ new LockingClause(LockStrength::UPDATE), From 23fb77868a1d17d70a5d52d0e373741096e9e436 Mon Sep 17 00:00:00 2001 From: Maxim Tyugaev Date: Thu, 9 Nov 2023 13:34:58 +0300 Subject: [PATCH 09/13] Test codecov --- tests/Locking/LockingWalkerWalkerTest.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/Locking/LockingWalkerWalkerTest.php b/tests/Locking/LockingWalkerWalkerTest.php index 360b0d9..1813886 100644 --- a/tests/Locking/LockingWalkerWalkerTest.php +++ b/tests/Locking/LockingWalkerWalkerTest.php @@ -78,6 +78,9 @@ public function testHints(LockingClause $lockingClause, string $producedSql): vo self::assertSame($producedSql, $query->getSQL()); } + /** + * @return iterable + */ public static function lockingClauseAndSql(): iterable { yield [ From c51b19d58180daff37f8f7af81604df6faf01e76 Mon Sep 17 00:00:00 2001 From: Maxim Tyugaev Date: Thu, 9 Nov 2023 13:43:13 +0300 Subject: [PATCH 10/13] Test codecov --- tests/Locking/LockingWalkerWalkerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Locking/LockingWalkerWalkerTest.php b/tests/Locking/LockingWalkerWalkerTest.php index 1813886..ea8689c 100644 --- a/tests/Locking/LockingWalkerWalkerTest.php +++ b/tests/Locking/LockingWalkerWalkerTest.php @@ -30,7 +30,7 @@ use Tugmaks\DoctrineWalkers\Locking\Option; /** - * @coversDefaultClass \LockingWalker + * @coversDefaultClass \Tugmaks\DoctrineWalkers\Locking\LockingWalker */ final class LockingWalkerWalkerTest extends TestCase { From 31016a6fd0d1bf77c5c30ae9b32d37e23de6da74 Mon Sep 17 00:00:00 2001 From: Maxim Tyugaev Date: Thu, 9 Nov 2023 13:48:16 +0300 Subject: [PATCH 11/13] Test codecov --- tests/Locking/LockingWalkerWalkerTest.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/Locking/LockingWalkerWalkerTest.php b/tests/Locking/LockingWalkerWalkerTest.php index ea8689c..91c7845 100644 --- a/tests/Locking/LockingWalkerWalkerTest.php +++ b/tests/Locking/LockingWalkerWalkerTest.php @@ -29,9 +29,6 @@ use Tugmaks\DoctrineWalkers\Locking\LockStrength; use Tugmaks\DoctrineWalkers\Locking\Option; -/** - * @coversDefaultClass \Tugmaks\DoctrineWalkers\Locking\LockingWalker - */ final class LockingWalkerWalkerTest extends TestCase { private EntityManager $entityManager; @@ -62,7 +59,8 @@ protected function setUp(): void } /** - * @covers ::walkSelectStatement + * @covers \Tugmaks\DoctrineWalkers\Locking\LockingWalker::walkSelectStatement + * @covers \Tugmaks\DoctrineWalkers\Locking\LockingClause * * @dataProvider lockingClauseAndSql */ @@ -95,7 +93,7 @@ public static function lockingClauseAndSql(): iterable } /** - * @covers ::walkSelectStatement + * @covers \Tugmaks\DoctrineWalkers\Locking\LockingWalker::walkSelectStatement */ public function testItThrowsExceptionIfLockingClauseNotProvided(): void { @@ -113,6 +111,7 @@ public function testItThrowsExceptionIfLockingClauseNotProvided(): void /** * @covers ::walkSelectStatement + * @covers \Tugmaks\DoctrineWalkers\Locking\LockingClause */ public function testItThrowsExceptionIfAnotherLockSet(): void { From cb9628d4a090aecf5db193fb596daa27563d8614 Mon Sep 17 00:00:00 2001 From: Maxim Tyugaev Date: Thu, 9 Nov 2023 13:48:36 +0300 Subject: [PATCH 12/13] Test codecov --- tests/Locking/LockingWalkerWalkerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Locking/LockingWalkerWalkerTest.php b/tests/Locking/LockingWalkerWalkerTest.php index 91c7845..0c5133f 100644 --- a/tests/Locking/LockingWalkerWalkerTest.php +++ b/tests/Locking/LockingWalkerWalkerTest.php @@ -110,7 +110,7 @@ public function testItThrowsExceptionIfLockingClauseNotProvided(): void } /** - * @covers ::walkSelectStatement + * @covers \Tugmaks\DoctrineWalkers\Locking\LockingWalker::walkSelectStatement * @covers \Tugmaks\DoctrineWalkers\Locking\LockingClause */ public function testItThrowsExceptionIfAnotherLockSet(): void From 3124bd7d921d27007fa21fe3e49e45496bef86d3 Mon Sep 17 00:00:00 2001 From: Maxim Tyugaev Date: Thu, 9 Nov 2023 13:49:43 +0300 Subject: [PATCH 13/13] Test codecov --- tests/Locking/LockingWalkerWalkerTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Locking/LockingWalkerWalkerTest.php b/tests/Locking/LockingWalkerWalkerTest.php index 0c5133f..6a7559c 100644 --- a/tests/Locking/LockingWalkerWalkerTest.php +++ b/tests/Locking/LockingWalkerWalkerTest.php @@ -59,8 +59,8 @@ protected function setUp(): void } /** - * @covers \Tugmaks\DoctrineWalkers\Locking\LockingWalker::walkSelectStatement * @covers \Tugmaks\DoctrineWalkers\Locking\LockingClause + * @covers \Tugmaks\DoctrineWalkers\Locking\LockingWalker::walkSelectStatement * * @dataProvider lockingClauseAndSql */ @@ -110,8 +110,8 @@ public function testItThrowsExceptionIfLockingClauseNotProvided(): void } /** - * @covers \Tugmaks\DoctrineWalkers\Locking\LockingWalker::walkSelectStatement * @covers \Tugmaks\DoctrineWalkers\Locking\LockingClause + * @covers \Tugmaks\DoctrineWalkers\Locking\LockingWalker::walkSelectStatement */ public function testItThrowsExceptionIfAnotherLockSet(): void {