wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1613 from nextcloud/2fa-backup-codes-psr4

Browse source 
Do not use underscores in PSR4 namespaces of the backup codes app
This commit is contained in:
Joas Schilling 2016-10-04 10:37:36 +02:00 committed by GitHub
commit 3a0e06147c
12 changed files with 28 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/twofactor_backupcodes/appinfo/info.xml
View file

@ -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>

4
apps/twofactor_backupcodes/lib/Controller/SettingsController.php
View file

@ -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;

2
apps/twofactor_backupcodes/lib/Db/BackupCode.php
View file

@ -19,7 +19,7 @@
*
*/
namespace OCA\TwoFactor_BackupCodes\Db;
namespace OCA\TwoFactorBackupCodes\Db;
use OCP\AppFramework\Db\Entity;

3
apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php
View file

@ -19,8 +19,7 @@
*
*/
namespace OCA\TwoFactor_BackupCodes\Db;
namespace OCA\TwoFactorBackupCodes\Db;
use OCP\AppFramework\Db\Mapper;
use OCP\DB\QueryBuilder\IQueryBuilder;

4
apps/twofactor_backupcodes/lib/Provider/BackupCodesProvider.php
View file

@ -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;

6
apps/twofactor_backupcodes/lib/Service/BackupCodeStorage.php
View file

@ -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;

6
apps/twofactor_backupcodes/tests/Integration/Db/BackupCodeMapperTest.php
View file

@ -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;

4
apps/twofactor_backupcodes/tests/Integration/Service/BackupCodeStorageTest.php
View file

@ -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;
/**

6
apps/twofactor_backupcodes/tests/Unit/Controller/SettingsControllerTest.php
View file

@ -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;

6
apps/twofactor_backupcodes/tests/Unit/Provider/BackupCodesProviderTest.php
View file

@ -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;

8
apps/twofactor_backupcodes/tests/Unit/Service/BackupCodeStorageTest.php
View file

@ -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;

5
tests/lib/Authentication/TwoFactorAuth/ManagerTest.php
View file

@ -26,7 +26,6 @@ use Exception;
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;
@ -89,7 +88,7 @@ class ManagerTest extends TestCase {
$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;
});
}
@ -149,7 +148,7 @@ class ManagerTest extends TestCase {
[
'twofactor_backupcodes',
['two-factor-providers' => [
'\OCA\TwoFactor_BackupCodes\Provider\FakeBackupCodesProvider',
'\OCA\TwoFactorBackupCodes\Provider\FakeBackupCodesProvider',
]
]
],