Skip to content

Do not use underscores in PSR4 namespaces of the backup codes app #1613

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.

Sign up for GitHub

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
nickvergessen merged 1 commit into from
Oct 4, 2016
Merged

Do not use underscores in PSR4 namespaces of the backup codes app #1613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/twofactor_backupcodes/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<licence>agpl</licence>
<author>Christoph Wurst</author>
<version>1.0.0</version>
<namespace>TwoFactor_BackupCodes</namespace>
<namespace>TwoFactorBackupCodes</namespace>
<category>other</category>

<two-factor-providers>
<provider>OCA\TwoFactor_BackupCodes\Provider\BackupCodesProvider</provider>
<provider>OCA\TwoFactorBackupCodes\Provider\BackupCodesProvider</provider>
</two-factor-providers>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions apps/twofactor_backupcodes/lib/Controller/SettingsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
*
*/

namespace OCA\TwoFactor_BackupCodes\Controller;
namespace OCA\TwoFactorBackupCodes\Controller;

use OCA\TwoFactor_BackupCodes\Service\BackupCodeStorage;
use OCA\TwoFactorBackupCodes\Service\BackupCodeStorage;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\JSONResponse;
use OCP\IRequest;
Expand Down
2 changes: 1 addition & 1 deletion apps/twofactor_backupcodes/lib/Db/BackupCode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
*/

namespace OCA\TwoFactor_BackupCodes\Db;
namespace OCA\TwoFactorBackupCodes\Db;


use OCP\AppFramework\Db\Entity;
Expand Down
3 changes: 1 addition & 2 deletions apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
*
*/

namespace OCA\TwoFactor_BackupCodes\Db;

namespace OCA\TwoFactorBackupCodes\Db;

use OCP\AppFramework\Db\Mapper;
use OCP\DB\QueryBuilder\IQueryBuilder;
Expand Down
4 changes: 2 additions & 2 deletions apps/twofactor_backupcodes/lib/Provider/BackupCodesProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
*
*/

namespace OCA\TwoFactor_BackupCodes\Provider;
namespace OCA\TwoFactorBackupCodes\Provider;

use OCA\TwoFactor_BackupCodes\Service\BackupCodeStorage;
use OCA\TwoFactorBackupCodes\Service\BackupCodeStorage;
use OCP\Authentication\TwoFactorAuth\IProvider;
use OCP\IL10N;
use OCP\IUser;
Expand Down
6 changes: 3 additions & 3 deletions apps/twofactor_backupcodes/lib/Service/BackupCodeStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
*
*/

namespace OCA\TwoFactor_BackupCodes\Service;
namespace OCA\TwoFactorBackupCodes\Service;

use OCA\TwoFactor_BackupCodes\Db\BackupCode;
use OCA\TwoFactor_BackupCodes\Db\BackupCodeMapper;
use OCA\TwoFactorBackupCodes\Db\BackupCode;
use OCA\TwoFactorBackupCodes\Db\BackupCodeMapper;
use OCP\IUser;
use OCP\Security\IHasher;
use OCP\Security\ISecureRandom;
Expand Down
6 changes: 3 additions & 3 deletions apps/twofactor_backupcodes/tests/Integration/Db/BackupCodeMapperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
*
*/

namespace OCA\TwoFactor_BackupCodes\Tests\Integration\Db;
namespace OCA\TwoFactorBackupCodes\Tests\Integration\Db;

use OCA\TwoFactor_BackupCodes\Db\BackupCode;
use OCA\TwoFactor_BackupCodes\Db\BackupCodeMapper;
use OCA\TwoFactorBackupCodes\Db\BackupCode;
use OCA\TwoFactorBackupCodes\Db\BackupCodeMapper;
use OCP\IDBConnection;
use OCP\IUser;
use Test\TestCase;
Expand Down
4 changes: 2 additions & 2 deletions apps/twofactor_backupcodes/tests/Integration/Service/BackupCodeStorageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
*
*/

namespace OCA\TwoFactor_BackupCodes\Tests\Integration\Service;
namespace OCA\TwoFactorBackupCodes\Tests\Integration\Service;

use OCA\TwoFactor_BackupCodes\Service\BackupCodeStorage;
use OCA\TwoFactorBackupCodes\Service\BackupCodeStorage;
use Test\TestCase;

/**
Expand Down
6 changes: 3 additions & 3 deletions apps/twofactor_backupcodes/tests/Unit/Controller/SettingsControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
*
*/

namespace OCA\TwoFactor_BackupCodes\Tests\Unit\Controller;
namespace OCA\TwoFactorBackupCodes\Tests\Unit\Controller;

use OCA\TwoFactor_BackupCodes\Controller\SettingsController;
use OCA\TwoFactor_BackupCodes\Service\BackupCodeStorage;
use OCA\TwoFactorBackupCodes\Controller\SettingsController;
use OCA\TwoFactorBackupCodes\Service\BackupCodeStorage;
use OCP\IRequest;
use OCP\IUser;
use OCP\IUserSession;
Expand Down
6 changes: 3 additions & 3 deletions apps/twofactor_backupcodes/tests/Unit/Provider/BackupCodesProviderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
*
*/

namespace OCA\TwoFactor_BackupCodes\Tests\Unit\Provider;
namespace OCA\TwoFactorBackupCodes\Tests\Unit\Provider;

use OCA\TwoFactor_BackupCodes\Provider\BackupCodesProvider;
use OCA\TwoFactor_BackupCodes\Service\BackupCodeStorage;
use OCA\TwoFactorBackupCodes\Provider\BackupCodesProvider;
use OCA\TwoFactorBackupCodes\Service\BackupCodeStorage;
use OCP\IL10N;
use OCP\IUser;
use OCP\Template;
Expand Down
8 changes: 4 additions & 4 deletions apps/twofactor_backupcodes/tests/Unit/Service/BackupCodeStorageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
*
*/

namespace OCA\TwoFactor_BackupCodes\Tests\Unit\Service;
namespace OCA\TwoFactorBackupCodes\Tests\Unit\Service;

use OCA\TwoFactor_BackupCodes\Db\BackupCode;
use OCA\TwoFactor_BackupCodes\Db\BackupCodeMapper;
use OCA\TwoFactor_BackupCodes\Service\BackupCodeStorage;
use OCA\TwoFactorBackupCodes\Db\BackupCode;
use OCA\TwoFactorBackupCodes\Db\BackupCodeMapper;
use OCA\TwoFactorBackupCodes\Service\BackupCodeStorage;
use OCP\IUser;
use OCP\Security\IHasher;
use OCP\Security\ISecureRandom;
Expand Down
5 changes: 2 additions & 3 deletions tests/lib/Authentication/TwoFactorAuth/ManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
use OC;
use OC\App\AppManager;
use OC\Authentication\TwoFactorAuth\Manager;
use OCA\TwoFactor_BackupCodes\Provider\BackupCodesProvider;
use OCP\Authentication\TwoFactorAuth\IProvider;
use OCP\IConfig;
use OCP\ISession;
Expand Down Expand Up @@ -89,7 +88,7 @@ protected function setUp() {
$this->backupProvider->expects($this->any())
->method('isTwoFactorAuthEnabledForUser')
->will($this->returnValue(true));
OC::$server->registerService('\OCA\TwoFactor_BackupCodes\Provider\FakeBackupCodesProvider', function () {
OC::$server->registerService('\OCA\TwoFactorBackupCodes\Provider\FakeBackupCodesProvider', function () {
return $this->backupProvider;
});
}
Expand Down Expand Up @@ -149,7 +148,7 @@ private function prepareProvidersWitBackupProvider() {
[
'twofactor_backupcodes',
['two-factor-providers' => [
'\OCA\TwoFactor_BackupCodes\Provider\FakeBackupCodesProvider',
'\OCA\TwoFactorBackupCodes\Provider\FakeBackupCodesProvider',
]
]
],
Expand Down