GEANT / CAT

tests/unit/web/lib/admin/domain/SilverbulletCertificateTest.php

Spacing +8 added lines, -8 removed lines

@@ -40,7 +40,7 @@ 
     
     private $faultyUser = null;
     
-    protected function setUp(){
+    protected function setUp() {
         $this->profile = new MockProfileSilverbullet(\core\DBConnection::handle('INST'));
         $this->profileId = $this->profile->identifier;
         
@@ -70,7 +70,7 @@ 
         $list = SilverbulletCertificate::getList($this->newUser);
         $found = false;
         foreach ($list as $certificate) {
-            if($certificate->getIdentifier() == $this->newCertificate->getIdentifier()){
+            if ($certificate->getIdentifier() == $this->newCertificate->getIdentifier()) {
                 $found = true;
                 break;
             }
@@ -89,7 +89,7 @@ 
         $this->assertTrue($result);
     }
     
-    public function testNewCertificateFailure(){
+    public function testNewCertificateFailure() {
         $this->faultyCertificate->save();
         $this->assertEmpty($this->faultyCertificate->getIdentifier());
         
@@ -99,7 +99,7 @@ 
         $list = SilverbulletCertificate::getList($this->faultyUser);
         $found = false;
         foreach ($list as $certificate) {
-            if($certificate->getIdentifier() == $this->faultyCertificate->getIdentifier()){
+            if ($certificate->getIdentifier() == $this->faultyCertificate->getIdentifier()) {
                 $found = true;
                 break;
             }
@@ -107,12 +107,12 @@ 
         $this->assertFalse($found);
     }
     
-    public function testFaultyCertificateLoadFailure(){
+    public function testFaultyCertificateLoadFailure() {
         $this->faultyCertificate->load();
         $this->assertEmpty($this->faultyCertificate->getIdentifier());
     }
     
-    public function testSetRevoked(){
+    public function testSetRevoked() {
         $this->newCertificate->save();
         $this->assertNotEmpty($this->newCertificate->getIdentifier());
         
@@ -136,9 +136,9 @@ 
         $this->assertEquals(SilverbulletCertificate::NOT_REVOKED, $existingCertificate->get(SilverbulletCertificate::REVOCATION_STATUS));
     }
     
-    protected function tearDown(){
+    protected function tearDown() {
         $this->newUser->delete();
-        if(!empty($this->faultyCertificate)){
+        if (!empty($this->faultyCertificate)) {
             $this->faultyCertificate->delete();
         }
         $this->profile->delete();

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;

Braces +3 added lines, -1 removed lines

@@ -1,7 +1,9 @@
 <?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' );

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/http/AddUserCommand.php

Braces +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
             if(!empty($user->getIdentifier())){
                 $this->storeInfoMessage(_('User was added successfully!'));
             }
-        }else{
+        } else{
             $this->storeErrorMessage(_('User name or expiry parameters are missing!'));
         }
     }

Spacing +5 added lines, -5 removed lines

@@ -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,15 +33,15 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\AbstractCommand::execute()
      */
-    public function execute(){
-        if(isset($_POST[self::PARAM_NAME]) && isset($_POST[self::PARAM_EXPIRY])){
+    public function execute() {
+        if (isset($_POST[self::PARAM_NAME]) && isset($_POST[self::PARAM_EXPIRY])) {
             $name = $this->parseString(filter_input(INPUT_POST, self::PARAM_NAME, FILTER_SANITIZE_STRING));
             $expiry = $this->parseString($_POST[self::PARAM_EXPIRY]);
             $user = $this->context->createUser($name, $expiry, $this);
-            if(!empty($user->getIdentifier())){
+            if (!empty($user->getIdentifier())) {
                 $this->storeInfoMessage(_('User was added successfully!'));
             }
-        }else{
+        } else {
             $this->storeErrorMessage(_('User name or expiry parameters are missing!'));
         }
     }

web/lib/admin/domain/PersistentEntity.php

Braces +12 added lines, -5 removed lines

@@ -151,7 +151,7 @@ 
         if(count($this->row) > 0){
             if(isset($this->row[self::ID])){
                 $result = $this->executeUpdateQuery();
-            }else{
+            } else{
                 $result = $this->executeInsertQuery();
             }
         }
@@ -170,8 +170,12 @@ 
         $types = '';
         $arguments = array();
         foreach ($this->row as $key => $attribute) {
-            if($keyString != "(") $keyString .= " ,";
-            if($valueString != "(") $valueString .= " ,";
+            if($keyString != "(") {
+                $keyString .= " ,";
+            }
+            if($valueString != "(") {
+                $valueString .= " ,";
+            }
             $keyString .= "`" . $key . "`";
             $valueString .= "?";
             $types .= $attribute->getType();
@@ -200,8 +204,11 @@ 
         $types = '';
         $arguments = array();
         foreach ($this->row as $key => $attribute) {
-            if(!empty($updateString)) $updateString .= " ,";
-            else $updateString .=" SET ";
+            if(!empty($updateString)) {
+                $updateString .= " ,";
+            } else {
+                $updateString .=" SET ";
+            }
             $updateString .= "`" . $key . "`=?";
             $types .= $attribute->getType();
             $arguments [] = $attribute->value;

Spacing +28 added lines, -28 removed lines

@@ -56,7 +56,7 @@ 
      * @param string $table
      * @param string $databaseType
      */
-    public function __construct($table, $databaseType = 'INST'){
+    public function __construct($table, $databaseType = 'INST') {
         $this->table = $table;
         $this->setAttributeType(self::ID, Attribute::TYPE_INTEGER);
         $this->databaseHandle = \core\DBConnection::handle($databaseType);
@@ -67,7 +67,7 @@ 
      * @param string $key
      * @param string $type
      */
-    protected function setAttributeType($key, $type){
+    protected function setAttributeType($key, $type) {
         $this->types[$key] = $type; 
     }
     
@@ -76,7 +76,7 @@ 
      * @param string $key
      * @return string
      */
-    protected function getAttributeType($key){
+    protected function getAttributeType($key) {
         return isset($this->types[$key]) ? $this->types[$key] : Attribute::TYPE_STRING;
     }
     
@@ -86,7 +86,7 @@ 
      * @param string $key
      * @return string
      */
-    public function get($key){
+    public function get($key) {
         return isset($this->row[$key]) ? $this->row[$key]->value : "";
     }
     
@@ -95,7 +95,7 @@ 
      * @param string $key
      * @return NULL|\web\lib\admin\domain\Attribute
      */
-    public function getAttribute($key){
+    public function getAttribute($key) {
         return isset($this->row[$key]) ? $this->row[$key] : new Attribute('', '');
     }
     
@@ -105,7 +105,7 @@ 
      * @param string $key
      * @param mixed $value
      */
-    protected function set($key, $value){
+    protected function set($key, $value) {
         $attribute = new Attribute($key, $value, $this->getAttributeType($key));
         $this->row[$key] = $attribute;
     }
@@ -114,9 +114,9 @@ 
      * 
      * @param array $row
      */
-    public function setRow($row){
+    public function setRow($row) {
         $this->clear();
-        foreach ($row as $key => $value){
+        foreach ($row as $key => $value) {
             $this->set($key, $value);
         }
     }
@@ -124,7 +124,7 @@ 
     /**
      * 
      */
-    public function clear(){
+    public function clear() {
         $this->row = array();
     }
     
@@ -132,7 +132,7 @@ 
      * 
      * @return string
      */
-    public function getIdentifier(){
+    public function getIdentifier() {
         return $this->get(self::ID);
     }
     
@@ -141,12 +141,12 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\PersistentInterface::save()
      */
-    public function save(){
+    public function save() {
         $result = false;
-        if(count($this->row) > 0){
-            if(isset($this->row[self::ID])){
+        if (count($this->row) > 0) {
+            if (isset($this->row[self::ID])) {
                 $result = $this->executeUpdateQuery();
-            }else{
+            } else {
                 $result = $this->executeInsertQuery();
             }
         }
@@ -157,7 +157,7 @@ 
      * 
      * @return boolean|mixed
      */
-    private function executeInsertQuery(){
+    private function executeInsertQuery() {
         $result = false;
         $query = sprintf("INSERT INTO `%s`", $this->table);
         $keyString = "(";
@@ -165,8 +165,8 @@ 
         $types = '';
         $arguments = array();
         foreach ($this->row as $key => $attribute) {
-            if($keyString != "(") $keyString .= " ,";
-            if($valueString != "(") $valueString .= " ,";
+            if ($keyString != "(") $keyString .= " ,";
+            if ($valueString != "(") $valueString .= " ,";
             $keyString .= "`" . $key . "`";
             $valueString .= "?";
             $types .= $attribute->getType();
@@ -175,10 +175,10 @@ 
         $keyString .= ")";
         $valueString .= ")";
         $isValid = $this->validate();
-        if($isValid && $keyString != "()"){
-            $query .= " " .$keyString . " VALUES " . $valueString;
+        if ($isValid && $keyString != "()") {
+            $query .= " " . $keyString . " VALUES " . $valueString;
             $result = $this->databaseHandle->exec($query, $types, ...$arguments);
-            if($result){
+            if ($result) {
                 $this->set(self::ID, $this->databaseHandle->lastID());
             }
         }
@@ -189,21 +189,21 @@ 
      * 
      * @return boolean|mixed
      */
-    private function executeUpdateQuery(){
+    private function executeUpdateQuery() {
         $result = false;
         $query = sprintf("UPDATE `%s`", $this->table);
         $updateString = "";
         $types = '';
         $arguments = array();
         foreach ($this->row as $key => $attribute) {
-            if(!empty($updateString)) $updateString .= " ,";
-            else $updateString .=" SET ";
+            if (!empty($updateString)) $updateString .= " ,";
+            else $updateString .= " SET ";
             $updateString .= "`" . $key . "`=?";
             $types .= $attribute->getType();
             $arguments [] = $attribute->value;
         }
-        if(!empty($updateString)){
-            $query .= " " .$updateString . " WHERE `" .self::ID. "`=?";
+        if (!empty($updateString)) {
+            $query .= " " . $updateString . " WHERE `" . self::ID . "`=?";
             $id = $this->getAttribute(self::ID);
             $types .= $id->getType();
             $arguments [] = $id->value;
@@ -216,13 +216,13 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\PersistentInterface::load()
      */
-    public function load($searchAttribute = null){
+    public function load($searchAttribute = null) {
         $state = false;
         $id = $this->getAttribute(self::ID);
         $query = sprintf("SELECT * FROM `%s` WHERE `%s` =?", $this->table, self::ID);
         $value = $id->value;
         $result = $this->databaseHandle->exec($query, $id->getType(), $value);
-        if(mysqli_num_rows($result)>0){
+        if (mysqli_num_rows($result) > 0) {
             $this->setRow(mysqli_fetch_assoc($result));
             $state = true;
         }
@@ -234,7 +234,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\PersistentInterface::delete()
      */
-    public function delete(){
+    public function delete() {
         $id = $this->getAttribute(self::ID);
         $query = sprintf("DELETE FROM `%s` WHERE `%s`=?", $this->table, self::ID);
         $type = $id->getType();

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