GEANT / CAT

web/lib/admin/view/PageElementAdapter.php

Spacing +4 added lines, -4 removed lines

@@ -9,7 +9,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class PageElementAdapter implements PageElementInterface{
+class PageElementAdapter implements PageElementInterface {
     
     /**
      * Wrapped HTML element.
@@ -39,7 +39,7 @@ 
      * 
      * @param string $text
      */
-    public function addText($text){
+    public function addText($text) {
         $this->text .= $text;
     }
     
@@ -49,10 +49,10 @@ 
      * @see \web\lib\admin\view\PageElementInterface::render()
      */
     public function render() {
-        if($this->element != null){
+        if ($this->element != null) {
             echo $this->element;
         }
-        if($this->text != ''){
+        if ($this->text != '') {
             echo $this->text;
         }
     }

tests/unit/web/lib/admin/http/SendTokenByEmailTest.php

Spacing +5 added lines, -5 removed lines

@@ -8,15 +8,15 @@ 
 use web\lib\admin\view\DefaultHtmlPage;
 use web\lib\admin\view\InstitutionPageBuilder;
 
-class MockEmptyPageBuilder extends InstitutionPageBuilder{
+class MockEmptyPageBuilder extends InstitutionPageBuilder {
 
-    public function __construct($page){
+    public function __construct($page) {
         $this->page = $page;
     }
 
 }
 
-class SendTokenByEmailTest extends PHPUnit_Framework_TestCase{
+class SendTokenByEmailTest extends PHPUnit_Framework_TestCase {
     
     /**
      * 
@@ -36,7 +36,7 @@ 
         $this->command = new MockSendTokenByEmail(MockSendTokenByEmail::COMMAND, $context);
     }
     
-    public function testExecute(){
+    public function testExecute() {
         
         $this->command->execute();
         $mail = $this->command->getMailer();
@@ -50,7 +50,7 @@ 
         $this->command->execute();
         $this->assertEmpty($mail->ErrorInfo);
         $this->assertNotEquals("", $mail->Subject);
-        $this->assertTrue(strpos($mail->Body, $_POST[GetTokenEmailDetails::PARAM_TOKENLINK])!==false);
+        $this->assertTrue(strpos($mail->Body, $_POST[GetTokenEmailDetails::PARAM_TOKENLINK]) !== false);
         $this->assertNotEmpty($mail->getAllRecipientAddresses());
         $this->assertArrayHasKey($_POST[ValidateEmailAddress::PARAM_ADDRESS], $mail->getAllRecipientAddresses());
     }

tests/unit/web/lib/admin/http/MockPHPMailer.php

Spacing +4 added lines, -4 removed lines

@@ -2,7 +2,7 @@ 
 require_once(dirname(dirname(dirname(dirname(dirname(dirname(dirname(__FILE__))))))) . "/core/PHPMailer/src/PHPMailer.php");
 use PHPMailer\PHPMailer\PHPMailer;
 
-class MockPHPMailer extends PHPMailer{
+class MockPHPMailer extends PHPMailer {
     
     /**
      * 
@@ -16,10 +16,10 @@ 
      * {@inheritDoc}
      * @see \PHPMailer\PHPMailer\PHPMailer::send()
      */
-    public function send(){
-        if($this->Subject && $this->Body && count($this->to)>0){
+    public function send() {
+        if ($this->Subject && $this->Body && count($this->to) > 0) {
             return true;
-        }else{
+        } else {
             $this->ErrorInfo = "Missing subject, body or email address!";
             return false;
         }

Braces +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
     public function send(){
         if($this->Subject && $this->Body && count($this->to)>0){
             return true;
-        }else{
+        } else{
             $this->ErrorInfo = "Missing subject, body or email address!";
             return false;
         }

tests/unit/web/lib/admin/http/MockDefaultAjaxPage.php

Spacing +4 added lines, -4 removed lines

@@ -3,7 +3,7 @@ 
 use web\lib\admin\view\DefaultAjaxPage;
 use web\lib\admin\view\html\CompositeTag;
 
-class MockDefaultAjaxPage extends DefaultAjaxPage{
+class MockDefaultAjaxPage extends DefaultAjaxPage {
     
     /**
      * 
@@ -23,8 +23,8 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\view\AbstractPage::appendHtmlElement()
      */
-    public function appendHtmlElement($name, $element){
-        if($name==DefaultAjaxPage::SECTION_RESPONSE){
+    public function appendHtmlElement($name, $element) {
+        if ($name == DefaultAjaxPage::SECTION_RESPONSE) {
             $this->response->addTag($element);
         }
     }
@@ -33,7 +33,7 @@ 
      * 
      * @return CompositeTag
      */
-    public function getResponse(){
+    public function getResponse() {
         return $this->response;
     }
 }

tests/unit/web/lib/admin/http/GetTokenEmailDetailsTest.php

Spacing +8 added lines, -8 removed lines

@@ -5,7 +5,7 @@ 
 use web\lib\admin\http\DefaultContext;
 use web\lib\admin\http\GetTokenEmailDetails;
 
-class GetTokenEmailDetailsTest extends PHPUnit_Framework_TestCase{
+class GetTokenEmailDetailsTest extends PHPUnit_Framework_TestCase {
     
     /**
      * 
@@ -24,13 +24,13 @@ 
         $this->command = new GetTokenEmailDetails(GetTokenEmailDetails::COMMAND, new DefaultContext($this->page));
     }
     
-    public function testExecute(){
+    public function testExecute() {
         
         $this->command->execute();
         $response = $this->page->getResponse();
         $renderedResponse = $response->__toString();
-        $this->assertTrue(strpos($renderedResponse, '<response>')!==false);
-        $this->assertTrue(strpos($renderedResponse, '</response>')!==false);
+        $this->assertTrue(strpos($renderedResponse, '<response>') !== false);
+        $this->assertTrue(strpos($renderedResponse, '</response>') !== false);
         $this->assertFalse(strpos($renderedResponse, 'subject='));
         
         $_POST[GetTokenEmailDetails::PARAM_TOKENLINK] = 'testtokenlinkstring';
@@ -39,9 +39,9 @@ 
 
         $renderedResponse = $response->__toString();
         
-        $this->assertTrue(strpos($renderedResponse, '<response>')!==false);
-        $this->assertTrue(strpos($renderedResponse, '</response>')!==false);
-        $this->assertTrue(strpos($renderedResponse, 'subject=')!==false);
-        $this->assertTrue(strpos($renderedResponse, $_POST[GetTokenEmailDetails::PARAM_TOKENLINK])!==false);
+        $this->assertTrue(strpos($renderedResponse, '<response>') !== false);
+        $this->assertTrue(strpos($renderedResponse, '</response>') !== false);
+        $this->assertTrue(strpos($renderedResponse, 'subject=') !== false);
+        $this->assertTrue(strpos($renderedResponse, $_POST[GetTokenEmailDetails::PARAM_TOKENLINK]) !== false);
     }
 }

tests/unit/web/lib/admin/http/MockSendTokenByEmail.php

Spacing +3 added lines, -3 removed lines

@@ -4,14 +4,14 @@ 
 use web\lib\admin\http\SilverbulletContext;
 use web\lib\admin\http\GetTokenEmailDetails;
 
-class MockSendTokenByEmail extends SendTokenByEmail{
+class MockSendTokenByEmail extends SendTokenByEmail {
     
     /**
      * 
      * @param string $commandToken
      * @param SilverbulletContext $context
      */
-    public function __construct($commandToken, $context){
+    public function __construct($commandToken, $context) {
         $this->session = $context->getSession();
         $this->mail = new MockPHPMailer();
         $this->detailsCommand = new GetTokenEmailDetails(GetTokenEmailDetails::COMMAND, $context);
@@ -22,7 +22,7 @@ 
      * 
      * @return \PHPMailer\PHPMailer\PHPMailer
      */
-    public function getMailer(){
+    public function getMailer() {
         return $this->mail;
     }
 }

web/lib/admin/http/UpdateUserCommand.php

Spacing +4 added lines, -4 removed lines

@@ -9,7 +9,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class UpdateUserCommand extends AbstractInvokerCommand{
+class UpdateUserCommand extends AbstractInvokerCommand {
 
     /**
      * Update command identifier.
@@ -29,7 +29,7 @@ 
      * @param string $commandToken
      * @param SilverbulletContext $context
      */
-    public function __construct($commandToken, $context){
+    public function __construct($commandToken, $context) {
         parent::__construct($commandToken, $context);
         $this->context = $context;
     }
@@ -39,7 +39,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\AbstractCommand::execute()
      */
-    public function execute(){
+    public function execute() {
         $userIndex = $this->parseInt($_POST[self::COMMAND]);
         $userIds = $this->parseArray($_POST[SaveUsersCommand::PARAM_ID]);
         $userExpiries = $this->parseArray($_POST[SaveUsersCommand::PARAM_EXPIRY]);
@@ -51,7 +51,7 @@ 
 
         $user->setExpiry($userExpiry);
         $username = $user->getUsername();
-        if(empty($user->get(SilverbulletUser::EXPIRY))){
+        if (empty($user->get(SilverbulletUser::EXPIRY))) {
             $this->storeErrorMessage(sprintf(_("Expiry date was incorrect for '%s'!"), $username));
         }
         $user->save();

web/lib/admin/http/RevokeCertificateCommand.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class RevokeCertificateCommand extends AbstractInvokerCommand{
+class RevokeCertificateCommand extends AbstractInvokerCommand {
 
     const COMMAND = 'revokecertificate';
 
@@ -23,7 +23,7 @@ 
      * @param string $commandToken
      * @param SilverbulletContext $context
      */
-    public function __construct($commandToken, $context){
+    public function __construct($commandToken, $context) {
         parent::__construct($commandToken, $context);
         $this->context = $context;
     }
@@ -33,7 +33,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\AbstractCommand::execute()
      */
-    public function execute(){
+    public function execute() {
         $profile = $this->context->getProfile();
         $certificateId = $this->parseInt($_POST[self::COMMAND]);
         

web/lib/admin/http/AbstractController.php

Spacing +2 added lines, -2 removed lines

@@ -23,8 +23,8 @@
      * @param string $commandToken
      * @return AbstractCommand
      */
-    public function createCommand($commandToken){
-        if(!isset($this->commands[$commandToken]) || $this->commands[$commandToken] == null){
+    public function createCommand($commandToken) {
+        if (!isset($this->commands[$commandToken]) || $this->commands[$commandToken] == null) {
             $this->commands[$commandToken] = $this->doCreateCommand($commandToken);
         }
         return $this->commands[$commandToken];