Skip to content
Snippets Groups Projects
Commit 22907296 authored by Kevin Ditscheid's avatar Kevin Ditscheid
Browse files

[TASK] Replace @inject with inject methods

parent 2faec617
No related branches found
No related tags found
1 merge request!25Feature upgrade to typo3 10
...@@ -29,7 +29,7 @@ namespace SGalinski\SgNews\Controller; ...@@ -29,7 +29,7 @@ namespace SGalinski\SgNews\Controller;
use RuntimeException; use RuntimeException;
use SGalinski\SgNews\Domain\Model\Category; use SGalinski\SgNews\Domain\Model\Category;
use SGalinski\SgNews\Domain\Model\News; use SGalinski\SgNews\Domain\Model\News;
use SGalinski\SgNews\Utility\ExtensionUtility; use SGalinski\SgNews\Service\ImageService;
use TYPO3\CMS\Extbase\Domain\Model\FileReference; use TYPO3\CMS\Extbase\Domain\Model\FileReference;
use TYPO3\CMS\Extbase\Mvc\Controller\ActionController; use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
...@@ -38,8 +38,7 @@ use TYPO3\CMS\Extbase\Mvc\Controller\ActionController; ...@@ -38,8 +38,7 @@ use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
*/ */
abstract class AbstractController extends ActionController { abstract class AbstractController extends ActionController {
/** /**
* @inject * @var ImageService
* @var \SGalinski\SgNews\Service\ImageService
*/ */
protected $imageService; protected $imageService;
...@@ -65,6 +64,13 @@ abstract class AbstractController extends ActionController { ...@@ -65,6 +64,13 @@ abstract class AbstractController extends ActionController {
parent::initializeAction(); parent::initializeAction();
} }
/**
* @param ImageService $imageService
*/
public function injectImageService(ImageService $imageService) {
$this->imageService = $imageService;
}
/** /**
* Error Handler * Error Handler
* *
......
...@@ -28,6 +28,9 @@ namespace SGalinski\SgNews\Controller; ...@@ -28,6 +28,9 @@ namespace SGalinski\SgNews\Controller;
use SGalinski\SgNews\Domain\Model\Category; use SGalinski\SgNews\Domain\Model\Category;
use SGalinski\SgNews\Domain\Model\News; use SGalinski\SgNews\Domain\Model\News;
use SGalinski\SgNews\Domain\Repository\CategoryRepository;
use SGalinski\SgNews\Domain\Repository\NewsRepository;
use SGalinski\SgNews\Domain\Repository\TagRepository;
use SGalinski\SgNews\Service\ConfigurationService; use SGalinski\SgNews\Service\ConfigurationService;
use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Core\Utility\GeneralUtility;
...@@ -36,20 +39,17 @@ use TYPO3\CMS\Core\Utility\GeneralUtility; ...@@ -36,20 +39,17 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
*/ */
class LatestController extends AbstractController { class LatestController extends AbstractController {
/** /**
* @inject * @var CategoryRepository
* @var \SGalinski\SgNews\Domain\Repository\CategoryRepository
*/ */
protected $categoryRepository; protected $categoryRepository;
/** /**
* @inject * @var TagRepository
* @var \SGalinski\SgNews\Domain\Repository\TagRepository
*/ */
protected $tagRepository; protected $tagRepository;
/** /**
* @inject * @var NewsRepository
* @var \SGalinski\SgNews\Domain\Repository\NewsRepository
*/ */
protected $newsRepository; protected $newsRepository;
...@@ -118,4 +118,26 @@ class LatestController extends AbstractController { ...@@ -118,4 +118,26 @@ class LatestController extends AbstractController {
$this->view->assign('newsMetaData', $newsMetaData); $this->view->assign('newsMetaData', $newsMetaData);
} }
/**
* @param CategoryRepository $categoryRepository
*/
public function injectCategoryRepository(CategoryRepository $categoryRepository
) {
$this->categoryRepository = $categoryRepository;
}
/**
* @param NewsRepository $newsRepository
*/
public function injectNewsRepository(NewsRepository $newsRepository) {
$this->newsRepository = $newsRepository;
}
/**
* @param TagRepository $tagRepository
*/
public function injectTagRepository(TagRepository $tagRepository) {
$this->tagRepository = $tagRepository;
}
} }
...@@ -27,6 +27,9 @@ namespace SGalinski\SgNews\Controller; ...@@ -27,6 +27,9 @@ namespace SGalinski\SgNews\Controller;
***************************************************************/ ***************************************************************/
use SGalinski\SgNews\Domain\Model\News; use SGalinski\SgNews\Domain\Model\News;
use SGalinski\SgNews\Domain\Repository\CategoryRepository;
use SGalinski\SgNews\Domain\Repository\NewsRepository;
use SGalinski\SgNews\Domain\Repository\TagRepository;
use SGalinski\SgNews\Service\ConfigurationService; use SGalinski\SgNews\Service\ConfigurationService;
use SGalinski\SgNews\Service\HeaderMetaDataService; use SGalinski\SgNews\Service\HeaderMetaDataService;
use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Core\Utility\GeneralUtility;
...@@ -37,20 +40,17 @@ use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface; ...@@ -37,20 +40,17 @@ use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
*/ */
class ListByCategoryController extends AbstractController { class ListByCategoryController extends AbstractController {
/** /**
* @inject * @var CategoryRepository
* @var \SGalinski\SgNews\Domain\Repository\CategoryRepository
*/ */
protected $categoryRepository; protected $categoryRepository;
/** /**
* @inject * @var TagRepository
* @var \SGalinski\SgNews\Domain\Repository\TagRepository
*/ */
protected $tagRepository; protected $tagRepository;
/** /**
* @inject * @var NewsRepository
* @var \SGalinski\SgNews\Domain\Repository\NewsRepository
*/ */
protected $newsRepository; protected $newsRepository;
...@@ -66,6 +66,28 @@ class ListByCategoryController extends AbstractController { ...@@ -66,6 +66,28 @@ class ListByCategoryController extends AbstractController {
} }
} }
/**
* @param CategoryRepository $categoryRepository
*/
public function injectCategoryRepository(CategoryRepository $categoryRepository
) {
$this->categoryRepository = $categoryRepository;
}
/**
* @param NewsRepository $newsRepository
*/
public function injectNewsRepository(NewsRepository $newsRepository) {
$this->newsRepository = $newsRepository;
}
/**
* @param TagRepository $tagRepository
*/
public function injectTagRepository(TagRepository $tagRepository) {
$this->tagRepository = $tagRepository;
}
/** /**
* Renders the news list of a category * Renders the news list of a category
* *
......
...@@ -26,6 +26,7 @@ namespace SGalinski\SgNews\Controller; ...@@ -26,6 +26,7 @@ namespace SGalinski\SgNews\Controller;
* This copyright notice MUST APPEAR in all copies of the script! * This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/ ***************************************************************/
use SGalinski\SgNews\Domain\Repository\NewsRepository;
use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Core\Utility\GeneralUtility;
/** /**
...@@ -33,8 +34,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility; ...@@ -33,8 +34,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
*/ */
class NewsFeedController extends AbstractController { class NewsFeedController extends AbstractController {
/** /**
* @inject * @var NewsRepository
* @var \SGalinski\SgNews\Domain\Repository\NewsRepository
*/ */
protected $newsRepository; protected $newsRepository;
...@@ -53,4 +53,11 @@ class NewsFeedController extends AbstractController { ...@@ -53,4 +53,11 @@ class NewsFeedController extends AbstractController {
); );
$this->view->assign('news', $news); $this->view->assign('news', $news);
} }
/**
* @param NewsRepository $newsRepository
*/
public function injectNewsRepository(NewsRepository $newsRepository) {
$this->newsRepository = $newsRepository;
}
} }
...@@ -29,6 +29,9 @@ namespace SGalinski\SgNews\Controller; ...@@ -29,6 +29,9 @@ namespace SGalinski\SgNews\Controller;
use SGalinski\SgNews\Domain\Model\Category; use SGalinski\SgNews\Domain\Model\Category;
use SGalinski\SgNews\Domain\Model\Tag; use SGalinski\SgNews\Domain\Model\Tag;
use SGalinski\SgNews\Domain\Model\News; use SGalinski\SgNews\Domain\Model\News;
use SGalinski\SgNews\Domain\Repository\CategoryRepository;
use SGalinski\SgNews\Domain\Repository\NewsRepository;
use SGalinski\SgNews\Domain\Repository\TagRepository;
use SGalinski\SgNews\Service\ConfigurationService; use SGalinski\SgNews\Service\ConfigurationService;
use SGalinski\SgNews\Service\HeaderMetaDataService; use SGalinski\SgNews\Service\HeaderMetaDataService;
use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Core\Utility\GeneralUtility;
...@@ -41,20 +44,17 @@ use TYPO3\CMS\Extbase\Persistence\QueryInterface; ...@@ -41,20 +44,17 @@ use TYPO3\CMS\Extbase\Persistence\QueryInterface;
*/ */
class OverviewController extends AbstractController { class OverviewController extends AbstractController {
/** /**
* @inject * @var CategoryRepository
* @var \SGalinski\SgNews\Domain\Repository\CategoryRepository
*/ */
protected $categoryRepository; protected $categoryRepository;
/** /**
* @inject * @var TagRepository
* @var \SGalinski\SgNews\Domain\Repository\TagRepository
*/ */
protected $tagRepository; protected $tagRepository;
/** /**
* @inject * @var NewsRepository
* @var \SGalinski\SgNews\Domain\Repository\NewsRepository
*/ */
protected $newsRepository; protected $newsRepository;
...@@ -450,6 +450,28 @@ class OverviewController extends AbstractController { ...@@ -450,6 +450,28 @@ class OverviewController extends AbstractController {
} }
} }
/**
* @param CategoryRepository $categoryRepository
*/
public function injectCategoryRepository(CategoryRepository $categoryRepository
) {
$this->categoryRepository = $categoryRepository;
}
/**
* @param NewsRepository $newsRepository
*/
public function injectNewsRepository(NewsRepository $newsRepository) {
$this->newsRepository = $newsRepository;
}
/**
* @param TagRepository $tagRepository
*/
public function injectTagRepository(TagRepository $tagRepository) {
$this->tagRepository = $tagRepository;
}
/** /**
* Renders the news in a paginated list * Renders the news in a paginated list
* *
......
...@@ -28,33 +28,33 @@ namespace SGalinski\SgNews\Controller; ...@@ -28,33 +28,33 @@ namespace SGalinski\SgNews\Controller;
use SGalinski\SgNews\Domain\Model\Category; use SGalinski\SgNews\Domain\Model\Category;
use SGalinski\SgNews\Domain\Model\News; use SGalinski\SgNews\Domain\Model\News;
use SGalinski\SgNews\Domain\Repository\CategoryRepository;
use SGalinski\SgNews\Domain\Repository\NewsRepository;
use SGalinski\SgNews\Domain\Repository\TagRepository;
use SGalinski\SgNews\Service\HeaderMetaDataService; use SGalinski\SgNews\Service\HeaderMetaDataService;
use TYPO3\CMS\Core\Charset\CharsetConverter;
/** /**
* Controller that handles the news single view page * Controller that handles the news single view page
*/ */
class SingleViewController extends AbstractController { class SingleViewController extends AbstractController {
/** /**
* @inject * @var CategoryRepository
* @var \SGalinski\SgNews\Domain\Repository\CategoryRepository
*/ */
protected $categoryRepository; protected $categoryRepository;
/** /**
* @inject * @var TagRepository
* @var \SGalinski\SgNews\Domain\Repository\TagRepository
*/ */
protected $tagRepository; protected $tagRepository;
/** /**
* @inject * @var NewsRepository
* @var \SGalinski\SgNews\Domain\Repository\NewsRepository
*/ */
protected $newsRepository; protected $newsRepository;
/** /**
* @inject * @var CharsetConverter
* @var \TYPO3\CMS\Core\Charset\CharsetConverter
*/ */
protected $characterSetConverter; protected $characterSetConverter;
...@@ -113,4 +113,33 @@ class SingleViewController extends AbstractController { ...@@ -113,4 +113,33 @@ class SingleViewController extends AbstractController {
] ]
); );
} }
/**
* @param CategoryRepository $categoryRepository
*/
public function injectCategoryRepository(CategoryRepository $categoryRepository
) {
$this->categoryRepository = $categoryRepository;
}
/**
* @param CharsetConverter $characterSetConverter
*/
public function injectCharacterSetConverter(CharsetConverter $characterSetConverter) {
$this->characterSetConverter = $characterSetConverter;
}
/**
* @param NewsRepository $newsRepository
*/
public function injectNewsRepository(NewsRepository $newsRepository) {
$this->newsRepository = $newsRepository;
}
/**
* @param TagRepository $tagRepository
*/
public function injectTagRepository(TagRepository $tagRepository) {
$this->tagRepository = $tagRepository;
}
} }
...@@ -26,6 +26,7 @@ namespace SGalinski\SgNews\Service; ...@@ -26,6 +26,7 @@ namespace SGalinski\SgNews\Service;
* This copyright notice MUST APPEAR in all copies of the script! * This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/ ***************************************************************/
use TYPO3\CMS\Core\Charset\CharsetConverter;
use TYPO3\CMS\Core\SingletonInterface; use TYPO3\CMS\Core\SingletonInterface;
use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Domain\Model\FileReference; use TYPO3\CMS\Extbase\Domain\Model\FileReference;
...@@ -35,8 +36,7 @@ use TYPO3\CMS\Extbase\Domain\Model\FileReference; ...@@ -35,8 +36,7 @@ use TYPO3\CMS\Extbase\Domain\Model\FileReference;
*/ */
class ImageService implements SingletonInterface { class ImageService implements SingletonInterface {
/** /**
* @inject * @var CharsetConverter
* @var \TYPO3\CMS\Core\Charset\CharsetConverter
*/ */
protected $characterSetConverter; protected $characterSetConverter;
...@@ -92,4 +92,11 @@ class ImageService implements SingletonInterface { ...@@ -92,4 +92,11 @@ class ImageService implements SingletonInterface {
return $croppedImage; return $croppedImage;
} }
/**
* @param CharsetConverter $characterSetConverter
*/
public function injectCharacterSetConverter(CharsetConverter $characterSetConverter) {
$this->characterSetConverter = $characterSetConverter;
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment