Skip to content

Commit 9c80b84

Browse files
nicklognicklog
committed
update dependencies
1 parent 6d8f3c3 commit 9c80b84

21 files changed

+103
-197
lines changed

‎.github/workflows/php.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ jobs:
1515

1616
strategy:
1717
matrix:
18-
php-versions: [ '8.2', '8.3' ]
18+
php-versions: [ '8.4', '8.5' ]
19+
dependencies: [ 'locked', 'latest', 'lowest' ]
1920

2021
steps:
2122
- uses: actions/checkout@v2
@@ -26,10 +27,13 @@ jobs:
2627
php-version: ${{ matrix.php-versions }}
2728

2829
- name: Validate composer.json and composer.lock
29-
run: composer validate
30+
run: composer validate --strict -n
3031

31-
- name: Install dependencies
32-
run: composer install --prefer-dist --no-progress --no-suggest
32+
- name: Install Composer dependencies
33+
uses: ramsey/composer-install@v3
34+
with:
35+
dependency-versions: ${{ matrix.dependencies }}
36+
composer-options: --prefer-dist --no-suggest --no-scripts
3337

3438
- name: Run Check
3539
run: composer check

‎composer-dependency-analyser.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
use ShipMonk\ComposerDependencyAnalyser\Config\Configuration;
6+
7+
return new Configuration()
8+
// Adjusting scanned paths
9+
->addPathToScan(__DIR__ . '/src', false)
10+
->addPathToScan(__DIR__ . '/tests', true);

‎composer-require-checker.json‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎composer-unused.php‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎composer.json‎

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -30,35 +30,31 @@
3030
}
3131
],
3232
"require": {
33-
"php": "^8.2",
33+
"php": "^8.4",
3434

35-
"symfony/framework-bundle": "^5.4 || ^6.4 || ^7.0",
36-
"symfony/config": "^5.4 || ^6.4 || ^7.0",
37-
"symfony/http-kernel": "^5.4 || ^6.4 || ^7.0",
38-
"symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0",
39-
"symfony/form": "^5.4 || ^6.4 || ^7.0",
40-
"symfony/yaml": "^5.4 || ^6.4 || ^7.0",
41-
"symfony/options-resolver": "^5.4 || ^6.4 || ^7.0",
42-
"symfony/property-access": "^5.4 || ^6.4 || ^7.0",
43-
"symfony/property-info": "^5.4 || ^6.4 || ^7.0",
35+
"symfony/config": "^7.4 || ^8.0",
36+
"symfony/http-kernel": "^7.4 || ^8.0",
37+
"symfony/dependency-injection": "^7.4 || ^8.0",
38+
"symfony/form": "^7.4 || ^8.0",
39+
"symfony/options-resolver": "^7.4 || ^8.0",
40+
"symfony/property-access": "^7.4 || ^8.0",
41+
"symfony/property-info": "^7.4 || ^8.0",
4442

45-
"doctrine/persistence": "^3.0",
46-
"webmozart/assert": "^1.9"
43+
"doctrine/persistence": "^4.1"
4744
},
4845
"require-dev": {
49-
"icanhazstring/composer-unused": "~0.8",
50-
"doctrine/coding-standard": "^12.0",
46+
"doctrine/coding-standard": "^14.0",
5147
"roave/security-advisories": "dev-master",
52-
"squizlabs/php_codesniffer": "^3.7",
53-
"phpstan/phpstan": "~1.10",
54-
"phpstan/phpstan-deprecation-rules": "~1.1",
55-
"phpstan/phpstan-phpunit": "~1.3",
56-
"phpstan/phpstan-strict-rules": "~1.5",
57-
"phpstan/phpstan-webmozart-assert": "~1.2",
58-
"maglnet/composer-require-checker": "^4.7",
59-
"phpstan/phpstan-symfony": "^1.3",
60-
"phpunit/phpunit": "^10.5",
61-
"symfony/var-dumper": "^7.0"
48+
"squizlabs/php_codesniffer": "^4.0",
49+
"phpstan/phpstan": "^2.1",
50+
"phpstan/phpstan-deprecation-rules": "^2.0",
51+
"phpstan/phpstan-phpunit": "^2.0",
52+
"phpstan/phpstan-strict-rules": "^2.0",
53+
"phpstan/phpstan-webmozart-assert": "^2.0",
54+
"phpstan/phpstan-symfony": "^2.0",
55+
"phpunit/phpunit": "^12.5",
56+
"symfony/var-dumper": "^8.0",
57+
"shipmonk/composer-dependency-analyser": "^1.8.4"
6258
},
6359
"autoload": {
6460
"psr-4": {
@@ -72,19 +68,17 @@
7268
},
7369
"scripts": {
7470
"check": [
75-
"@crc",
76-
"@unused",
71+
"@cda",
7772
"@cs-check",
7873
"@phpstan",
7974
"@phpunit"
8075
],
8176
"phpstan": "phpstan analyse --ansi",
8277
"phpstan-update-baseline": "phpstan analyse --ansi --generate-baseline phpstan-baseline.neon",
83-
"crc": "vendor/bin/composer-require-checker --config-file=./composer-require-checker.json --ansi",
78+
"cda": "vendor/bin/composer-dependency-analyser --config=./composer-dependency-analyser.php",
8479
"phpunit": "phpunit --colors=always",
8580
"cs-check": "phpcs -s",
86-
"cs-fix": "phpcbf",
87-
"unused": "vendor/bin/composer-unused"
81+
"cs-fix": "phpcbf"
8882
},
8983
"extra": {
9084
"branch-alias": {

‎docker-compose.yml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/DependencyInjection/ShapecodeHiddenEntityTypeExtension.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66

77
use Symfony\Component\Config\FileLocator;
88
use Symfony\Component\DependencyInjection\ContainerBuilder;
9-
use Symfony\Component\DependencyInjection\Loader;
10-
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
9+
use Symfony\Component\DependencyInjection\Extension\Extension;
10+
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
1111

12-
class ShapecodeHiddenEntityTypeExtension extends Extension
12+
final class ShapecodeHiddenEntityTypeExtension extends Extension
1313
{
1414
/** @inheritDoc */
1515
public function load(array $configs, ContainerBuilder $container): void
1616
{
1717
$locator = new FileLocator(__DIR__ . '/../Resources/config');
18-
$loader = new Loader\YamlFileLoader($container, $locator);
19-
$loader->load('form.yml');
18+
$loader = new PhpFileLoader($container, $locator);
19+
$loader->load('services.php');
2020
}
2121
}

‎src/Form/DataTransformer/ObjectToIdTransformer.php‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,20 @@
77
use LogicException;
88
use Symfony\Component\Form\Exception\TransformationFailedException;
99
use Symfony\Component\PropertyAccess\PropertyAccess;
10-
use Webmozart\Assert\Assert;
1110

1211
use function is_numeric;
1312
use function is_string;
1413
use function sprintf;
1514

1615
/** @template-extends Transformer<object, string> */
17-
class ObjectToIdTransformer extends Transformer
16+
final readonly class ObjectToIdTransformer extends Transformer
1817
{
19-
public function transform(mixed $value): mixed
18+
public function transform(mixed $value): string|null
2019
{
2120
if ($value === null) {
2221
return null;
2322
}
2423

25-
Assert::isInstanceOf($value, $this->class);
26-
2724
$accessor = PropertyAccess::createPropertyAccessor();
2825
$property = $this->getProperty();
2926

@@ -44,7 +41,7 @@ public function transform(mixed $value): mixed
4441
return (string) $valueObject;
4542
}
4643

47-
public function reverseTransform(mixed $value): mixed
44+
public function reverseTransform(mixed $value): object|null
4845
{
4946
if ($value === null) {
5047
return null;
@@ -65,8 +62,6 @@ public function reverseTransform(mixed $value): mixed
6562
);
6663
}
6764

68-
Assert::isInstanceOf($result, $this->class);
69-
7065
return $result;
7166
}
7267
}

‎src/Form/DataTransformer/ObjectsToIdTransformer.php‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,21 @@
66

77
use Symfony\Component\Form\Exception\TransformationFailedException;
88
use Symfony\Component\PropertyAccess\PropertyAccess;
9-
use Webmozart\Assert\Assert;
109

1110
use function count;
1211
use function explode;
1312
use function implode;
1413
use function sprintf;
1514

16-
/** @template-extends Transformer<object[], string> */
17-
class ObjectsToIdTransformer extends Transformer
15+
/** @template-extends Transformer<array<array-key, object>, string> */
16+
final readonly class ObjectsToIdTransformer extends Transformer
1817
{
19-
public function transform(mixed $value): mixed
18+
public function transform(mixed $value): string|null
2019
{
2120
if ($value === null) {
2221
return null;
2322
}
2423

25-
Assert::allIsInstanceOf($value, $this->class);
26-
2724
$accessor = PropertyAccess::createPropertyAccessor();
2825
$property = $this->getProperty();
2926

@@ -40,7 +37,8 @@ public function transform(mixed $value): mixed
4037
return implode(',', $valueIds);
4138
}
4239

43-
public function reverseTransform(mixed $value): mixed
40+
/** @return array<array-key, object> */
41+
public function reverseTransform(mixed $value): array
4442
{
4543
if ($value === null) {
4644
return [];
@@ -61,8 +59,6 @@ public function reverseTransform(mixed $value): mixed
6159
);
6260
}
6361

64-
Assert::allIsInstanceOf($results, $this->class);
65-
6662
return $results;
6763
}
6864
}

‎src/Form/DataTransformer/Transformer.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
* @template T
2222
* @template-implements DataTransformerInterface<TKey, T>
2323
*/
24-
abstract class Transformer implements DataTransformerInterface
24+
abstract readonly class Transformer implements DataTransformerInterface
2525
{
2626
/** @param class-string $class */
2727
public function __construct(
28-
protected readonly ManagerRegistry $registry,
29-
protected readonly string $class,
30-
protected readonly string $property = 'id',
28+
protected ManagerRegistry $registry,
29+
protected string $class,
30+
protected string $property = 'id',
3131
) {
3232
if (! class_exists($class)) {
3333
throw new InvalidArgumentException(

0 commit comments

Comments
 (0)