Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2018-06-13 23:54:08 +0300
committerRoeland Jago Douma <roeland@famdouma.nl>2018-06-13 23:54:08 +0300
commite4db293cc17acb855c9cd50f5ab9d5c840fe6dc2 (patch)
treec7a18c2ca0e2c546d5fc67fbf868b30b3b210d10 /apps/theming/lib/Controller
parentcd87a40eb3a2b7026dfd1822e6e43e131edd3423 (diff)
Fix possible test timing issues in IconController
Since the response now handles the caching. We need to provide a default ITimeFactory mock. Else you might have failing tests. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps/theming/lib/Controller')
-rw-r--r--apps/theming/lib/Controller/IconController.php6
1 files changed, 0 insertions, 6 deletions
diff --git a/apps/theming/lib/Controller/IconController.php b/apps/theming/lib/Controller/IconController.php
index 13f385e0bd1..0caf9a2bc37 100644
--- a/apps/theming/lib/Controller/IconController.php
+++ b/apps/theming/lib/Controller/IconController.php
@@ -34,15 +34,12 @@ use OCP\AppFramework\Http\NotFoundResponse;
use OCP\AppFramework\Http\FileDisplayResponse;
use OCP\AppFramework\Http\DataDisplayResponse;
use OCP\AppFramework\Http\Response;
-use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Files\NotFoundException;
use OCP\IRequest;
class IconController extends Controller {
/** @var ThemingDefaults */
private $themingDefaults;
- /** @var ITimeFactory */
- private $timeFactory;
/** @var IconBuilder */
private $iconBuilder;
/** @var ImageManager */
@@ -56,7 +53,6 @@ class IconController extends Controller {
* @param string $appName
* @param IRequest $request
* @param ThemingDefaults $themingDefaults
- * @param ITimeFactory $timeFactory
* @param IconBuilder $iconBuilder
* @param ImageManager $imageManager
* @param FileAccessHelper $fileAccessHelper
@@ -65,7 +61,6 @@ class IconController extends Controller {
$appName,
IRequest $request,
ThemingDefaults $themingDefaults,
- ITimeFactory $timeFactory,
IconBuilder $iconBuilder,
ImageManager $imageManager,
FileAccessHelper $fileAccessHelper
@@ -73,7 +68,6 @@ class IconController extends Controller {
parent::__construct($appName, $request);
$this->themingDefaults = $themingDefaults;
- $this->timeFactory = $timeFactory;
$this->iconBuilder = $iconBuilder;
$this->imageManager = $imageManager;
$this->fileAccessHelper = $fileAccessHelper;