owncloud / security

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 {

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

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 {

 

tests/SecurityConfigTest.php

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

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

templates/settings-personal.php

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>

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');

 }

 

lib/PasswordValidator.php

Spacing +7 added lines, -7 removed lines

@@ -22,7 +22,7 @@ 
 use OC\HintException;

 use OCP\IL10N;

 

-class PasswordValidator  {

+class PasswordValidator {

 

 	/** @var SecurityConfig */

 	protected $config;

@@ -62,8 +62,8 @@ 
 	 */

 	public function checkPasswordLength($password) {

 		$minPassLength = $this->config->getMinPasswordLength();

-		if(strlen($password) < $minPassLength) {

-			$message = 'Password needs to be at least ' . $minPassLength . ' characters long';

+		if (strlen($password) < $minPassLength) {

+			$message = 'Password needs to be at least '.$minPassLength.' characters long';

 			$hint = $this->l->t(

 				'Password needs to be at least %s characters long', [$minPassLength]

 			);

@@ -78,8 +78,8 @@ 
 	 * @throws HintException

 	 */

 	public function checkUpperLowerCase($password) {

-		$enforceUpperLowerCase= $this->config->getIsUpperLowerCaseEnforced();

-		if($enforceUpperLowerCase === true && $this->hasUpperAndLowerCase($password) === false) {

+		$enforceUpperLowerCase = $this->config->getIsUpperLowerCaseEnforced();

+		if ($enforceUpperLowerCase === true && $this->hasUpperAndLowerCase($password) === false) {

 			$message = 'Password should contain at least one upper and one lower case character.';

 			$hint = $this->l->t(

 				'Password should contain at least one upper and one lower case character.'

@@ -96,7 +96,7 @@ 
 	 */

 	public function checkNumericCharacters($password) {

 		$enforceNumericCharacters = $this->config->getIsNumericCharactersEnforced();

-		if($enforceNumericCharacters === true && $this->hasNumericalCharacters($password) === false) {

+		if ($enforceNumericCharacters === true && $this->hasNumericalCharacters($password) === false) {

 			$message = 'Password should contain at least one numerical character.';

 			$hint = $this->l->t(

 				'Password should contain at least one numerical character.'

@@ -113,7 +113,7 @@ 
 	 */

 	public function checkSpecialCharacters($password) {

 		$enforceSpecialCharacters = $this->config->getIsSpecialCharactersEnforced();

-		if($enforceSpecialCharacters === true && $this->hasSpecialCharacter($password) === false) {

+		if ($enforceSpecialCharacters === true && $this->hasSpecialCharacter($password) === false) {

 			$message = 'Password should contain at least one special character.';

 			$hint = $this->l->t(

 				'Password should contain at least one special character.'

lib/AppInfo/Application.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 

 class Application extends App {

 

-    public function __construct(array $urlParams=array()){

+    public function __construct(array $urlParams = array()) {

         parent::__construct('security', $urlParams);

 

         $container = $this->getContainer();