Skip to content

Tidy up typing in OC\Files\View #36836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
come-nc merged 8 commits into from
Apr 5, 2023
Merged

Tidy up typing in OC\Files\View #36836

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
966a3e6
Tidy up typing in OC\Files\View
come-nc Mar 13, 2023
4393b96
Remove unused method getLocalFolder
come-nc Feb 28, 2023
f974281
Improve typing for fopen/toTmpFile
come-nc Feb 28, 2023
ea05544
Fix return type of methods returning false on error
come-nc Mar 13, 2023
0b3dad8
More type cleanup in View and FileInfo
come-nc Mar 28, 2023
5ad0456
View needs to return an instance of OC\Files\FileInfo explicitely
come-nc Mar 28, 2023
8f26a5d
Fix dav application tests
come-nc Mar 30, 2023
6633b4c
Remove unecessary fully qualified namespaces from phpdoc
come-nc Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Improve typing for fopen/toTmpFile 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Apr 3, 2023
commit f974281ac9a086004c7e971f3585ed8aa21d194d
7 changes: 4 additions & 3 deletions lib/private/Files/Filesystem.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ public static function tearDown() {
/**
* get the relative path of the root data directory for the current user
*
* @return string
* @return ?string
*
* Returns path like /admin/files
*/
Expand Down Expand Up @@ -584,9 +584,10 @@ public static function fopen($path, $mode) {
}

/**
* @return string
* @param string $path
* @throws \OCP\Files\InvalidPathException
*/
public static function toTmpFile($path) {
public static function toTmpFile($path): string|false {
return self::$defaultInstance->toTmpFile($path);
}

Expand Down
2 changes: 1 addition & 1 deletion lib/private/Files/Node/File.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public function putContent($data) {

/**
* @param string $mode
* @return resource
* @return resource|false
* @throws NotPermittedException
* @throws LockedException
*/
Expand Down
2 changes: 1 addition & 1 deletion lib/public/Files/File.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public function getMimeType();
* Open the file as stream, resulting resource can be operated as stream like the result from php's own fopen
*
* @param string $mode
* @return resource
* @return resource|false
* @throws NotPermittedException
* @throws LockedException
* @since 6.0.0
Expand Down