Merge pull request #1368 from nextcloud/use-codesniffer

Fix codesniffer complains on some apps
pull/1380/head
Christoph Wurst 2016-09-12 19:37:50 +07:00 committed by GitHub
commit f70600cde5
19 changed files with 23 additions and 38 deletions

@ -25,9 +25,6 @@
namespace OCA\Admin_Audit\Actions;
use OCP\ILogger;
use OCP\IUserSession;
class Trashbin extends Action {
public function delete($params) {

@ -33,7 +33,6 @@ use OCA\Encryption\Exceptions\PublicKeyMissingException;
use OCA\Encryption\Crypto\Crypt;
use OCP\Encryption\Keys\IStorage;
use OCP\IConfig;
use OCP\IDBConnection;
use OCP\ILogger;
use OCP\IUserSession;

@ -46,7 +46,7 @@ class MigrationTest extends \Test\TestCase {
private $recovery_key_id = 'recovery_key_id';
private $moduleId;
/** @var \PHPUnit_Framework_MockObject_MockObject | ILogger */
/** @var \PHPUnit_Framework_MockObject_MockObject|ILogger */
private $logger;
public static function setUpBeforeClass() {

@ -29,7 +29,6 @@ use OCA\FederatedFileSharing\AddressHandler;
use OCA\FederatedFileSharing\Controller\RequestHandlerController;
use OCA\FederatedFileSharing\FederatedShareProvider;
use OCA\FederatedFileSharing\Notifications;
use OCA\FederatedFileSharing\RequestHandler;
use OCP\AppFramework\App;
class Application extends App {

@ -24,7 +24,6 @@
*/
use OCA\FederatedFileSharing\AppInfo\Application;
use OCA\Theming\Template;
\OC_Util::checkLoggedIn();

@ -23,7 +23,6 @@
namespace OCA\FederatedFileSharing\Tests;
use OC\Files\Filesystem;
use OCA\Files\Share;
/**
* Class Test_Files_Sharing_Base

@ -1,5 +1,4 @@
<?php
/**
* @author Christoph Wurst <christoph@winzerhof-wurst.at>
*
@ -22,6 +21,7 @@
namespace OCA\TwoFactor_BackupCodes\Db;
use OCP\AppFramework\Db\Entity;
/**

@ -1,5 +1,4 @@
<?php
/**
* @author Christoph Wurst <christoph@winzerhof-wurst.at>
*
@ -22,6 +21,7 @@
namespace OCA\TwoFactor_BackupCodes\Db;
use OCP\AppFramework\Db\Mapper;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDb;
@ -38,7 +38,7 @@ class BackupCodeMapper extends Mapper {
* @return BackupCode[]
*/
public function getBackupCodes(IUser $user) {
/* @var $qb IQueryBuilder */
/* @var IQueryBuilder $qb */
$qb = $this->db->getQueryBuilder();
$qb->select('id', 'user_id', 'code', 'used')
@ -55,7 +55,7 @@ class BackupCodeMapper extends Mapper {
}
public function deleteCodes(IUser $user) {
/* @var $qb IQueryBuilder */
/* @var IQueryBuilder $qb */
$qb = $this->db->getQueryBuilder();
$qb->delete('twofactor_backup_codes')

@ -22,7 +22,6 @@
namespace OCA\TwoFactor_BackupCodes\Tests\Integration\Db;
use OC;
use OCA\TwoFactor_BackupCodes\Db\BackupCode;
use OCA\TwoFactor_BackupCodes\Db\BackupCodeMapper;
use OCP\IDBConnection;
@ -53,8 +52,8 @@ class BackupCodeMapperTest extends TestCase {
protected function setUp() {
parent::setUp();
$this->db = OC::$server->getDatabaseConnection();
$this->mapper = OC::$server->query(BackupCodeMapper::class);
$this->db = \OC::$server->getDatabaseConnection();
$this->mapper = \OC::$server->query(BackupCodeMapper::class);
$this->resetDB();
}

@ -22,7 +22,6 @@
namespace OCA\TwoFactor_BackupCodes\Tests\Integration\Service;
use OC;
use OCA\TwoFactor_BackupCodes\Service\BackupCodeStorage;
use Test\TestCase;
@ -40,7 +39,7 @@ class BackupCodeStorageTest extends TestCase {
protected function setUp() {
parent::setUp();
$this->storage = OC::$server->query(BackupCodeStorage::class);
$this->storage = \OC::$server->query(BackupCodeStorage::class);
}
public function testSimpleWorkFlow() {

@ -32,13 +32,13 @@ use Test\TestCase;
class BackupCodeStorageTest extends TestCase {
/** @var BackupCodeMapper|PHPUnit_Framework_MockObject_MockObject */
/** @var BackupCodeMapper|\PHPUnit_Framework_MockObject_MockObject */
private $mapper;
/** @var ISecureRandom|PHPUnit_Framework_MockObject_MockObject */
/** @var ISecureRandom|\PHPUnit_Framework_MockObject_MockObject */
private $random;
/** @var IHasher|PHPUnit_Framework_MockObject_MockObject */
/** @var IHasher|\PHPUnit_Framework_MockObject_MockObject */
private $hasher;
/** @var BackupCodeStorage */

@ -24,7 +24,6 @@
namespace OCA\UpdateNotification\AppInfo;
use OC\AppFramework\Utility\TimeFactory;
use OC\Updater;
use OCA\UpdateNotification\Controller\AdminController;
use OCA\UpdateNotification\UpdateChecker;
use OCP\AppFramework\App;

@ -25,11 +25,11 @@
namespace OCA\User_LDAP\Command;
use OCA\User_LDAP\Configuration;
use OCA\User_LDAP\Helper;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use \OCA\User_LDAP\Helper;
use \OCA\User_LDAP\Configuration;
class CreateEmptyConfig extends Command {
/** @var \OCA\User_LDAP\Helper */

@ -25,11 +25,12 @@
namespace OCA\User_LDAP\Command;
use OCA\User_LDAP\Helper;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use \OCA\User_LDAP\Helper;
class DeleteConfig extends Command {
/** @var \OCA\User_LDAP\Helper */

@ -24,13 +24,13 @@
namespace OCA\User_LDAP\Jobs;
use \OC\BackgroundJob\TimedJob;
use \OCA\User_LDAP\User_LDAP;
use \OCA\User_LDAP\User_Proxy;
use \OCA\User_LDAP\Helper;
use \OCA\User_LDAP\LDAP;
use \OCA\User_LDAP\User\DeletedUsersIndex;
use \OCA\User_LDAP\Mapping\UserMapping;
use OC\BackgroundJob\TimedJob;
use OCA\User_LDAP\Helper;
use OCA\User_LDAP\LDAP;
use OCA\User_LDAP\Mapping\UserMapping;
use OCA\User_LDAP\User_LDAP;
use OCA\User_LDAP\User_Proxy;
use OCA\User_LDAP\User\DeletedUsersIndex;
/**
* Class CleanUp

@ -22,12 +22,11 @@
namespace OCA\User_LDAP;
use OCP\IUserBackend;
use OCP\LDAP\ILDAPProvider;
use OCP\LDAP\IDeletionFlagSupport;
use OCP\IServerContainer;
use OCA\User_LDAP\User\DeletedUsersIndex;
use OCA\User_LDAP\Mapping\UserMapping;
/**
* LDAP provider for pulic access to the LDAP backend.

@ -27,7 +27,6 @@
namespace OCA\User_LDAP\Tests;
use OCA\User_LDAP\Access;
use OCA\User_LDAP\Connection;
use OCA\User_LDAP\FilesystemHelper;
use OCA\User_LDAP\ILDAPWrapper;
use OCA\User_LDAP\LogWrapper;

@ -29,8 +29,6 @@
namespace OCA\User_LDAP\Tests;
use OCA\User_LDAP\Group_LDAP as GroupLDAP;
use OCA\User_LDAP\Access;
use OCA\User_LDAP\Connection;
use OCA\User_LDAP\ILDAPWrapper;
/**

@ -32,8 +32,6 @@ use OCA\User_LDAP\FilesystemHelper;
use OCA\User_LDAP\ILDAPWrapper;
use OCA\User_LDAP\LogWrapper;
use OCA\User_LDAP\User_LDAP as UserLDAP;
use \OCA\User_LDAP\Access;
use \OCA\User_LDAP\Connection;
use OCP\IAvatarManager;
use OCP\IConfig;
use OCP\IDBConnection;