Skip to content
This repository was archived by the owner on May 4, 2021. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Classes/Configuration/VidiModulesAspect.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ class VidiModulesAspect implements TableConfigurationPostProcessingHookInterface
*/
public function processData() {

/** @var \TYPO3\CMS\Vidi\ModuleLoader $moduleLoader */
$moduleLoader = GeneralUtility::makeInstance('TYPO3\CMS\Vidi\ModuleLoader');
/** @var \TYPO3\CMS\Vidi\Module\ModuleLoader $moduleLoader */
$moduleLoader = GeneralUtility::makeInstance('TYPO3\CMS\Vidi\Module\ModuleLoader');

// Each data data can be displayed in a Vidi module
foreach ($GLOBALS['TCA'] as $dataType => $configuration) {
Expand Down
4 changes: 2 additions & 2 deletions Classes/ContentRepositoryFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ class ContentRepositoryFactory implements SingletonInterface {
*/
static public function getInstance($dataType = NULL) {

/** @var \TYPO3\CMS\Vidi\ModuleLoader $moduleLoader */
/** @var \TYPO3\CMS\Vidi\Module\ModuleLoader $moduleLoader */
if (is_null($dataType)) {

// Try to get the data type from the module loader.
$moduleLoader = GeneralUtility::makeInstance('TYPO3\CMS\Vidi\ModuleLoader');
$moduleLoader = GeneralUtility::makeInstance('TYPO3\CMS\Vidi\Module\ModuleLoader');
$dataType = $moduleLoader->getDataType();
}

Expand Down
4 changes: 2 additions & 2 deletions Classes/Controller/Backend/ContentController.php
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,9 @@ public function deleteAction(array $matches) {
/**
* Get the Vidi Module Loader.
*
* @return \TYPO3\CMS\Vidi\ModuleLoader
* @return \TYPO3\CMS\Vidi\Module\ModuleLoader
*/
protected function getModuleLoader() {
return GeneralUtility::makeInstance('TYPO3\CMS\Vidi\ModuleLoader');
return GeneralUtility::makeInstance('TYPO3\CMS\Vidi\Module\ModuleLoader');
}
}
4 changes: 2 additions & 2 deletions Classes/Grid/RelationEditRenderer.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ public function render() {
/**
* Get the Vidi Module Loader.
*
* @return \TYPO3\CMS\Vidi\ModuleLoader
* @return \TYPO3\CMS\Vidi\Module\ModuleLoader
*/
protected function getModuleLoader() {
return GeneralUtility::makeInstance('TYPO3\CMS\Vidi\ModuleLoader');
return GeneralUtility::makeInstance('TYPO3\CMS\Vidi\Module\ModuleLoader');
}
}
2 changes: 1 addition & 1 deletion Classes/Module/ModulePlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
class ModulePlugin implements SingletonInterface {

/**
* @var \TYPO3\CMS\Vidi\ModuleLoader
* @var \TYPO3\CMS\Vidi\Module\ModuleLoader
* @inject
*/
protected $moduleLoader;
Expand Down
4 changes: 2 additions & 2 deletions Classes/Module/ModuleService.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ protected function getDatabaseConnection() {
/**
* Get the Vidi Module Loader.
*
* @return \TYPO3\CMS\Vidi\ModuleLoader
* @return \TYPO3\CMS\Vidi\Module\ModuleLoader
*/
protected function getModuleLoader() {
return GeneralUtility::makeInstance('TYPO3\CMS\Vidi\ModuleLoader');
return GeneralUtility::makeInstance('TYPO3\CMS\Vidi\Module\ModuleLoader');
}
}
4 changes: 2 additions & 2 deletions Classes/Persistence/MatcherObjectFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
***************************************************************/
use TYPO3\CMS\Core\SingletonInterface;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Vidi\ModuleLoader;
use TYPO3\CMS\Vidi\Module\ModuleLoader;
use TYPO3\CMS\Vidi\Tca\TcaService;

/**
Expand Down Expand Up @@ -152,7 +152,7 @@ protected function emitPostProcessMatcherObjectSignal(Matcher $matcher) {
if (strlen($matcher->getDataType()) <= 0) {

/** @var ModuleLoader $moduleLoader */
$moduleLoader = $this->getObjectManager()->get('TYPO3\CMS\Vidi\ModuleLoader');
$moduleLoader = $this->getObjectManager()->get('TYPO3\CMS\Vidi\Module\ModuleLoader');
$matcher->setDataType($moduleLoader->getDataType());
}

Expand Down
4 changes: 2 additions & 2 deletions Classes/Tca/TcaService.php
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ class TcaService implements SingletonInterface, TcaServiceInterface {
static public function getService($tableName = '', $serviceType) {
if (TYPO3_MODE == 'BE' && empty($tableName)) {

/** @var \TYPO3\CMS\Vidi\ModuleLoader $moduleLoader */
$moduleLoader = GeneralUtility::makeInstance('TYPO3\CMS\Vidi\ModuleLoader');
/** @var \TYPO3\CMS\Vidi\Module\ModuleLoader $moduleLoader */
$moduleLoader = GeneralUtility::makeInstance('TYPO3\CMS\Vidi\Module\ModuleLoader');
$tableName = $moduleLoader->getDataType();
}

Expand Down
4 changes: 2 additions & 2 deletions Classes/View/Menu/DataTypeMenu.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ protected function assembleMenuOptions(array $moduleCodes) {
/**
* Get the Vidi Module Loader.
*
* @return \TYPO3\CMS\Vidi\ModuleLoader
* @return \TYPO3\CMS\Vidi\Module\ModuleLoader
*/
protected function getModuleLoader() {
return GeneralUtility::makeInstance('TYPO3\CMS\Vidi\ModuleLoader');
return GeneralUtility::makeInstance('TYPO3\CMS\Vidi\Module\ModuleLoader');
}
}
4 changes: 2 additions & 2 deletions Classes/ViewHelpers/Be/AssetsViewHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ public function render() {
$doc = $this->getDocInstance();
$pageRenderer = $doc->getPageRenderer();

/** @var \TYPO3\CMS\Vidi\ModuleLoader $moduleLoader */
$moduleLoader = $this->objectManager->get('TYPO3\CMS\Vidi\ModuleLoader');
/** @var \TYPO3\CMS\Vidi\Module\ModuleLoader $moduleLoader */
$moduleLoader = $this->objectManager->get('TYPO3\CMS\Vidi\Module\ModuleLoader');

foreach ($moduleLoader->getAdditionalStyleSheetFiles() as $addCssFile) {
$fileNameAndPath = $this->resolvePath($addCssFile);
Expand Down
2 changes: 1 addition & 1 deletion Classes/ViewHelpers/Component/CheckPidViewHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
class CheckPidViewHelper extends AbstractViewHelper {

/**
* @var \TYPO3\CMS\Vidi\ModuleLoader
* @var \TYPO3\CMS\Vidi\Module\ModuleLoader
* @inject
*/
protected $moduleLoader;
Expand Down
2 changes: 1 addition & 1 deletion Classes/ViewHelpers/Component/CheckRelationsViewHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
class CheckRelationsViewHelper extends AbstractViewHelper {

/**
* @var \TYPO3\CMS\Vidi\ModuleLoader
* @var \TYPO3\CMS\Vidi\Module\ModuleLoader
* @inject
*/
protected $moduleLoader;
Expand Down
4 changes: 2 additions & 2 deletions Classes/ViewHelpers/Grid/SystemButtonsViewHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
***************************************************************/
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3\CMS\Vidi\Domain\Model\Content;
use TYPO3\CMS\Vidi\ModuleLoader;
use TYPO3\CMS\Vidi\Module\ModuleLoader;

/**
* View helper for rendering buttons in the grids according to a Content object.
Expand All @@ -46,7 +46,7 @@ class SystemButtonsViewHelper extends AbstractViewHelper {
public function render(Content $object) {

/** @var ModuleLoader $moduleLoader */
$moduleLoader = $this->objectManager->get('TYPO3\CMS\Vidi\ModuleLoader');
$moduleLoader = $this->objectManager->get('TYPO3\CMS\Vidi\Module\ModuleLoader');
$components = $moduleLoader->getGridButtonsComponents();

$result = '';
Expand Down
4 changes: 2 additions & 2 deletions Classes/ViewHelpers/ModuleLoaderViewHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ class ModuleLoaderViewHelper extends AbstractViewHelper {
public function render($key) {
$getter = 'get' . ucfirst($key);

/** @var \TYPO3\CMS\Vidi\ModuleLoader $moduleLoader */
$moduleLoader = $this->objectManager->get('TYPO3\CMS\Vidi\ModuleLoader');
/** @var \TYPO3\CMS\Vidi\Module\ModuleLoader $moduleLoader */
$moduleLoader = $this->objectManager->get('TYPO3\CMS\Vidi\Module\ModuleLoader');
return $moduleLoader->$getter();
}

Expand Down
4 changes: 2 additions & 2 deletions Classes/ViewHelpers/Render/ComponentsViewHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3\CMS\Vidi\ModuleLoader;
use TYPO3\CMS\Vidi\Module\ModuleLoader;

/**
* View helper for rendering components
Expand All @@ -45,7 +45,7 @@ class ComponentsViewHelper extends AbstractViewHelper {
public function render($part) {

/** @var ModuleLoader $moduleLoader */
$moduleLoader = $this->objectManager->get('TYPO3\CMS\Vidi\ModuleLoader');
$moduleLoader = $this->objectManager->get('TYPO3\CMS\Vidi\Module\ModuleLoader');

$getComponents = 'get' . ucfirst($part) . 'Components';
$components = $moduleLoader->$getComponents();
Expand Down
8 changes: 4 additions & 4 deletions Classes/ViewHelpers/Uri/CreateViewHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class CreateViewHelper extends AbstractViewHelper {
protected $backendUser;

/**
* @var \TYPO3\CMS\Vidi\ModuleLoader
* @var \TYPO3\CMS\Vidi\Module\ModuleLoader
*/
protected $moduleLoader;

Expand All @@ -49,7 +49,7 @@ class CreateViewHelper extends AbstractViewHelper {
*/
public function initialize() {
$this->backendUser = $GLOBALS['BE_USER'];
$this->moduleLoader = GeneralUtility::makeInstance('TYPO3\CMS\Vidi\ModuleLoader');
$this->moduleLoader = GeneralUtility::makeInstance('TYPO3\CMS\Vidi\Module\ModuleLoader');
}

/**
Expand Down Expand Up @@ -92,9 +92,9 @@ public function getPid() {
/**
* Get the Vidi Module Loader.
*
* @return \TYPO3\CMS\Vidi\ModuleLoader
* @return \TYPO3\CMS\Vidi\Module\ModuleLoader
*/
protected function getModuleLoader() {
return GeneralUtility::makeInstance('TYPO3\CMS\Vidi\ModuleLoader');
return GeneralUtility::makeInstance('TYPO3\CMS\Vidi\Module\ModuleLoader');
}
}
2 changes: 1 addition & 1 deletion Classes/ViewHelpers/Uri/DeleteViewHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
class DeleteViewHelper extends AbstractViewHelper {

/**
* @var \TYPO3\CMS\Vidi\ModuleLoader
* @var \TYPO3\CMS\Vidi\Module\ModuleLoader
* @inject
*/
protected $moduleLoader;
Expand Down
4 changes: 2 additions & 2 deletions Classes/ViewHelpers/Uri/EditViewHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ public function render(Content $object) {
/**
* Get the Vidi Module Loader.
*
* @return \TYPO3\CMS\Vidi\ModuleLoader
* @return \TYPO3\CMS\Vidi\Module\ModuleLoader
*/
protected function getModuleLoader() {
return GeneralUtility::makeInstance('TYPO3\CMS\Vidi\ModuleLoader');
return GeneralUtility::makeInstance('TYPO3\CMS\Vidi\Module\ModuleLoader');
}
}

2 changes: 1 addition & 1 deletion Tests/Unit/Grid/RelationRendererTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class RelationRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
private $moduleCode = 'user_VidiFeUsersM1';

public function setUp() {
$moduleLoader = new \TYPO3\CMS\Vidi\ModuleLoader($this->dataType);
$moduleLoader = new \TYPO3\CMS\Vidi\Module\ModuleLoader($this->dataType);
$moduleLoader->register();
$GLOBALS['_GET']['M'] = $this->moduleCode;
$this->fixture = new \TYPO3\CMS\Vidi\Grid\RelationRenderer();
Expand Down
10 changes: 5 additions & 5 deletions Tests/Unit/Module/ModuleLoaderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
***************************************************************/

/**
* Test case for class \TYPO3\CMS\Vidi\ModuleLoader.
* Test case for class \TYPO3\CMS\Vidi\Module\ModuleLoader.
*/
class ModuleLoaderTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {

/**
* @var \TYPO3\CMS\Vidi\ModuleLoader
* @var \TYPO3\CMS\Vidi\Module\ModuleLoader
*/
private $fixture;

Expand All @@ -47,7 +47,7 @@ class ModuleLoaderTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {


public function setUp() {
$this->fixture = new \TYPO3\CMS\Vidi\ModuleLoader($this->dataType);
$this->fixture = new \TYPO3\CMS\Vidi\Module\ModuleLoader($this->dataType);
$this->fixture->register();
}

Expand Down Expand Up @@ -99,7 +99,7 @@ public function attributeProvider() {
* @test
*/
public function getModuleConfigurationReturnsArrayWithSomeKeys() {
$moduleLoader = new \TYPO3\CMS\Vidi\ModuleLoader($this->dataType);
$moduleLoader = new \TYPO3\CMS\Vidi\Module\ModuleLoader($this->dataType);
$moduleLoader->register();
$GLOBALS['_GET']['M'] = $this->moduleCode;

Expand All @@ -114,7 +114,7 @@ public function getModuleConfigurationReturnsArrayWithSomeKeys() {
* @test
*/
public function getModuleConfigurationWithParameterDataTypeReturnsDataType() {
$moduleLoader = new \TYPO3\CMS\Vidi\ModuleLoader($this->dataType);
$moduleLoader = new \TYPO3\CMS\Vidi\Module\ModuleLoader($this->dataType);
$moduleLoader->register();
$GLOBALS['_GET']['M'] = $this->moduleCode;
$this->assertEquals($this->dataType, $moduleLoader->getModuleConfiguration('dataType'));
Expand Down
2 changes: 1 addition & 1 deletion Tests/Unit/Tca/FieldServiceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class FieldServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {

public function setUp() {

$moduleLoader = new \TYPO3\CMS\Vidi\ModuleLoader($this->dataType);
$moduleLoader = new \TYPO3\CMS\Vidi\Module\ModuleLoader($this->dataType);
$moduleLoader->register();
$GLOBALS['_GET']['M'] = $this->moduleCode;

Expand Down
10 changes: 5 additions & 5 deletions ext_tables.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

// Check from Vidi configuration what default module should be loaded.
// Make sure the class exists to avoid a Runtime Error
if (TYPO3_MODE == 'BE' && class_exists('TYPO3\CMS\Vidi\ModuleLoader')) {
if (TYPO3_MODE == 'BE' && class_exists('TYPO3\CMS\Vidi\Module\ModuleLoader')) {

/** @var \TYPO3\CMS\Extbase\Object\ObjectManager $objectManager */
$objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Extbase\Object\ObjectManager');
Expand All @@ -18,14 +18,14 @@
// Loop around the data types and register them to be displayed within a BE module.
if ($configuration['data_types']['value']) {

/** @var \TYPO3\CMS\Vidi\ModuleLoader $moduleLoader */
$moduleLoader = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Vidi\ModuleLoader');
/** @var \TYPO3\CMS\Vidi\Module\ModuleLoader $moduleLoader */
$moduleLoader = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Vidi\Module\ModuleLoader');

$dataTypes = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $configuration['data_types']['value']);
foreach ($dataTypes as $dataType) {

/** @var \TYPO3\CMS\Vidi\ModuleLoader $moduleLoader */
$moduleLoader = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Vidi\ModuleLoader', $dataType);
/** @var \TYPO3\CMS\Vidi\Module\ModuleLoader $moduleLoader */
$moduleLoader = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Vidi\Module\ModuleLoader', $dataType);
$moduleLoader->setIcon(sprintf('EXT:vidi/Resources/Public/Images/%s.png', $dataType))
->setModuleLanguageFile(sprintf('LLL:EXT:vidi/Resources/Private/Language/%s.xlf', $dataType))
->addJavaScriptFiles(array(sprintf('EXT:vidi/Resources/Public/JavaScript/%s.js', $dataType)))
Expand Down