Skip to content

Commit 40b605d

Browse files
byteheadbytehead
authored
Fix support for Symfony 8 (#450)
1 parent 75481fd commit 40b605d

13 files changed

Lines changed: 45 additions & 71 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 11 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2
1818
with:
19-
php-version: 8.0
19+
php-version: 8.1
2020
extensions: dom, fileinfo, filter, gd, hash, intl, json, mbstring, pcre, pdo, zlib
2121
coverage: none
2222

@@ -38,45 +38,19 @@ jobs:
3838
strategy:
3939
fail-fast: false
4040
matrix:
41-
php: [8.0, 8.1, 8.2, 8.3, 8.4, 8.5]
42-
symfony: [5.4, 6.0, 6.1, 6.2, 6.3, 6.4, 7.0]
41+
php: [8.1, 8.2, 8.3, 8.4, 8.5]
42+
symfony: [6.4, 7.4, 8.0]
4343
exclude:
44-
- php: 8.0
45-
symfony: 6.0
46-
- php: 8.0
47-
symfony: 6.1
48-
- php: 8.0
49-
symfony: 6.2
50-
- php: 8.0
51-
symfony: 6.3
52-
- php: 8.0
53-
symfony: 6.4
54-
- php: 8.0
55-
symfony: 7.0
5644
- php: 8.1
57-
symfony: 7.0
58-
- php: 8.4
59-
symfony: 5.4
60-
- php: 8.4
61-
symfony: 6.0
62-
- php: 8.4
63-
symfony: 6.1
64-
- php: 8.4
65-
symfony: 6.2
66-
- php: 8.4
67-
symfony: 6.3
45+
symfony: 7.4
46+
- php: 8.1
47+
symfony: 8.0
48+
- php: 8.2
49+
symfony: 8.0
50+
- php: 8.3
51+
symfony: 8.0
6852
- php: 8.4
6953
symfony: 6.4
70-
- php: 8.5
71-
symfony: 5.4
72-
- php: 8.5
73-
symfony: 6.0
74-
- php: 8.5
75-
symfony: 6.1
76-
- php: 8.5
77-
symfony: 6.2
78-
- php: 8.5
79-
symfony: 6.3
8054
- php: 8.5
8155
symfony: 6.4
8256
steps:
@@ -105,7 +79,7 @@ jobs:
10579
- name: Setup PHP
10680
uses: shivammathur/setup-php@v2
10781
with:
108-
php-version: 8.0
82+
php-version: 8.1
10983
extensions: dom, fileinfo, filter, gd, hash, intl, json, mbstring, pcre, pdo_mysql, zlib
11084
coverage: none
11185

‎composer.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,30 +33,30 @@
3333
],
3434
"require": {
3535
"php": "^8.0",
36-
"symfony/asset": "^5.4 || ^6.0 || ^7.0 || ^8.0",
36+
"symfony/asset": "^6.0 || ^7.0 || ^8.0",
3737
"symfony/event-dispatcher-contracts": "^1.0 || ^2.0 || ^3.0",
38-
"symfony/finder": "^5.4 || ^6.0 || ^7.0 || ^8.0",
39-
"symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0 || ^8.0",
40-
"symfony/mime": "^5.4 || ^6.0 || ^7.0 || ^8.0",
41-
"symfony/translation": "^5.4 || ^6.0 || ^7.0 || ^8.0",
38+
"symfony/finder": "^6.0 || ^7.0 || ^8.0",
39+
"symfony/framework-bundle": "^6.0 || ^7.0 || ^8.0",
40+
"symfony/mime": "^6.0 || ^7.0 || ^8.0",
41+
"symfony/translation": "^6.0 || ^7.0 || ^8.0",
4242
"symfony/translation-contracts": "^1.0 || ^2.0 || ^3.0",
43-
"symfony/yaml": "^5.4 || ^6.0 || ^7.0 || ^8.0",
43+
"symfony/yaml": "^6.0 || ^7.0 || ^8.0",
4444
"twig/twig": "^2.4 || ^3.0"
4545
},
4646
"require-dev": {
4747
"amazonwebservices/aws-sdk-for-php": "1.5.*",
4848
"doctrine/common": "^2.12 || ^3.0",
49-
"doctrine/doctrine-bundle": "^2.4",
49+
"doctrine/doctrine-bundle": "^2.4 || ^3.2",
5050
"friendsofphp/php-cs-fixer": "^3.40",
5151
"knplabs/gaufrette": "^0.9",
5252
"m2mtech/flysystem-stream-wrapper": "^1.0",
5353
"oneup/flysystem-bundle": "^4.1",
5454
"phpstan/phpstan": "^1.8",
5555
"phpunit/phpunit": "^9.5",
56-
"symfony/browser-kit": "^5.4 || ^6.0 || ^7.0 || ^8.0",
56+
"symfony/browser-kit": "^6.0 || ^7.0 || ^8.0",
5757
"symfony/phpunit-bridge": "^6.0.17 || ^7.0 || ^8.0",
58-
"symfony/security-bundle": "^5.4 || ^6.0 || ^7.0 || ^8.0",
59-
"symfony/var-dumper": "^5.4 || ^6.0 || ^7.0 || ^8.0",
58+
"symfony/security-bundle": "^6.0 || ^7.0 || ^8.0",
59+
"symfony/var-dumper": "^6.0 || ^7.0 || ^8.0",
6060
"twistor/flysystem-stream-wrapper": "^1.0"
6161
},
6262
"suggest": {

‎doc/custom_logic.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ As you can see, we extended the `request` part of the FineUploader by adding a `
7777
public function onUpload(PostPersistEvent $event)
7878
{
7979
$request = $event->getRequest();
80-
$gallery = $request->get('gallery');
80+
$gallery = $request->request->get('gallery');
8181
8282
// ...
8383
}

‎src/Controller/AbstractController.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function progress(): JsonResponse
4040
$prefix = (string) \ini_get('session.upload_progress.prefix');
4141
$name = (string) \ini_get('session.upload_progress.name');
4242
/** @var string $value */
43-
$value = $request->get($name);
43+
$value = $request->request->get($name);
4444
// assemble session key
4545
// ref: http://php.net/manual/en/session.upload-progress.php
4646
$key = \sprintf('%s.%s', $prefix, $value);
@@ -58,7 +58,7 @@ public function cancel(): JsonResponse
5858
$prefix = (string) \ini_get('session.upload_progress.prefix');
5959
$name = (string) \ini_get('session.upload_progress.name');
6060
/** @var string $value */
61-
$value = $request->get($name);
61+
$value = $request->request->get($name);
6262
$key = \sprintf('%s.%s', $prefix, $value);
6363

6464
/** @var array $progress */
@@ -97,7 +97,7 @@ protected function handleUpload(FileInterface|File $file, ResponseInterface $res
9797
// wrap the file if it is not done yet which can only happen
9898
// if it wasn't a chunked upload, in which case it is definitely
9999
// on the local filesystem.
100-
if (!($file instanceof FileInterface)) {
100+
if (!$file instanceof FileInterface) {
101101
$file = new FilesystemFile($file);
102102
}
103103

‎src/Controller/BlueimpController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function progress(): JsonResponse
4242
$prefix = (string) \ini_get('session.upload_progress.prefix');
4343
$name = (string) \ini_get('session.upload_progress.name');
4444
/** @var string $value */
45-
$value = $request->get($name);
45+
$value = $request->request->get($name);
4646

4747
// ref: https://github.com/blueimp/jQuery-File-Upload/wiki/PHP-Session-Upload-Progress
4848
$key = \sprintf('%s.%s', $prefix, $value);

‎src/Controller/DropzoneController.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ public function upload(): JsonResponse
4747

4848
protected function parseChunkedRequest(Request $request): array
4949
{
50-
$totalChunkCount = $request->get('dztotalchunkcount');
51-
$index = (int) $request->get('dzchunkindex');
50+
$totalChunkCount = $request->request->get('dztotalchunkcount');
51+
$index = (int) $request->request->get('dzchunkindex');
5252
$last = ($index + 1) === (int) $totalChunkCount;
53-
$uuid = $request->get('dzuuid');
53+
$uuid = $request->request->get('dzuuid');
5454

5555
/**
5656
* @var UploadedFile $file

‎src/Controller/FineUploaderController.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public function upload(): JsonResponse
2020
$translator = $this->container->get('translator');
2121

2222
$response = new FineUploaderResponse();
23-
$totalParts = $request->get('qqtotalparts', 1);
23+
$totalParts = $request->request->get('qqtotalparts', 1);
2424
$files = $this->getFiles($request->files);
2525
$chunked = $totalParts > 1;
2626

@@ -46,10 +46,10 @@ public function upload(): JsonResponse
4646

4747
protected function parseChunkedRequest(Request $request): array
4848
{
49-
$index = (int) $request->get('qqpartindex');
50-
$total = (int) $request->get('qqtotalparts');
51-
$uuid = $request->get('qquuid');
52-
$orig = $request->get('qqfilename');
49+
$index = (int) $request->request->get('qqpartindex');
50+
$total = (int) $request->request->get('qqtotalparts');
51+
$uuid = $request->request->get('qquuid');
52+
$orig = $request->request->get('qqfilename');
5353
$last = ($total - 1) === $index;
5454

5555
return [$last, $uuid, $index, $orig];

‎src/Controller/PluploadController.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function upload(): JsonResponse
1717
$response = new EmptyResponse();
1818
$files = $this->getFiles($request->files);
1919

20-
$chunked = null !== $request->get('chunks');
20+
$chunked = null !== $request->request->get('chunks');
2121

2222
foreach ($files as $file) {
2323
try {
@@ -37,9 +37,9 @@ protected function parseChunkedRequest(Request $request): array
3737
{
3838
$session = $request->getSession();
3939

40-
$orig = $request->get('name');
41-
$index = (int) $request->get('chunk');
42-
$last = (int) $request->get('chunks') - 1 === (int) $request->get('chunk');
40+
$orig = $request->request->get('name');
41+
$index = (int) $request->request->get('chunk');
42+
$last = (int) $request->request->get('chunks') - 1 === (int) $request->request->get('chunk');
4343

4444
// it is possible, that two clients send a file with the
4545
// exact same filename, therefore we have to add the session

‎src/DependencyInjection/Configuration.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public function getConfigTreeBuilder(): TreeBuilder
8080
->arrayNode('endpoints')
8181
->beforeNormalization()
8282
->ifString()
83-
->then(function ($v) {
83+
->then(static function ($v) {
8484
if ('/' !== substr($v, -1)) {
8585
$v .= '/';
8686
}
@@ -106,7 +106,7 @@ public function getConfigTreeBuilder(): TreeBuilder
106106
->prototype('scalar')
107107
->beforeNormalization()
108108
->ifString()
109-
->then(fn ($v) => strtolower($v))
109+
->then(static fn ($v) => strtolower($v))
110110
->end()
111111
->end()
112112
->end()

‎src/Uploader/Chunk/Storage/FilesystemStorage.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function addChunk(string $uuid, int $index, UploadedFile $chunk, string $
5757
*/
5858
public function assembleChunks($chunks, bool $removeChunk, bool $renameChunk): File
5959
{
60-
if (!($chunks instanceof \IteratorAggregate)) {
60+
if (!$chunks instanceof \IteratorAggregate) {
6161
throw new \InvalidArgumentException('The first argument must implement \IteratorAggregate interface.');
6262
}
6363

@@ -116,7 +116,7 @@ public function getChunks(string $uuid): Finder
116116

117117
$finder = new Finder();
118118
$finder
119-
->in(\sprintf('%s/%s', $this->directory, $uuid))->files()->sort(function (\SplFileInfo $a, \SplFileInfo $b) {
119+
->in(\sprintf('%s/%s', $this->directory, $uuid))->files()->sort(static function (\SplFileInfo $a, \SplFileInfo $b) {
120120
$t = explode('_', $a->getBasename());
121121
$s = explode('_', $b->getBasename());
122122
$t = (int) $t[0];

0 commit comments

Comments
 (0)