Merge branch 'repairAnnotations' into 'develop'

Repair most of PhpStorms Inspection hints/errors

See merge request t3o/ter!257

html/typo3conf/ext/ter_fe2/Classes/Controller/AbstractController.php

@@ -164,7 +164,7 @@ abstract class AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\Acti
      * WORKAROUND for #33788
      *
      * @param string $uri The URI
-     * @return void
+     * @return string
      */
     protected function addBaseUriIfNecessary($uri)
     {

html/typo3conf/ext/ter_fe2/Classes/Controller/AbstractTerBasedController.php

@@ -59,6 +59,7 @@ abstract class AbstractTerBasedController extends \T3o\TerFe2\Controller\Abstrac
     /**
      * Initializes the view, add login state to template variables
      *
+     * @param \TYPO3\CMS\Extbase\Mvc\View\ViewInterface $view
      * @return void
      */
     public function initializeView(\TYPO3\CMS\Extbase\Mvc\View\ViewInterface $view)
@@ -97,6 +98,7 @@ abstract class AbstractTerBasedController extends \T3o\TerFe2\Controller\Abstrac
      * Create a connection to the TER server
      *
      * @return \T3o\TerFe2\Service\Ter The TER connection
+     * @throws \Exception
      */
     protected function getTerConnection()
     {

html/typo3conf/ext/ter_fe2/Classes/Controller/ExtensionController.php

@@ -390,6 +390,7 @@ class ExtensionController extends \T3o\TerFe2\Controller\AbstractController
      * @param string $format Format of the file output
      * @ignorevalidation $extension
      * @return void
+     * @throws \Exception
      */
     public function downloadAction(\T3o\TerFe2\Domain\Model\Extension $extension, $versionString = '', $format = '')
     {

html/typo3conf/ext/ter_fe2/Classes/Controller/RegisterkeyController.php

@@ -261,7 +261,7 @@ class RegisterkeyController extends \T3o\TerFe2\Controller\AbstractTerBasedContr
      */
     public function keepAction(\T3o\TerFe2\Domain\Model\Extension $extension)
     {
-        $extension->setExpire(0);
+        $extension->setExpire(null);
         $this->extensionRepository->update($extension);
         $this->redirect('index', 'Registerkey');
     }

html/typo3conf/ext/ter_fe2/Classes/Domain/Model/Author.php

@@ -14,7 +14,6 @@ namespace T3o\TerFe2\Domain\Model;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Extbase\Domain\Model\FrontendUser;
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 
 /**

html/typo3conf/ext/ter_fe2/Classes/Domain/Model/Extension.php

@@ -590,9 +590,9 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
     }
 
     /**
-     * @param \DateTime $expire
+     * @param \DateTime|null $expire
      */
-    public function setExpire(\DateTime $expire)
+    public function setExpire(\DateTime $expire = null)
     {
         $this->expire = $expire;
     }

html/typo3conf/ext/ter_fe2/Classes/Domain/Model/Version.php

@@ -904,7 +904,7 @@ class Version extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
     /**
      * Setter for softwareRelations
      *
-     * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage <\T3o\TerFe2\Domain\Model\Relation> $softwareRelations Relations
+     * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage $softwareRelations Relations
      * @return void
      */
     public function setSoftwareRelations(ObjectStorage $softwareRelations)
@@ -915,7 +915,7 @@ class Version extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
     /**
      * Getter for softwareRelations
      *
-     * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\T3o\TerFe2\Domain\Model\Relation> Relations
+     * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage Relations
      */
     public function getSoftwareRelations(): ObjectStorage
     {

html/typo3conf/ext/ter_fe2/Classes/Domain/Repository/AbstractRepository.php

@@ -23,8 +23,8 @@ abstract class AbstractRepository extends \TYPO3\CMS\Extbase\Persistence\Reposit
     /**
      * Returns a query for objects of this repository
      *
-     * @param string $offset Offset to start with
-     * @param string $count Count of result
+     * @param int $offset Offset to start with
+     * @param int $count Count of result
      * @param array $ordering Ordering <-> Direction
      * @return \TYPO3\CMS\Extbase\Persistence\QueryInterface
      */
@@ -50,10 +50,10 @@ abstract class AbstractRepository extends \TYPO3\CMS\Extbase\Persistence\Reposit
     /**
      * Returns all objects
      *
-     * @param string $offset Offset to start with
-     * @param string $count Count of result
-     * @param string $ordering Ordering <-> Direction
-     * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage Objects
+     * @param int $offset Offset to start with
+     * @param int $count Count of result
+     * @param array $ordering Ordering <-> Direction
+     * @return \TYPO3\CMS\Extbase\Persistence\QueryResultInterface Objects
      */
     public function findAll($offset = 0, $count = 0, array $ordering = array())
     {

html/typo3conf/ext/ter_fe2/Classes/Domain/Repository/ExtensionManagerCacheEntryRepository.php

@@ -33,9 +33,8 @@ class ExtensionManagerCacheEntryRepository extends \T3o\TerFe2\Domain\Repository
         $query = $this->createQuery($offset, $count);
         $query->getQuerySettings()->setRespectStoragePage(false);
         $query->getQuerySettings()->setRespectSysLanguage(false);
-        $query->getQuerySettings()->setReturnRawQueryResult(true);
         $query->matching($query->greaterThan('lastuploaddate', (int)$lastUpdateDate));
-        return $query->execute();
+        return $query->execute(true);
     }
 
 
@@ -51,15 +50,14 @@ class ExtensionManagerCacheEntryRepository extends \T3o\TerFe2\Domain\Repository
         $query = $this->createQuery(0, 1);
         $query->getQuerySettings()->setRespectStoragePage(false);
         $query->getQuerySettings()->setRespectSysLanguage(false);
-        $query->getQuerySettings()->setReturnRawQueryResult(true);
         $query->matching(
-            $query->logicalAnd(
+            $query->logicalAnd([
                 $query->equals('extkey', $extKey),
                 $query->equals('version', $versionString)
-            )
+            ])
         );
 
-        $rows = $query->execute();
+        $rows = $query->execute(true);
         if (is_array($rows)) {
             return reset($rows);
         }

html/typo3conf/ext/ter_fe2/Classes/Domain/Repository/ExtensionRepository.php

@@ -53,7 +53,7 @@ class ExtensionRepository extends \T3o\TerFe2\Domain\Repository\AbstractReposito
      *
      * @param \TYPO3\CMS\Extbase\Persistence\QueryInterface $query
      * @param \TYPO3\CMS\Extbase\Persistence\Generic\Qom\ConstraintInterface $constraint
-     * @return \TYPO3\CMS\Extbase\Persistence\QueryInterface
+     * @return void
      */
     protected function match(\TYPO3\CMS\Extbase\Persistence\QueryInterface $query, \TYPO3\CMS\Extbase\Persistence\Generic\Qom\ConstraintInterface $constraint)
     {
@@ -62,10 +62,10 @@ class ExtensionRepository extends \T3o\TerFe2\Domain\Repository\AbstractReposito
             return;
         }
 
-        $query->matching($query->logicalAnd(
+        $query->matching($query->logicalAnd([
             $query->logicalNot($query->equals('lastVersion.reviewState', -1)),
             $constraint
-        ));
+        ]));
     }
 
 
@@ -117,7 +117,7 @@ class ExtensionRepository extends \T3o\TerFe2\Domain\Repository\AbstractReposito
      * Returns new and updated extensions
      *
      * @param integer $latestCount Count of extensions
-     * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage Objects
+     * @return \TYPO3\CMS\Extbase\Persistence\QueryResultInterface Objects
      */
     public function findLatest($latestCount = 0)
     {
@@ -142,9 +142,8 @@ class ExtensionRepository extends \T3o\TerFe2\Domain\Repository\AbstractReposito
     }
 
     /**
-     *
      * @param string $frontendUser
-     * @return \TYPO3\CMS\Extbase\Persistence\Generic\QueryResult|NULL
+     * @return \TYPO3\CMS\Extbase\Persistence\QueryResultInterface
      */
     public function findByFrontendUserAndExpiring($frontendUser)
     {
@@ -181,14 +180,14 @@ class ExtensionRepository extends \T3o\TerFe2\Domain\Repository\AbstractReposito
         $query->getQuerySettings()->setRespectSysLanguage(false);
         $constraints = array(
             $query->equals('frontendUser', $frontendUser),
-            $query->logicalAnd(
+            $query->logicalAnd([
                 $query->logicalNot(
                     $query->equals('uid', $extension->getUid())
                 ),
                 $query->logicalNot(
                     $query->equals('lastVersion.state', 'obsolete')
                 )
-            ),
+            ]),
             $query->greaterThanOrEqual('lastVersion.review_state', '0'),
             $query->greaterThanOrEqual('versions', '1')
         );

html/typo3conf/ext/ter_fe2/Classes/Domain/Repository/VersionRepository.php

@@ -41,7 +41,7 @@ class VersionRepository extends \T3o\TerFe2\Domain\Repository\AbstractRepository
      *
      * @param \TYPO3\CMS\Extbase\Persistence\QueryInterface $query
      * @param \TYPO3\CMS\Extbase\Persistence\Generic\Qom\ConstraintInterface $constraint
-     * @return \TYPO3\CMS\Extbase\Persistence\QueryInterface
+     * @return void
      */
     protected function match(\TYPO3\CMS\Extbase\Persistence\QueryInterface $query, \TYPO3\CMS\Extbase\Persistence\Generic\Qom\ConstraintInterface $constraint)
     {
@@ -51,10 +51,10 @@ class VersionRepository extends \T3o\TerFe2\Domain\Repository\AbstractRepository
         }
 
         $query->matching(
-            $query->logicalAnd(
+            $query->logicalAnd([
                 $query->greaterThanOrEqual('reviewState', 0),
                 $constraint
-            )
+            ])
         );
     }
 
@@ -71,10 +71,10 @@ class VersionRepository extends \T3o\TerFe2\Domain\Repository\AbstractRepository
         $query->getQuerySettings()->setRespectStoragePage(false);
         $query->getQuerySettings()->setRespectSysLanguage(false);
         $query->matching(
-            $query->logicalAnd(
+            $query->logicalAnd([
                 $query->equals('extension', $extension),
                 $query->equals('versionString', $versionString)
-            )
+            ])
         );
         return $query->execute()->getFirst();
     }
@@ -86,7 +86,7 @@ class VersionRepository extends \T3o\TerFe2\Domain\Repository\AbstractRepository
      * @param \T3o\TerFe2\Domain\Model\Extension $extension The extension object
      * @param integer $count Count of versions to return
      * @param boolean $skipLatest Skip latest version
-     * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage Objects
+     * @return \TYPO3\CMS\Extbase\Persistence\QueryResultInterface Objects
      */
     public function getVersionHistory($extension, $count = 0, $skipLatest = true)
     {
@@ -97,12 +97,12 @@ class VersionRepository extends \T3o\TerFe2\Domain\Repository\AbstractRepository
 
         if (!empty($skipLatest)) {
             $query->matching(
-                $query->logicalAnd(
+                $query->logicalAnd([
                     $query->equals('extension', $extension),
                     $query->logicalNot(
                         $query->equals('uid', (int)$extension->getLastVersion()->getUid())
                     )
-                )
+                ])
             );
         } else {
             $query->matching($query->equals('extension', $extension));

html/typo3conf/ext/ter_fe2/Classes/Persistence/AbstractPersistence.php

@@ -120,6 +120,7 @@ abstract class AbstractPersistence implements \T3o\TerFe2\Persistence\Persistenc
      * @param string $key Name of the value
      * @param mixed $value Value content
      * @return void
+     * @throws \Exception
      */
     public function set($key, $value)
     {
@@ -152,7 +153,7 @@ abstract class AbstractPersistence implements \T3o\TerFe2\Persistence\Persistenc
     /**
      * Add multiple values
      *
-     * @param array $value Key <-> value pairs
+     * @param array $values Key <-> value pairs
      * @return void
      */
     public function addMultiple(array $values)

html/typo3conf/ext/ter_fe2/Classes/Persistence/PersistenceInterface.php

@@ -59,7 +59,7 @@ interface PersistenceInterface
     /**
      * Add multiple values
      *
-     * @param array $value Key <-> value pairs
+     * @param array $values Key <-> value pairs
      * @return void
      */
     public function addMultiple(array $values);

html/typo3conf/ext/ter_fe2/Classes/Persistence/Session.php

@@ -19,11 +19,11 @@ namespace T3o\TerFe2\Persistence;
  */
 class Session extends \T3o\TerFe2\Persistence\AbstractPersistence
 {
-
     /**
      * Load content
      *
      * @return void
+     * @throws \Exception
      */
     public function load()
     {
@@ -36,11 +36,11 @@ class Session extends \T3o\TerFe2\Persistence\AbstractPersistence
         }
     }
 
-
     /**
      * Save content
      *
      * @return void
+     * @throws \Exception
      */
     public function save()
     {

html/typo3conf/ext/ter_fe2/Classes/Provider/AbstractProvider.php

@@ -48,8 +48,6 @@ abstract class AbstractProvider implements \T3o\TerFe2\Provider\ProviderInterfac
 
     /**
      * Get or create absolute path to image cache directory
-     *
-     * @return void
      */
     public function __construct()
     {

html/typo3conf/ext/ter_fe2/Classes/Provider/FileProvider.php

@@ -171,7 +171,9 @@ class FileProvider extends \T3o\TerFe2\Provider\AbstractProvider
      *
      * @param string $extension Extension key
      * @param string $version Version string
+     * @param string $fileHash hash of file
      * @return array Extension info array
+     * @throws \Exception
      */
     protected function getExtensionInfo($extension, $version, $fileHash)
     {
@@ -240,7 +242,7 @@ class FileProvider extends \T3o\TerFe2\Provider\AbstractProvider
         $extensionModel = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class);
         $states = $extensionModel->getDefaultState(null);
         $states = array_flip($states);
-        $categories = Category::getDefaultCategories(null);
+        $categories = Category::getDefaultCategories();
         $categories = array_flip($categories);
 
         $extensions = array();

html/typo3conf/ext/ter_fe2/Classes/Provider/MirrorProvider.php

@@ -106,7 +106,9 @@ class MirrorProvider extends \T3o\TerFe2\Provider\FileProvider
      *
      * @param string $extension Extension key
      * @param string $version Version string
+     * @param string $fileHash Hash of file
      * @return array Extension info array
+     * @throws \Exception
      */
     protected function getExtensionInfo($extension, $version, $fileHash)
     {

html/typo3conf/ext/ter_fe2/Classes/Provider/ProviderManager.php

@@ -46,6 +46,7 @@ class ProviderManager implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param string $name Name of the provider
      * @return \T3o\TerFe2\Provider\ProviderInterface Extension provider
+     * @throws \Exception
      */
     public function getProvider($name)
     {

html/typo3conf/ext/ter_fe2/Classes/Provider/SoapProvider.php

@@ -50,6 +50,7 @@ class SoapProvider extends \T3o\TerFe2\Provider\AbstractProvider
      * Initialize provider
      *
      * @return void
+     * @throws \Exception
      */
     public function initializeProvider()
     {
@@ -93,6 +94,7 @@ class SoapProvider extends \T3o\TerFe2\Provider\AbstractProvider
      * @param integer $offset Offset to start with
      * @param integer $count Extension count to load
      * @return array Extension rows
+     * @throws \Exception
      */
     public function getExtensions($lastRun, $offset, $count)
     {
@@ -115,6 +117,7 @@ class SoapProvider extends \T3o\TerFe2\Provider\AbstractProvider
      * @param \T3o\TerFe2\Domain\Model\Version $version Version object
      * @param string $fileType File type
      * @return string Url to file
+     * @throws \Exception
      */
     public function getFileUrl(\T3o\TerFe2\Domain\Model\Version $version, $fileType)
     {
@@ -140,6 +143,7 @@ class SoapProvider extends \T3o\TerFe2\Provider\AbstractProvider
      * @param \T3o\TerFe2\Domain\Model\Version $version Version object
      * @param string $fileType File type
      * @return string File name
+     * @throws \Exception
      */
     public function getFileName(\T3o\TerFe2\Domain\Model\Version $version, $fileType)
     {
@@ -164,6 +168,7 @@ class SoapProvider extends \T3o\TerFe2\Provider\AbstractProvider
      *
      * @param \T3o\TerFe2\Domain\Model\Version $version Version object
      * @return array Version details
+     * @throws \Exception
      */
     public function getVersionDetails(\T3o\TerFe2\Domain\Model\Version $version)
     {

html/typo3conf/ext/ter_fe2/Classes/Service/Mirror.php

@@ -115,6 +115,7 @@ class Mirror implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param boolean $refresh Generate new mirror url
      * @return string Mirror url
+     * @throws \Exception
      */
     public function getMirror($refresh = false)
     {
@@ -172,6 +173,7 @@ class Mirror implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param string $filename File name to check
      * @return string Url to file on mirror server
+     * @throws \Exception
      */
     public function getUrlToFile($filename)
     {
@@ -204,6 +206,7 @@ class Mirror implements \TYPO3\CMS\Core\SingletonInterface
      *
      * @param string $filename File name to fetch
      * @return string File content
+     * @throws \Exception
      */
     public function getFile($filename)
     {

html/typo3conf/ext/ter_fe2/Classes/Service/Soap.php

@@ -134,7 +134,7 @@ class Soap implements \TYPO3\CMS\Core\SingletonInterface
     /**
      * Set authentication header
      *
-     * @param \SoapHeader $soapHeader SOAP header
+     * @param \SoapHeader $authenticationHeader SOAP header
      * @return void
      */
     public function setAuthenticationHeader(\SoapHeader $authenticationHeader)

html/typo3conf/ext/ter_fe2/Classes/Service/Ter.php

@@ -66,6 +66,7 @@ class Ter
      * Check if an extension key is valid
      *
      * @param string $extensionKey Extension key
+     * @param string $error Error key
      * @return boolean TRUE if extension key is valid
      */
     public function checkExtensionKey($extensionKey, &$error)
@@ -106,18 +107,15 @@ class Ter
 
         // if the result is empty
         if (empty($result['resultCode'])) {
-            $error = 'result_empty';
             return false;
         }
 
         // result code invalid 10502 = TX_TER_RESULT_EXTENSIONKEYNOTVALID
         if ($result['resultCode'] === '10502') {
-            $error = 'key_invalid';
             return false;
         }
         // key exists 10500 = TX_TER_RESULT_EXTENSIONKEYALREADYEXISTS
         if ($result['resultCode'] === '10500') {
-            $error = 'key_exists';
             return false;
         }
 
@@ -217,7 +215,7 @@ class Ter
 
         try {
             $this->soapService->setReviewState($this->userData, $parameters);
-        } catch (SoapFault $exception) {
+        } catch (\SoapFault $exception) {
             $error = $exception->faultstring;
             return false;
         }

html/typo3conf/ext/ter_fe2/Classes/Task/ImportAllExtensionsTask.php

@@ -96,6 +96,7 @@ class ImportAllExtensionsTask extends \TYPO3\CMS\Extbase\Scheduler\Task
     /**
      * Gets the extension data out of ter tables
      *
+     * @param int $extUid
      * @return array $extData
      */
     public function getExtensionDataOfExtUid($extUid)
@@ -104,7 +105,7 @@ class ImportAllExtensionsTask extends \TYPO3\CMS\Extbase\Scheduler\Task
             'tx_ter_extensions.*, tx_ter_extensiondetails.*',
             'tx_ter_extensions
 				LEFT JOIN tx_ter_extensiondetails ON tx_ter_extensions.uid = tx_ter_extensiondetails.extensionuid',
-            'tx_ter_extensiondetails.extensionuid = ' . $extUid
+            'tx_ter_extensiondetails.extensionuid = ' . (int)$extUid
         );
         return $extData;
     }
@@ -193,11 +194,12 @@ class ImportAllExtensionsTask extends \TYPO3\CMS\Extbase\Scheduler\Task
      */
     public function createVersion($extUid, $extData)
     {
+        /** @var \TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extensionModel */
         $extensionModel = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class);
-        $states = $extensionModel->getDefaultState(null);
-        $categories = Category::getDefaultCategories(null);
+        $states = $extensionModel->getDefaultState();
+        $categories = Category::getDefaultCategories();
 
-        $insertVersion = array(
+        $insertVersion = [
             'pid' => $this->pid,
             'extension' => $extUid,
             'title' => $extData['title'],
@@ -231,7 +233,7 @@ class ImportAllExtensionsTask extends \TYPO3\CMS\Extbase\Scheduler\Task
             'has_images' => 0,
             't3x_file_size' => @filesize(PATH_site . 'fileadmin/ter/' . $extData['extensionkey'] . '_' . $extData['version_string'] . '.t3x'),
             'zip_file_size' => 0
-        );
+        ];
 
         $GLOBALS['TYPO3_DB']->exec_INSERTquery('tx_terfe2_domain_model_version', $insertVersion);
         return $GLOBALS['TYPO3_DB']->sql_insert_id();

html/typo3conf/ext/ter_fe2/Classes/Utility/Archive.php

@@ -28,8 +28,9 @@ class Archive
      *
      * @param string $filename File name of the archive
      * @param array $files All files to insert
-     * @param string $overwrite Overwrite file if exists
+     * @param bool $overwrite Overwrite file if exists
      * @return boolean TRUE if success
+     * @throws \Exception
      */
     public static function createZipArchive($filename, array $files, $overwrite = false)
     {
@@ -75,6 +76,7 @@ class Archive
      * @param string $path Path to extract into
      * @param mixed $files Single filename or array of filenames to extract
      * @return boolean TRUE if success
+     * @throws \Exception
      */
     public static function extractZipArchive($filename, $path, $files = null)
     {
@@ -118,6 +120,7 @@ class Archive
      *
      * @param string $filename File name
      * @return array File informations
+     * @throws \Exception
      */
     public static function getZipArchiveContent($filename)
     {
@@ -166,10 +169,10 @@ class Archive
     /**
      * Creates a zip file from given extension T3X file
      *
-     * @throws Exception
      * @param string $t3xFile Path to the t3x file
      * @param string $zipFile Path to the zip file
      * @return boolean TRUE if success
+     * @throws \Exception
      */
     public static function convertT3xToZip($t3xFile, $zipFile)
     {
@@ -268,7 +271,7 @@ class Archive
      *
      * @param string $filename Path to zip file
      * @param array $files Reference to files
-     * @return stdClass Extension information
+     * @return \stdClass Extension information
      * @see tx_em_Extensions_Details::uploadToTER
      */
     public static function getExtensionDetailsFromZipArchive($filename, array &$files = array())

html/typo3conf/ext/ter_fe2/Classes/Utility/File.php

@@ -178,7 +178,7 @@ class File
      * This function must be called before any HTTP headers have been sent
      *
      * @param string $content File content
-     * @param string $visibleFileName File name for downloaded file
+     * @param string $fileName File name for downloaded file
      * @return boolean FALSE if something wents wrong
      */
     public static function transferFileContent($content, $fileName)
@@ -371,7 +371,7 @@ class File
      * Move a directory
      *
      * @param string $fromDirectory Existing directory
-     * @param string $toParentDirectory Name of the new directory
+     * @param string $toDirectory Name of the new directory
      * @param boolean $overwrite A directory with new name will be overwritten if set
      * @return boolean TRUE if success
      */
@@ -390,7 +390,7 @@ class File
      * @param string $tempname Temporary file name
      * @param string $filename Original file name
      * @param string $directory Directory path
-     * @return New file name
+     * @return string New file name
      */
     public static function moveUploadedFile($tempname, $filename, $directory = 'uploads/')
     {
@@ -403,7 +403,6 @@ class File
         return '';
     }
 
-
     /**
      * Remove a file
      *

html/typo3conf/ext/ter_fe2/Classes/Utility/Log.php

@@ -26,7 +26,6 @@ class Log