Skip to content

Commit 1237fb6

Browse files
Merge branch 'main' into renovate/major-composer-qa-tooling
2 parents 8285ea2 + c2fd34d commit 1237fb6

File tree

7 files changed

+14
-15
lines changed

7 files changed

+14
-15
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ jobs:
4141
name: "Code Quality"
4242

4343
steps:
44-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
44+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
4545

4646
- name: Set up PHP
47-
uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2
47+
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2
4848
with:
4949
php-version: '8.5'
5050
extensions: ctype, json, mbstring

.github/workflows/integration-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ jobs:
7979
-e POSTGRES_INITDB_ARGS="--data-checksums"
8080
8181
steps:
82-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
82+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
8383

8484
- name: Set up PHP
85-
uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2
85+
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2
8686
with:
8787
php-version: ${{ matrix.php }}
8888
coverage: ${{ matrix.calculate-code-coverage == true && 'xdebug' || 'none' }}

.github/workflows/unit-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ jobs:
6161
doctrine-lexer: '2.1'
6262

6363
steps:
64-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
64+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
6565

6666
- name: Set up PHP with PECL extension
67-
uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2
67+
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2
6868
with:
6969
php-version: ${{ matrix.php }}
7070
coverage: ${{ matrix.calculate-code-coverage == true && 'xdebug' || 'none' }}

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@
5454
"phpstan/phpstan-phpunit": "^2.0.8",
5555
"phpunit/phpunit": "^12.4.5",
5656
"rector/rector": "^2.2.8",
57-
"symfony/cache": "^6.4||^7.0"
57+
"symfony/cache": "^6.4||^7.0",
58+
"symfony/var-exporter": "^6.4||^7.0"
5859
},
5960
"suggest": {
6061
"php": "^8.4",

src/MartinGeorgiev/Doctrine/DBAL/Types/GeographyArray.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
namespace MartinGeorgiev\Doctrine\DBAL\Types;
66

7-
use Doctrine\DBAL\Types\ConversionException;
87
use MartinGeorgiev\Doctrine\DBAL\Types\Exceptions\InvalidGeographyForPHPException;
98

109
/**
@@ -21,12 +20,12 @@ protected function transformArrayItemForPostgres(mixed $item): string
2120
return (string) $this->getValidatedArrayItem($item);
2221
}
2322

24-
protected function createInvalidTypeExceptionForPHP(mixed $item): ConversionException
23+
protected function createInvalidTypeExceptionForPHP(mixed $item): InvalidGeographyForPHPException
2524
{
2625
return InvalidGeographyForPHPException::forInvalidType($item);
2726
}
2827

29-
protected function createInvalidFormatExceptionForPHP(mixed $item): ConversionException
28+
protected function createInvalidFormatExceptionForPHP(mixed $item): InvalidGeographyForPHPException
3029
{
3130
return InvalidGeographyForPHPException::forInvalidFormat($item);
3231
}

src/MartinGeorgiev/Doctrine/DBAL/Types/GeometryArray.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
namespace MartinGeorgiev\Doctrine\DBAL\Types;
66

7-
use Doctrine\DBAL\Types\ConversionException;
87
use MartinGeorgiev\Doctrine\DBAL\Types\Exceptions\InvalidGeometryForPHPException;
98

109
/**
@@ -21,12 +20,12 @@ protected function transformArrayItemForPostgres(mixed $item): string
2120
return (string) $this->getValidatedArrayItem($item);
2221
}
2322

24-
protected function createInvalidTypeExceptionForPHP(mixed $item): ConversionException
23+
protected function createInvalidTypeExceptionForPHP(mixed $item): InvalidGeometryForPHPException
2524
{
2625
return InvalidGeometryForPHPException::forInvalidType($item);
2726
}
2827

29-
protected function createInvalidFormatExceptionForPHP(mixed $item): ConversionException
28+
protected function createInvalidFormatExceptionForPHP(mixed $item): InvalidGeometryForPHPException
3029
{
3130
return InvalidGeometryForPHPException::forInvalidFormat($item);
3231
}

tests/Unit/MartinGeorgiev/Utils/PHPArrayToPostgresValueTransformerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public static function provideInvalidPHPValuesForDatabaseTransformation(): array
152152
#[Test]
153153
public function can_transform_object_with_to_string_method(): void
154154
{
155-
$object = new class {
155+
$object = new class implements \Stringable {
156156
public function __toString(): string
157157
{
158158
return 'object string representation';
@@ -199,7 +199,7 @@ public function can_transform_mixed_types_in_array(): void
199199
1.5,
200200
true,
201201
null,
202-
new class {
202+
new class implements \Stringable {
203203
public function __toString(): string
204204
{
205205
return 'object';

0 commit comments

Comments
 (0)