Adjust patches

diff --git a/apps/files/controller/apicontroller.php b/apps/files/controller/apicontroller.php
index ed14b887479505c3cddaa42bc582f02e2212cad3..ee54db6319140bca816dfbf3840d4f2f4afb0682 100644 (file)
--- a/apps/files/controller/apicontroller.php
+++ b/apps/files/controller/apicontroller.php
@@ -127,7 +127,7 @@ class ApiController extends Controller {
         *
         * @NoAdminRequired
         *
-        * @param string[] $tagName tag name to filter by
+        * @param string $tagName tag name to filter by
         * @return DataResponse
         */
        public function getFilesByTag($tagName) {

diff --git a/apps/files/service/tagservice.php b/apps/files/service/tagservice.php
index 1999d97e1affb74cca68c13af89dfa33b07732ee..cf3f2bb7865094bec0e7b54676647158bdf8cf39 100644 (file)
--- a/apps/files/service/tagservice.php
+++ b/apps/files/service/tagservice.php
@@ -91,7 +91,7 @@ class TagService {
        /**
         * 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
         * @throws \Exception if the tag does not exist
         */

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index cd2498eca40a4ee27b2b4441d16adca2e0ec748d..b0b9db123cda7ba053d679f4e5993aec42d8a8ea 100644 (file)
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -358,16 +358,16 @@ class OC_Mount_Config {
         * @param \OCP\IL10N $l
         * @param string $module
         * @param string $backend
-        * @return OC_L10N_String
+        * @return string
         */
        private static function getSingleDependencyMessage(\OCP\IL10N $l, $module, $backend) {
                switch (strtolower($module)) {
                        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':
-                               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:
-                               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));
                }
        }