GEANT / CAT

web/lib/admin/view/TitledFormDecorator.php

Spacing +8 added lines, -8 removed lines

@@ -3,7 +3,7 @@ 
 
 use web\lib\admin\view\html\Attribute;
 
-class TitledFormDecorator extends PageElementDecorator{
+class TitledFormDecorator extends PageElementDecorator {
     
     const BEFORE = 0;
     
@@ -34,7 +34,7 @@ 
      * 
      * @var array
      */
-    private $elements = array( self::BEFORE => array(), self::AFTER => array());
+    private $elements = array(self::BEFORE => array(), self::AFTER => array());
     
     /**
      * 
@@ -42,7 +42,7 @@ 
      * @param string $class
      * @param string $title
      */
-    public function __construct($element, $title, $action, $class = '', $method = 'post', $charset = 'UTF-8'){
+    public function __construct($element, $title, $action, $class = '', $method = 'post', $charset = 'UTF-8') {
         parent::__construct($element, $class);
         $this->title = $title;
         $this->action = new Attribute('action', $action);
@@ -50,13 +50,13 @@ 
         $this->charset = new Attribute('accept-charset', $charset);
     }
     
-    public function addHtmlElement($element, $position = self::AFTER){
+    public function addHtmlElement($element, $position = self::AFTER) {
         $this->elements[$position][] = $element;
     }
     
     public function render() {
         ?>
-        <form enctype="multipart/form-data"<?php echo $this->action.$this->method.$this->charset; ?>>
+        <form enctype="multipart/form-data"<?php echo $this->action . $this->method . $this->charset; ?>>
             <fieldset<?php echo $this->class; ?>>
                 <legend>
                     <strong><?php echo $this->title; ?></strong>
@@ -64,7 +64,7 @@ 
 
                 <?php
                     foreach ($this->elements[self::BEFORE] as $element) {
-                        echo "\n".$element;
+                        echo "\n" . $element;
                     }
                 ?>
 
@@ -72,11 +72,11 @@ 
                     $this->element->render();
                 ?>
 
-                <?php if(count($this->elements[self::AFTER]) > 0){ ?>
+                <?php if (count($this->elements[self::AFTER]) > 0) { ?>
                 <div style="padding: 20px;">
                 <?php
                     foreach ($this->elements[self::AFTER] as $element) {
-                        echo "\n".$element;
+                        echo "\n" . $element;
                     }
                 ?>
                 </div>

web/lib/admin/view/DatePicker.php

Spacing +4 added lines, -4 removed lines

@@ -45,9 +45,9 @@ 
      * @param string $name Name of an input element
      * @param string $format Defines a format template for the date value
      */
-    public function __construct($name, $format='yyyy-MM-dd'){
+    public function __construct($name, $format = 'yyyy-MM-dd') {
         self::$COUNT++;
-        $this->id = self::INPUT_CLASS.'-'.self::$COUNT;
+        $this->id = self::INPUT_CLASS . '-' . self::$COUNT;
         $this->name = $name;
         $this->format = $format;
     }
@@ -57,7 +57,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\view\PageElementInterface::render()
      */
-    public function render(){
+    public function render() {
         echo $this;
         
         /*?>
@@ -69,7 +69,7 @@ 
         */
     }
     
-    public function __toString(){
+    public function __toString() {
         $div = new CompositeTag('div');
         $div->addAttribute('class', self::BLOCK_CLASS);
             $input = new UnaryTag('input');

web/lib/admin/view/InfoBlockTable.php

Spacing +5 added lines, -5 removed lines

@@ -4,7 +4,7 @@ 
 use web\lib\admin\view\html\Table;
 use web\lib\admin\view\html\Row;
 
-class InfoBlockTable implements PageElementInterface{
+class InfoBlockTable implements PageElementInterface {
     
     /**
      * 
@@ -18,22 +18,22 @@ 
      */
     private $decorator;
     
-    public function __construct($title){
+    public function __construct($title) {
         $this->table = new Table();
         $this->table->addAttribute("cellpadding", 5);
-        $this->decorator = new TitledBlockDecorator($this->table, $title,  PageElementInterface::INFOBLOCK_CLASS);
+        $this->decorator = new TitledBlockDecorator($this->table, $title, PageElementInterface::INFOBLOCK_CLASS);
     }
     
     /**
      * @param array $rowArray
      */
-    public function addRow($rowArray){
+    public function addRow($rowArray) {
         $row = new Row($rowArray);
         $row->addCellAttribute(0, 'class', Table::TITLED_CELL_CLASS);
         $this->table->addRow($row);
     }
     
-    public function render(){
+    public function render() {
         $this->decorator->render();
     }
 }

web/lib/admin/view/TitledBlockDecorator.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 namespace web\lib\admin\view;
 
-class TitledBlockDecorator extends PageElementDecorator{
+class TitledBlockDecorator extends PageElementDecorator {
     
     /**
      * 
@@ -15,7 +15,7 @@ 
      * @param string $class
      * @param string $title
      */
-    public function __construct($element, $title, $class = ""){
+    public function __construct($element, $title, $class = "") {
         parent::__construct($element, $class);
         $this->title = $title;
         

web/lib/admin/view/YesNoDialogBox.php

Braces +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
             <button type="submit" name="<?php echo $this->controls[self::YES]['name']; ?>" value="<?php echo $this->controls[self::YES]['value']; ?>"><?php echo _('Yes'); ?></button>
         <?php if($this->controls[self::NO]['name'] == ''){ ?>
             <button class="<?php echo $this->id . '-close'; ?>" type="reset"><?php echo _('No'); ?></button>
-        <?php }else{ ?>
+        <?php } else{ ?>
             <button type="submit" name="<?php echo $this->controls[self::NO]['name']; ?>" value="<?php echo $this->controls[self::NO]['value']; ?>"><?php echo _('No'); ?></button>
         <?php }
     }

Spacing +7 added lines, -7 removed lines

@@ -6,7 +6,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class YesNoDialogBox extends AbstractTextDialogBox{
+class YesNoDialogBox extends AbstractTextDialogBox {
 
     const NO = 0;
     const YES = 1;
@@ -25,7 +25,7 @@ 
      * @param string $action
      * @param string $text
      */
-    public function __construct($id, $action, $text){
+    public function __construct($id, $action, $text) {
         parent::__construct($action, $text);
         $this->id = $id;
     }
@@ -35,7 +35,7 @@ 
      * @param string $name
      * @param string $value
      */
-    public function setYesControl($name, $value){
+    public function setYesControl($name, $value) {
         $this->controls[self::YES]['name'] = $name;
         $this->controls[self::YES]['value'] = $value;
     }
@@ -45,7 +45,7 @@ 
      * @param string $name
      * @param string $value
      */
-    public function setNoControl($name, $value){
+    public function setNoControl($name, $value) {
         $this->controls[self::NO]['name'] = $name;
         $this->controls[self::NO]['value'] = $value;
     }
@@ -55,12 +55,12 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\view\AbstractDialogBox::renderControls()
      */
-    protected function renderControls(){
+    protected function renderControls() {
         ?>
             <button type="submit" name="<?php echo $this->controls[self::YES]['name']; ?>" value="<?php echo $this->controls[self::YES]['value']; ?>"><?php echo _('Yes'); ?></button>
-        <?php if($this->controls[self::NO]['name'] == ''){ ?>
+        <?php if ($this->controls[self::NO]['name'] == '') { ?>
             <button class="<?php echo $this->id . '-close'; ?>" type="reset"><?php echo _('No'); ?></button>
-        <?php }else{ ?>
+        <?php } else { ?>
             <button type="submit" name="<?php echo $this->controls[self::NO]['name']; ?>" value="<?php echo $this->controls[self::NO]['value']; ?>"><?php echo _('No'); ?></button>
         <?php }
     }

web/lib/admin/view/PageElementDecorator.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 
 use web\lib\admin\view\html\Attribute;
 
-abstract class PageElementDecorator implements PageElementInterface{
+abstract class PageElementDecorator implements PageElementInterface {
     
     /**
      * 

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

Doc Comments +1 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
     
     /**
      * 
-     * @return number
+     * @return integer
      */
     public function size(){
         return count($this->rows);
@@ -53,7 +53,6 @@ 
     
     /**
      * 
-     * @param array $row
      */
     public function addRowArray($cells){
         $this->addRow(new Row($cells));

Spacing +17 added lines, -17 removed lines

@@ -5,7 +5,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class Table extends Tag{
+class Table extends Tag {
     
     const TITLED_CELL_CLASS = 'sb-titled-cell';
     
@@ -24,7 +24,7 @@ 
      * 
      * @param array $rows
      */
-    public function __construct($rows = array()){
+    public function __construct($rows = array()) {
         parent::__construct('table');
         $this->setRows($rows);
     }
@@ -33,7 +33,7 @@ 
      * 
      * @return number
      */
-    public function size(){
+    public function size() {
         return count($this->rows);
     }
 
@@ -42,11 +42,11 @@ 
      * @param int $row
      * @param string $column
      */
-    private function createRow($row, $column){
-        if(!in_array($column, $this->columns)){
+    private function createRow($row, $column) {
+        if (!in_array($column, $this->columns)) {
             $this->columns [] = $column;
         }
-        if(!isset($this->rows[$row])){
+        if (!isset($this->rows[$row])) {
             $this->rows [$row] = new Row();
         }
     }
@@ -57,7 +57,7 @@ 
      * @param string $column
      * @param UnaryTag $element
      */
-    public function addToCell($row, $column, $element){
+    public function addToCell($row, $column, $element) {
         $this->createRow($row, $column);
         $this->rows[$row]->addToCell($column, $element);
     }
@@ -68,7 +68,7 @@ 
      * @param string $column
      * @return \web\lib\admin\view\html\CompositeTag
      */
-    public function getCell($row, $column){
+    public function getCell($row, $column) {
         $this->createRow($row, $column);
         return $this->rows[$row]->getCell($column);
     }
@@ -77,7 +77,7 @@ 
      * 
      * @param array $row
      */
-    public function addRowArray($cells){
+    public function addRowArray($cells) {
         $this->addRow(new Row($cells));
     }
     
@@ -85,8 +85,8 @@ 
      *
      * @param Row $row
      */
-    public function addRow($row){
-        if(count($row->size())>0){
+    public function addRow($row) {
+        if (count($row->size()) > 0) {
             $this->rows [] = $row;
             $this->setColumns($row);
         }
@@ -96,8 +96,8 @@ 
      * 
      * @param array $rows
      */
-    public function setRows($rows){
-        if(count($rows)>0){
+    public function setRows($rows) {
+        if (count($rows) > 0) {
             foreach ($rows as $cells) {
                 $this->addRowArray($cells);
             }
@@ -108,10 +108,10 @@ 
      * 
      * @param Row $row
      */
-    private function setColumns($row){
+    private function setColumns($row) {
         $cells = $row->getCells();
         foreach ($cells as $key => $value) {
-            if(!in_array($key, $this->columns)){
+            if (!in_array($key, $this->columns)) {
                 $this->columns [] = $key;
             }
         }
@@ -121,11 +121,11 @@ 
      * 
      * @return string
      */
-    protected function composeInnerString(){
+    protected function composeInnerString() {
         $innerString = "";
         foreach ($this->rows as $row) {
             $row->setColumns($this->columns);
-            $row->setTab("\t".$this->tab);
+            $row->setTab("\t" . $this->tab);
             $innerString .= $row;
         }
         return $innerString;

tests/unit/web/lib/admin/view/InstitutionPageBuilderTest.php

Braces +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
     private function valid_IdP($input, $owner){
         if ($input == 1){
             return new MockInstitution();
-        }else{
+        } else{
             throw new Exception('IdP '.$input.' not found in database!');
         }
     }

Doc Comments +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
      * @param unknown $input
      * @param unknown $owner
      * @throws Exception
-     * @return mixed
+     * @return MockInstitution
      */
     private function valid_IdP($input, $owner){
         if ($input == 1){

Spacing +12 added lines, -12 removed lines

@@ -3,9 +3,9 @@ 
 use web\lib\admin\view\DefaultHtmlPage;
 use web\lib\admin\view\InstitutionPageBuilder;
 
-class MockValidateInstitutionPageBuilder extends InstitutionPageBuilder{
+class MockValidateInstitutionPageBuilder extends InstitutionPageBuilder {
     
-    protected function validateInstitution(){
+    protected function validateInstitution() {
         $this->institution = $this->valid_IdP($_GET['inst_id'], $_SESSION['user']);
     }
     
@@ -16,34 +16,34 @@ 
      * @throws Exception
      * @return mixed
      */
-    private function valid_IdP($input, $owner){
-        if ($input == 1){
+    private function valid_IdP($input, $owner) {
+        if ($input == 1) {
             return new MockInstitution();
-        }else{
-            throw new Exception('IdP '.$input.' not found in database!');
+        } else {
+            throw new Exception('IdP ' . $input . ' not found in database!');
         }
     }
     
 }
 
-class MockInstitution{
+class MockInstitution {
     public $name = "Test name";
 }
 
-class InstitutionPageBuilderTest extends \PHPUnit_Framework_TestCase{
+class InstitutionPageBuilderTest extends \PHPUnit_Framework_TestCase {
     
     protected function setUp() {
         $_SESSION['user'] = "user";
     }
     
-    public function testConstructorSuccess(){
-        $_GET['inst_id']=1;
+    public function testConstructorSuccess() {
+        $_GET['inst_id'] = 1;
         $builder = new MockValidateInstitutionPageBuilder(new DefaultHtmlPage("Testing Page"));
         $this->assertTrue($builder->isReady());
     }
     
-    public function testConstructorFailure(){
-        $_GET['inst_id']=-1;
+    public function testConstructorFailure() {
+        $_GET['inst_id'] = -1;
         $builder = new MockValidateInstitutionPageBuilder(new DefaultHtmlPage("Testing Page"));
         $this->assertFalse($builder->isReady());
         

web/admin/API.php

Spacing +1 added lines, -2 removed lines

@@ -41,8 +41,7 @@
         $leftNum = (int) preg_replace($pat, $rep, $left);
         $rightNum = (int) preg_replace($pat, $rep, $right);
         return ($left != $leftNum && $right != $rightNum) ?
-                $leftNum - $rightNum :
-                strcmp($left, $right);
+                $leftNum - $rightNum : strcmp($left, $right);
     }