Commit d39d1651 authored by mabolek's avatar mabolek Committed by Thomas Löffler
Browse files

[FIX] Linitng errors fixed

parent 99f968db
......@@ -2,10 +2,7 @@
namespace T3o\Karma\Controller;
<<<<<<< HEAD:extensions/karma/Classes/Controller/ManagerController.php
=======
use T3o\Karma\Domain\Model\KarmaSource;
>>>>>>> [TASK] It is possible to add karma to a user and cache it:html/typo3conf/ext/karma/Classes/Controller/ManagerController.php
use T3o\Karma\Domain\Repository\KarmaSourceRepository;
use T3o\Karma\Service\KarmaService;
use TYPO3\CMS\Extbase\Domain\Repository\FrontendUserRepository;
......@@ -69,12 +66,8 @@ class ManagerController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControll
/**
* @param KarmaSourceRepository $karmaSourceRepository
*/
<<<<<<< HEAD:extensions/karma/Classes/Controller/ManagerController.php
public function injectKarmaSourceRepository(KarmaSourceRepository $karmaSourceRepository)
{
=======
public function injectKarmaSourceRepository(KarmaSourceRepository $karmaSourceRepository) {
>>>>>>> [TASK] It is possible to add karma to a user and cache it:html/typo3conf/ext/karma/Classes/Controller/ManagerController.php
$this->karmaSourceRepository = $karmaSourceRepository;
}
......@@ -89,13 +82,7 @@ class ManagerController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControll
$this->karmaService->addKarmaToUser(12, $frontendUser, $karmaSource);
<<<<<<< HEAD:extensions/karma/Classes/Controller/ManagerController.php
$valueReturned = $this->karmaService->getImmutableKarmaForUser($frontendUser, true, true);
=======
$valueReturned = $this->karmaService->getImmutableKarmaForUser($frontendUser);
>>>>>>> [TASK] It is possible to add karma to a user and cache it:html/typo3conf/ext/karma/Classes/Controller/ManagerController.php
var_dump($valueReturned);
}
......
......@@ -2,11 +2,8 @@
namespace T3o\Karma\Domain\Model;
<<<<<<< HEAD:extensions/karma/Classes/Domain/Model/LedgerEntry.php
=======
use T3o\Karma\Domain\Model\FrontendUser;
>>>>>>> [TASK] It is possible to add karma to a user and cache it:html/typo3conf/ext/karma/Classes/Domain/Model/LedgerEntry.php
/***************************************************************
* Copyright notice
*
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment