From e9094b8a41e81fbd4f86aae5a4cadcab0674d93c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 18 Nov 2015 10:34:52 +0100
Subject: [PATCH] Only require the interface
---
apps/files/lib/activity.php | 8 ++++----
apps/files/tests/activitytest.php | 12 ++++++------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/apps/files/lib/activity.php b/apps/files/lib/activity.php
index c171b3bfabf..132f4169dee 100644
--- a/apps/files/lib/activity.php
+++ b/apps/files/lib/activity.php
@@ -22,7 +22,7 @@
namespace OCA\Files;
-use OC\L10N\Factory;
+use OCP\L10N\IFactory;
use OCP\Activity\IExtension;
use OCP\Activity\IManager;
use OCP\IConfig;
@@ -43,7 +43,7 @@ class Activity implements IExtension {
/** @var IL10N */
protected $l;
- /** @var Factory */
+ /** @var IFactory */
protected $languageFactory;
/** @var IURLGenerator */
@@ -59,13 +59,13 @@ class Activity implements IExtension {
protected $helper;
/**
- * @param Factory $languageFactory
+ * @param IFactory $languageFactory
* @param IURLGenerator $URLGenerator
* @param IManager $activityManager
* @param ActivityHelper $helper
* @param IConfig $config
*/
- public function __construct(Factory $languageFactory, IURLGenerator $URLGenerator, IManager $activityManager, ActivityHelper $helper, IConfig $config) {
+ public function __construct(IFactory $languageFactory, IURLGenerator $URLGenerator, IManager $activityManager, ActivityHelper $helper, IConfig $config) {
$this->languageFactory = $languageFactory;
$this->URLGenerator = $URLGenerator;
$this->l = $this->getL10N();
diff --git a/apps/files/tests/activitytest.php b/apps/files/tests/activitytest.php
index f6a21a7db62..6a3424e727a 100644
--- a/apps/files/tests/activitytest.php
+++ b/apps/files/tests/activitytest.php
@@ -30,19 +30,19 @@ class ActivityTest extends TestCase {
/** @var \OC\ActivityManager */
private $activityManager;
- /** @var \PHPUnit_Framework_MockObject_MockObject */
+ /** @var \OCP\IRequest|\PHPUnit_Framework_MockObject_MockObject */
protected $request;
- /** @var \PHPUnit_Framework_MockObject_MockObject */
+ /** @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject */
protected $session;
- /** @var \PHPUnit_Framework_MockObject_MockObject */
+ /** @var \OCP\IConfig|\PHPUnit_Framework_MockObject_MockObject */
protected $config;
- /** @var \PHPUnit_Framework_MockObject_MockObject */
+ /** @var \OCA\Files\ActivityHelper|\PHPUnit_Framework_MockObject_MockObject */
protected $activityHelper;
- /** @var \PHPUnit_Framework_MockObject_MockObject */
+ /** @var \OCP\L10N\IFactory|\PHPUnit_Framework_MockObject_MockObject */
protected $l10nFactory;
/** @var \OCA\Files\Activity */
@@ -70,7 +70,7 @@ class ActivityTest extends TestCase {
$this->config
);
- $this->l10nFactory = $this->getMockBuilder('OC\L10N\Factory')
+ $this->l10nFactory = $this->getMockBuilder('OCP\L10N\IFactory')
->disableOriginalConstructor()
->getMock();
$deL10n = $this->getMockBuilder('OC_L10N')
--
GitLab