Skip to content

Commit 40c8c42

Browse files
priyadipriyadi
authored
fix: remove dependency on ServiceSubscriberTrait, fixes deprecated warning from symfony/service-contracts (#23)
* fix: remove dependency on `ServiceSubscriberTrait`, fixes deprecated warning from `symfony/service-contracts` * workaround psalm supression bug * adapting for changes in symfony * release 1.8.7
1 parent 1acf758 commit 40c8c42

File tree

20 files changed

+82
-52
lines changed

20 files changed

+82
-52
lines changed

‎CHANGELOG.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
# CHANGELOG
22

3-
## 1.8.5
3+
## 1.8.7
4+
5+
* fix: remove dependency on `ServiceSubscriberTrait`, fixes deprecated warning
6+
from `symfony/service-contracts`
7+
8+
## 1.8.6
49

510
* feat: AssetMapper compatibility
11+
* deps: Update oneup/uploaderbundle requirement from 4.0 to 5.0
612

713
## 1.8.4
814

‎composer.json

+18-17
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
"symfony/asset-mapper": "^6.2 || ^7.0",
6464
"symfony/console": "^6.2 || ^7.0",
6565
"symfony/framework-bundle": "^6.2 || ^7.0",
66+
"symfony/http-client": "^6.2 || ^7.0",
6667
"symfony/phpunit-bridge": "^6.3 || ^7.0",
6768
"symfony/property-info": "^6.2 || ^7.0",
6869
"symfony/routing": "^6.2 || ^7.0",
@@ -98,23 +99,23 @@
9899
}
99100
},
100101
"replace": {
101-
"rekalogika/file": "1.8.6",
102-
"rekalogika/file-association": "1.8.6",
103-
"rekalogika/file-association-contracts": "1.8.6",
104-
"rekalogika/file-association-entity": "1.8.6",
105-
"rekalogika/file-bundle": "1.8.6",
106-
"rekalogika/file-contracts": "1.8.6",
107-
"rekalogika/file-derivation": "1.8.6",
108-
"rekalogika/file-filepond": "1.8.6",
109-
"rekalogika/file-image": "1.8.6",
110-
"rekalogika/file-metadata": "1.8.6",
111-
"rekalogika/file-metadata-contracts": "1.8.6",
112-
"rekalogika/file-null": "1.8.6",
113-
"rekalogika/file-oneup-uploader-bridge": "1.8.6",
114-
"rekalogika/file-server": "1.8.6",
115-
"rekalogika/file-symfony-bridge": "1.8.6",
116-
"rekalogika/file-tree-contracts": "1.8.6",
117-
"rekalogika/file-zip": "1.8.6"
102+
"rekalogika/file": "1.8.7",
103+
"rekalogika/file-association": "1.8.7",
104+
"rekalogika/file-association-contracts": "1.8.7",
105+
"rekalogika/file-association-entity": "1.8.7",
106+
"rekalogika/file-bundle": "1.8.7",
107+
"rekalogika/file-contracts": "1.8.7",
108+
"rekalogika/file-derivation": "1.8.7",
109+
"rekalogika/file-filepond": "1.8.7",
110+
"rekalogika/file-image": "1.8.7",
111+
"rekalogika/file-metadata": "1.8.7",
112+
"rekalogika/file-metadata-contracts": "1.8.7",
113+
"rekalogika/file-null": "1.8.7",
114+
"rekalogika/file-oneup-uploader-bridge": "1.8.7",
115+
"rekalogika/file-server": "1.8.7",
116+
"rekalogika/file-symfony-bridge": "1.8.7",
117+
"rekalogika/file-tree-contracts": "1.8.7",
118+
"rekalogika/file-zip": "1.8.7"
118119
},
119120
"config": {
120121
"allow-plugins": {

‎packages/file-association-entity/composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
},
2828
"require": {
2929
"doctrine/collections": "^2.0",
30-
"rekalogika/file-contracts": "^1.8.6",
31-
"rekalogika/file-metadata": "^1.8.6",
32-
"rekalogika/file-null": "^1.8.6",
30+
"rekalogika/file-contracts": "^1.8.7",
31+
"rekalogika/file-metadata": "^1.8.7",
32+
"rekalogika/file-null": "^1.8.7",
3333
"rekalogika/doctrine-collections-decorator": "^2.0"
3434
},
3535
"extra": {

‎packages/file-association/composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
},
2828
"require": {
2929
"rekalogika/direct-property-access": "^1.1.2 || ^1.2",
30-
"rekalogika/file-association-contracts": "^1.8.6",
31-
"rekalogika/file-contracts": "^1.8.6",
30+
"rekalogika/file-association-contracts": "^1.8.7",
31+
"rekalogika/file-contracts": "^1.8.7",
3232
"rekalogika/reconstitutor": "^1.0",
3333
"symfony/property-access": "^6.2 || ^7.0"
3434
},

‎packages/file-bundle/composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
"league/flysystem": "^3.16",
2929
"league/flysystem-local": "^3.16",
3030
"psr/container": "^2.0",
31-
"rekalogika/file": "^1.8.6",
32-
"rekalogika/file-contracts": "^1.8.6",
31+
"rekalogika/file": "^1.8.7",
32+
"rekalogika/file-contracts": "^1.8.7",
3333
"symfony/config": "^6.2 || ^7.0",
3434
"symfony/dependency-injection": "^6.2 || ^7.0",
3535
"symfony/http-kernel": "^6.2 || ^7.0"

‎packages/file-derivation/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
}
2222
},
2323
"require": {
24-
"rekalogika/file-contracts": "^1.8.6"
24+
"rekalogika/file-contracts": "^1.8.7"
2525
},
2626
"extra": {
2727
"branch-alias": {

‎packages/file-filepond/composer.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
}
2626
},
2727
"require": {
28-
"rekalogika/file": "^1.8.6",
29-
"rekalogika/file-association-entity": "^1.8.6",
30-
"rekalogika/file-bundle": "^1.8.6",
31-
"rekalogika/file-contracts": "^1.8.6",
32-
"rekalogika/file-image": "^1.8.6",
33-
"rekalogika/file-server": "^1.8.6",
34-
"rekalogika/file-symfony-bridge": "^1.8.6",
28+
"rekalogika/file": "^1.8.7",
29+
"rekalogika/file-association-entity": "^1.8.7",
30+
"rekalogika/file-bundle": "^1.8.7",
31+
"rekalogika/file-contracts": "^1.8.7",
32+
"rekalogika/file-image": "^1.8.7",
33+
"rekalogika/file-server": "^1.8.7",
34+
"rekalogika/file-symfony-bridge": "^1.8.7",
3535
"rekalogika/temporary-url-bundle": "^1.3",
3636
"symfony/form": "^6.2 || ^7.0",
3737
"symfony/options-resolver": "^6.2 || ^7.0",

‎packages/file-image/composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
},
2828
"require": {
2929
"intervention/image": "^3.3",
30-
"rekalogika/file-contracts": "^1.8.6",
31-
"rekalogika/file-derivation": "^1.8.6",
30+
"rekalogika/file-contracts": "^1.8.7",
31+
"rekalogika/file-derivation": "^1.8.7",
3232
"symfony/service-contracts": "^3.3",
3333
"twig/twig": "^2.12|^3.0",
3434
"webmozart/assert": "^1.11"

‎packages/file-image/src/ImageTwigExtension.php

+9-2
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@
1414
namespace Rekalogika\File\Image;
1515

1616
use Rekalogika\Contracts\File\FileInterface;
17+
use Symfony\Component\DependencyInjection\ContainerInterface;
18+
use Symfony\Contracts\Service\Attribute\Required;
1719
use Symfony\Contracts\Service\ServiceSubscriberInterface;
18-
use Symfony\Contracts\Service\ServiceSubscriberTrait;
1920
use Twig\Extension\AbstractExtension;
2021
use Twig\TwigFilter;
2122

2223
class ImageTwigExtension extends AbstractExtension implements ServiceSubscriberInterface
2324
{
24-
use ServiceSubscriberTrait;
25+
protected ContainerInterface $container;
2526

2627
public static function getSubscribedServices(): array
2728
{
@@ -30,6 +31,12 @@ public static function getSubscribedServices(): array
3031
];
3132
}
3233

34+
#[Required]
35+
public function setContainer(ContainerInterface $container): void
36+
{
37+
$this->container = $container;
38+
}
39+
3340
private function getImageResizer(): ImageResizer
3441
{
3542
$resizer = $this->container->get(ImageResizer::class);

‎packages/file-metadata/composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
"require": {
2626
"cardinalby/content-disposition": "^1.1",
2727
"fileeye/mimemap": "^2.0",
28-
"rekalogika/file-contracts": "^1.8.6",
29-
"rekalogika/file-metadata-contracts": "^1.8.6",
28+
"rekalogika/file-contracts": "^1.8.7",
29+
"rekalogika/file-metadata-contracts": "^1.8.7",
3030
"symfony/translation-contracts": "^3.0"
3131
},
3232
"extra": {

‎packages/file-null/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"require": {
2727
"psr/http-message": "^1.0 || ^2.0",
28-
"rekalogika/file-contracts": "^1.8.6",
28+
"rekalogika/file-contracts": "^1.8.7",
2929
"symfony/translation-contracts": "^3.0"
3030
},
3131
"extra": {

‎packages/file-oneup-uploader-bridge/composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
},
2525
"require": {
2626
"oneup/uploader-bundle": "^4.0",
27-
"rekalogika/file-contracts": "^1.8.6",
28-
"rekalogika/file": "^1.8.6"
27+
"rekalogika/file-contracts": "^1.8.7",
28+
"rekalogika/file": "^1.8.7"
2929
},
3030
"extra": {
3131
"branch-alias": {

‎packages/file-server/composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
}
2424
},
2525
"require": {
26-
"rekalogika/file-contracts": "^1.8.6",
27-
"rekalogika/file-symfony-bridge": "^1.8.6",
26+
"rekalogika/file-contracts": "^1.8.7",
27+
"rekalogika/file-symfony-bridge": "^1.8.7",
2828
"rekalogika/temporary-url-bundle": "^1.3",
2929
"symfony/http-foundation": "^6.2 || ^7.0"
3030
},

‎packages/file-symfony-bridge/composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
}
2727
},
2828
"require": {
29-
"rekalogika/file": "^1.8.6",
30-
"rekalogika/file-contracts": "^1.8.6",
31-
"rekalogika/file-metadata-contracts": "^1.8.6",
29+
"rekalogika/file": "^1.8.7",
30+
"rekalogika/file-contracts": "^1.8.7",
31+
"rekalogika/file-metadata-contracts": "^1.8.7",
3232
"symfony/form": "^6.2 || ^7.0",
3333
"symfony/http-foundation": "^6.2 || ^7.0",
3434
"symfony/validator": "^6.2 || ^7.0"

‎packages/file-tree-contracts/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
}
2222
},
2323
"require": {
24-
"rekalogika/file-contracts": "^1.8.6"
24+
"rekalogika/file-contracts": "^1.8.7"
2525
},
2626
"extra": {
2727
"branch-alias": {

‎packages/file-zip/composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
},
2828
"require": {
2929
"psr/http-message": "^1.0 || ^2.0",
30-
"rekalogika/file-contracts": "^1.8.6",
31-
"rekalogika/file-metadata": "^1.8.6",
30+
"rekalogika/file-contracts": "^1.8.7",
31+
"rekalogika/file-metadata": "^1.8.7",
3232
"rekalogika/temporary-url-bundle": "^1.3",
3333
"maennchen/zipstream-php": "^3.1",
3434
"symfony/http-foundation": "^6.2 || ^7.0",

‎packages/file/composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
"psr/http-factory-implementation": "^1.0",
3434
"league/flysystem": "^3.16",
3535
"league/mime-type-detection": "^1.0.0",
36-
"rekalogika/file-contracts": "^1.8.6",
37-
"rekalogika/file-metadata": "^1.8.6",
36+
"rekalogika/file-contracts": "^1.8.7",
37+
"rekalogika/file-metadata": "^1.8.7",
3838
"symfony/deprecation-contracts": "^3.1"
3939
},
4040
"require-dev": {

‎psalm.xml

+5
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,11 @@
7373
<file name="packages/file-filepond/src/FilePondCollectionType.php" />
7474
</errorLevel>
7575
</MixedArgument>
76+
<MissingConstructor>
77+
<errorLevel type="suppress">
78+
<file name="packages/file-image/src/ImageTwigExtension.php" />
79+
</errorLevel>
80+
</MissingConstructor>
7681
</issueHandlers>
7782

7883
<plugins>

‎tests/Model/EntityWithDifferentFileProperties.php

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Rekalogika\Contracts\File\FileInterface;
1717
use Rekalogika\File\Association\Attribute\AsFileAssociation;
1818

19+
/** @psalm-suppress MissingConstructor */
1920
class EntityWithDifferentFileProperties
2021
{
2122
#[AsFileAssociation(fetch: 'EAGER')]

‎tests/TestKernel.php

+10
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,13 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
8686
'php_errors' => [
8787
'log' => true,
8888
],
89+
'http_client' => [
90+
'enabled' => true,
91+
'max_host_connections' => 1,
92+
'default_options' => [
93+
'timeout' => 10,
94+
],
95+
],
8996
]);
9097

9198
$container->loadFromExtension('doctrine', [
@@ -96,6 +103,9 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
96103
],
97104
'orm' => [
98105
'enable_lazy_ghost_objects' => true,
106+
'controller_resolver' => [
107+
'auto_mapping' => false,
108+
]
99109
]
100110
]);
101111

0 commit comments

Comments
 (0)