Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adjustments for v8 #110

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Adjustments for v8 #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9749090
Adjustments for v8
Aug 7, 2017
81411c4
Fixed OffPageItemListViewhelper to prevent breaking htmlescaped output
Oct 29, 2018
02b259b
Merge pull request #1 from hrym55/typo3-v8
kiwi2101 Oct 29, 2018
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
12 changes: 6 additions & 6 deletions Classes/Controller/AbstractController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,14 +134,14 @@ abstract class Tx_Yag_Controller_AbstractController extends Tx_PtExtbase_Control


/**
* @var Tx_Yag_Domain_Repository_ItemRepository
* @var \Tx_Yag_Domain_Repository_ItemRepository
*/
protected $itemRepository;



/**
* @var Tx_PtExtbase_State_Session_SessionPersistenceManagerBuilder
* @var \Tx_PtExtbase_State_Session_SessionPersistenceManagerBuilder
*/
protected $sessionPersistenceManagerBuilder;

Expand All @@ -150,9 +150,9 @@ abstract class Tx_Yag_Controller_AbstractController extends Tx_PtExtbase_Control
* Constructor triggers creation of lifecycle manager
*
* @param Tx_PtExtbase_Lifecycle_Manager $lifecycleManager
* @param Tx_PtExtbase_State_Session_SessionPersistenceManagerBuilder $sessionPersistenceManagerBuilder
* @param \Tx_PtExtbase_State_Session_SessionPersistenceManagerBuilder $sessionPersistenceManagerBuilder
*/
public function __construct(Tx_PtExtbase_Lifecycle_Manager $lifecycleManager, Tx_PtExtbase_State_Session_SessionPersistenceManagerBuilder $sessionPersistenceManagerBuilder)
public function __construct(Tx_PtExtbase_Lifecycle_Manager $lifecycleManager, \Tx_PtExtbase_State_Session_SessionPersistenceManagerBuilder $sessionPersistenceManagerBuilder)
{
if (TYPO3_MODE === 'BE') {
GeneralUtility::makeInstance('Tx_Yag_Utility_TCAUtility')->deactivateHiddenFields();
Expand Down Expand Up @@ -209,9 +209,9 @@ public function injectAlbumRepository(Tx_Yag_Domain_Repository_AlbumRepository $


/**
* @param Tx_Yag_Domain_Repository_ItemRepository $itemRepository
* @param \Tx_Yag_Domain_Repository_ItemRepository $itemRepository
*/
public function injectItemRepository(Tx_Yag_Domain_Repository_ItemRepository $itemRepository)
public function injectItemRepository(\Tx_Yag_Domain_Repository_ItemRepository $itemRepository)
{
$this->itemRepository = $itemRepository;
}
Expand Down
8 changes: 4 additions & 4 deletions Classes/Controller/AjaxController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class Tx_Yag_Controller_AjaxController extends Tx_Yag_Controller_AbstractControl
/**
* Holds an instance of item repository
*
* @var Tx_Yag_Domain_Repository_ItemRepository
* @var \Tx_Yag_Domain_Repository_ItemRepository
*/
protected $itemRepository;

Expand Down Expand Up @@ -65,9 +65,9 @@ class Tx_Yag_Controller_AjaxController extends Tx_Yag_Controller_AbstractControl


/**
* @param Tx_Yag_Domain_Repository_ItemRepository $itemRepository
* @param \Tx_Yag_Domain_Repository_ItemRepository $itemRepository
*/
public function injectItemRepository(Tx_Yag_Domain_Repository_ItemRepository $itemRepository)
public function injectItemRepository(\Tx_Yag_Domain_Repository_ItemRepository $itemRepository)
{
$this->itemRepository = $itemRepository;
}
Expand Down Expand Up @@ -499,7 +499,7 @@ protected function returnDataAndShutDown($content = 'OK')
{
$this->persistenceManager->persistAll();
$this->lifecycleManager->updateState(Tx_PtExtbase_Lifecycle_Manager::END);
GeneralUtility::cleanOutputBuffers();
GeneralUtility::flushOutputBuffers();
echo $content;
exit();
}
Expand Down
2 changes: 1 addition & 1 deletion Classes/Controller/BackendController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public function maintenanceOverviewAction()
$this->forward('dbUpdateNeeded');
}

$itemRepository = $this->objectManager->get('Tx_Yag_Domain_Repository_ItemRepository'); /* @var $itemRepository Tx_Yag_Domain_Repository_ItemRepository */
$itemRepository = $this->objectManager->get('Tx_Yag_Domain_Repository_ItemRepository'); /* @var $itemRepository \Tx_Yag_Domain_Repository_ItemRepository */

$galleryCount = $this->objectManager->get('Tx_Yag_Domain_Repository_GalleryRepository')->countAll();
$albumCount = $this->objectManager->get('Tx_Yag_Domain_Repository_AlbumRepository')->countAll();
Expand Down
4 changes: 2 additions & 2 deletions Classes/Controller/ResolutionFileCacheController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public function clearResolutionFileCacheAction()
*/
public function buildAllItemResolutionsAction()
{
$itemRepository = $this->objectManager->get('Tx_Yag_Domain_Repository_ItemRepository'); /* @var $itemRepository Tx_Yag_Domain_Repository_ItemRepository */
$itemRepository = $this->objectManager->get('\Tx_Yag_Domain_Repository_ItemRepository'); /* @var $itemRepository \Tx_Yag_Domain_Repository_ItemRepository */
$items = $itemRepository->findAll();

foreach ($items as $item) {
Expand Down Expand Up @@ -117,7 +117,7 @@ protected function buildReturnArray(Tx_Yag_Domain_Model_Item $item)
$itemFileResolution = $this->resolutionFileCache->getItemFileResolutionPathByConfiguration($item, $resolutionConfig);

// The next image uid
$nextItem = $this->objectManager->get('Tx_Yag_Domain_Repository_ItemRepository')->getItemsAfterThisItem($item);
$nextItem = $this->objectManager->get('\Tx_Yag_Domain_Repository_ItemRepository')->getItemsAfterThisItem($item);
$nextItemUid = 0;
if ($nextItem) {
$nextItemUid = $nextItem->getUid();
Expand Down
2 changes: 1 addition & 1 deletion Classes/Domain/Context/YagContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ public function getItem()
if ($this->selectedItem instanceof Tx_Yag_Domain_Model_Item && $this->selectedItem->getUid() == $this->selectedItemUid) {
return $this->selectedItem;
} else {
return $this->objectManager->get('Tx_Yag_Domain_Repository_ItemRepository')->findByUid($this->selectedItemUid);
return $this->objectManager->get('\Tx_Yag_Domain_Repository_ItemRepository')->findByUid($this->selectedItemUid);
}
}

Expand Down
22 changes: 11 additions & 11 deletions Classes/Domain/Context/YagContextFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,31 +38,31 @@ class Tx_Yag_Domain_Context_YagContextFactory
* @var Tx_Yag_Domain_Context_YagContext
*/
protected static $instances = [];


/**
* Identifier of the active context
*
*
* @var string
*/
protected static $activeContext = null;


/**
* Create and store a named context
*
* Create and store a named context
*
* @param string $identifier
* @param boolean $resetInstance
* @return Tx_Yag_Domain_Context_YagContext
*/
public static function createInstance($identifier, $resetInstance = false)
{
self::$activeContext = $identifier;

if (self::$instances[$identifier] == null || $resetInstance) {
$objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Object\\ObjectManager'); /** @var $objectManager \TYPO3\CMS\Extbase\Object\ObjectManager */
$extensionNameSpace = $objectManager->get('Tx_Yag_Extbase_ExtbaseContext')->getExtensionNameSpace();

$yagContext = $objectManager->get('Tx_Yag_Domain_Context_YagContext', $identifier); /** @var Tx_Yag_Domain_Context_YagContext $yagContext */
$yagContext->_injectConfigurationBuilder(Tx_Yag_Domain_Configuration_ConfigurationBuilderFactory::getInstance());

Expand All @@ -79,7 +79,7 @@ public static function createInstance($identifier, $resetInstance = false)

self::$instances[$identifier] = $yagContext;
}

return self::$instances[$identifier];
}

Expand All @@ -99,7 +99,7 @@ public static function getInstance($identifier = '')
if (!$identifier || !array_key_exists($identifier, self::$instances)) {
throw new Exception('No active context found!', 1299089647);
}

return self::$instances[$identifier];
}
}
6 changes: 3 additions & 3 deletions Classes/Domain/Import/AbstractImporter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ abstract class Tx_Yag_Domain_Import_AbstractImporter implements Tx_Yag_Domain_Im
/**
* Holds an instance of item repository
*
* @var Tx_Yag_Domain_Repository_ItemRepository
* @var \Tx_Yag_Domain_Repository_ItemRepository
*/
protected $itemRepository;

Expand Down Expand Up @@ -179,9 +179,9 @@ public function injectFileManager(Tx_Yag_Domain_FileSystem_FileManager $fileMana
/**
* Injector for item repository
*
* @param Tx_Yag_Domain_Repository_ItemRepository $itemRepository
* @param \Tx_Yag_Domain_Repository_ItemRepository $itemRepository
*/
public function injectItemRepository(Tx_Yag_Domain_Repository_ItemRepository $itemRepository)
public function injectItemRepository(\Tx_Yag_Domain_Repository_ItemRepository $itemRepository)
{
$this->itemRepository = $itemRepository;
}
Expand Down
6 changes: 3 additions & 3 deletions Classes/Domain/Model/Album.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,8 +531,8 @@ public function getIsGalleryThumb()
*/
public function updateSorting($sortingField, $sortingDirection)
{
$itemRepository = $this->objectManager->get('Tx_Yag_Domain_Repository_ItemRepository');
/* @var Tx_Yag_Domain_Repository_ItemRepository $itemRepository */
$itemRepository = $this->objectManager->get('\Tx_Yag_Domain_Repository_ItemRepository');
/* @var \Tx_Yag_Domain_Repository_ItemRepository $itemRepository */
$sortedItems = $itemRepository->getSortedItemsByAlbumFieldAndDirection($this, $sortingField, $sortingDirection);
$this->items = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
foreach ($sortedItems as $item) {
Expand All @@ -549,7 +549,7 @@ public function updateSorting($sortingField, $sortingDirection)
public function getMaxSorting()
{
$itemRepository = $this->objectManager->get('Tx_Yag_Domain_Repository_ItemRepository');
/* @var $itemRepository Tx_Yag_Domain_Repository_ItemRepository */
/* @var $itemRepository \Tx_Yag_Domain_Repository_ItemRepository */
$maxSortingItem = $itemRepository->getItemWithMaxSortingForAlbum($this);
if (count($maxSortingItem) > 0) {
return $maxSortingItem[0]->getSorting();
Expand Down
Loading