Commit 64b98560 authored by Thomas Löffler's avatar Thomas Löffler

Merge branch '75-use-namespaces-and-new-class-names-in-the-tasks' into 'develop'

Resolve "Use namespaces and new class names in the tasks"

Closes #75

See merge request !91
parents 36a35f33 501bb457
Pipeline #1126 passed with stages
in 3 minutes and 46 seconds
<?php
namespace T3o\TerFe2\Cache;
/*******************************************************************
* Copyright notice
*
......@@ -26,7 +28,7 @@
/**
* Cache for extension files
*/
class Tx_TerFe2_Cache_FileCache implements \TYPO3\CMS\Core\SingletonInterface
class FileCache implements \TYPO3\CMS\Core\SingletonInterface
{
/**
......@@ -44,9 +46,9 @@ class Tx_TerFe2_Cache_FileCache implements \TYPO3\CMS\Core\SingletonInterface
public function setCacheDirectory($cacheDirectory)
{
if (empty($cacheDirectory)) {
throw new Exception('An empty cache directory is not allowed');
throw new \Exception('An empty cache directory is not allowed');
}
$this->cacheDirectory = Tx_TerFe2_Utility_File::getAbsoluteDirectory($cacheDirectory);
$this->cacheDirectory = \T3o\TerFe2\Utility\File::getAbsoluteDirectory($cacheDirectory);
}
......@@ -70,7 +72,7 @@ class Tx_TerFe2_Cache_FileCache implements \TYPO3\CMS\Core\SingletonInterface
public function getFile($filename)
{
$filename = $this->getFilePath($filename);
if (Tx_TerFe2_Utility_File::fileExists($filename)) {
if (\T3o\TerFe2\Utility\File::fileExists($filename)) {
return $filename;
}
return '';
......@@ -104,7 +106,7 @@ class Tx_TerFe2_Cache_FileCache implements \TYPO3\CMS\Core\SingletonInterface
return '';
}
$filename = $this->getFilePath($filename);
if (Tx_TerFe2_Utility_File::copyFile($fileUrl, $filename)) {
if (\T3o\TerFe2\Utility\File::copyFile($fileUrl, $filename)) {
return $filename;
}
return '';
......@@ -135,7 +137,7 @@ class Tx_TerFe2_Cache_FileCache implements \TYPO3\CMS\Core\SingletonInterface
public function removeFile($filename)
{
$filename = $this->getFilePath($filename);
if (!Tx_TerFe2_Utility_File::fileExists($fileUrl)) {
if (!\T3o\TerFe2\Utility\File::fileExists($fileUrl)) {
return FALSE;
}
return unlink($filename);
......@@ -169,7 +171,7 @@ class Tx_TerFe2_Cache_FileCache implements \TYPO3\CMS\Core\SingletonInterface
}
$cacheDirectory = $this->getCacheDirectory();
if (empty($cacheDirectory)) {
throw new Exception('No cache directory defined');
throw new \Exception('No cache directory defined');
}
return $cacheDirectory . $filename;
}
......
<?php
namespace T3o\TerFe2\Controller;
/*******************************************************************
* Copyright notice
*
......@@ -26,18 +28,18 @@
/**
* Abstract controller
*/
abstract class Tx_TerFe2_Controller_AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController
abstract class AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController
{
/**
* @var Tx_TerFe2_Security_Role
* @var \T3o\TerFe2\Security\Role;
*/
protected $securityRole;
/**
* @param Tx_TerFe2_Security_Role $securityRole
* @param \T3o\TerFe2\Security\Role $securityRole
*/
public function injectSecurityRole(Tx_TerFe2_Security_Role $securityRole)
public function injectSecurityRole(\T3o\TerFe2\Security\Role $securityRole)
{
$this->securityRole = $securityRole;
}
......@@ -50,7 +52,7 @@ abstract class Tx_TerFe2_Controller_AbstractController extends \TYPO3\CMS\Extbas
public function initializeAction()
{
// Pre-parse settings
$this->settings = Tx_TerFe2_Utility_TypoScript::parse($this->settings);
$this->settings = \T3o\TerFe2\Utility\TypoScript::parse($this->settings);
// Initialize the controller
$this->initializeController();
......
<?php
namespace T3o\TerFe2\Controller;
/*******************************************************************
* Copyright notice
*
......@@ -26,7 +28,7 @@
/**
* Abstract controller
*/
abstract class Tx_TerFe2_Controller_AbstractTerBasedController extends Tx_TerFe2_Controller_AbstractController
abstract class AbstractTerBasedController extends \T3o\TerFe2\Controller\AbstractController
{
/**
......@@ -35,7 +37,7 @@ abstract class Tx_TerFe2_Controller_AbstractTerBasedController extends Tx_TerFe2
protected $frontendUser = array();
/**
* @var Tx_TerFe2_Service_Ter
* @var \T3o\TerFe2\Service\Ter
*/
protected $terConnection;
......@@ -105,18 +107,18 @@ abstract class Tx_TerFe2_Controller_AbstractTerBasedController extends Tx_TerFe2
/**
* Create a connection to the TER server
*
* @return Tx_TerFe2_Service_Ter The TER connection
* @return \T3o\TerFe2\Service\Ter The TER connection
*/
protected function getTerConnection()
{
// Check the wsdl uri
if (empty($this->terSettings['wsdl'])) {
throw new Exception('No wsdl set to connect to TER server');
throw new \Exception('No wsdl set to connect to TER server');
}
// Create connection
$wsdl = $this->terSettings['wsdl'];
return $this->objectManager->get('Tx_TerFe2_Service_Ter', $wsdl, $this->terAccount['username'], $this->terAccount['password']);
return $this->objectManager->get(\T3o\TerFe2\Service\Ter::class, $wsdl, $this->terAccount['username'], $this->terAccount['password']);
}
}
<?php
namespace T3o\TerFe2\Controller;
/*******************************************************************
* Copyright notice
*
......@@ -26,16 +28,16 @@
/**
* Controller for the author object
*/
class Tx_TerFe2_Controller_AuthorController extends Tx_TerFe2_Controller_AbstractController
class AuthorController extends \T3o\TerFe2\Controller\AbstractController
{
/**
* @var Tx_TerFe2_Domain_Repository_AuthorRepository
* @var \T3o\TerFe2\Domain\Repository\AuthorRepository
*/
protected $authorRepository;
/**
* @var Tx_TerFe2_Domain_Repository_ExtensionRepository
* @var \T3o\TerFe2\Domain\Repository\ExtensionRepository
*/
protected $extensionRepository;
......@@ -47,8 +49,8 @@ class Tx_TerFe2_Controller_AuthorController extends Tx_TerFe2_Controller_Abstrac
*/
protected function initializeController()
{
$this->authorRepository = $this->objectManager->get('Tx_TerFe2_Domain_Repository_AuthorRepository');
$this->extensionRepository = $this->objectManager->get('Tx_TerFe2_Domain_Repository_ExtensionRepository');
$this->authorRepository = $this->objectManager->get(\T3o\TerFe2\Domain\Repository\AuthorRepository::class);
$this->extensionRepository = $this->objectManager->get(\T3o\TerFe2\Domain\Repository\ExtensionRepository::class);
}
......@@ -66,10 +68,10 @@ class Tx_TerFe2_Controller_AuthorController extends Tx_TerFe2_Controller_Abstrac
/**
* Action that displays a single author
*
* @param Tx_TerFe2_Domain_Model_Author $author The author to display
* @param \T3o\TerFe2\Domain\Model\Author $author The author to display
* @return void
*/
public function showAction(Tx_TerFe2_Domain_Model_Author $author)
public function showAction(\T3o\TerFe2\Domain\Model\Author $author)
{
$this->view->assign('author', $author);
$authorExtensions = $this->extensionRepository->findByAuthor($author);
......@@ -80,11 +82,11 @@ class Tx_TerFe2_Controller_AuthorController extends Tx_TerFe2_Controller_Abstrac
/**
* Displays a form to edit an existing author
*
* @param Tx_TerFe2_Domain_Model_Author $author The author to display
* @param \T3o\TerFe2\Domain\Model\Author $author The author to display
* @return void
* @dontvalidate $author
*/
public function editAction(Tx_TerFe2_Domain_Model_Author $author)
public function editAction(\T3o\TerFe2\Domain\Model\Author $author)
{
$this->view->assign('author', $author);
}
......@@ -93,10 +95,10 @@ class Tx_TerFe2_Controller_AuthorController extends Tx_TerFe2_Controller_Abstrac
/**
* Updates an existing author
*
* @param Tx_TerFe2_Domain_Model_Author $author Author to update
* @param \T3o\TerFe2\Domain\Model\Author $author Author to update
* @return void
*/
public function updateAction(Tx_TerFe2_Domain_Model_Author $author)
public function updateAction(\T3o\TerFe2\Domain\Model\Author $author)
{
$this->authorRepository->update($author);
$this->redirectWithMessage($this->translate('msg.author_updated'), 'list');
......
<?php
namespace T3o\TerFe2\Controller\Eid;
/*
* This file is part of the TYPO3 CMS project.
......@@ -14,9 +15,9 @@
*/
/**
* Class Tx_TerFe2_Controller_Eid_ExtensionController
* Class \T3o\TerFe2\Controller\Eid\ExtensionController
*/
class Tx_TerFe2_Controller_Eid_ExtensionController
class ExtensionController
{
/**
......@@ -90,5 +91,5 @@ class Tx_TerFe2_Controller_Eid_ExtensionController
}
}
$controller = new Tx_TerFe2_Controller_Eid_ExtensionController();
$controller = new ExtensionController();
$controller->dispatch(\TYPO3\CMS\Core\Utility\GeneralUtility::_GET('action'));
<?php
namespace T3o\TerFe2\Controller;
/*******************************************************************
* Copyright notice
*
......@@ -26,36 +28,36 @@
/**
* Controller for the extension object
*/
class Tx_TerFe2_Controller_ExtensionController extends Tx_TerFe2_Controller_AbstractController
class ExtensionController extends \T3o\TerFe2\Controller\AbstractController
{
/**
* @var Tx_TerFe2_Domain_Repository_ExtensionRepository
* @var \T3o\TerFe2\Domain\Repository\ExtensionRepository
*/
protected $extensionRepository;
/**
* @var Tx_TerFe2_Domain_Repository_TagRepository
* @var \T3o\TerFe2\Domain\Repository\TagRepository
*/
protected $tagRepository;
/**
* @var Tx_TerFe2_Domain_Repository_AuthorRepository
* @var \T3o\TerFe2\Domain\Repository\AuthorRepository
*/
protected $authorRepository;
/**
* @var Tx_TerFe2_Domain_Repository_VersionRepository
* @var \T3o\TerFe2\Domain\Repository\VersionRepository
*/
protected $versionRepository;
/**
* @var Tx_TerFe2_Provider_ProviderManager
* @var \T3o\TerFe2\Provider\ProviderManager
*/
protected $providerManager;
/**
* @var Tx_TerFe2_Persistence_Session
* @var \T3o\TerFe2\Persistence\Session
*/
protected $session;
......@@ -81,13 +83,13 @@ class Tx_TerFe2_Controller_ExtensionController extends Tx_TerFe2_Controller_Abst
*/
protected function initializeController()
{
$this->extensionRepository = $this->objectManager->get('Tx_TerFe2_Domain_Repository_ExtensionRepository');
$this->tagRepository = $this->objectManager->get('Tx_TerFe2_Domain_Repository_TagRepository');
$this->versionRepository = $this->objectManager->get('Tx_TerFe2_Domain_Repository_VersionRepository');
$this->authorRepository = $this->objectManager->get('Tx_TerFe2_Domain_Repository_AuthorRepository');
$this->extensionRepository = $this->objectManager->get(\T3o\TerFe2\Domain\Repository\ExtensionRepository::class);
$this->tagRepository = $this->objectManager->get(\T3o\TerFe2\Domain\Repository\TagRepository::class);
$this->versionRepository = $this->objectManager->get(\T3o\TerFe2\Domain\Repository\VersionRepository::class);
$this->authorRepository = $this->objectManager->get(\T3o\TerFe2\Domain\Repository\AuthorRepository::class);
$this->ownerRepository = $this->objectManager->get(\TYPO3\CMS\Extbase\Domain\Repository\FrontendUserRepository::class);
$this->providerManager = $this->objectManager->get('Tx_TerFe2_Provider_ProviderManager');
$this->session = $this->objectManager->get('Tx_TerFe2_Persistence_Session');
$this->providerManager = $this->objectManager->get(\T3o\TerFe2\Provider\ProviderManager::class);
$this->session = $this->objectManager->get(\T3o\TerFe2\Persistence\Session::class);
$this->persistenceManager = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class);
// Show insecure extensions only for reviewers
......@@ -174,22 +176,22 @@ class Tx_TerFe2_Controller_ExtensionController extends Tx_TerFe2_Controller_Abst
/**
* Action that displays a single extension
*
* @param Tx_TerFe2_Domain_Model_Extension $extension The extension to display
* @param \T3o\TerFe2\Domain\Model\Extension $extension The extension to display
* @param string $extensionKey Extension key
* @return void
*
* @ignorevalidation $extension
*/
public function showAction(Tx_TerFe2_Domain_Model_Extension $extension = NULL, $extensionKey = NULL)
public function showAction(\T3o\TerFe2\Domain\Model\Extension $extension = NULL, $extensionKey = NULL)
{
if (!empty($extensionKey)) {
if (!is_string($extensionKey)) {
throw new Exception('No valid extension key given');
throw new \Exception('No valid extension key given');
}
$extension = $this->extensionRepository->findOneByExtKey($extensionKey);
}
$owner = array();
if ($extension instanceof Tx_TerFe2_Domain_Model_Extension and $extension->getFrontendUser()) {
if ($extension instanceof \T3o\TerFe2\Domain\Model\Extension and $extension->getFrontendUser()) {
$owner = $this->ownerRepository->findOneByUsername($extension->getFrontendUser());
}
$versionHistoryCount = (!empty($this->settings['versionHistoryCount']) ? $this->settings['versionHistoryCount'] : 5);
......@@ -198,7 +200,7 @@ class Tx_TerFe2_Controller_ExtensionController extends Tx_TerFe2_Controller_Abst
//$loggedInUser = $this->ownerRepository->findCurrent();
if ($extension !== NULL &&
$extension instanceof Tx_TerFe2_Domain_Model_Extension &&
$extension instanceof \T3o\TerFe2\Domain\Model\Extension &&
(
$this->securityRole->isReviewer() ||
($extension->getLastVersion() && $extension->getLastVersion()->getReviewState() != -1)
......@@ -210,8 +212,8 @@ class Tx_TerFe2_Controller_ExtensionController extends Tx_TerFe2_Controller_Abst
$this->view->assign('versionHistory', $versionHistory);
$this->view->assign('loggedInUser', $loggedInUser);
/** @var Tx_TerFe2_Service_Documentation $documentationService */
//$documentationService = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('Tx_TerFe2_Service_Documentation');
/** @var \T3o\TerFe2\Service\Documentation $documentationService */
//$documentationService = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('\T3o\TerFe2\Service\Documentation');
//$documentationLink = $documentationService->getDocumentationLink($extension->getExtKey(), $extension->getLastVersion()->getVersionString());
$this->view->assign('documentationLink', $documentationLink);
......@@ -272,11 +274,11 @@ class Tx_TerFe2_Controller_ExtensionController extends Tx_TerFe2_Controller_Abst
/**
* Displays a form for creating a new extension
*
* @param Tx_TerFe2_Domain_Model_Extension $newExtension New extension object
* @param \T3o\TerFe2\Domain\Model\Extension $newExtension New extension object
* @return void
* @dontvalidate $newExtension
*/
public function newAction(Tx_TerFe2_Domain_Model_Extension $newExtension = NULL)
public function newAction(\T3o\TerFe2\Domain\Model\Extension $newExtension = NULL)
{
$this->view->assign('newExtension', $newExtension);
$this->view->assign('tags', $this->tagRepository->findAll());
......@@ -286,10 +288,10 @@ class Tx_TerFe2_Controller_ExtensionController extends Tx_TerFe2_Controller_Abst
/**
* Creates a new extension
*
* @param Tx_TerFe2_Domain_Model_Extension $newExtension New extension object
* @param \T3o\TerFe2\Domain\Model\Extension $newExtension New extension object
* @return void
*/
public function createAction(Tx_TerFe2_Domain_Model_Extension $newExtension)
public function createAction(\T3o\TerFe2\Domain\Model\Extension $newExtension)
{
$this->extensionRepository->add($newExtension);
$this->redirectWithMessage($this->translate('msg.extension_created'), 'index');
......@@ -299,11 +301,11 @@ class Tx_TerFe2_Controller_ExtensionController extends Tx_TerFe2_Controller_Abst
/**
* Displays a form to edit an existing extension
*
* @param Tx_TerFe2_Domain_Model_Extension $extension The extension to display
* @param \T3o\TerFe2\Domain\Model\Extension $extension The extension to display
* @dontvalidate $extension
* @return void
*/
public function editAction(Tx_TerFe2_Domain_Model_Extension $extension)
public function editAction(\T3o\TerFe2\Domain\Model\Extension $extension)
{
$extensionOwner = $this->ownerRepository->findByUid($GLOBALS['TSFE']->fe_user->user['uid']);
if ($this->securityRole->isAdmin()
......@@ -318,14 +320,14 @@ class Tx_TerFe2_Controller_ExtensionController extends Tx_TerFe2_Controller_Abst
/**
* Updates an existing extension
*
* @param Tx_TerFe2_Domain_Model_Extension $extension extension to update
* @param \T3o\TerFe2\Domain\Model\Extension $extension extension to update
* @param string $tag
* @param string $save
* @return void
*/
public function updateAction(Tx_TerFe2_Domain_Model_Extension $extension, $tag = '', $save = '')
public function updateAction(\T3o\TerFe2\Domain\Model\Extension $extension, $tag = '', $save = '')
{
/** @var Tx_T3oAjaxlogin_Domain_Model_User $currentUser */
/** @var \TYPO3\CMS\Extbase\Domain\Model\FrontendUser $currentUser */
$currentUser = $this->ownerRepository->findByUid($GLOBALS['TSFE']->fe_user->user['uid']);
if ($extension->getFrontendUser() !== $currentUser->getUsername()) {
$this->redirectWithError(
......@@ -345,7 +347,7 @@ class Tx_TerFe2_Controller_ExtensionController extends Tx_TerFe2_Controller_Abst
}
$tags = array_unique($tags);
foreach ($tags as $tag) {
/** @var Tx_TerFe2_Domain_Model_Tag $newTag */
/** @var \T3o\TerFe2\Domain\Model\Tag $newTag */
$newTag = $this->tagRepository->findByTitle($tag)->getFirst();
if ($newTag !== NULL) {
if (!$extension->getTags()->contains($newTag)) {
......@@ -354,7 +356,7 @@ class Tx_TerFe2_Controller_ExtensionController extends Tx_TerFe2_Controller_Abst
continue;
}
} else {
$newTag = $this->objectManager->get('Tx_TerFe2_Domain_Model_Tag');
$newTag = $this->objectManager->get(\T3o\TerFe2\Domain\Model\Tag::class);
$newTag->setTitle($tag);
$extension->addTag($newTag);
}
......@@ -384,12 +386,12 @@ class Tx_TerFe2_Controller_ExtensionController extends Tx_TerFe2_Controller_Abst
}
/**
* @param Tx_TerFe2_Domain_Model_Extension $extension
* @param Tx_TerFe2_Domain_Model_Tag $tag
* @param \T3o\TerFe2\Domain\Model\Extension $extension
* @param \T3o\TerFe2\Domain\Model\Tag $tag
*
* @return void
*/
public function removeTagAction(Tx_TerFe2_Domain_Model_Extension $extension, Tx_TerFe2_Domain_Model_Tag $tag)
public function removeTagAction(\T3o\TerFe2\Domain\Model\Extension $extension, \T3o\TerFe2\Domain\Model\Tag $tag)
{
if ($extension->getTags()->contains($tag)) {
$extension->removeTag($tag);
......@@ -409,10 +411,10 @@ class Tx_TerFe2_Controller_ExtensionController extends Tx_TerFe2_Controller_Abst
/**
* Deletes an existing extension and all versions
*
* @param Tx_TerFe2_Domain_Model_Extension $extension The extension to delete
* @param \T3o\TerFe2\Domain\Model\Extension $extension The extension to delete
* @return void
*/
public function deleteAction(Tx_TerFe2_Domain_Model_Extension $extension)
public function deleteAction(\T3o\TerFe2\Domain\Model\Extension $extension)
{
$this->extensionRepository->remove($extension);
$this->redirectWithMessage($this->translate('msg.extension_deleted'), 'index');
......@@ -422,18 +424,18 @@ class Tx_TerFe2_Controller_ExtensionController extends Tx_TerFe2_Controller_Abst
/**
* Check file hash, increment download counter and send file to client browser
*
* @param Tx_TerFe2_Domain_Model_Extension $extension The extension object
* @param \T3o\TerFe2\Domain\Model\Extension $extension The extension object
* @param string $versionString An existing version string
* @param string $format Format of the file output
* @return void
*/
public function downloadAction(Tx_TerFe2_Domain_Model_Extension $extension, $versionString, $format)
public function downloadAction(\T3o\TerFe2\Domain\Model\Extension $extension, $versionString, $format)
{
if (!$format) {
$format = 't3x';
}
if ($format !== 't3x' && $format !== 'zip') {
throw new Exception('A download action for the format "' . $format . '" is not implemented');
throw new \Exception('A download action for the format "' . $format . '" is not implemented');
}
$version = $this->versionRepository->findOneByExtensionAndVersionString($extension, $versionString);
......@@ -450,13 +452,13 @@ class Tx_TerFe2_Controller_ExtensionController extends Tx_TerFe2_Controller_Abst
if ($fileUrl === '') {
$t3xFileUrl = $provider->getFileUrl($version, 't3x');
$zipFileUrl = str_replace('.t3x', '.zip', $t3xFileUrl);
Tx_TerFe2_Utility_Archive::convertT3xToZip(
Tx_TerFe2_Utility_File::getAbsolutePathFromUrl($t3xFileUrl),
Tx_TerFe2_Utility_File::getAbsolutePathFromUrl($zipFileUrl)
\T3o\TerFe2\Utility\Archive::convertT3xToZip(
\T3o\TerFe2\Utility\File::getAbsolutePathFromUrl($t3xFileUrl),
\T3o\TerFe2\Utility\File::getAbsolutePathFromUrl($zipFileUrl)
);
// update ZIP filesize
$version->setZipFileSize(filesize(Tx_TerFe2_Utility_File::getAbsolutePathFromUrl($zipFileUrl)));
$version->setZipFileSize(filesize(\T3o\TerFe2\Utility\File::getAbsolutePathFromUrl($zipFileUrl)));
$this->versionRepository->update($version);
$this->persistenceManager->persistAll();
......@@ -465,13 +467,13 @@ class Tx_TerFe2_Controller_ExtensionController extends Tx_TerFe2_Controller_Abst
}
// Check if file exists
if (empty($fileUrl) || !Tx_TerFe2_Utility_File::fileExists($fileUrl)) {
if (empty($fileUrl) || !\T3o\TerFe2\Utility\File::fileExists($fileUrl)) {
$this->redirectWithMessage($this->translate('msg.file_not_found') . ': ' . basename($fileUrl), 'show', '', \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR, NULL, NULL, array('extension' => $extension));
}
// Check file hash of t3x packages
if ($format === 't3x') {
$fileHash = Tx_TerFe2_Utility_File::getFileHash($fileUrl);
$fileHash = \T3o\TerFe2\Utility\File::getFileHash($fileUrl);
if ($fileHash != $version->getFileHash()) {
$this->redirectWithMessage($this->translate('msg.file_hash_not_equal'), 'show', '', \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR, NULL, NULL, array('extension' => $extension));
}
......@@ -493,7 +495,7 @@ class Tx_TerFe2_Controller_ExtensionController extends Tx_TerFe2_Controller_Abst
}
// Send file to browser
if (!Tx_TerFe2_Utility_File::transferFile($fileUrl)) {
if (!\T3o\TerFe2\Utility\File::transferFile($fileUrl)) {
$this->redirectWithMessage($this->translate('msg.could_not_transfer_file'), 'show', '', \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR, NULL, NULL, array('extension' => $extension));
}
......@@ -505,13 +507,13 @@ class Tx_TerFe2_Controller_ExtensionController extends Tx_TerFe2_Controller_Abst
/**
* Show upload form for a new extension version
*
* @param Tx_TerFe2_Domain_Model_Extension $extension The extension object
* @param \T3o\TerFe2\Domain\Model\Extension $extension The extension object
* @param array $form Form information for the new version
* @return void
* @dontvalidate $extension
* @dontvalidate $form
*/
public function uploadVersionAction(Tx_TerFe2_Domain_Model_Extension $extension, array $form = array())
public function uploadVersionAction(\T3o\TerFe2\Domain\Model\Extension $extension, array $form = array())
{
if (!\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('ter')) {
$this->addFlashMessage($this->translate('msq.createVersionTerNotLoaded'));
......@@ -536,13 +538,13 @@ class Tx_TerFe2_Controller_ExtensionController extends Tx_TerFe2_Controller_Abst
/**
* Create new version of an extension
*
* @param Tx_TerFe2_Domain_Model_Extension $extension The extension object
* @param \T3o\TerFe2\Domain\Model\Extension $extension The extension object
* @param array $form Form information for the new version
* @return void
* @dontvalidate $extension
* @dontvalidate $form
*/
public function createVersionAction(Tx_TerFe2_Domain_Model_Extension $extension, array $form)
public function createVersionAction(\T3o\TerFe2\Domain\Model\Extension $extension, array $form)
{
if (!$form['gplCompliant']) {