Skip to content

Commit b9f8622

Browse files
ChristophWurstChristophWurst
committed
Bump icewind/streams from 0.7.1 to 0.7.2
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
1 parent 083f3d2 commit b9f8622

20 files changed

Lines changed: 147 additions & 190 deletions

File tree

‎3rdparty‎

Submodule 3rdparty updated 23 files

‎apps/dav/lib/Connector/Sabre/File.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ public function getContentType() {
494494
}
495495

496496
/**
497-
* @return array|false
497+
* @return array|bool
498498
*/
499499
public function getDirectDownload() {
500500
if (\OCP\App::isEnabled('encryption')) {

‎apps/files_external/lib/Lib/Storage/SMB.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ public function hasUpdated($path, $time) {
441441
/**
442442
* @param string $path
443443
* @param string $mode
444-
* @return resource|false
444+
* @return resource|bool
445445
*/
446446
public function fopen($path, $mode) {
447447
$fullPath = $this->buildPath($path);

‎apps/workflowengine/lib/Check/FileMimeType.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,7 @@ protected function getActualValue() {
122122
return $this->cacheAndReturnMimeType($this->storage->getId(), $this->path, 'httpd/unix-directory');
123123
}
124124

125-
if ($this->storage->file_exists($this->path)) {
126-
$path = $this->storage->getLocalFile($this->path);
125+
if ($this->storage->file_exists($this->path) && is_string($path = $this->storage->getLocalFile($this->path))) {
127126
$mimeType = $this->mimeTypeDetector->detectContent($path);
128127
return $this->cacheAndReturnMimeType($this->storage->getId(), $this->path, $mimeType);
129128
}

‎build/psalm-baseline.xml‎

Lines changed: 19 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1724,12 +1724,8 @@
17241724
</InvalidReturnType>
17251725
</file>
17261726
<file src="apps/files_sharing/lib/SharedStorage.php">
1727-
<FalsableReturnStatement occurrences="5">
1728-
<code>$this-&gt;nonMaskedStorage-&gt;fopen($this-&gt;getUnjailedPath($path), $mode)</code>
1727+
<FalsableReturnStatement occurrences="1">
17291728
<code>$this-&gt;sourceRootInfo</code>
1730-
<code>false</code>
1731-
<code>false</code>
1732-
<code>false</code>
17331729
</FalsableReturnStatement>
17341730
<InvalidNullableReturnType occurrences="1">
17351731
<code>ICacheEntry</code>
@@ -2792,7 +2788,7 @@
27922788
<file src="core/routes.php">
27932789
<InvalidScope occurrences="2">
27942790
<code>$this</code>
2795-
<code>$this</code>
2791+
<code>$this-&gt;create('core_ajax_update', '/core/ajax/update.php')</code>
27962792
</InvalidScope>
27972793
</file>
27982794
<file src="core/templates/layout.public.php">
@@ -3068,10 +3064,11 @@
30683064
<FalsableReturnStatement occurrences="1">
30693065
<code>false</code>
30703066
</FalsableReturnStatement>
3071-
<InvalidReturnStatement occurrences="1">
3067+
<InvalidReturnStatement occurrences="2">
30723068
<code>$this-&gt;tar-&gt;extractInString($path)</code>
30733069
</InvalidReturnStatement>
3074-
<InvalidReturnType occurrences="1">
3070+
<InvalidReturnType occurrences="2">
3071+
<code>resource</code>
30753072
<code>string</code>
30763073
</InvalidReturnType>
30773074
<UndefinedDocblockClass occurrences="1">
@@ -3083,6 +3080,10 @@
30833080
<code>boolean|null</code>
30843081
<code>boolean|null</code>
30853082
</ImplementedReturnTypeMismatch>
3083+
<InvalidReturnStatement occurrences="1"/>
3084+
<InvalidReturnType occurrences="1">
3085+
<code>resource</code>
3086+
</InvalidReturnType>
30863087
</file>
30873088
<file src="lib/private/Authentication/LoginCredentials/Store.php">
30883089
<RedundantCondition occurrences="1">
@@ -4213,29 +4214,6 @@
42134214
</InvalidReturnType>
42144215
</file>
42154216
<file src="lib/private/Files/Storage/Wrapper/Encoding.php">
4216-
<FalsableReturnStatement occurrences="12">
4217-
<code>$result</code>
4218-
<code>$this-&gt;storage-&gt;file_get_contents($this-&gt;findPathToUse($path))</code>
4219-
<code>$this-&gt;storage-&gt;filemtime($this-&gt;findPathToUse($path))</code>
4220-
<code>$this-&gt;storage-&gt;filesize($this-&gt;findPathToUse($path))</code>
4221-
<code>$this-&gt;storage-&gt;free_space($this-&gt;findPathToUse($path))</code>
4222-
<code>$this-&gt;storage-&gt;getETag($this-&gt;findPathToUse($path))</code>
4223-
<code>$this-&gt;storage-&gt;getLocalFile($this-&gt;findPathToUse($path))</code>
4224-
<code>$this-&gt;storage-&gt;getMimeType($this-&gt;findPathToUse($path))</code>
4225-
<code>$this-&gt;storage-&gt;hash($type, $this-&gt;findPathToUse($path), $raw)</code>
4226-
<code>$this-&gt;storage-&gt;opendir($this-&gt;findPathToUse($path))</code>
4227-
<code>$this-&gt;storage-&gt;search($query)</code>
4228-
<code>$this-&gt;storage-&gt;stat($this-&gt;findPathToUse($path))</code>
4229-
</FalsableReturnStatement>
4230-
<ImplementedReturnTypeMismatch occurrences="1">
4231-
<code>bool</code>
4232-
</ImplementedReturnTypeMismatch>
4233-
<InvalidReturnStatement occurrences="1">
4234-
<code>$this-&gt;storage-&gt;filetype($this-&gt;findPathToUse($path))</code>
4235-
</InvalidReturnStatement>
4236-
<InvalidReturnType occurrences="1">
4237-
<code>bool</code>
4238-
</InvalidReturnType>
42394217
<UndefinedInterfaceMethod occurrences="13">
42404218
<code>$this-&gt;namesCache</code>
42414219
<code>$this-&gt;namesCache</code>
@@ -4253,16 +4231,6 @@
42534231
</UndefinedInterfaceMethod>
42544232
</file>
42554233
<file src="lib/private/Files/Storage/Wrapper/Encryption.php">
4256-
<FalsableReturnStatement occurrences="5">
4257-
<code>$stat</code>
4258-
<code>$this-&gt;storage-&gt;file_get_contents($path)</code>
4259-
<code>$this-&gt;storage-&gt;filesize($path)</code>
4260-
<code>$this-&gt;storage-&gt;getLocalFile($path)</code>
4261-
<code>false</code>
4262-
</FalsableReturnStatement>
4263-
<ImplementedReturnTypeMismatch occurrences="1">
4264-
<code>resource|bool</code>
4265-
</ImplementedReturnTypeMismatch>
42664234
<InvalidArgument occurrences="2">
42674235
<code>$source</code>
42684236
<code>$target</code>
@@ -4281,49 +4249,25 @@
42814249
<InvalidReturnType occurrences="1">
42824250
<code>int</code>
42834251
</InvalidReturnType>
4284-
<InvalidScalarArgument occurrences="2">
4252+
<InvalidScalarArgument occurrences="4">
42854253
<code>$lastChunkPos</code>
42864254
<code>$newUnencryptedSize</code>
4255+
<code>$size</code>
4256+
<code>$unencryptedSize</code>
42874257
</InvalidScalarArgument>
42884258
<NullableReturnStatement occurrences="1">
42894259
<code>null</code>
42904260
</NullableReturnStatement>
42914261
</file>
42924262
<file src="lib/private/Files/Storage/Wrapper/Jail.php">
4293-
<FalsableReturnStatement occurrences="12">
4294-
<code>$this-&gt;getWrapperStorage()-&gt;file_get_contents($this-&gt;getUnjailedPath($path))</code>
4295-
<code>$this-&gt;getWrapperStorage()-&gt;filemtime($this-&gt;getUnjailedPath($path))</code>
4296-
<code>$this-&gt;getWrapperStorage()-&gt;filesize($this-&gt;getUnjailedPath($path))</code>
4297-
<code>$this-&gt;getWrapperStorage()-&gt;fopen($this-&gt;getUnjailedPath($path), $mode)</code>
4298-
<code>$this-&gt;getWrapperStorage()-&gt;free_space($this-&gt;getUnjailedPath($path))</code>
4299-
<code>$this-&gt;getWrapperStorage()-&gt;getETag($this-&gt;getUnjailedPath($path))</code>
4300-
<code>$this-&gt;getWrapperStorage()-&gt;getLocalFile($this-&gt;getUnjailedPath($path))</code>
4301-
<code>$this-&gt;getWrapperStorage()-&gt;getMimeType($this-&gt;getUnjailedPath($path))</code>
4302-
<code>$this-&gt;getWrapperStorage()-&gt;hash($type, $this-&gt;getUnjailedPath($path), $raw)</code>
4303-
<code>$this-&gt;getWrapperStorage()-&gt;opendir($this-&gt;getUnjailedPath($path))</code>
4304-
<code>$this-&gt;getWrapperStorage()-&gt;search($query)</code>
4305-
<code>$this-&gt;getWrapperStorage()-&gt;stat($this-&gt;getUnjailedPath($path))</code>
4306-
</FalsableReturnStatement>
4307-
<ImplementedReturnTypeMismatch occurrences="1">
4308-
<code>bool</code>
4309-
</ImplementedReturnTypeMismatch>
43104263
<InvalidReturnStatement occurrences="1">
43114264
<code>$this-&gt;getWrapperStorage()-&gt;filetype($this-&gt;getUnjailedPath($path))</code>
43124265
</InvalidReturnStatement>
43134266
<InvalidReturnType occurrences="1">
43144267
<code>bool</code>
43154268
</InvalidReturnType>
43164269
</file>
4317-
<file src="lib/private/Files/Storage/Wrapper/PermissionsMask.php">
4318-
<FalsableReturnStatement occurrences="1">
4319-
<code>$this-&gt;checkMask($permissions) ? parent::fopen($path, $mode) : false</code>
4320-
</FalsableReturnStatement>
4321-
</file>
43224270
<file src="lib/private/Files/Storage/Wrapper/Quota.php">
4323-
<FalsableReturnStatement occurrences="2">
4324-
<code>$source</code>
4325-
<code>$this-&gt;storage-&gt;free_space($path)</code>
4326-
</FalsableReturnStatement>
43274271
<InvalidReturnStatement occurrences="1">
43284272
<code>$extension === 'part'</code>
43294273
</InvalidReturnStatement>
@@ -4339,30 +4283,10 @@
43394283
</ParamNameMismatch>
43404284
</file>
43414285
<file src="lib/private/Files/Storage/Wrapper/Wrapper.php">
4342-
<FalsableReturnStatement occurrences="13">
4343-
<code>$this-&gt;getWrapperStorage()-&gt;file_get_contents($path)</code>
4344-
<code>$this-&gt;getWrapperStorage()-&gt;filemtime($path)</code>
4345-
<code>$this-&gt;getWrapperStorage()-&gt;filesize($path)</code>
4346-
<code>$this-&gt;getWrapperStorage()-&gt;fopen($path, $mode)</code>
4347-
<code>$this-&gt;getWrapperStorage()-&gt;free_space($path)</code>
4348-
<code>$this-&gt;getWrapperStorage()-&gt;getDirectDownload($path)</code>
4349-
<code>$this-&gt;getWrapperStorage()-&gt;getETag($path)</code>
4350-
<code>$this-&gt;getWrapperStorage()-&gt;getLocalFile($path)</code>
4351-
<code>$this-&gt;getWrapperStorage()-&gt;getMimeType($path)</code>
4352-
<code>$this-&gt;getWrapperStorage()-&gt;hash($type, $path, $raw)</code>
4353-
<code>$this-&gt;getWrapperStorage()-&gt;opendir($path)</code>
4354-
<code>$this-&gt;getWrapperStorage()-&gt;search($query)</code>
4355-
<code>$this-&gt;getWrapperStorage()-&gt;stat($path)</code>
4356-
</FalsableReturnStatement>
4357-
<ImplementedReturnTypeMismatch occurrences="1">
4358-
<code>bool</code>
4359-
</ImplementedReturnTypeMismatch>
4360-
<InvalidReturnStatement occurrences="2">
4361-
<code>$this-&gt;getWrapperStorage()-&gt;filetype($path)</code>
4286+
<InvalidReturnStatement occurrences="1">
43624287
<code>$this-&gt;getWrapperStorage()-&gt;test()</code>
43634288
</InvalidReturnStatement>
4364-
<InvalidReturnType occurrences="2">
4365-
<code>bool</code>
4289+
<InvalidReturnType occurrences="1">
43664290
<code>true</code>
43674291
</InvalidReturnType>
43684292
</file>
@@ -4774,9 +4698,12 @@
47744698
</InvalidReturnType>
47754699
</file>
47764700
<file src="lib/private/Preview/ProviderV2.php">
4777-
<FalsableReturnStatement occurrences="1">
4701+
<InvalidReturnStatement occurrences="1">
47784702
<code>$file-&gt;getStorage()-&gt;getLocalFile($file-&gt;getInternalPath())</code>
4779-
</FalsableReturnStatement>
4703+
</InvalidReturnStatement>
4704+
<InvalidReturnType occurrences="1">
4705+
<code>string</code>
4706+
</InvalidReturnType>
47804707
</file>
47814708
<file src="lib/private/Preview/SVG.php">
47824709
<ImplicitToStringCast occurrences="1">

‎lib/composer/composer/installed.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
[]
1+
{
2+
"packages": [],
3+
"dev": false,
4+
"dev-package-names": []
5+
}

‎lib/private/Files/ObjectStore/StorageObjectStore.php‎

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

2727
use OCP\Files\ObjectStore\IObjectStore;
2828
use OCP\Files\Storage\IStorage;
29+
use function is_resource;
2930

3031
/**
3132
* Object store that wraps a storage backend, mostly for testing purposes
@@ -57,11 +58,11 @@ public function getStorageId() {
5758
*/
5859
public function readObject($urn) {
5960
$handle = $this->storage->fopen($urn, 'r');
60-
if ($handle) {
61+
if (is_resource($handle)) {
6162
return $handle;
62-
} else {
63-
throw new \Exception();
6463
}
64+
65+
throw new \Exception();
6566
}
6667

6768
/**

‎lib/private/Files/SimpleFS/NewSimpleFile.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ public function read() {
208208
/**
209209
* Open the file as stream for writing, resulting resource can be operated as stream like the result from php's own fopen
210210
*
211-
* @return resource
211+
* @return resource|bool
212212
* @throws \OCP\Files\NotPermittedException
213213
* @since 14.0.0
214214
*/

‎lib/private/Files/Storage/Common.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -630,8 +630,9 @@ public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $t
630630
}
631631
}
632632

633-
if ($result and $preserveMtime) {
634-
$this->touch($targetInternalPath, $sourceStorage->filemtime($sourceInternalPath));
633+
if ($result && $preserveMtime) {
634+
$mtime = $sourceStorage->filemtime($sourceInternalPath);
635+
$this->touch($targetInternalPath, is_int($mtime) ? $mtime : null);
635636
}
636637

637638
if (!$result) {

‎lib/private/Files/Storage/Wrapper/Encoding.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public function rmdir($path) {
156156
* see https://www.php.net/manual/en/function.opendir.php
157157
*
158158
* @param string $path
159-
* @return resource
159+
* @return resource|bool
160160
*/
161161
public function opendir($path) {
162162
return $this->storage->opendir($this->findPathToUse($path));
@@ -187,7 +187,7 @@ public function is_file($path) {
187187
* only the following keys are required in the result: size and mtime
188188
*
189189
* @param string $path
190-
* @return array
190+
* @return array|bool
191191
*/
192192
public function stat($path) {
193193
return $this->storage->stat($this->findPathToUse($path));
@@ -197,7 +197,7 @@ public function stat($path) {
197197
* see https://www.php.net/manual/en/function.filetype.php
198198
*
199199
* @param string $path
200-
* @return bool
200+
* @return string|bool
201201
*/
202202
public function filetype($path) {
203203
return $this->storage->filetype($this->findPathToUse($path));
@@ -208,7 +208,7 @@ public function filetype($path) {
208208
* The result for filesize when called on a folder is required to be 0
209209
*
210210
* @param string $path
211-
* @return int
211+
* @return int|bool
212212
*/
213213
public function filesize($path) {
214214
return $this->storage->filesize($this->findPathToUse($path));
@@ -289,7 +289,7 @@ public function file_exists($path) {
289289
* see https://www.php.net/manual/en/function.filemtime.php
290290
*
291291
* @param string $path
292-
* @return int
292+
* @return int|bool
293293
*/
294294
public function filemtime($path) {
295295
return $this->storage->filemtime($this->findPathToUse($path));
@@ -299,7 +299,7 @@ public function filemtime($path) {
299299
* see https://www.php.net/manual/en/function.file_get_contents.php
300300
*
301301
* @param string $path
302-
* @return string
302+
* @return string|bool
303303
*/
304304
public function file_get_contents($path) {
305305
return $this->storage->file_get_contents($this->findPathToUse($path));
@@ -358,7 +358,7 @@ public function copy($path1, $path2) {
358358
*
359359
* @param string $path
360360
* @param string $mode
361-
* @return resource
361+
* @return resource|bool
362362
*/
363363
public function fopen($path, $mode) {
364364
$result = $this->storage->fopen($this->findPathToUse($path), $mode);
@@ -373,7 +373,7 @@ public function fopen($path, $mode) {
373373
* The mimetype for a folder is required to be "httpd/unix-directory"
374374
*
375375
* @param string $path
376-
* @return string
376+
* @return string|bool
377377
*/
378378
public function getMimeType($path) {
379379
return $this->storage->getMimeType($this->findPathToUse($path));
@@ -385,7 +385,7 @@ public function getMimeType($path) {
385385
* @param string $type
386386
* @param string $path
387387
* @param bool $raw
388-
* @return string
388+
* @return string|bool
389389
*/
390390
public function hash($type, $path, $raw = false) {
391391
return $this->storage->hash($type, $this->findPathToUse($path), $raw);
@@ -395,7 +395,7 @@ public function hash($type, $path, $raw = false) {
395395
* see https://www.php.net/manual/en/function.free_space.php
396396
*
397397
* @param string $path
398-
* @return int
398+
* @return int|bool
399399
*/
400400
public function free_space($path) {
401401
return $this->storage->free_space($this->findPathToUse($path));
@@ -405,7 +405,7 @@ public function free_space($path) {
405405
* search for occurrences of $query in file names
406406
*
407407
* @param string $query
408-
* @return array
408+
* @return array|bool
409409
*/
410410
public function search($query) {
411411
return $this->storage->search($query);
@@ -428,7 +428,7 @@ public function touch($path, $mtime = null) {
428428
* The local version of the file can be temporary and doesn't have to be persistent across requests
429429
*
430430
* @param string $path
431-
* @return string
431+
* @return string|bool
432432
*/
433433
public function getLocalFile($path) {
434434
return $this->storage->getLocalFile($this->findPathToUse($path));
@@ -480,7 +480,7 @@ public function getScanner($path = '', $storage = null) {
480480
* get the ETag for a file or folder
481481
*
482482
* @param string $path
483-
* @return string
483+
* @return string|bool
484484
*/
485485
public function getETag($path) {
486486
return $this->storage->getETag($this->findPathToUse($path));

0 commit comments

Comments
 (0)