mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix for Nextcloud9

This commit is contained in:
Joas Schilling 2016-09-06 11:28:25 +02:00
parent 996f2019f7
commit 110bd5e36e
No known key found for this signature in database
GPG Key ID: E166FD8976B3BAC8
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/theming/lib/capabilities.php
View File

@ -24,7 +24,6 @@
namespace OCA\Theming;
use OCP\Capabilities\ICapability;
use OCP\IURLGenerator;
/**
* Class Capabilities
@ -33,13 +32,13 @@ use OCP\IURLGenerator;
*/
class Capabilities implements ICapability {
/** @var ThemingDefaults */
/** @var Template */
protected $theming;
/**
* @param ThemingDefaults $theming
* @param Template $theming
*/
public function __construct(ThemingDefaults $theming) {
public function __construct(Template $theming) {
$this->theming = $theming;
}

7
apps/theming/tests/CapabilitiesTest.php
View File

@ -22,8 +22,7 @@
namespace OCA\Theming\Tests;
use OCA\Theming\Capabilities;
use OCA\Theming\ThemingDefaults;
use OCP\IURLGenerator;
use OCA\Theming\Template;
use Test\TestCase;
/**
@ -33,7 +32,7 @@ use Test\TestCase;
* @package OCA\Theming\Tests
*/
class CapabilitiesTest extends TestCase {
/** @var ThemingDefaults|\PHPUnit_Framework_MockObject_MockObject */
/** @var Template|\PHPUnit_Framework_MockObject_MockObject */
protected $theming;
/** @var Capabilities */
@ -42,7 +41,7 @@ class CapabilitiesTest extends TestCase {
protected function setUp() {
parent::setUp();
$this->theming = $this->getMockBuilder('OCA\Theming\ThemingDefaults')
$this->theming = $this->getMockBuilder('OCA\Theming\Template')
->disableOriginalConstructor()
->getMock();

13
apps/theming/tests/ServicesTest.php
View File

@ -50,18 +50,11 @@ class ServicesTest extends TestCase {
// lib/
['OCA\Theming\Capabilities'],
['OCA\Theming\Capabilities', 'OCP\Capabilities\ICapability'],
['OCA\Theming\ThemingDefaults'],
['OCA\Theming\ThemingDefaults', 'OC_Defaults'],
['OCA\Theming\Util'],
['OCA\Theming\Template'],
['OCA\Theming\Template', 'OC_Defaults'],
// Controller
// controller/
['OCA\Theming\Controller\ThemingController'],
// Settings
['OCA\Theming\Settings\Admin'],
['OCA\Theming\Settings\Admin', 'OCP\Settings\ISettings'],
['OCA\Theming\Settings\Section'],
['OCA\Theming\Settings\Section', 'OCP\Settings\ISection'],
];
}