Skip to content

Commit

Permalink
Merge pull request #31055 from owncloud/fix-version-on-public-api
Browse files Browse the repository at this point in the history
Fix version on public API
  • Loading branch information
Vincent Petry authored Apr 20, 2018
2 parents 05c5435 + 57fa677 commit 5747258
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions lib/public/Files/IPreviewNode.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* this interface.
*
* @package OCP\Files
* @since 10.1.0
* @since 10.0.9
*/
interface IPreviewNode {

Expand All @@ -37,7 +37,7 @@ interface IPreviewNode {
*
* @param array $options
* @return IImage
* @since 10.1.0
* @since 10.0.9
*/
public function getThumbnail($options);
}
6 changes: 3 additions & 3 deletions lib/public/Files/IProvidesAdditionalHeaders.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,22 @@
* This interface allows to add additional headers to the response
*
* @package OCP\Files
* @since 10.0.5
* @since 10.0.9
*/
interface IProvidesAdditionalHeaders {

/**
* Returns an array of headers.
*
* @return array
* @since 10.0.5
* @since 10.0.9
*/
public function getHeaders();

/**
* Returns the file name which is to be used for the content disposition
* @return string
* @since 10.0.5
* @since 10.0.9
*/
public function getContentDispositionFileName();
}
12 changes: 6 additions & 6 deletions lib/public/Files/ObjectStore/IVersionedObjectStorage.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* object living in an object store
*
* @package OCP\Files\ObjectStore
* @since 10.0.5
* @since 10.0.9
*/
interface IVersionedObjectStorage {

Expand All @@ -36,7 +36,7 @@ interface IVersionedObjectStorage {
*
* @param string $urn the unified resource name used to identify the object
* @return array
* @since 10.0.5
* @since 10.0.9
*/
public function getVersions($urn);

Expand All @@ -46,7 +46,7 @@ public function getVersions($urn);
* @param string $urn the unified resource name used to identify the object
* @param string $versionId
* @return array
* @since 10.0.5
* @since 10.0.9
*/
public function getVersion($urn, $versionId);

Expand All @@ -56,7 +56,7 @@ public function getVersion($urn, $versionId);
* @param string $urn the unified resource name used to identify the object
* @param string $versionId
* @return resource
* @since 10.0.5
* @since 10.0.9
*/
public function getContentOfVersion($urn, $versionId);

Expand All @@ -66,14 +66,14 @@ public function getContentOfVersion($urn, $versionId);
* @param string $urn the unified resource name used to identify the object
* @param string $versionId
* @return boolean
* @since 10.0.5
* @since 10.0.9
*/
public function restoreVersion($urn, $versionId);

/**
* Tells the storage to explicitly create a version of a given file
* @return boolean
* @since 10.0.5
* @since 10.0.9
*/
public function saveVersion($internalPath);

Expand Down
12 changes: 6 additions & 6 deletions lib/public/Files/Storage/IVersionedStorage.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* Interface IVersionedStorage - storage layer to access version of a file
*
* @package OCP\Files\Storage
* @since 10.0.5
* @since 10.0.9
*/
interface IVersionedStorage {

Expand All @@ -35,7 +35,7 @@ interface IVersionedStorage {
*
* @param string $internalPath
* @return array
* @since 10.0.5
* @since 10.0.9
*/
public function getVersions($internalPath);

Expand All @@ -45,7 +45,7 @@ public function getVersions($internalPath);
* @param string $internalPath
* @param string $versionId
* @return array
* @since 10.0.5
* @since 10.0.9
*/
public function getVersion($internalPath, $versionId);

Expand All @@ -55,7 +55,7 @@ public function getVersion($internalPath, $versionId);
* @param string $internalPath
* @param string $versionId
* @return resource
* @since 10.0.5
* @since 10.0.9
*/
public function getContentOfVersion($internalPath, $versionId);

Expand All @@ -65,7 +65,7 @@ public function getContentOfVersion($internalPath, $versionId);
* @param string $internalPath
* @param string $versionId
* @return boolean
* @since 10.0.5
* @since 10.0.9
*/
public function restoreVersion($internalPath, $versionId);

Expand All @@ -74,7 +74,7 @@ public function restoreVersion($internalPath, $versionId);
*
* @param string $internalPath
* @return bool
* @since 10.0.5
* @since 10.0.9
*/
public function saveVersion($internalPath);

Expand Down
2 changes: 1 addition & 1 deletion lib/public/Preview/IProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*
* @package OCP\Preview
* @since 8.1.0
* @deprecated 10.1.0
* @deprecated 10.0.8
*/
interface IProvider {
/**
Expand Down
8 changes: 4 additions & 4 deletions lib/public/Preview/IProvider2.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
* Interface IProvider2
*
* @package OCP\Preview
* @since 10.1.0
* @since 10.0.9
*/
interface IProvider2 {
/**
* @return string Regex with the mimetypes that are supported by this provider
* @since 10.1.0
* @since 10.0.9
*/
public function getMimeType();

Expand All @@ -41,7 +41,7 @@ public function getMimeType();
*
* @param File $file
* @return bool
* @since 10.1.0
* @since 10.0.9
*/
public function isAvailable(File $file);

Expand All @@ -53,7 +53,7 @@ public function isAvailable(File $file);
* @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image
* @param bool $scalingUp Disable/Enable upscaling of previews
* @return bool|\OCP\IImage false if no preview was generated
* @since 10.1.0
* @since 10.0.9
*/
public function getThumbnail(File $file, $maxX, $maxY, $scalingUp);
}

0 comments on commit 5747258

Please sign in to comment.