GEANT / CAT

web/lib/admin/view/PageElementGroup.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  * @author Zilvinas Vaira
  * 
  */
-class PageElementGroup implements PageElementInterface{
+class PageElementGroup implements PageElementInterface {
     
     /**
      * List of contained elements. Default value is empty array.

web/lib/admin/view/FileUploadForm.php

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class FileUploadForm extends AbstractForm{
+class FileUploadForm extends AbstractForm {
     
     /**
      *
@@ -27,10 +27,10 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\view\PageElementInterface::render()
      */
-    public function render(){
+    public function render() {
         ?>
         <div>
-            <form enctype="multipart/form-data" method="post" action="<?php echo $this->action;?>" accept-charset="utf-8">
+            <form enctype="multipart/form-data" method="post" action="<?php echo $this->action; ?>" accept-charset="utf-8">
                 <div class="<?php echo AddNewUserForm::ADDNEWUSER_CLASS; ?>">
                     <?php $this->messageBox->render(); ?>
                     <p><?php echo $this->description; ?></p>

web/lib/admin/view/AbstractPage.php

Spacing +13 added lines, -13 removed lines

@@ -9,7 +9,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-abstract class AbstractPage implements PageElementInterface{
+abstract class AbstractPage implements PageElementInterface {
 
     /**
      * Stores reusable null page element.
@@ -35,7 +35,7 @@ 
     /**
      * Instantiates common null element.
      */
-    public function __construct(){
+    public function __construct() {
         $this->nullElement = new PageElementNull();
     }
     
@@ -45,16 +45,16 @@ 
      * @param string $name Section name.
      * @param PageElementInterface $element Page element object.
      */
-    public function append($name, $element){
-        if(isset($this->groups [$name])){
+    public function append($name, $element) {
+        if (isset($this->groups [$name])) {
             $group = $this->groups [$name];
             $group->addElement($element);
-        }else if(isset($this->blocks[$name])){
+        } else if (isset($this->blocks[$name])) {
             $group = new PageElementGroup();
             $group->addElement($this->blocks[$name]);
             $this->blocks[$name] = $this->groups[$name] = $group;
             $group->addElement($element);
-        }else{
+        } else {
             $this->assign($name, $element);
         }
     }
@@ -65,7 +65,7 @@ 
      * @param string $name
      * @param HtmlElementInterface $element
      */
-    public function appendHtmlElement($name, $element){
+    public function appendHtmlElement($name, $element) {
         $this->append($name, new PageElementAdapter($element));
     }
     
@@ -75,9 +75,9 @@ 
      * @param string $name Section name.
      * @param PageElementInterface $element Page element object.
      */
-    public function assign($name, $element){
+    public function assign($name, $element) {
         $this->blocks [$name] = $element;
-        if(isset($this->groups [$name])){
+        if (isset($this->groups [$name])) {
             unset($this->groups[$name]);
         }
     }
@@ -88,7 +88,7 @@ 
      * @param string $name
      * @param HtmlElementInterface $element
      */
-    public function assignHtmlElement($name, $element){
+    public function assignHtmlElement($name, $element) {
         $this->assign($name, new PageElementAdapter($element));
     }
     
@@ -98,10 +98,10 @@ 
      * @param string $name Section name.
      * @return PageElementInterface Page element or group of page elements.
      */
-    public function fetch($name){
-        if(isset($this->blocks[$name])){
+    public function fetch($name) {
+        if (isset($this->blocks[$name])) {
             return $this->blocks[$name];
-        }else{
+        } else {
             return $this->nullElement;
         }
     }

Braces +3 added lines, -3 removed lines

@@ -49,12 +49,12 @@ 
         if(isset($this->groups [$name])){
             $group = $this->groups [$name];
             $group->addElement($element);
-        }else if(isset($this->blocks[$name])){
+        } else if(isset($this->blocks[$name])){
             $group = new PageElementGroup();
             $group->addElement($this->blocks[$name]);
             $this->blocks[$name] = $this->groups[$name] = $group;
             $group->addElement($element);
-        }else{
+        } else{
             $this->assign($name, $element);
         }
     }
@@ -101,7 +101,7 @@ 
     public function fetch($name){
         if(isset($this->blocks[$name])){
             return $this->blocks[$name];
-        }else{
+        } else{
             return $this->nullElement;
         }
     }

web/lib/admin/view/html/Tag.php

Spacing +9 added lines, -9 removed lines

@@ -6,7 +6,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class Tag extends UnaryTag{
+class Tag extends UnaryTag {
     
     /**
      *
@@ -14,7 +14,7 @@ 
      */
     protected $text = "";
     
-    public function addText($text){
+    public function addText($text) {
         $this->text .= $text;
     }
     
@@ -22,9 +22,9 @@ 
      * 
      * @return string
      */
-    protected function composeInnerString(){
+    protected function composeInnerString() {
         $innerString = "";
-        if(!empty($this->text)){
+        if (!empty($this->text)) {
             $innerString = $this->text;
         }
         return $innerString;
@@ -35,13 +35,13 @@ 
      * {@inheritDoc}
      * @see UnaryTag::composeTagString()
      */
-    protected function composeTagString($attributeString){
+    protected function composeTagString($attributeString) {
         $tagString = "";
         $innerString = $this->composeInnerString();
-        if(!empty($innerString)){
-            $tagString = "\n".$this->tab."<" . $this->name . $attributeString . ">" . $innerString . "</" . $this->name . ">";
-        }else{
-            $tagString = "\n".$this->tab."<" . $this->name . $attributeString . "></" . $this->name . ">";
+        if (!empty($innerString)) {
+            $tagString = "\n" . $this->tab . "<" . $this->name . $attributeString . ">" . $innerString . "</" . $this->name . ">";
+        } else {
+            $tagString = "\n" . $this->tab . "<" . $this->name . $attributeString . "></" . $this->name . ">";
         }
         return $tagString;
     }

Braces +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
         $innerString = $this->composeInnerString();
         if(!empty($innerString)){
             $tagString = "\n".$this->tab."<" . $this->name . $attributeString . ">" . $innerString . "</" . $this->name . ">";
-        }else{
+        } else{
             $tagString = "\n".$this->tab."<" . $this->name . $attributeString . "></" . $this->name . ">";
         }
         return $tagString;

web/lib/admin/view/DefaultAjaxPage.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class DefaultAjaxPage extends AbstractPage{
+class DefaultAjaxPage extends AbstractPage {
 
     const SECTION_RESPONSE = 'response';
     
@@ -26,7 +26,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\view\PageElementInterface::render()
      */
-    public function render(){
+    public function render() {
         $response = $this->fetch(self::SECTION_RESPONSE);
         ?><response><?php $response->render(); ?></response><?php 
     }

web/lib/admin/view/DefaultHtmlPage.php

Spacing +18 added lines, -18 removed lines

@@ -10,7 +10,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class DefaultHtmlPage extends AbstractPage{
+class DefaultHtmlPage extends AbstractPage {
     
     /**
      * Manage users base page type.
@@ -65,8 +65,8 @@ 
      * @param string $url File source url (must be clean url without query parameters).
      * @return string File source url with version query.
      */
-    private function  decorateVersion($url){
-        return $url.'?v='.$this->version;
+    private function  decorateVersion($url) {
+        return $url . '?v=' . $this->version;
     }
     
     /**
@@ -74,7 +74,7 @@ 
      * 
      * @param string $type 
      */
-    public function setType($type){
+    public function setType($type) {
         $this->type = $type;
     }
     
@@ -83,7 +83,7 @@ 
      * 
      * @return string
      */
-    public function getType(){
+    public function getType() {
         return $this->type;
     }
     
@@ -92,7 +92,7 @@ 
      * 
      * @param string $title Page title.
      */
-    public function setTitle($title){
+    public function setTitle($title) {
         $this->title = $title;
     }
     
@@ -101,7 +101,7 @@ 
      * 
      * @return string
      */
-    public function getTitle(){
+    public function getTitle() {
         return $this->title;
     }
 
@@ -110,7 +110,7 @@ 
      *
      * @param PageElementInterface $element Any page element.
      */
-    public function appendPrelude($element){
+    public function appendPrelude($element) {
         $this->append(self::SECTION_PRELUDE, $element);
     }
     
@@ -119,7 +119,7 @@ 
      *
      * @return PageElementInterface
      */
-    public function fetchPrelude(){
+    public function fetchPrelude() {
         return $this->fetch(self::SECTION_PRELUDE);
     }
     
@@ -128,7 +128,7 @@ 
      * 
      * @param PageElementInterface $element Any page element.
      */
-    public function appendContent($element){
+    public function appendContent($element) {
         $this->append(self::SECTION_CONTENT, $element);
     }
     
@@ -137,7 +137,7 @@ 
      * 
      * @return PageElementInterface
      */
-    public function fetchContent(){
+    public function fetchContent() {
         return $this->fetch(self::SECTION_CONTENT);
     }
     
@@ -146,7 +146,7 @@ 
      * 
      * @param string $url Path to a JavaScript file.
      */
-    public function appendScript($url){
+    public function appendScript($url) {
         $script = new Tag('script');
         $script->addAttribute('type', 'text/javascript');
         $script->addAttribute('src', $this->decorateVersion($url));
@@ -158,7 +158,7 @@ 
      * 
      * @return PageElementInterface
      */
-    public function fetchScript(){
+    public function fetchScript() {
         return $this->fetch(self::SECTION_SCRIPT);
     }
     
@@ -167,7 +167,7 @@ 
      * 
      * @param string $url Path to a CSS file.
      */
-    public function appendCss($url){
+    public function appendCss($url) {
         $css = new UnaryTag('link');
         $css->addAttribute('rel', 'stylesheet');
         $css->addAttribute('type', 'text/css');
@@ -180,7 +180,7 @@ 
      * 
      * @return PageElementInterface
      */
-    public function fetchCss(){
+    public function fetchCss() {
         return $this->fetch(self::SECTION_CSS);
     }
     
@@ -189,7 +189,7 @@ 
      * 
      * @param string[] $attributes Associative list of attributes for meta element.
      */
-    public function appendMeta($attributes = array()){
+    public function appendMeta($attributes = array()) {
         $meta = new Tag('meta');
         foreach ($attributes as $name => $value) {
             $meta->addAttribute($name, $value);
@@ -202,7 +202,7 @@ 
      *
      * @return PageElementInterface
      */
-    public function fetchMeta(){
+    public function fetchMeta() {
         return $this->fetch(self::SECTION_META);
     }
     
@@ -211,7 +211,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\view\PageElementInterface::render()
      */
-    public function render(){
+    public function render() {
         $content = $this->fetch(self::SECTION_CONTENT);
         $content->render();
     }

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