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.

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

[TASK] Make it compatible with new version of ext:News 3.2.0 #1

Merged
merged 1 commit into from Dec 18, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Classes/Controller/EventController.php
Expand Up @@ -13,7 +13,7 @@
* @subpackage roq_newsevent
* @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3 or later
*/
class Tx_RoqNewsevent_Controller_EventController extends Tx_News_Controller_NewsController {
class Tx_RoqNewsevent_Controller_EventController extends \GeorgRinger\News\Controller\NewsController {

/**
* eventRepository
Expand Down
2 changes: 1 addition & 1 deletion Classes/Domain/Model/Event.php
Expand Up @@ -30,7 +30,7 @@
* @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3 or later
*
*/
class Tx_RoqNewsevent_Domain_Model_Event extends Tx_News_Domain_Model_News {
class Tx_RoqNewsevent_Domain_Model_Event extends \GeorgRinger\News\Domain\Model\News {

/**
* Is event
Expand Down
6 changes: 3 additions & 3 deletions Classes/Domain/Repository/EventRepository.php
Expand Up @@ -13,7 +13,7 @@
* @subpackage roq_newsevent
* @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3 or later
*/
class Tx_RoqNewsevent_Domain_Repository_EventRepository extends Tx_News_Domain_Repository_NewsRepository {
class Tx_RoqNewsevent_Domain_Repository_EventRepository extends GeorgRinger\News\Domain\Repository\NewsRepository {

/**
* Returns the constraint to determine if a news event is active or not (archived)
Expand Down Expand Up @@ -54,12 +54,12 @@ protected function createIsActiveConstraint(\TYPO3\CMS\Extbase\Persistence\Query

/**
* @param \TYPO3\CMS\Extbase\Persistence\QueryInterface $query
* @param Tx_News_Domain_Model_DemandInterface $demand
* @param \GeorgRinger\News\Domain\Model\DemandInterface $demand
* @return array
* @throws InvalidArgumentException
* @throws Exception
*/
protected function createConstraintsFromDemand(\TYPO3\CMS\Extbase\Persistence\QueryInterface $query, Tx_News_Domain_Model_DemandInterface $demand) {
protected function createConstraintsFromDemand(\TYPO3\CMS\Extbase\Persistence\QueryInterface $query, \GeorgRinger\News\Domain\Model\DemandInterface $demand) {
$constraints = array();

if ($demand->getCategories() && $demand->getCategories() !== '0') {
Expand Down
2 changes: 1 addition & 1 deletion Classes/Hooks/CmsLayout.php
Expand Up @@ -28,7 +28,7 @@
* @package TYPO3
* @subpackage tx_news
*/
class Tx_Roqnewsevent_Hooks_CmsLayout extends Tx_News_Hooks_CmsLayout {
class Tx_Roqnewsevent_Hooks_CmsLayout extends \GeorgRinger\News\Hooks\PageLayoutView {

/**
* Path to the locallang file
Expand Down
6 changes: 4 additions & 2 deletions Configuration/TypoScript/setup.txt
Expand Up @@ -2,7 +2,7 @@
config.tx_extbase {
persistence {
classes {
Tx_News_Domain_Model_News {
GeorgRinger\News\Domain\Model\News {
subclasses {
Tx_RoqNewsevent_Event = Tx_RoqNewsevent_Domain_Model_Event
}
Expand All @@ -26,7 +26,9 @@ config.tx_extbase {
}

objects {
Tx_News_Controller_NewsController.className = Tx_RoqNewsevent_Controller_EventController
GeorgRinger\News\Controller\NewsController {
className = Tx_RoqNewsevent_Controller_EventController
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -5,6 +5,6 @@
"homepage": "https://github.com/visol/roq_newsevent",
"license": ["GPL-2.0+"],
"require": {
"typo3-ter/news": ">=3.1.0,<=3.99.99"
"news": ">=3.2.0,<=3.99.99"
}
}
2 changes: 1 addition & 1 deletion ext_emconf.php
Expand Up @@ -37,7 +37,7 @@
'depends' =>
array (
'typo3' => '6.2.0-6.2.99',
'news' => '3.1.0-3.99.99',
'news' => '3.2.0-3.99.99',
),
'conflicts' =>
array (
Expand Down