[BUGFIX] Fix wrong type hint for emitAfterExtensionT3DImportSignal() 03/31503/3
authorMarkus Klein <klein.t3@mfc-linz.at>
Tue, 8 Jul 2014 10:55:07 +0000 (12:55 +0200)
committerOliver Hader <oliver.hader@typo3.org>
Tue, 8 Jul 2014 11:19:58 +0000 (13:19 +0200)
Fix a wrong type hint for the second parameter in
InstallUtility::emitAfterExtensionT3DImportSignal(). The parameter is of
type integer and not array.

Resolves: #60179
Releases: 6.3, 6.2
Change-Id: Iccfb7445bd374edaecfd3408380034dbec82e539
Reviewed-on: https://review.typo3.org/31503
Reviewed-by: Wouter Wolters
Reviewed-by: Oliver Hader
Tested-by: Oliver Hader
typo3/sysext/extensionmanager/Classes/Utility/InstallUtility.php
typo3/sysext/impexp/Classes/Utility/ImportExportUtility.php

index 71190e3..4f76380 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Extensionmanager\Utility;
  *
  * The TYPO3 project - inspiring people to share!
  */
+use TYPO3\CMS\Impexp\Utility\ImportExportUtility;
 
 /**
  * Extension Manager Install Utility
@@ -449,6 +450,7 @@ class InstallUtility implements \TYPO3\CMS\Core\SingletonInterface {
                        $importFileToUse = $possibleImportFile;
                }
                if ($importFileToUse !== NULL) {
+                       /** @var ImportExportUtility $importExportUtility */
                        $importExportUtility = $this->objectManager->get('TYPO3\\CMS\\Impexp\\Utility\\ImportExportUtility');
                        try {
                                $importResult = $importExportUtility->importT3DFile(PATH_site . $importFileToUse, 0);
@@ -466,9 +468,9 @@ class InstallUtility implements \TYPO3\CMS\Core\SingletonInterface {
         * Emits a signal after an t3d file was imported
         *
         * @param string $importFileToUse
-        * @param array $importResult
+        * @param int $importResult
         */
-       protected function emitAfterExtensionT3DImportSignal($importFileToUse, array $importResult) {
+       protected function emitAfterExtensionT3DImportSignal($importFileToUse, $importResult) {
                $this->signalSlotDispatcher->dispatch(__CLASS__, 'afterExtensionT3DImport', array($importFileToUse, $importResult, $this));
        }
 
index 525d995..fd989fb 100644 (file)
@@ -30,7 +30,7 @@ class ImportExportUtility {
         * @param int $pid The pid under which the t3d file should be imported
         * @throws \ErrorException
         * @throws \InvalidArgumentException
-        * @return array
+        * @return int
         */
        public function importT3DFile($file, $pid) {
                $importResponse = array();