Inject the database connection
This commit is contained in:
parent
e9094b8a41
commit
23046ca5b7
|
@ -65,6 +65,7 @@ $templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadshe
|
||||||
new \OCA\Files\ActivityHelper(
|
new \OCA\Files\ActivityHelper(
|
||||||
\OC::$server->getTagManager()
|
\OC::$server->getTagManager()
|
||||||
),
|
),
|
||||||
|
\OC::$server->getDatabaseConnection(),
|
||||||
\OC::$server->getConfig()
|
\OC::$server->getConfig()
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
|
|
||||||
namespace OCA\Files;
|
namespace OCA\Files;
|
||||||
|
|
||||||
|
use OCP\IDBConnection;
|
||||||
use OCP\L10N\IFactory;
|
use OCP\L10N\IFactory;
|
||||||
use OCP\Activity\IExtension;
|
use OCP\Activity\IExtension;
|
||||||
use OCP\Activity\IManager;
|
use OCP\Activity\IManager;
|
||||||
|
@ -52,6 +53,9 @@ class Activity implements IExtension {
|
||||||
/** @var \OCP\Activity\IManager */
|
/** @var \OCP\Activity\IManager */
|
||||||
protected $activityManager;
|
protected $activityManager;
|
||||||
|
|
||||||
|
/** @var \OCP\IDBConnection */
|
||||||
|
protected $connection;
|
||||||
|
|
||||||
/** @var \OCP\IConfig */
|
/** @var \OCP\IConfig */
|
||||||
protected $config;
|
protected $config;
|
||||||
|
|
||||||
|
@ -63,14 +67,16 @@ class Activity implements IExtension {
|
||||||
* @param IURLGenerator $URLGenerator
|
* @param IURLGenerator $URLGenerator
|
||||||
* @param IManager $activityManager
|
* @param IManager $activityManager
|
||||||
* @param ActivityHelper $helper
|
* @param ActivityHelper $helper
|
||||||
|
* @param IDBConnection $connection
|
||||||
* @param IConfig $config
|
* @param IConfig $config
|
||||||
*/
|
*/
|
||||||
public function __construct(IFactory $languageFactory, IURLGenerator $URLGenerator, IManager $activityManager, ActivityHelper $helper, IConfig $config) {
|
public function __construct(IFactory $languageFactory, IURLGenerator $URLGenerator, IManager $activityManager, ActivityHelper $helper, IDBConnection $connection, IConfig $config) {
|
||||||
$this->languageFactory = $languageFactory;
|
$this->languageFactory = $languageFactory;
|
||||||
$this->URLGenerator = $URLGenerator;
|
$this->URLGenerator = $URLGenerator;
|
||||||
$this->l = $this->getL10N();
|
$this->l = $this->getL10N();
|
||||||
$this->activityManager = $activityManager;
|
$this->activityManager = $activityManager;
|
||||||
$this->helper = $helper;
|
$this->helper = $helper;
|
||||||
|
$this->connection = $connection;
|
||||||
$this->config = $config;
|
$this->config = $config;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -391,7 +397,7 @@ class Activity implements IExtension {
|
||||||
}
|
}
|
||||||
foreach ($favorites['folders'] as $favorite) {
|
foreach ($favorites['folders'] as $favorite) {
|
||||||
$fileQueryList[] = '`file` LIKE ?';
|
$fileQueryList[] = '`file` LIKE ?';
|
||||||
$parameters[] = \OC::$server->getDatabaseConnection()->escapeLikeParameter($favorite) . '/%';
|
$parameters[] = $this->connection->escapeLikeParameter($favorite) . '/%';
|
||||||
}
|
}
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
|
|
@ -25,6 +25,12 @@ namespace OCA\Files\Tests;
|
||||||
use OCA\Files\Activity;
|
use OCA\Files\Activity;
|
||||||
use Test\TestCase;
|
use Test\TestCase;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class ActivityTest
|
||||||
|
*
|
||||||
|
* @group DB
|
||||||
|
* @package OCA\Files\Tests
|
||||||
|
*/
|
||||||
class ActivityTest extends TestCase {
|
class ActivityTest extends TestCase {
|
||||||
|
|
||||||
/** @var \OC\ActivityManager */
|
/** @var \OC\ActivityManager */
|
||||||
|
@ -95,6 +101,7 @@ class ActivityTest extends TestCase {
|
||||||
$this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock(),
|
$this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock(),
|
||||||
$this->activityManager,
|
$this->activityManager,
|
||||||
$this->activityHelper,
|
$this->activityHelper,
|
||||||
|
\OC::$server->getDatabaseConnection(),
|
||||||
$this->config
|
$this->config
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue