owncloud / security

lib/Hooks.php

Doc Comments -1 removed lines

@@ -81,7 +81,6 @@
 
     /**
      * @param string $uid
-     * @param Throttle $throttle
      */
     public function failedLoginCallback($uid) {
         $this->throttle->addFailedLoginAttempt($uid, $this->request->getRemoteAddress());

Indentation +7 added lines, -8 removed lines

@@ -1,6 +1,5 @@ 
 <?php
 /**
-
  *
  * @author Semih Serhat Karakaya
  * @copyright Copyright (c) 2016, ITU IT HEAD OFFICE.
@@ -45,15 +44,15 @@ 
 
     /** @var PasswordValidator */
     private $passValidator;
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
 
     /**
      * @param IUserManager $userManager
      * @param Throttle $throttle
      * @param IRequest $request
-	 * @param PasswordValidator $passValidator
-	 * @param EventDispatcherInterface $dispatcher
+     * @param PasswordValidator $passValidator
+     * @param EventDispatcherInterface $dispatcher
      */
     public function __construct($userManager, $throttle, $request, $passValidator, $dispatcher){
         $this->userManager = $userManager;
@@ -73,9 +72,9 @@ 
             $this->postLoginCallback($user);
         });
 
-		$this->dispatcher->addListener('OCP\User::validatePassword', function(GenericEvent $event) {
-			$this->passValidator->validate($event->getArgument('password'));
-		});
+        $this->dispatcher->addListener('OCP\User::validatePassword', function(GenericEvent $event) {
+            $this->passValidator->validate($event->getArgument('password'));
+        });
 
     }
 

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 	 * @param PasswordValidator $passValidator
 	 * @param EventDispatcherInterface $dispatcher
      */
-    public function __construct($userManager, $throttle, $request, $passValidator, $dispatcher){
+    public function __construct($userManager, $throttle, $request, $passValidator, $dispatcher) {
         $this->userManager = $userManager;
         $this->throttle = $throttle;
         $this->request = $request;

tests/Controller/SettingsControllerTest.php

Unused Use Statements +3 added lines, -3 removed lines

@@ -20,9 +20,9 @@
  */

 namespace OCA\Security\Tests\Controller;

 

-use OCA\Security\Controller\SettingsController;

-use OCA\Security\SecurityConfig;

-use OCP\IRequest;

+use OCA\Security\Controller\SettingsController;
+use OCA\Security\SecurityConfig;
+use OCP\IRequest;
 use Test\TestCase;

 

 class SettingsControllerTest extends TestCase {

Indentation +27 added lines, -27 removed lines

@@ -26,32 +26,32 @@
 use Test\TestCase;

 

 class SettingsControllerTest extends TestCase {

-	/** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */

-	private $request;

-	/** @var SecurityConfig|\PHPUnit_Framework_MockObject_MockObject */

-	private $config;

-	/** @var SettingsController */

-	private $controller;

-	protected function setUp() {

-		parent::setUp();

-		$this->request = $this->getMockBuilder(IRequest::class)->getMock();

-		$this->config = $this->getMockBuilder(SecurityConfig::class)

-			->disableOriginalConstructor()

-			->getMock();

-		$this->controller = new SettingsController('security', $this->request, $this->config);

-	}

-	public function testState() {

-		$expected = [

-			'bruteForceProtectionState' => true,

-			'minPassLength' => 8,

-			'enforceUpperLowerState' => true,

-			'enforceNumericalCharactersState' => true,

-			'enforceSpecialCharactersState' => true

-		];

-		$this->config->expects($this->exactly(1))

-			->method('getAllSecurityConfigs')

-			->willReturn($expected);

+    /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */

+    private $request;

+    /** @var SecurityConfig|\PHPUnit_Framework_MockObject_MockObject */

+    private $config;

+    /** @var SettingsController */

+    private $controller;

+    protected function setUp() {

+        parent::setUp();

+        $this->request = $this->getMockBuilder(IRequest::class)->getMock();

+        $this->config = $this->getMockBuilder(SecurityConfig::class)

+            ->disableOriginalConstructor()

+            ->getMock();

+        $this->controller = new SettingsController('security', $this->request, $this->config);

+    }

+    public function testState() {

+        $expected = [

+            'bruteForceProtectionState' => true,

+            'minPassLength' => 8,

+            'enforceUpperLowerState' => true,

+            'enforceNumericalCharactersState' => true,

+            'enforceSpecialCharactersState' => true

+        ];

+        $this->config->expects($this->exactly(1))

+            ->method('getAllSecurityConfigs')

+            ->willReturn($expected);

 

-		$this->assertEquals($expected, $this->controller->state());

-	}

+        $this->assertEquals($expected, $this->controller->state());

+    }

 }
\ No newline at end of file

tests/Db/DbServiceTest.php

Unused Use Statements +3 added lines, -3 removed lines

@@ -22,9 +22,9 @@
 

 namespace OCA\Security\Tests\Db;

 

-use OCA\Security\Db\DbService;

-use OC\AppFramework\Utility\TimeFactory;

-use OCP\IDBConnection;

+use OCA\Security\Db\DbService;
+use OC\AppFramework\Utility\TimeFactory;
+use OCP\IDBConnection;
 use Test\TestCase;

 

 /**

tests/PasswordValidatorTest.php

Doc Comments +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 	}

 

 	/**

-	 * @param array $mockedMethods

+	 * @param string[] $mockedMethods

 	 * @return PasswordValidator | \PHPUnit_Framework_MockObject_MockObject

 	 */

 	private function getMockInstance($mockedMethods = []) {

Unused Use Statements +4 added lines, -4 removed lines

@@ -19,10 +19,10 @@
  *

  */

 namespace OCA\Password_Policy\Tests;

-use OC\HintException;

-use OCA\Security\SecurityConfig;

-use OCA\Security\PasswordValidator;

-use OCP\IL10N;

+use OC\HintException;
+use OCA\Security\SecurityConfig;
+use OCA\Security\PasswordValidator;
+use OCP\IL10N;
 use Test\TestCase;

 class PasswordValidatorTest extends TestCase {

 

Indentation +146 added lines, -146 removed lines

@@ -26,155 +26,155 @@
 use Test\TestCase;

 class PasswordValidatorTest extends TestCase {

 

-	/** @var  SecurityConfig|\PHPUnit_Framework_MockObject_MockObject */

-	private $config;

+    /** @var  SecurityConfig|\PHPUnit_Framework_MockObject_MockObject */

+    private $config;

 

-	/** @var  IL10N|\PHPUnit_Framework_MockObject_MockObject */

-	private $l10n;

+    /** @var  IL10N|\PHPUnit_Framework_MockObject_MockObject */

+    private $l10n;

 

-	/** @var  PasswordValidator */

-	private $passValidator;

+    /** @var  PasswordValidator */

+    private $passValidator;

 

-	public function setUp() {

-		parent::setUp();

-		$this->l10n = $this->createMock(IL10N::class);

-		$this->config = $this->createMock(SecurityConfig::class);

-		$this->passValidator = new PasswordValidator($this->config, $this->l10n);

-	}

+    public function setUp() {

+        parent::setUp();

+        $this->l10n = $this->createMock(IL10N::class);

+        $this->config = $this->createMock(SecurityConfig::class);

+        $this->passValidator = new PasswordValidator($this->config, $this->l10n);

+    }

 

-	/**

-	 * @param array $mockedMethods

-	 * @return PasswordValidator | \PHPUnit_Framework_MockObject_MockObject

-	 */

-	private function getMockInstance($mockedMethods = []) {

-		$passwordValidator = $this->getMockBuilder('OCA\Security\PasswordValidator')

-			->setConstructorArgs([$this->config, $this->l10n])

-			->setMethods($mockedMethods)->getMock();

-		return $passwordValidator;

-	}

+    /**

+     * @param array $mockedMethods

+     * @return PasswordValidator | \PHPUnit_Framework_MockObject_MockObject

+     */

+    private function getMockInstance($mockedMethods = []) {

+        $passwordValidator = $this->getMockBuilder('OCA\Security\PasswordValidator')

+            ->setConstructorArgs([$this->config, $this->l10n])

+            ->setMethods($mockedMethods)->getMock();

+        return $passwordValidator;

+    }

 

-	public function testCheckPasswordLength() {

-		$this->config->expects($this->exactly(1))->method('getMinPasswordLength')->willReturn(4);

-		$this->passValidator->checkPasswordLength('password');

-	}

-	/**

-	 * @expectedException \OC\HintException

-	 */

-	public function testCheckPasswordLengthFail() {

-		$this->config->expects($this->exactly(1))->method('getMinPasswordLength')->willReturn(4);

-		$this->passValidator->checkPasswordLength('123');

-	}

-	/**

-	 * @dataProvider dataTestCheckUpperLowerCase

-	 *

-	 * @param string $password

-	 * @param bool $enforceUpperLowerCase

-	 */

-	public function testCheckUpperLowerCase($password, $enforceUpperLowerCase) {

-		$this->config->expects($this->once())->method('getIsUpperLowerCaseEnforced')

-			->willReturn($enforceUpperLowerCase);

-		$this->passValidator->checkUpperLowerCase($password);

-	}

-	public function dataTestCheckUpperLowerCase() {

-		return [

-			['testPass', true],

-			['Testpass', true],

-			['testpass', false],

-			['TESTPASS', false],

-		];

-	}

-	/**

-	 * @dataProvider dataTestCheckUpperLowerCaseFail

-	 * @param string $password

-	 * @expectedException \OC\HintException

-	 */

-	public function testCheckUpperLowerCaseFail($password) {

-		$this->config->expects($this->once())->method('getIsUpperLowerCaseEnforced')->willReturn(true);

-		$this->passValidator->checkUpperLowerCase($password);

-	}

-	public function dataTestCheckUpperLowerCaseFail() {

-		return [

-			['TESTPASS'], ['testpass']

-		];

-	}

-	/**

-	 * @dataProvider dataTestCheckNumericCharacters

-	 *

-	 * @param string $password

-	 * @param bool $enforceNumericCharacters

-	 */

-	public function testCheckNumericCharacters($password, $enforceNumericCharacters) {

-		$this->config->expects($this->once())->method('getIsNumericCharactersEnforced')->willReturn($enforceNumericCharacters);

-		$this->passValidator->checkNumericCharacters($password);

-	}

-	public function dataTestCheckNumericCharacters() {

-		return [

-			['testPass1', true],

-			['testpass', false]

-		];

-	}

-	/**

-	 * @dataProvider dataTestCheckNumericCharactersFail

-	 * @param string $password

-	 * @expectedException \OC\HintException

-	 */

-	public function testCheckNumericCharactersFail($password) {

-		$this->config->expects($this->once())->method('getIsNumericCharactersEnforced')->willReturn(true);

-		$this->passValidator->checkNumericCharacters($password);

-	}

-	public function dataTestCheckNumericCharactersFail() {

-		return [

-			['testpass'],

-			['TestPass%'],

-			['TEST*PASS']

-		];

-	}

-	/**

-	 * @dataProvider dataTestCheckSpecialCharacters

-	 *

-	 * @param string $password

-	 * @param bool $enforceSpecialCharacters

-	 */

-	public function testCheckSpecialCharacters($password, $enforceSpecialCharacters) {

-		$this->config->expects($this->once())->method('getIsSpecialCharactersEnforced')->willReturn($enforceSpecialCharacters);

-		$this->passValidator->checkSpecialCharacters($password);

-	}

-	public function dataTestCheckSpecialCharacters() {

-		return [

-			['testPass%', true],

-			['testpass', false]

-		];

-	}

-	/**

-	 * @dataProvider dataTestCheckSpecialCharactersFail

-	 * @param string $password

-	 * @expectedException \OC\HintException

-	 */

-	public function testCheckSpecialCharactersFail($password) {

-		$this->config->expects($this->once())->method('getIsSpecialCharactersEnforced')->willReturn(true);

-		$this->passValidator->checkSpecialCharacters($password);

-	}

-	public function dataTestCheckSpecialCharactersFail() {

-		return [

-			['testpass'],

-			['TestPass1'],

-			['TEST2PASS']

-		];

-	}

-	public function testValidate() {

-		$password = 'password';

-		$instance = $this->getMockInstance(

-			[

-				'checkPasswordLength',

-				'checkUpperLowerCase',

-				'checkNumericCharacters',

-				'checkSpecialCharacters',

-			]

-		);

-		$instance->expects($this->once())->method('checkPasswordLength')->with($password);

-		$instance->expects($this->once())->method('checkUpperLowerCase')->with($password);

-		$instance->expects($this->once())->method('checkNumericCharacters')->with($password);

-		$instance->expects($this->once())->method('checkSpecialCharacters')->with($password);

-		$instance->validate($password);

-	}

+    public function testCheckPasswordLength() {

+        $this->config->expects($this->exactly(1))->method('getMinPasswordLength')->willReturn(4);

+        $this->passValidator->checkPasswordLength('password');

+    }

+    /**

+     * @expectedException \OC\HintException

+     */

+    public function testCheckPasswordLengthFail() {

+        $this->config->expects($this->exactly(1))->method('getMinPasswordLength')->willReturn(4);

+        $this->passValidator->checkPasswordLength('123');

+    }

+    /**

+     * @dataProvider dataTestCheckUpperLowerCase

+     *

+     * @param string $password

+     * @param bool $enforceUpperLowerCase

+     */

+    public function testCheckUpperLowerCase($password, $enforceUpperLowerCase) {

+        $this->config->expects($this->once())->method('getIsUpperLowerCaseEnforced')

+            ->willReturn($enforceUpperLowerCase);

+        $this->passValidator->checkUpperLowerCase($password);

+    }

+    public function dataTestCheckUpperLowerCase() {

+        return [

+            ['testPass', true],

+            ['Testpass', true],

+            ['testpass', false],

+            ['TESTPASS', false],

+        ];

+    }

+    /**

+     * @dataProvider dataTestCheckUpperLowerCaseFail

+     * @param string $password

+     * @expectedException \OC\HintException

+     */

+    public function testCheckUpperLowerCaseFail($password) {

+        $this->config->expects($this->once())->method('getIsUpperLowerCaseEnforced')->willReturn(true);

+        $this->passValidator->checkUpperLowerCase($password);

+    }

+    public function dataTestCheckUpperLowerCaseFail() {

+        return [

+            ['TESTPASS'], ['testpass']

+        ];

+    }

+    /**

+     * @dataProvider dataTestCheckNumericCharacters

+     *

+     * @param string $password

+     * @param bool $enforceNumericCharacters

+     */

+    public function testCheckNumericCharacters($password, $enforceNumericCharacters) {

+        $this->config->expects($this->once())->method('getIsNumericCharactersEnforced')->willReturn($enforceNumericCharacters);

+        $this->passValidator->checkNumericCharacters($password);

+    }

+    public function dataTestCheckNumericCharacters() {

+        return [

+            ['testPass1', true],

+            ['testpass', false]

+        ];

+    }

+    /**

+     * @dataProvider dataTestCheckNumericCharactersFail

+     * @param string $password

+     * @expectedException \OC\HintException

+     */

+    public function testCheckNumericCharactersFail($password) {

+        $this->config->expects($this->once())->method('getIsNumericCharactersEnforced')->willReturn(true);

+        $this->passValidator->checkNumericCharacters($password);

+    }

+    public function dataTestCheckNumericCharactersFail() {

+        return [

+            ['testpass'],

+            ['TestPass%'],

+            ['TEST*PASS']

+        ];

+    }

+    /**

+     * @dataProvider dataTestCheckSpecialCharacters

+     *

+     * @param string $password

+     * @param bool $enforceSpecialCharacters

+     */

+    public function testCheckSpecialCharacters($password, $enforceSpecialCharacters) {

+        $this->config->expects($this->once())->method('getIsSpecialCharactersEnforced')->willReturn($enforceSpecialCharacters);

+        $this->passValidator->checkSpecialCharacters($password);

+    }

+    public function dataTestCheckSpecialCharacters() {

+        return [

+            ['testPass%', true],

+            ['testpass', false]

+        ];

+    }

+    /**

+     * @dataProvider dataTestCheckSpecialCharactersFail

+     * @param string $password

+     * @expectedException \OC\HintException

+     */

+    public function testCheckSpecialCharactersFail($password) {

+        $this->config->expects($this->once())->method('getIsSpecialCharactersEnforced')->willReturn(true);

+        $this->passValidator->checkSpecialCharacters($password);

+    }

+    public function dataTestCheckSpecialCharactersFail() {

+        return [

+            ['testpass'],

+            ['TestPass1'],

+            ['TEST2PASS']

+        ];

+    }

+    public function testValidate() {

+        $password = 'password';

+        $instance = $this->getMockInstance(

+            [

+                'checkPasswordLength',

+                'checkUpperLowerCase',

+                'checkNumericCharacters',

+                'checkSpecialCharacters',

+            ]

+        );

+        $instance->expects($this->once())->method('checkPasswordLength')->with($password);

+        $instance->expects($this->once())->method('checkUpperLowerCase')->with($password);

+        $instance->expects($this->once())->method('checkNumericCharacters')->with($password);

+        $instance->expects($this->once())->method('checkSpecialCharacters')->with($password);

+        $instance->validate($password);

+    }

 }
\ No newline at end of file

tests/SecurityConfigTest.php

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	}

 

 	/**

-	 * @param array $mockedMethods

+	 * @param string[] $mockedMethods

 	 * @return SecurityConfig | \PHPUnit_Framework_MockObject_MockObject

 	 */

 	private function getMockInstance($mockedMethods = []) {

Unused Use Statements +2 added lines, -2 removed lines

@@ -20,8 +20,8 @@
  */

 namespace OCA\Security\Tests;

 

-use OCA\Security\SecurityConfig;

-use OCP\IConfig;

+use OCA\Security\SecurityConfig;
+use OCP\IConfig;
 use Test\TestCase;

 class SecurityConfigTest extends TestCase {

 	/** @var  IConfig|\PHPUnit_Framework_MockObject_MockObject */

Indentation +164 added lines, -164 removed lines

@@ -24,170 +24,170 @@
 use OCP\IConfig;

 use Test\TestCase;

 class SecurityConfigTest extends TestCase {

-	/** @var  IConfig|\PHPUnit_Framework_MockObject_MockObject */

-	private $config;

-	/** @var  SecurityConfig */

-	private $securityConfig;

-	public function setUp() {

-		parent::setUp();

-		$this->config = $this->createMock(IConfig::class);

-		$this->securityConfig = new SecurityConfig($this->config);

-	}

+    /** @var  IConfig|\PHPUnit_Framework_MockObject_MockObject */

+    private $config;

+    /** @var  SecurityConfig */

+    private $securityConfig;

+    public function setUp() {

+        parent::setUp();

+        $this->config = $this->createMock(IConfig::class);

+        $this->securityConfig = new SecurityConfig($this->config);

+    }

 

-	/**

-	 * @param array $mockedMethods

-	 * @return SecurityConfig | \PHPUnit_Framework_MockObject_MockObject

-	 */

-	private function getMockInstance($mockedMethods = []) {

-		$passwordValidator = $this->getMockBuilder('OCA\Security\SecurityConfig')

-			->setConstructorArgs([$this->config])

-			->setMethods($mockedMethods)->getMock();

-		return $passwordValidator;

-	}

+    /**

+     * @param array $mockedMethods

+     * @return SecurityConfig | \PHPUnit_Framework_MockObject_MockObject

+     */

+    private function getMockInstance($mockedMethods = []) {

+        $passwordValidator = $this->getMockBuilder('OCA\Security\SecurityConfig')

+            ->setConstructorArgs([$this->config])

+            ->setMethods($mockedMethods)->getMock();

+        return $passwordValidator;

+    }

 

-	public function testGetAllSecurityConfigs() {

-		$instance = $this->getMockInstance(

-			[

-				'getIsBruteForceProtectionEnabled',

-				'getMinPasswordLength',

-				'getIsUpperLowerCaseEnforced',

-				'getIsNumericCharactersEnforced',

-				'getIsSpecialCharactersEnforced'

-			]

-		);

-		$instance->expects($this->once())->method('getIsBruteForceProtectionEnabled');

-		$instance->expects($this->once())->method('getMinPasswordLength');

-		$instance->expects($this->once())->method('getIsUpperLowerCaseEnforced');

-		$instance->expects($this->once())->method('getIsNumericCharactersEnforced');

-		$instance->expects($this->once())->method('getIsNumericCharactersEnforced');

-		$instance->getAllSecurityConfigs();

-	}

-	/**

-	 * @dataProvider configTestData

-	 * @param string $appConfigValue

-	 * @param bool $expected

-	 */

-	public function testGetIsBruteForceProtectionEnabled($appConfigValue, $expected) {

-		$this->config->expects($this->once())->method('getAppValue')

-			->with('security', 'enable_brute_force_protection', '0')

-			->willReturn($appConfigValue);

-		$this->assertSame($expected,

-			$this->securityConfig->getIsBruteForceProtectionEnabled()

-		);

-	}

-	/**

-	 * @dataProvider minPassTestData

-	 * @param string $appConfigValue

-	 * @param bool $expected

-	 */

-	public function testGetMinPasswordLength($appConfigValue, $expected) {

-		$this->config->expects($this->once())->method('getAppValue')

-			->with('security', 'min_password_length', '8')

-			->willReturn($appConfigValue);

-		$this->assertSame($expected,

-			$this->securityConfig->getMinPasswordLength()

-		);

-	}

-	/**

-	 * @dataProvider configTestData

-	 * @param string $appConfigValue

-	 * @param bool $expected

-	 */

-	public function testGetIsUpperLowerCaseEnforced($appConfigValue, $expected) {

-		$this->config->expects($this->once())->method('getAppValue')

-			->with('security', 'enforce_upper_lower_case', '0')

-			->willReturn($appConfigValue);

-		$this->assertSame($expected,

-			$this->securityConfig->getIsUpperLowerCaseEnforced()

-		);

-	}

-	/**

-	 * @dataProvider configTestData

-	 * @param string $appConfigValue

-	 * @param bool $expected

-	 */

-	public function testGetIsNumericCharactersEnforced($appConfigValue, $expected) {

-		$this->config->expects($this->once())->method('getAppValue')

-			->with('security', 'enforce_numeric_characters', '0')

-			->willReturn($appConfigValue);

-		$this->assertSame($expected,

-			$this->securityConfig->getIsNumericCharactersEnforced()

-		);

-	}

-	/**

-	 * @dataProvider configTestData

-	 * @param string $appConfigValue

-	 * @param bool $expected

-	 */

-	public function testGetIsSpecialCharactersEnforced($appConfigValue, $expected) {

-		$this->config->expects($this->once())->method('getAppValue')

-			->with('security', 'enforce_special_characters', '0')

-			->willReturn($appConfigValue);

-		$this->assertSame($expected,

-			$this->securityConfig->getIsSpecialCharactersEnforced()

-		);

-	}

-	/**

-	 * @dataProvider configTestData

-	 * @param string $expected

-	 * @param bool $setValue

-	 */

-	public function testSetIsBruteForceProtectionEnabled($expected, $setValue) {

-		$this->config->expects($this->once())->method('setAppValue')

-			->with('security', 'enable_brute_force_protection', $expected);

-		$this->securityConfig->setIsBruteForceProtectionEnabled($setValue);

-	}

-	/**

-	 * @dataProvider minPassTestData

-	 * @param string $expected

-	 * @param bool $setValue

-	 */

-	public function testSetMinPasswordLength($expected, $setValue) {

-		$this->config->expects($this->once())->method('setAppValue')

-			->with('security', 'min_password_length', $expected);

-		$this->securityConfig->setMinPasswordLength($setValue);

-	}

-	/**

-	 * @dataProvider configTestData

-	 * @param string $expected

-	 * @param bool $setValue

-	 */

-	public function testSetIsUpperLowerCaseEnforced($expected, $setValue) {

-		$this->config->expects($this->once())->method('setAppValue')

-			->with('security', 'enforce_upper_lower_case', $expected);

-		$this->securityConfig->setIsUpperLowerCaseEnforced($setValue);

-	}

-	/**

-	 * @dataProvider configTestData

-	 * @param string $expected

-	 * @param bool $setValue

-	 */

-	public function testSetIsNumericCharactersEnforced($expected, $setValue) {

-		$this->config->expects($this->once())->method('setAppValue')

-			->with('security', 'enforce_numeric_characters', $expected);

-		$this->securityConfig->setIsNumericCharactersEnforced($setValue);

-	}

-	/**

-	 * @dataProvider configTestData

-	 * @param string $expected

-	 * @param bool $setValue

-	 */

-	public function testSetIsSpecialCharactersEnforced($expected, $setValue) {

-		$this->config->expects($this->once())->method('setAppValue')

-			->with('security', 'enforce_special_characters', $expected);

-		$this->securityConfig->setIsSpecialCharactersEnforced($setValue);

-	}

-	public function configTestData() {

-		return [

-			['1', true],

-			['0', false],

-		];

-	}

-	public function minPassTestData() {

-		return [

-			['8', 8],

-			['16', 16],

-			['255', 255]

-		];

-	}

+    public function testGetAllSecurityConfigs() {

+        $instance = $this->getMockInstance(

+            [

+                'getIsBruteForceProtectionEnabled',

+                'getMinPasswordLength',

+                'getIsUpperLowerCaseEnforced',

+                'getIsNumericCharactersEnforced',

+                'getIsSpecialCharactersEnforced'

+            ]

+        );

+        $instance->expects($this->once())->method('getIsBruteForceProtectionEnabled');

+        $instance->expects($this->once())->method('getMinPasswordLength');

+        $instance->expects($this->once())->method('getIsUpperLowerCaseEnforced');

+        $instance->expects($this->once())->method('getIsNumericCharactersEnforced');

+        $instance->expects($this->once())->method('getIsNumericCharactersEnforced');

+        $instance->getAllSecurityConfigs();

+    }

+    /**

+     * @dataProvider configTestData

+     * @param string $appConfigValue

+     * @param bool $expected

+     */

+    public function testGetIsBruteForceProtectionEnabled($appConfigValue, $expected) {

+        $this->config->expects($this->once())->method('getAppValue')

+            ->with('security', 'enable_brute_force_protection', '0')

+            ->willReturn($appConfigValue);

+        $this->assertSame($expected,

+            $this->securityConfig->getIsBruteForceProtectionEnabled()

+        );

+    }

+    /**

+     * @dataProvider minPassTestData

+     * @param string $appConfigValue

+     * @param bool $expected

+     */

+    public function testGetMinPasswordLength($appConfigValue, $expected) {

+        $this->config->expects($this->once())->method('getAppValue')

+            ->with('security', 'min_password_length', '8')

+            ->willReturn($appConfigValue);

+        $this->assertSame($expected,

+            $this->securityConfig->getMinPasswordLength()

+        );

+    }

+    /**

+     * @dataProvider configTestData

+     * @param string $appConfigValue

+     * @param bool $expected

+     */

+    public function testGetIsUpperLowerCaseEnforced($appConfigValue, $expected) {

+        $this->config->expects($this->once())->method('getAppValue')

+            ->with('security', 'enforce_upper_lower_case', '0')

+            ->willReturn($appConfigValue);

+        $this->assertSame($expected,

+            $this->securityConfig->getIsUpperLowerCaseEnforced()

+        );

+    }

+    /**

+     * @dataProvider configTestData

+     * @param string $appConfigValue

+     * @param bool $expected

+     */

+    public function testGetIsNumericCharactersEnforced($appConfigValue, $expected) {

+        $this->config->expects($this->once())->method('getAppValue')

+            ->with('security', 'enforce_numeric_characters', '0')

+            ->willReturn($appConfigValue);

+        $this->assertSame($expected,

+            $this->securityConfig->getIsNumericCharactersEnforced()

+        );

+    }

+    /**

+     * @dataProvider configTestData

+     * @param string $appConfigValue

+     * @param bool $expected

+     */

+    public function testGetIsSpecialCharactersEnforced($appConfigValue, $expected) {

+        $this->config->expects($this->once())->method('getAppValue')

+            ->with('security', 'enforce_special_characters', '0')

+            ->willReturn($appConfigValue);

+        $this->assertSame($expected,

+            $this->securityConfig->getIsSpecialCharactersEnforced()

+        );

+    }

+    /**

+     * @dataProvider configTestData

+     * @param string $expected

+     * @param bool $setValue

+     */

+    public function testSetIsBruteForceProtectionEnabled($expected, $setValue) {

+        $this->config->expects($this->once())->method('setAppValue')

+            ->with('security', 'enable_brute_force_protection', $expected);

+        $this->securityConfig->setIsBruteForceProtectionEnabled($setValue);

+    }

+    /**

+     * @dataProvider minPassTestData

+     * @param string $expected

+     * @param bool $setValue

+     */

+    public function testSetMinPasswordLength($expected, $setValue) {

+        $this->config->expects($this->once())->method('setAppValue')

+            ->with('security', 'min_password_length', $expected);

+        $this->securityConfig->setMinPasswordLength($setValue);

+    }

+    /**

+     * @dataProvider configTestData

+     * @param string $expected

+     * @param bool $setValue

+     */

+    public function testSetIsUpperLowerCaseEnforced($expected, $setValue) {

+        $this->config->expects($this->once())->method('setAppValue')

+            ->with('security', 'enforce_upper_lower_case', $expected);

+        $this->securityConfig->setIsUpperLowerCaseEnforced($setValue);

+    }

+    /**

+     * @dataProvider configTestData

+     * @param string $expected

+     * @param bool $setValue

+     */

+    public function testSetIsNumericCharactersEnforced($expected, $setValue) {

+        $this->config->expects($this->once())->method('setAppValue')

+            ->with('security', 'enforce_numeric_characters', $expected);

+        $this->securityConfig->setIsNumericCharactersEnforced($setValue);

+    }

+    /**

+     * @dataProvider configTestData

+     * @param string $expected

+     * @param bool $setValue

+     */

+    public function testSetIsSpecialCharactersEnforced($expected, $setValue) {

+        $this->config->expects($this->once())->method('setAppValue')

+            ->with('security', 'enforce_special_characters', $expected);

+        $this->securityConfig->setIsSpecialCharactersEnforced($setValue);

+    }

+    public function configTestData() {

+        return [

+            ['1', true],

+            ['0', false],

+        ];

+    }

+    public function minPassTestData() {

+        return [

+            ['8', 8],

+            ['16', 16],

+            ['255', 255]

+        ];

+    }

 }
\ No newline at end of file

templates/settings-admin.php

Spacing +5 added lines, -5 removed lines

@@ -26,7 +26,7 @@ 
 <div id="brute-force-protection">

 	<div>

 		<input type="checkbox" class="checkbox" id="security-brute-force-protection-enabled"

-			<?php if ($_['isBruteForceProtectionEnabled']) p("checked");?> >

+			<?php if ($_['isBruteForceProtectionEnabled']) p("checked"); ?> >

 		<label for="security-brute-force-protection-enabled"><?php p($l->t('Activate Brute Force Protection')) ?></label>

 	</div>

 </div>

@@ -36,22 +36,22 @@ 
 	<div>

 		<label for="security-min-password-length"><?php p($l->t('Determine minimum password length')) ?></label>

 		<input type="number" id="security-min-password-length" min="6" value="<?php p($_['minPasswordLength']) ?>">

-        <button id="save-pass-length" class="save"><?php p($l->t('Save Length'));?></button>

+        <button id="save-pass-length" class="save"><?php p($l->t('Save Length')); ?></button>

         <span id="security-min-password-length-message" class="msg"></span>

 	</div>

 	<div>

 		<input type="checkbox" class="checkbox" id="security-enforce-upper-lower-case"

-			<?php if ($_['isUpperLowerCaseEnforced']) p("checked");?> >

+			<?php if ($_['isUpperLowerCaseEnforced']) p("checked"); ?> >

 		<label for="security-enforce-upper-lower-case"><?php p($l->t('Enforce at least one upper and one lower case character on passwords')) ?></label>

 	</div>

 	<div>

 		<input type="checkbox" class="checkbox" id="security-enforce-numerical-characters"

-			<?php if ($_['isNumericalCharsEnforced']) p("checked");?> >

+			<?php if ($_['isNumericalCharsEnforced']) p("checked"); ?> >

 		<label for="security-enforce-numerical-characters"><?php p($l->t('Enforce at least one numerical characters on passwords')) ?></label>

 	</div>

 	<div>

 		<input type="checkbox" class="checkbox" id="security-enforce-special-characters"

-			<?php if ($_['isSpecialCharsEnforced']) p("checked");?> >

+			<?php if ($_['isSpecialCharsEnforced']) p("checked"); ?> >

 		<label for="security-enforce-special-characters"><?php p($l->t('Enforce at least one special characters on passwords')) ?></label>

 	</div>

 </div>
\ No newline at end of file

Braces +16 added lines, -4 removed lines

@@ -26,7 +26,10 @@ 
 <div id="brute-force-protection">

 	<div>

 		<input type="checkbox" class="checkbox" id="security-brute-force-protection-enabled"

-			<?php if ($_['isBruteForceProtectionEnabled']) p("checked");?> >

+			<?php if ($_['isBruteForceProtectionEnabled']) {
+    p("checked");
+}
+?> >

 		<label for="security-brute-force-protection-enabled"><?php p($l->t('Activate Brute Force Protection')) ?></label>

 	</div>

 </div>

@@ -41,17 +44,26 @@ 
 	</div>

 	<div>

 		<input type="checkbox" class="checkbox" id="security-enforce-upper-lower-case"

-			<?php if ($_['isUpperLowerCaseEnforced']) p("checked");?> >

+			<?php if ($_['isUpperLowerCaseEnforced']) {
+    p("checked");
+}
+?> >

 		<label for="security-enforce-upper-lower-case"><?php p($l->t('Enforce at least one upper and one lower case character on passwords')) ?></label>

 	</div>

 	<div>

 		<input type="checkbox" class="checkbox" id="security-enforce-numerical-characters"

-			<?php if ($_['isNumericalCharsEnforced']) p("checked");?> >

+			<?php if ($_['isNumericalCharsEnforced']) {
+    p("checked");
+}
+?> >

 		<label for="security-enforce-numerical-characters"><?php p($l->t('Enforce at least one numerical characters on passwords')) ?></label>

 	</div>

 	<div>

 		<input type="checkbox" class="checkbox" id="security-enforce-special-characters"

-			<?php if ($_['isSpecialCharsEnforced']) p("checked");?> >

+			<?php if ($_['isSpecialCharsEnforced']) {
+    p("checked");
+}
+?> >

 		<label for="security-enforce-special-characters"><?php p($l->t('Enforce at least one special characters on passwords')) ?></label>

 	</div>

 </div>
\ No newline at end of file

templates/settings-personal.php

Indentation +5 added lines, -5 removed lines

@@ -25,15 +25,15 @@
 ?>

 <div id="password-policies" class="hidden">

 	<?php print_unescaped(

-		"<p>". $l->t('Passwords must:'). "</p>");?>

+        "<p>". $l->t('Passwords must:'). "</p>");?>

 	<ul class="pass-info">

 		<?php print_unescaped(

-			"<li class='pass-info-element'>". $l->t('be at least 8 characters long ', $_['minPasswordLength']). "</li>");?>

+            "<li class='pass-info-element'>". $l->t('be at least 8 characters long ', $_['minPasswordLength']). "</li>");?>

 		<?php if ($_['isUpperLowerCaseEnforced']) print_unescaped(

-			"<li class='pass-info-element'>". $l->t('contain at least one uppercase letter and at least one lowercase letter '). "</li>");?>

+            "<li class='pass-info-element'>". $l->t('contain at least one uppercase letter and at least one lowercase letter '). "</li>");?>

 		<?php if ($_['isNumericalCharsEnforced']) print_unescaped(

-			"<li class='pass-info-element'>". $l->t('contain at least one numerical character'). "</li>");?>

+            "<li class='pass-info-element'>". $l->t('contain at least one numerical character'). "</li>");?>

 		<?php if ($_['isSpecialCharsEnforced']) print_unescaped(

-			"<li class='pass-info-element'>". $l->t('contain at least one special character'). "</li>");?>

+            "<li class='pass-info-element'>". $l->t('contain at least one special character'). "</li>");?>

 	</ul>

 </div>

Spacing +5 added lines, -5 removed lines

@@ -25,15 +25,15 @@
 ?>

 <div id="password-policies" class="hidden">

 	<?php print_unescaped(

-		"<p>". $l->t('Passwords must:'). "</p>");?>

+		"<p>".$l->t('Passwords must:')."</p>"); ?>

 	<ul class="pass-info">

 		<?php print_unescaped(

-			"<li class='pass-info-element'>". $l->t('be at least 8 characters long ', $_['minPasswordLength']). "</li>");?>

+			"<li class='pass-info-element'>".$l->t('be at least 8 characters long ', $_['minPasswordLength'])."</li>"); ?>

 		<?php if ($_['isUpperLowerCaseEnforced']) print_unescaped(

-			"<li class='pass-info-element'>". $l->t('contain at least one uppercase letter and at least one lowercase letter '). "</li>");?>

+			"<li class='pass-info-element'>".$l->t('contain at least one uppercase letter and at least one lowercase letter ')."</li>"); ?>

 		<?php if ($_['isNumericalCharsEnforced']) print_unescaped(

-			"<li class='pass-info-element'>". $l->t('contain at least one numerical character'). "</li>");?>

+			"<li class='pass-info-element'>".$l->t('contain at least one numerical character')."</li>"); ?>

 		<?php if ($_['isSpecialCharsEnforced']) print_unescaped(

-			"<li class='pass-info-element'>". $l->t('contain at least one special character'). "</li>");?>

+			"<li class='pass-info-element'>".$l->t('contain at least one special character')."</li>"); ?>

 	</ul>

 </div>

Braces +15 added lines, -6 removed lines

@@ -29,11 +29,20 @@
 	<ul class="pass-info">

 		<?php print_unescaped(

 			"<li class='pass-info-element'>". $l->t('be at least 8 characters long ', $_['minPasswordLength']). "</li>");?>

-		<?php if ($_['isUpperLowerCaseEnforced']) print_unescaped(

-			"<li class='pass-info-element'>". $l->t('contain at least one uppercase letter and at least one lowercase letter '). "</li>");?>

-		<?php if ($_['isNumericalCharsEnforced']) print_unescaped(

-			"<li class='pass-info-element'>". $l->t('contain at least one numerical character'). "</li>");?>

-		<?php if ($_['isSpecialCharsEnforced']) print_unescaped(

-			"<li class='pass-info-element'>". $l->t('contain at least one special character'). "</li>");?>

+		<?php if ($_['isUpperLowerCaseEnforced']) {
+    print_unescaped(

+			"<li class='pass-info-element'>". $l->t('contain at least one uppercase letter and at least one lowercase letter '). "</li>");
+}
+?>

+		<?php if ($_['isNumericalCharsEnforced']) {
+    print_unescaped(

+			"<li class='pass-info-element'>". $l->t('contain at least one numerical character'). "</li>");
+}
+?>

+		<?php if ($_['isSpecialCharsEnforced']) {
+    print_unescaped(

+			"<li class='pass-info-element'>". $l->t('contain at least one special character'). "</li>");
+}
+?>

 	</ul>

 </div>

tests/bootstrap.php

Spacing +2 added lines, -2 removed lines

@@ -23,9 +23,9 @@
 }

 require_once __DIR__.'/../../../lib/base.php';

 

-OC::$composerAutoloader->addPsr4('Test\\', OC::$SERVERROOT . '/tests/lib', true);

+OC::$composerAutoloader->addPsr4('Test\\', OC::$SERVERROOT.'/tests/lib', true);

 

-if(!class_exists('PHPUnit_Framework_TestCase')) {

+if (!class_exists('PHPUnit_Framework_TestCase')) {

     require_once('PHPUnit/Autoload.php');

 }

 

tests/HooksTest.php

Indentation +25 added lines, -25 removed lines

@@ -47,14 +47,14 @@ 
      * @var \PHPUnit_Framework_MockObject_MockObject | IRequest

      */

     private $requestMock;

-	/**

-	 * @var \PHPUnit_Framework_MockObject_MockObject | PasswordValidator

-	 */

-	private $passwordValidatorMock;

-	/**

-	 * @var \PHPUnit_Framework_MockObject_MockObject | EventDispatcher

-	 */

-	private $dispatcherMock;

+    /**

+     * @var \PHPUnit_Framework_MockObject_MockObject | PasswordValidator

+     */

+    private $passwordValidatorMock;

+    /**

+     * @var \PHPUnit_Framework_MockObject_MockObject | EventDispatcher

+     */

+    private $dispatcherMock;

 

     public function setUp() {

         parent::setUp();

@@ -70,28 +70,28 @@ 
             ->disableOriginalConstructor()

             ->getMock();

         $this->passwordValidatorMock = $this->getMockBuilder('OCA\Security\PasswordValidator')

-			->disableOriginalConstructor()

-			->getMock();

-		$this->dispatcherMock = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcher')

-			->disableOriginalConstructor()

-			->getMock();

+            ->disableOriginalConstructor()

+            ->getMock();

+        $this->dispatcherMock = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcher')

+            ->disableOriginalConstructor()

+            ->getMock();

 

 

         $this->hooks = new Hooks(

-        	$this->userManagerMock,

-			$this->throttleMock,

-			$this->requestMock,

-			$this->passwordValidatorMock,

-			$this->dispatcherMock);

+            $this->userManagerMock,

+            $this->throttleMock,

+            $this->requestMock,

+            $this->passwordValidatorMock,

+            $this->dispatcherMock);

     }

 

     public function testRegister() {

-    	$this->userManagerMock->expects($this->exactly(2))

-			->method('listen');

-    	$this->dispatcherMock->expects($this->once())

-			->method('addListener');

-    	$this->hooks->register();

-	}

+        $this->userManagerMock->expects($this->exactly(2))

+            ->method('listen');

+        $this->dispatcherMock->expects($this->once())

+            ->method('addListener');

+        $this->hooks->register();

+    }

 

     public function testFailedLoginCallback() {

         $this->throttleMock->expects($this->once())

@@ -107,7 +107,7 @@ 
         $this->throttleMock->expects($this->once())

             ->method('clearSuspiciousAttemptsForIp');

 

-		/** @var \OCP\IUser $user*/

+        /** @var \OCP\IUser $user*/

         $user = $this->getMockBuilder('OCP\IUser')

             ->disableOriginalConstructor()

             ->getMock();