Skip to content

Commit e531fc3

Browse files
authored
Merge pull request #2524 from tarlepp/chore(deps)/dependency-update
Chore(deps) - Dependency update
2 parents 950c87c + 45b4fd3 commit e531fc3

File tree

22 files changed

+552
-442
lines changed

22 files changed

+552
-442
lines changed

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
"ext-mbstring": "*",
2727
"ext-pdo": "*",
2828
"ext-random": "*",
29-
"doctrine/doctrine-bundle": "2.10.2",
30-
"doctrine/doctrine-migrations-bundle": "3.2.4",
31-
"doctrine/orm": "2.16.2",
29+
"doctrine/doctrine-bundle": "2.11.1",
30+
"doctrine/doctrine-migrations-bundle": "3.3.0",
31+
"doctrine/orm": "2.17.1",
3232
"friendsofphp/proxy-manager-lts": "1.0.16",
3333
"gedmo/doctrine-extensions": "3.13.0",
3434
"lexik/jwt-authentication-bundle": "2.19.1",
3535
"mark-gerarts/automapper-plus-bundle": "1.4.1",
36-
"matomo/device-detector": "6.1.6",
36+
"matomo/device-detector": "6.2.0",
3737
"matthiasnoback/symfony-console-form": "5.3.2",
3838
"nelmio/api-doc-bundle": "4.12.0",
3939
"nelmio/cors-bundle": "2.3.1",
@@ -68,7 +68,7 @@
6868
},
6969
"require-dev": {
7070
"bamarni/composer-bin-plugin": "1.8.2",
71-
"doctrine/doctrine-fixtures-bundle": "3.4.4",
71+
"doctrine/doctrine-fixtures-bundle": "3.5.0",
7272
"roave/security-advisories": "dev-latest",
7373
"symfony/browser-kit": "6.3.8",
7474
"symfony/debug-bundle": "6.3.2",

composer.lock

Lines changed: 149 additions & 128 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Entity/DateDimension.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ class DateDimension implements EntityInterface
188188
'DateDimension',
189189
'DateDimension.unixTime',
190190
])]
191-
private int $unixTime;
191+
private string $unixTime;
192192

193193
public function __construct(
194194
#[ORM\Column(
@@ -199,7 +199,7 @@ public function __construct(
199199
'DateDimension',
200200
'DateDimension.date',
201201
])]
202-
private DateTimeImmutable $date
202+
private readonly DateTimeImmutable $date
203203
) {
204204
$this->id = $this->createUuid();
205205

@@ -212,7 +212,7 @@ public function __construct(
212212
$this->dayNumberOfYear = (int)$date->format('z');
213213
$this->leapYear = (bool)$date->format('L');
214214
$this->weekNumberingYear = (int)$date->format('o');
215-
$this->unixTime = (int)$date->format('U');
215+
$this->unixTime = $date->format('U');
216216
}
217217

218218
public function getId(): string
@@ -270,7 +270,7 @@ public function getWeekNumberingYear(): int
270270
return $this->weekNumberingYear;
271271
}
272272

273-
public function getUnixTime(): int
273+
public function getUnixTime(): string
274274
{
275275
return $this->unixTime;
276276
}
@@ -280,7 +280,7 @@ public function getUnixTime(): int
280280
*/
281281
public function getCreatedAt(): DateTimeImmutable
282282
{
283-
$output = DateTimeImmutable::createFromFormat('U', (string)$this->getUnixTime(), new DateTimeZone('UTC'));
283+
$output = DateTimeImmutable::createFromFormat('U', $this->getUnixTime(), new DateTimeZone('UTC'));
284284

285285
return $output === false ? new DateTimeImmutable(timezone: new DateTimeZone('UTC')) : $output;
286286
}

tests/Unit/Entity/DateDimensionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ public function testThatConstructorCallsExpectedMethods(): void
4646
self::assertSame((int)$dateTime->format('z'), $entity->getDayNumberOfYear());
4747
self::assertSame((bool)$dateTime->format('L'), $entity->isLeapYear());
4848
self::assertSame((int)$dateTime->format('o'), $entity->getWeekNumberingYear());
49-
self::assertSame((int)$dateTime->format('U'), $entity->getUnixTime());
49+
self::assertSame($dateTime->format('U'), $entity->getUnixTime());
5050
}
5151
}

tests/Unit/Utils/Tests/PHPUnitUtilTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,8 @@ public static function dataProviderTestThatGetInvalidValueForTypeReturnsExpected
147147
public static function dataProviderTestThatGetTypeReturnExpected(): Generator
148148
{
149149
yield ['int', 'integer'];
150-
yield ['int', 'bigint'];
150+
yield ['int', 'int'];
151+
yield ['string', 'bigint'];
151152
yield [DateTime::class, 'time'];
152153
yield [DateTime::class, 'date'];
153154
yield [DateTime::class, 'datetime'];
@@ -168,7 +169,7 @@ public static function dataProviderTestThatGetValidValueReturnsExpectedValue():
168169
{
169170
yield [666, 'int', true];
170171
yield [666, 'integer', true];
171-
yield [666, 'bigint', true];
172+
yield ['Some text here', 'bigint', true];
172173
yield [DateTime::class, 'time', false];
173174
yield [DateTime::class, 'date', false];
174175
yield [DateTime::class, 'datetime', false];

tests/Utils/PhpUnitUtil.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ public static function getType(Type | string | null $type): string
180180
'time_immutable', 'date_immutable', 'datetime_immutable' => DateTimeImmutable::class,
181181
AppTypes::ENUM_LANGUAGE => Language::class,
182182
AppTypes::ENUM_LOCALE => Locale::class,
183-
self::TYPE_INT, self::TYPE_INTEGER, 'bigint' => self::TYPE_INT,
184-
self::TYPE_STRING, 'text', 'EnumLogLogin' => self::TYPE_STRING,
183+
self::TYPE_INT, self::TYPE_INTEGER => self::TYPE_INT,
184+
self::TYPE_STRING, 'bigint', 'text', 'EnumLogLogin' => self::TYPE_STRING,
185185
self::TYPE_JSON => self::TYPE_JSON,
186186
self::TYPE_ARRAY => self::TYPE_ARRAY,
187187
self::TYPE_BOOL, self::TYPE_BOOLEAN => self::TYPE_BOOL,

tools/01_phpunit/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"require-dev": {
88
"liuggio/fastest": "1.11.0",
9-
"phpunit/php-code-coverage": "10.1.7",
9+
"phpunit/php-code-coverage": "10.1.8",
1010
"phpunit/phpcov": "9.0.2",
1111
"phpunit/phpunit": "10.0.19",
1212
"roave/security-advisories": "dev-latest",

tools/01_phpunit/composer.lock

Lines changed: 36 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tools/02_phpstan/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"php": "^8.2.0"
66
},
77
"require-dev": {
8-
"phpstan/phpstan": "1.10.41",
8+
"phpstan/phpstan": "1.10.42",
99
"phpstan/phpstan-phpunit": "1.3.15",
1010
"phpstan/phpstan-symfony": "1.3.5",
1111
"roave/security-advisories": "dev-latest"

0 commit comments

Comments
 (0)