mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #20825 from owncloud/scrutinizer-patch-1 

Scrutinizer Auto-Fixes
This commit is contained in:
Thomas Müller 2015-12-01 09:26:22 +01:00
parent 8a1e6c0ad9 d6da0396d0
commit 634859e6ed
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files/controller/apicontroller.php
View File

@ -127,7 +127,7 @@ class ApiController extends Controller {
* *
* @NoAdminRequired * @NoAdminRequired
* *
* @param array|string $tagName tag name to filter by * @param string $tagName tag name to filter by
* @return DataResponse * @return DataResponse
*/ */
public function getFilesByTag($tagName) { public function getFilesByTag($tagName) {

4
apps/files/lib/activity.php
View File

@ -166,7 +166,7 @@ class Activity implements IExtension {
* @param string $text * @param string $text
* @param IL10N $l * @param IL10N $l
* @param array $params * @param array $params
* @return bool|string * @return string|false
*/ */
protected function translateLong($text, IL10N $l, array $params) { protected function translateLong($text, IL10N $l, array $params) {
switch ($text) { switch ($text) {
@ -198,7 +198,7 @@ class Activity implements IExtension {
* @param string $text * @param string $text
* @param IL10N $l * @param IL10N $l
* @param array $params * @param array $params
* @return bool|string * @return string|false
*/ */
protected function translateShort($text, IL10N $l, array $params) { protected function translateShort($text, IL10N $l, array $params) {
switch ($text) { switch ($text) {

2
apps/files/service/tagservice.php
View File

@ -91,7 +91,7 @@ class TagService {
/** /**
* Get all files for the given tag * Get all files for the given tag
* *
* @param array $tagName tag name to filter by * @param string $tagName tag name to filter by
* @return FileInfo[] list of matching files * @return FileInfo[] list of matching files
* @throws \Exception if the tag does not exist * @throws \Exception if the tag does not exist
*/ */

7
apps/files_external/lib/config.php
View File

@ -243,6 +243,7 @@ class OC_Mount_Config {
* *
* @param string $class backend class name * @param string $class backend class name
* @param array $options backend configuration options * @param array $options backend configuration options
* @param boolean $isPersonal
* @return int see self::STATUS_* * @return int see self::STATUS_*
* @throws Exception * @throws Exception
*/ */
@ -362,11 +363,11 @@ class OC_Mount_Config {
private static function getSingleDependencyMessage(\OCP\IL10N $l, $module, $backend) { private static function getSingleDependencyMessage(\OCP\IL10N $l, $module, $backend) {
switch (strtolower($module)) { switch (strtolower($module)) {
case 'curl': case 'curl':
return $l->t('<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', $backend); return (string)$l->t('<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', $backend);
case 'ftp': case 'ftp':
return $l->t('<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', $backend); return (string)$l->t('<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', $backend);
default: default:
return $l->t('<b>Note:</b> "%s" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it.', array($module, $backend)); return (string)$l->t('<b>Note:</b> "%s" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it.', array($module, $backend));
} }
} }

1
apps/files_external/lib/config/configadapter.php
View File

@ -32,7 +32,6 @@ use OCP\IUser;
use OCA\Files_external\Service\UserStoragesService; use OCA\Files_external\Service\UserStoragesService;
use OCA\Files_External\Service\UserGlobalStoragesService; use OCA\Files_External\Service\UserGlobalStoragesService;
use OCA\Files_External\Lib\StorageConfig; use OCA\Files_External\Lib\StorageConfig;
use OCP\Files\StorageNotAvailableException;
use OCA\Files_External\Lib\FailedStorage; use OCA\Files_External\Lib\FailedStorage;
/** /**

2
apps/files_external/lib/sftp.php
View File

@ -195,7 +195,7 @@ class SFTP extends \OC\Files\Storage\Common {
} }
/** /**
* @return bool|string * @return string|false
*/ */
private function hostKeysPath() { private function hostKeysPath() {
try { try {