GEANT / CAT

tests/unit/web/lib/admin/utils/CSVParserTest.php

Spacing +12 added lines, -12 removed lines

@@ -2,19 +2,19 @@ 
 
 use web\lib\admin\utils\CSVParser;
 
-class MockCSVParser extends CSVParser{
+class MockCSVParser extends CSVParser {
     
     public function __construct($fileData, $rowDelimiter, $tokenDelimiter) {
         $this->rowDelimiter = $rowDelimiter;
         $this->tokenDelimiter = $tokenDelimiter;
-        if($this->validate($fileData)){
+        if ($this->validate($fileData)) {
             $this->rows = str_getcsv($fileData['contents'], $this->rowDelimiter);
         }
     }
     
 }
 
-class CSVParserTest extends PHPUnit_Framework_TestCase{
+class CSVParserTest extends PHPUnit_Framework_TestCase {
     
     private $rowDelimiter = "\n", $tokenDelimiter = ",";
     
@@ -52,15 +52,15 @@ 
             'contents' => ""
     );
     
-    protected function setUp(){
-        $this->successFileData['contents'] = "testuser1,".date('Y-m-d',strtotime("+1 month")).",2
-                           testuser2,".date('Y-m-d',strtotime("+2 month")).",
-                           testuser3,".date('Y-m-d',strtotime("+1 month")).",1
-                           testuser4,".date('Y-m-d',strtotime("+3 month")).",
-                           testuser5,".date('Y-m-d',strtotime("+1 month")).",3";
+    protected function setUp() {
+        $this->successFileData['contents'] = "testuser1," . date('Y-m-d', strtotime("+1 month")) . ",2
+                           testuser2,".date('Y-m-d', strtotime("+2 month")) . ",
+                           testuser3,".date('Y-m-d', strtotime("+1 month")) . ",1
+                           testuser4,".date('Y-m-d', strtotime("+3 month")) . ",
+                           testuser5,".date('Y-m-d', strtotime("+1 month")) . ",3";
     }
     
-    public function testIsValid(){
+    public function testIsValid() {
         $parser = new MockCSVParser($this->faultyFileData, $this->rowDelimiter, $this->tokenDelimiter);
         $this->assertFalse($parser->isValid());
         
@@ -76,7 +76,7 @@ 
         $this->assertTrue($parser->isValid());
     }
     
-    public function testHasMoreRows(){
+    public function testHasMoreRows() {
         $parser = new MockCSVParser($this->faultyFileData, $this->rowDelimiter, $this->tokenDelimiter);
         $this->assertFalse($parser->hasMoreRows());
 
@@ -87,7 +87,7 @@ 
         $this->assertTrue($parser->hasMoreRows());
     }
     
-    public function testNextRow(){
+    public function testNextRow() {
         $parser = new MockCSVParser($this->faultyFileData, $this->rowDelimiter, $this->tokenDelimiter);
         $this->assertCount(0, $parser->nextRow());
         

tests/unit/web/lib/admin/storage/SessionStorageTest.php

Spacing +7 added lines, -7 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 use web\lib\admin\storage\SessionStorage;
 
-if ( !isset( $_SESSION ) ) $_SESSION = array();
+if (!isset($_SESSION)) $_SESSION = array();
 
-class SessionStorageTest extends PHPUnit_Framework_TestCase{
-    protected $backupGlobalsBlacklist = array( '_SESSION' );
+class SessionStorageTest extends PHPUnit_Framework_TestCase {
+    protected $backupGlobalsBlacklist = array('_SESSION');
     private $package1 = "testpackage1";
     private $package2 = "testpackage2";
     
-    public function testGetInstance(){
+    public function testGetInstance() {
         $globalSession = SessionStorage::getInstance();
         $scopedSession1 = SessionStorage::getInstance($this->package1);
         $scopedSession2 = SessionStorage::getInstance($this->package2);
@@ -21,7 +21,7 @@ 
         $this->assertNotEquals($scopedSession1, $scopedSession2);
     }
     
-    public function testPut(){
+    public function testPut() {
         $testPutGlobal = "testputglobal";
         $globalSession = SessionStorage::getInstance();
         $globalSession->put($testPutGlobal, $testPutGlobal);
@@ -41,7 +41,7 @@ 
         $this->assertNotEquals($_SESSION[SessionStorage::INDEX][SessionStorage::SCOPED][$this->package1][$testPutScoped1], $_SESSION[SessionStorage::INDEX][SessionStorage::SCOPED][$this->package2][$testPutScoped2]);
     }
     
-    public function testGet(){
+    public function testGet() {
         $testGetGlobal = "testgetglobal";
         $globalSession = SessionStorage::getInstance();
         $_SESSION[SessionStorage::INDEX][SessionStorage::WIDE][$testGetGlobal] = $testGetGlobal;
@@ -62,7 +62,7 @@ 
         $this->assertNotEquals($scopedSession2->get($testGetScoped2), $scopedSession1->get($testGetScoped1));
     }
     
-    public function testDelete(){
+    public function testDelete() {
         $testGetGlobal = "testgetglobal";
         $globalSession = SessionStorage::getInstance();
         $_SESSION[SessionStorage::INDEX][SessionStorage::WIDE][$testGetGlobal] = $testGetGlobal;

tests/unit/web/lib/admin/view/html/AttributeTest.php

Spacing +6 added lines, -6 removed lines

@@ -1,19 +1,19 @@ 
 <?php
 use web\lib\admin\view\html\Attribute;
 
-class AttributeTest extends \PHPUnit_Framework_TestCase{
+class AttributeTest extends \PHPUnit_Framework_TestCase {
     
-    private function validateString($attribute){
+    private function validateString($attribute) {
         $string = $attribute->__toString();
         $this->assertNotEmpty($string);
     
         $space = substr($string, 0, 1);
-        $this->assertEquals($space,' ');
+        $this->assertEquals($space, ' ');
     
         $spaceRemoved = substr($string, 1);
         $pair = explode('=', $spaceRemoved, 2);
     
-        if(count($pair)>1){
+        if (count($pair) > 1) {
             $this->assertTrue(strlen($pair[0]) > 0);
             $this->assertTrue(strlen($pair[1]) > 2);
             $this->assertEquals(substr_count($pair[0], '"'), 0);
@@ -32,11 +32,11 @@ 
         $this->assertEmpty($string);
     }
     
-    public function testValidToString(){
+    public function testValidToString() {
         $this->validateString(new Attribute("type", "button"));
     }
     
-    public function testFaultyToString(){
+    public function testFaultyToString() {
         $this->validateString(new Attribute("t\"ype", "b=ut\"ton"));
     }
     

tests/unit/web/lib/admin/view/html/CompositeTagTest.php

Spacing +4 added lines, -4 removed lines

@@ -2,13 +2,13 @@ 
 use web\lib\admin\view\html\CompositeTag;
 use web\lib\admin\view\html\Tag;
 
-class CompositeTagTest extends \PHPUnit_Framework_TestCase{
+class CompositeTagTest extends \PHPUnit_Framework_TestCase {
     
     private $compositeTag;
     
     private $tag;
     
-    protected function setUp(){
+    protected function setUp() {
         $this->compositeTag = new CompositeTag('div');
         $this->tag = new Tag('p');
     }
@@ -23,7 +23,7 @@ 
         $this->assertTrue(in_array($this->tag, $tags));
     }
     
-    public function testToString(){
+    public function testToString() {
         $string = $this->compositeTag->__toString();
         $this->assertEquals('<div>', substr(trim($string), 0, 5));
         $this->assertEquals('</div>', substr(trim($string), -6));
@@ -33,7 +33,7 @@ 
         $this->assertEquals('<div>', substr(trim($string), 0, 5));
         $this->assertEquals('</div>', substr(trim($string), -6));
         
-        $string = str_replace(array('<div>','</div>'), '', $string);
+        $string = str_replace(array('<div>', '</div>'), '', $string);
         $this->assertEquals('<p>', substr(trim($string), 0, 3));
         $this->assertEquals('</p>', substr(trim($string), -4));
     }

tests/unit/web/lib/admin/view/html/ButtonTest.php

Spacing +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 use web\lib\admin\view\html\Button;
 
-class ButtonTest extends \PHPUnit_Framework_TestCase{
+class ButtonTest extends \PHPUnit_Framework_TestCase {
     
     private $title;
     
-    protected function setUp(){
+    protected function setUp() {
         $this->title = 'Some title';
     }
     
@@ -26,10 +26,10 @@ 
         $button = new Button($this->title, $type, $name, $value, $class);
         $string = $button->__toString();
     
-        $this->assertNotEquals(strpos($string, 'type="'.$type.'"'), false);
-        $this->assertNotEquals(strpos($string, 'name="'.$name.'"'), false);
-        $this->assertNotEquals(strpos($string, 'value="'.$value.'"'), false);
-        $this->assertNotEquals(strpos($string, 'class="'.$class.'"'), false);
+        $this->assertNotEquals(strpos($string, 'type="' . $type . '"'), false);
+        $this->assertNotEquals(strpos($string, 'name="' . $name . '"'), false);
+        $this->assertNotEquals(strpos($string, 'value="' . $value . '"'), false);
+        $this->assertNotEquals(strpos($string, 'class="' . $class . '"'), false);
         $this->assertNotEquals(strpos($string, $this->title), false);
     }
     

web/lib/admin/domain/Attribute.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
      * 
      * @return string
      */
-    public function getType(){
+    public function getType() {
         return $this->type;
     }
     

web/lib/admin/utils/CSVParser.php

Spacing +8 added lines, -8 removed lines

@@ -54,7 +54,7 @@ 
     public function __construct($fileData, $rowDelimiter, $tokenDelimiter) {
         $this->rowDelimiter = $rowDelimiter;
         $this->tokenDelimiter = $tokenDelimiter;
-        if($this->validate($fileData)){
+        if ($this->validate($fileData)) {
             $handle = fopen($fileData['tmp_name'], "r");
             $contents = fread($handle, filesize($fileData['tmp_name']));
             fclose($handle);
@@ -68,13 +68,13 @@ 
      * @param array $fileData Data array from $_FILES['yourfile']
      * @return boolean Is file data valid
      */
-    protected function validate($fileData){
-        if(empty($fileData) || empty($fileData['name']) || empty($fileData['tmp_name']) || $fileData['error']>0){
+    protected function validate($fileData) {
+        if (empty($fileData) || empty($fileData['name']) || empty($fileData['tmp_name']) || $fileData['error'] > 0) {
             $this->state = false;
         }
         
         $extension = pathinfo($fileData['name'], PATHINFO_EXTENSION);
-        if($extension!='csv' && $extension!='CSV'){
+        if ($extension != 'csv' && $extension != 'CSV') {
             $this->state = false;
         }
         return $this->state;
@@ -94,7 +94,7 @@ 
      * 
      * @return boolean
      */
-    public function hasMoreRows(){
+    public function hasMoreRows() {
         return $this->state && isset($this->rows[$this->index]);
     }
     
@@ -103,12 +103,12 @@ 
      * 
      * @return array
      */
-    public function nextRow(){
-        if($this->state && $this->hasMoreRows()){
+    public function nextRow() {
+        if ($this->state && $this->hasMoreRows()) {
             $row = str_getcsv($this->rows[$this->index], $this->tokenDelimiter);
             $this->index++;
             return $row;
-        }else{
+        } else {
             return array();
         }
     }

web/lib/admin/storage/SessionStorage.php

Spacing +20 added lines, -20 removed lines

@@ -6,7 +6,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class SessionStorage implements StorageInterface{
+class SessionStorage implements StorageInterface {
     
     const INDEX = 'silverbullet-storage';
     const WIDE = 'wide';
@@ -41,21 +41,21 @@ 
      * 
      * @param string $package
      */
-    private function __construct($package = ""){
-        if(!isset($_SESSION)){
+    private function __construct($package = "") {
+        if (!isset($_SESSION)) {
             session_start();
         }
-        if(!isset($_SESSION['silverbullet-storage'])){
+        if (!isset($_SESSION['silverbullet-storage'])) {
             $_SESSION[self::INDEX] = array();
             $_SESSION[self::INDEX][self::WIDE] = array();
             $_SESSION[self::INDEX][self::SCOPED] = array();
         }
-        if (!empty($package)){
-            if(!isset($_SESSION[self::INDEX][self::SCOPED][$package])){
+        if (!empty($package)) {
+            if (!isset($_SESSION[self::INDEX][self::SCOPED][$package])) {
                 $_SESSION[self::INDEX][self::SCOPED][$package] = array();
             }
             $this->session = &$_SESSION[self::INDEX][self::SCOPED][$package];
-        }else{
+        } else {
             $this->session = &$_SESSION[self::INDEX][self::WIDE];
         }
         $this->package = $package;
@@ -66,22 +66,22 @@ 
      * @param string $package
      * @return SessionStorage
      */
-    public static function getInstance($package = ""){
+    public static function getInstance($package = "") {
         
-        if(empty($package)){
-            if(empty(self::$instance)){
+        if (empty($package)) {
+            if (empty(self::$instance)) {
                 self::$instance = new self($package);
             }
             return self::$instance;
-        }else{
-            if(!isset(self::$pool[$package])){
+        } else {
+            if (!isset(self::$pool[$package])) {
                 self::$pool[$package] = new self($package);
             } 
             return self::$pool[$package];
         }
     }
     
-    public static function close(){
+    public static function close() {
         session_unset();
         session_destroy();
     }
@@ -91,7 +91,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\storage\StorageInterface::put()
      */
-    public function put($identifier, $object){
+    public function put($identifier, $object) {
         $this->session[$identifier] = $object;
     }
     
@@ -100,7 +100,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\storage\StorageInterface::add()
      */
-    public function add($identifier, $object){
+    public function add($identifier, $object) {
         $this->session[$identifier][] = $object;
     }
     
@@ -109,10 +109,10 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\storage\StorageInterface::get()
      */
-    public function get($identifier){
-        if(isset($this->session[$identifier])){
+    public function get($identifier) {
+        if (isset($this->session[$identifier])) {
             return $this->session[$identifier];
-        }else{
+        } else {
             return array();
         }
     }
@@ -120,7 +120,7 @@ 
     /**
      * 
      */
-    public function getAll(){
+    public function getAll() {
         return $this->session;
     }
     
@@ -129,7 +129,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\storage\StorageInterface::delete()
      */
-    public function delete($identifier){
+    public function delete($identifier) {
         unset($this->session[$identifier]);
     }
     

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

Spacing +3 added lines, -3 removed lines

@@ -6,7 +6,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class JSButton extends Button{
+class JSButton extends Button {
     
     const REVOKE_CREDENTIAL_ACTION = 'revokeCredential';
     const DELETE_USER_ACTION = 'deleteUser';
@@ -16,12 +16,12 @@ 
     
     private $action = "";
     
-    public function __construct($title, $action, $name = '', $value = '', $type = 'button', $class = ''){
+    public function __construct($title, $action, $name = '', $value = '', $type = 'button', $class = '') {
         parent::__construct($title, $type, $name, $value, $class);
         $this->action = $action;
     }
     
     protected function composeNameValueString() {
-        return ' onclick="'.$this->action.'(\''.$this->name.'\',\''.$this->value.'\')"';
+        return ' onclick="' . $this->action . '(\'' . $this->name . '\',\'' . $this->value . '\')"';
     }
 }