@@ -106,7 +106,7 @@ |
||
106 | 106 | '; |
107 | 107 | } |
108 | 108 | |
109 | - /** |
|
109 | + /** |
|
110 | 110 | * @return DocumentTemplate |
111 | 111 | */ |
112 | 112 | protected function getDocumentTemplate() |
@@ -118,10 +118,10 @@ |
||
118 | 118 | } |
119 | 119 | // Owner |
120 | 120 | $description[] = $lang->getLL('task.owner') . ': ' |
121 | - . ($presetCfg['user_uid'] === $GLOBALS['BE_USER']->user['uid'] |
|
121 | + . ($presetCfg['user_uid'] === $GLOBALS['BE_USER']->user['uid'] |
|
122 | 122 | ? $lang->getLL('task.own') |
123 | 123 | : '[' . htmlspecialchars($usernames[$presetCfg['user_uid']]['username']) . ']' |
124 | - ); |
|
124 | + ); |
|
125 | 125 | // Page & path |
126 | 126 | if ($configuration['pagetree']['id']) { |
127 | 127 | $description[] = $lang->getLL('task.page') . ': ' . $configuration['pagetree']['id']; |
@@ -242,7 +242,7 @@ |
||
242 | 242 | } |
243 | 243 | |
244 | 244 | /** |
245 | - * @return mixed |
|
245 | + * @return string |
|
246 | 246 | */ |
247 | 247 | protected function getLanguageService() |
248 | 248 | { |
@@ -79,7 +79,7 @@ |
||
79 | 79 | } |
80 | 80 | |
81 | 81 | return '<img src="' . htmlspecialchars(PathUtility::getAbsoluteWebPath($icon)) |
82 | - . '" width="16" height="16" title="' . htmlspecialchars($title) |
|
83 | - . '" alt="' . htmlspecialchars($title) . '" />'; |
|
82 | + . '" width="16" height="16" title="' . htmlspecialchars($title) |
|
83 | + . '" alt="' . htmlspecialchars($title) . '" />'; |
|
84 | 84 | } |
85 | 85 | } |
@@ -2597,10 +2597,10 @@ |
||
2597 | 2597 | $this->imageMagickExec($mask, $theMask, '-colorspace GRAY +matte'); |
2598 | 2598 | |
2599 | 2599 | $parameters = '-compose over +matte ' |
2600 | - . CommandUtility::escapeShellArgument($input) . ' ' |
|
2601 | - . CommandUtility::escapeShellArgument($overlay) . ' ' |
|
2602 | - . CommandUtility::escapeShellArgument($theMask) . ' ' |
|
2603 | - . CommandUtility::escapeShellArgument($output); |
|
2600 | + . CommandUtility::escapeShellArgument($input) . ' ' |
|
2601 | + . CommandUtility::escapeShellArgument($overlay) . ' ' |
|
2602 | + . CommandUtility::escapeShellArgument($theMask) . ' ' |
|
2603 | + . CommandUtility::escapeShellArgument($output); |
|
2604 | 2604 | $cmd = CommandUtility::imageMagickCommand('combine', $parameters); |
2605 | 2605 | $this->IM_commands[] = [$output, $cmd]; |
2606 | 2606 | $ret = CommandUtility::exec($cmd); |
@@ -725,7 +725,7 @@ discard block |
||
725 | 725 | * @param array $conf TypoScript array for the TEXT GIFBUILDER object |
726 | 726 | * @param array $workArea Work area definition |
727 | 727 | * @param array $BB Bounding box information, was set in \TYPO3\CMS\Frontend\Imaging\GifBuilder::start() |
728 | - * @return array [0]=x, [1]=y, [2]=w, [3]=h |
|
728 | + * @return integer[] [0]=x, [1]=y, [2]=w, [3]=h |
|
729 | 729 | * @access private |
730 | 730 | * @see makeText() |
731 | 731 | */ |
@@ -873,7 +873,7 @@ discard block |
||
873 | 873 | * Calculating the coordinates for a TEXT string on an image map. Used in an <area> tag |
874 | 874 | * |
875 | 875 | * @param array $cords Coordinates (from BBOX array) |
876 | - * @param array $offset Offset array |
|
876 | + * @param integer[] $offset Offset array |
|
877 | 877 | * @param array $conf Configuration for "imgMap." property of a TEXT GIFBUILDER object. |
878 | 878 | * @return array |
879 | 879 | * @access private |
@@ -1219,7 +1219,7 @@ discard block |
||
1219 | 1219 | * |
1220 | 1220 | * @param array $conf TypoScript array for the TEXT GIFBUILDER object |
1221 | 1221 | * @param int $scaleFactor TypoScript value from eg $conf['niceText.']['scaleFactor'] |
1222 | - * @return array Array with two keys [0]/[1] being array($spacing,$wordSpacing) |
|
1222 | + * @return integer[] Array with two keys [0]/[1] being array($spacing,$wordSpacing) |
|
1223 | 1223 | * @access private |
1224 | 1224 | * @see calcBBox() |
1225 | 1225 | */ |
@@ -2042,7 +2042,7 @@ discard block |
||
2042 | 2042 | * |
2043 | 2043 | * @param array $cords Integer coordinates in key 0/1 |
2044 | 2044 | * @param array $OFFSET Offset values in key 0/1 |
2045 | - * @return array Modified $cords array |
|
2045 | + * @return integer[] Modified $cords array |
|
2046 | 2046 | */ |
2047 | 2047 | public function applyOffset($cords, $OFFSET) |
2048 | 2048 | { |
@@ -2107,7 +2107,7 @@ discard block |
||
2107 | 2107 | * @param array $conf TypoScript configuration for a GIFBUILDER object |
2108 | 2108 | * @param array $workArea Workarea definition |
2109 | 2109 | * @param array $BB BB (Bounding box) array. Not just used for TEXT objects but also for others |
2110 | - * @return array [0]=x, [1]=y, [2]=w, [3]=h |
|
2110 | + * @return integer[] [0]=x, [1]=y, [2]=w, [3]=h |
|
2111 | 2111 | * @access private |
2112 | 2112 | * @see copyGifOntoGif(), makeBox(), crop() |
2113 | 2113 | */ |
@@ -2567,7 +2567,7 @@ |
||
2567 | 2567 | } |
2568 | 2568 | // If addFrameSelection is set in the Install Tool, a frame number is added to |
2569 | 2569 | // select a specific page of the image (by default this will be the first page) |
2570 | - $frame = $this->addFrameSelection ? '[' . (int)$frame . ']' : ''; |
|
2570 | + $frame = $this->addFrameSelection ? '[' . (int)$frame . ']' : ''; |
|
2571 | 2571 | $cmd = CommandUtility::imageMagickCommand('convert', $params . ' ' . CommandUtility::escapeShellArgument($input . $frame) . ' ' . CommandUtility::escapeShellArgument($output)); |
2572 | 2572 | $this->IM_commands[] = [$output, $cmd]; |
2573 | 2573 | $ret = CommandUtility::exec($cmd); |
@@ -137,37 +137,37 @@ |
||
137 | 137 | return $this->stream; |
138 | 138 | } |
139 | 139 | |
140 | - /** |
|
141 | - * Move the uploaded file to a new location. |
|
142 | - * |
|
143 | - * Use this method as an alternative to move_uploaded_file(). This method is |
|
144 | - * guaranteed to work in both SAPI and non-SAPI environments. |
|
145 | - * Implementations must determine which environment they are in, and use the |
|
146 | - * appropriate method (move_uploaded_file(), rename(), or a stream |
|
147 | - * operation) to perform the operation. |
|
148 | - * |
|
149 | - * $targetPath may be an absolute path, or a relative path. If it is a |
|
150 | - * relative path, resolution should be the same as used by PHP's rename() |
|
151 | - * function. |
|
152 | - * |
|
153 | - * The original file or stream MUST be removed on completion. |
|
154 | - * |
|
155 | - * If this method is called more than once, any subsequent calls MUST raise |
|
156 | - * an exception. |
|
157 | - * |
|
158 | - * When used in an SAPI environment where $_FILES is populated, when writing |
|
159 | - * files via moveTo(), is_uploaded_file() and move_uploaded_file() SHOULD be |
|
160 | - * used to ensure permissions and upload status are verified correctly. |
|
161 | - * |
|
162 | - * If you wish to move to a stream, use getStream(), as SAPI operations |
|
163 | - * cannot guarantee writing to stream destinations. |
|
164 | - * |
|
165 | - * @see http://php.net/is_uploaded_file |
|
166 | - * @see http://php.net/move_uploaded_file |
|
167 | - * @param string $targetPath Path to which to move the uploaded file. |
|
168 | - * @throws \InvalidArgumentException if the $path specified is invalid. |
|
169 | - * @throws \RuntimeException on any error during the move operation, or on the second or subsequent call to the method. |
|
170 | - */ |
|
140 | + /** |
|
141 | + * Move the uploaded file to a new location. |
|
142 | + * |
|
143 | + * Use this method as an alternative to move_uploaded_file(). This method is |
|
144 | + * guaranteed to work in both SAPI and non-SAPI environments. |
|
145 | + * Implementations must determine which environment they are in, and use the |
|
146 | + * appropriate method (move_uploaded_file(), rename(), or a stream |
|
147 | + * operation) to perform the operation. |
|
148 | + * |
|
149 | + * $targetPath may be an absolute path, or a relative path. If it is a |
|
150 | + * relative path, resolution should be the same as used by PHP's rename() |
|
151 | + * function. |
|
152 | + * |
|
153 | + * The original file or stream MUST be removed on completion. |
|
154 | + * |
|
155 | + * If this method is called more than once, any subsequent calls MUST raise |
|
156 | + * an exception. |
|
157 | + * |
|
158 | + * When used in an SAPI environment where $_FILES is populated, when writing |
|
159 | + * files via moveTo(), is_uploaded_file() and move_uploaded_file() SHOULD be |
|
160 | + * used to ensure permissions and upload status are verified correctly. |
|
161 | + * |
|
162 | + * If you wish to move to a stream, use getStream(), as SAPI operations |
|
163 | + * cannot guarantee writing to stream destinations. |
|
164 | + * |
|
165 | + * @see http://php.net/is_uploaded_file |
|
166 | + * @see http://php.net/move_uploaded_file |
|
167 | + * @param string $targetPath Path to which to move the uploaded file. |
|
168 | + * @throws \InvalidArgumentException if the $path specified is invalid. |
|
169 | + * @throws \RuntimeException on any error during the move operation, or on the second or subsequent call to the method. |
|
170 | + */ |
|
171 | 171 | public function moveTo($targetPath) |
172 | 172 | { |
173 | 173 | if (!is_string($targetPath) || empty($targetPath)) { |
@@ -1234,7 +1234,6 @@ |
||
1234 | 1234 | |
1235 | 1235 | /** |
1236 | 1236 | * Creates a (cryptographic) hash for a fileIdentifier. |
1237 | - |
|
1238 | 1237 | * @param string $fileIdentifier |
1239 | 1238 | * @param string $hash |
1240 | 1239 | * |
@@ -1124,7 +1124,7 @@ discard block |
||
1124 | 1124 | * |
1125 | 1125 | * @throws \InvalidArgumentException |
1126 | 1126 | * @throws Exception\ExistingTargetFileNameException |
1127 | - * @return FileInterface |
|
1127 | + * @return string |
|
1128 | 1128 | */ |
1129 | 1129 | public function sanitizeFileName($fileName, Folder $targetFolder = null) |
1130 | 1130 | { |
@@ -1240,7 +1240,7 @@ discard block |
||
1240 | 1240 | * into account. This helps mitigating problems with case-insensitive |
1241 | 1241 | * databases. |
1242 | 1242 | * |
1243 | - * @param string|FileInterface $file |
|
1243 | + * @param string $file |
|
1244 | 1244 | * @return string |
1245 | 1245 | */ |
1246 | 1246 | public function hashFileIdentifier($file) |
@@ -1374,7 +1374,7 @@ discard block |
||
1374 | 1374 | * Gets information about a file by its identifier. |
1375 | 1375 | * |
1376 | 1376 | * @param string $identifier |
1377 | - * @param array $propertiesToExtract |
|
1377 | + * @param string[] $propertiesToExtract |
|
1378 | 1378 | * @return array |
1379 | 1379 | * @internal |
1380 | 1380 | */ |
@@ -2492,7 +2492,7 @@ discard block |
||
2492 | 2492 | * Emits the file pre-rename signal |
2493 | 2493 | * |
2494 | 2494 | * @param FileInterface $file |
2495 | - * @param $targetFolder |
|
2495 | + * @param string $targetFolder |
|
2496 | 2496 | */ |
2497 | 2497 | protected function emitPreFileRenameSignal(FileInterface $file, $targetFolder) |
2498 | 2498 | { |
@@ -2514,7 +2514,7 @@ discard block |
||
2514 | 2514 | * Emits the file pre-replace signal. |
2515 | 2515 | * |
2516 | 2516 | * @param FileInterface $file |
2517 | - * @param $localFilePath |
|
2517 | + * @param string $localFilePath |
|
2518 | 2518 | */ |
2519 | 2519 | protected function emitPreFileReplaceSignal(FileInterface $file, $localFilePath) |
2520 | 2520 | { |
@@ -2567,7 +2567,7 @@ discard block |
||
2567 | 2567 | * Emits the file post-set-contents signal |
2568 | 2568 | * |
2569 | 2569 | * @param FileInterface $file |
2570 | - * @param mixed $content |
|
2570 | + * @param string $content |
|
2571 | 2571 | */ |
2572 | 2572 | protected function emitPostFileSetContentsSignal(FileInterface $file, $content) |
2573 | 2573 | { |
@@ -2600,7 +2600,7 @@ discard block |
||
2600 | 2600 | * |
2601 | 2601 | * @param Folder $folder |
2602 | 2602 | * @param Folder $targetFolder |
2603 | - * @param $newName |
|
2603 | + * @param string $newName |
|
2604 | 2604 | */ |
2605 | 2605 | protected function emitPreFolderCopySignal(Folder $folder, Folder $targetFolder, $newName) |
2606 | 2606 | { |
@@ -2624,7 +2624,7 @@ discard block |
||
2624 | 2624 | * |
2625 | 2625 | * @param Folder $folder |
2626 | 2626 | * @param Folder $targetFolder |
2627 | - * @param $newName |
|
2627 | + * @param string $newName |
|
2628 | 2628 | */ |
2629 | 2629 | protected function emitPreFolderMoveSignal(Folder $folder, Folder $targetFolder, $newName) |
2630 | 2630 | { |
@@ -149,7 +149,7 @@ |
||
149 | 149 | ->setFieldName('history_log'); |
150 | 150 | $buttonBar->addButton($helpButton); |
151 | 151 | |
152 | - // Get returnUrl parameter |
|
152 | + // Get returnUrl parameter |
|
153 | 153 | $returnUrl = GeneralUtility::sanitizeLocalUrl(GeneralUtility::_GP('returnUrl')); |
154 | 154 | if ($returnUrl) { |
155 | 155 | $backButton = $buttonBar->makeLinkButton() |
@@ -1505,10 +1505,10 @@ |
||
1505 | 1505 | } |
1506 | 1506 | |
1507 | 1507 | /** |
1508 | - * Retrieves configured favicon for backend (with fallback) |
|
1509 | - * |
|
1510 | - * @return string |
|
1511 | - */ |
|
1508 | + * Retrieves configured favicon for backend (with fallback) |
|
1509 | + * |
|
1510 | + * @return string |
|
1511 | + */ |
|
1512 | 1512 | protected function getBackendFavicon() |
1513 | 1513 | { |
1514 | 1514 | $extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['backend'], ['allowed_classes' => false]); |
@@ -1514,7 +1514,7 @@ |
||
1514 | 1514 | $extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['backend'], ['allowed_classes' => false]); |
1515 | 1515 | |
1516 | 1516 | if (!empty($extConf['backendFavicon'])) { |
1517 | - $path = $this->getUriForFileName($extConf['backendFavicon']); |
|
1517 | + $path = $this->getUriForFileName($extConf['backendFavicon']); |
|
1518 | 1518 | } else { |
1519 | 1519 | $path = ExtensionManagementUtility::extPath('backend') . 'Resources/Public/Icons/favicon.ico'; |
1520 | 1520 | } |
@@ -246,7 +246,7 @@ |
||
246 | 246 | if (!($dependency->getLowestVersion() === '') && version_compare(PHP_VERSION, $dependency->getLowestVersion()) === -1) { |
247 | 247 | throw new Exception\UnresolvedPhpDependencyException( |
248 | 248 | 'Your PHP version is lower than necessary. You need at least PHP version ' . $dependency->getLowestVersion(), |
249 | - 1377977857 |
|
249 | + 1377977857 |
|
250 | 250 | ); |
251 | 251 | } |
252 | 252 | if (!($dependency->getHighestVersion() === '') && version_compare($dependency->getHighestVersion(), PHP_VERSION) === -1) { |
@@ -579,7 +579,7 @@ |
||
579 | 579 | /** |
580 | 580 | * Get extensions (out of a given list) that are suitable for the current TYPO3 version |
581 | 581 | * |
582 | - * @param \TYPO3\CMS\Extbase\Persistence\QueryResultInterface|array $extensions List of extensions to check |
|
582 | + * @param Extension[] $extensions List of extensions to check |
|
583 | 583 | * @return array List of extensions suitable for current TYPO3 version |
584 | 584 | */ |
585 | 585 | public function getExtensionsSuitableForTypo3Version($extensions) |