-
-
Notifications
You must be signed in to change notification settings - Fork 4.7k
Revert "Where is your data?" #14753
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
rullzer
merged 2 commits into
master
from
revert-13097-feature/11319/where-is-your-data
Mar 20, 2019
Merged
Revert "Where is your data?" #14753
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| <?php | ||
| /** | ||
| * @copyright Copyright (c) 2016 Arthur Schiwon <[email protected]> | ||
| * | ||
| * @author Arthur Schiwon <[email protected]> | ||
| * @author Joas Schilling <[email protected]> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| namespace OCA\Theming\Settings; | ||
|
|
||
| use OCP\IL10N; | ||
| use OCP\IURLGenerator; | ||
| use OCP\Settings\IIconSection; | ||
|
|
||
| class Section implements IIconSection { | ||
| /** @var IL10N */ | ||
| private $l; | ||
| /** @var IURLGenerator */ | ||
| private $url; | ||
|
|
||
| /** | ||
| * @param IURLGenerator $url | ||
| * @param IL10N $l | ||
| */ | ||
| public function __construct(IURLGenerator $url, IL10N $l) { | ||
| $this->url = $url; | ||
| $this->l = $l; | ||
| } | ||
|
|
||
| /** | ||
| * returns the ID of the section. It is supposed to be a lower case string, | ||
| * e.g. 'ldap' | ||
| * | ||
| * @returns string | ||
| */ | ||
| public function getID() { | ||
| return 'theming'; | ||
| } | ||
|
|
||
| /** | ||
| * returns the translated name as it should be displayed, e.g. 'LDAP / AD | ||
| * integration'. Use the L10N service to translate it. | ||
| * | ||
| * @return string | ||
| */ | ||
| public function getName() { | ||
| return $this->l->t('Theming'); | ||
| } | ||
|
|
||
| /** | ||
| * @return int whether the form should be rather on the top or bottom of | ||
| * the settings navigation. The sections are arranged in ascending order of | ||
| * the priority values. It is required to return a value between 0 and 99. | ||
| * | ||
| * E.g.: 70 | ||
| */ | ||
| public function getPriority() { | ||
| return 30; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function getIcon() { | ||
| return $this->url->imagePath('theming', 'app-dark.svg'); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| <?php | ||
| /** | ||
| * @copyright Copyright (c) 2016 Lukas Reschke <[email protected]> | ||
| * | ||
| * @author Joas Schilling <[email protected]> | ||
| * @author Lukas Reschke <[email protected]> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| namespace OCA\Theming\Tests\Settings; | ||
|
|
||
| use OCA\Theming\Settings\Section; | ||
| use OCP\IL10N; | ||
| use OCP\IURLGenerator; | ||
| use Test\TestCase; | ||
|
|
||
| class SectionTest extends TestCase { | ||
| /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ | ||
| private $url; | ||
| /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */ | ||
| private $l; | ||
| /** @var Section */ | ||
| private $section; | ||
|
|
||
| public function setUp() { | ||
| parent::setUp(); | ||
| $this->url = $this->createMock(IURLGenerator::class); | ||
| $this->l = $this->createMock(IL10N::class); | ||
|
|
||
| $this->section = new Section( | ||
| $this->url, | ||
| $this->l | ||
| ); | ||
| } | ||
|
|
||
| public function testGetID() { | ||
| $this->assertSame('theming', $this->section->getID()); | ||
| } | ||
|
|
||
| public function testGetName() { | ||
| $this->l | ||
| ->expects($this->once()) | ||
| ->method('t') | ||
| ->with('Theming') | ||
| ->willReturn('Theming'); | ||
|
|
||
| $this->assertSame('Theming', $this->section->getName()); | ||
| } | ||
|
|
||
| public function testGetPriority() { | ||
| $this->assertSame(30, $this->section->getPriority()); | ||
| } | ||
|
|
||
| public function testGetIcon() { | ||
| $this->url->expects($this->once()) | ||
| ->method('imagePath') | ||
| ->with('theming', 'app-dark.svg') | ||
| ->willReturn('icon'); | ||
|
|
||
| $this->assertSame('icon', $this->section->getIcon()); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ref #14402 😉