[BUGFIX] Fix various wrong phpDoc comments 27/58027/2
authorBenni Mack <benni@typo3.org>
Fri, 24 Aug 2018 15:36:26 +0000 (17:36 +0200)
committerWouter Wolters <typo3@wouterwolters.nl>
Sat, 25 Aug 2018 09:46:30 +0000 (11:46 +0200)
Return types in phpDoc method annotations are wrong and should be adapted
to the actual return value in the PHP code.

Resolves: #85969
Releases: master
Change-Id: I10f31957db1c863510a1bff97293c0bad336568d
Reviewed-on: https://review.typo3.org/58027
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
typo3/sysext/core/Classes/Resource/ResourceFactory.php
typo3/sysext/extensionmanager/Classes/Utility/EmConfUtility.php

index 4c461c6..477bf42 100644 (file)
@@ -460,7 +460,7 @@ class ResourceFactory implements ResourceFactoryInterface, \TYPO3\CMS\Core\Singl
      * - "file:23"
      *
      * @param string $input
-     * @return File|Folder
+     * @return File|Folder|null
      */
     public function retrieveFileOrFolderObject($input)
     {
index d150d6e..11ceb8f 100644 (file)
@@ -26,7 +26,7 @@ class EmConfUtility implements SingletonInterface
      * Returns the $EM_CONF array from an extensions ext_emconf.php file
      *
      * @param array $extension Extension information array
-     * @return array EMconf array values.
+     * @return array|bool EMconf array values or false if no ext_emconf.php found.
      */
     public function includeEmConf(array $extension)
     {
@@ -135,7 +135,7 @@ $EM_CONF[$_EXTKEY] = ' . $emConf . ';
      * as they are implicit and of no interest without the version number.
      *
      * @param mixed $dependency Either a string or an array listing dependencies.
-     * @return string A simple dependency list for display
+     * @return array A simple dependency list for display
      */
     public function stringToDependency($dependency)
     {