From 1e44902340873421d03538791b8e66154b98c48a Mon Sep 17 00:00:00 2001 From: El RIDO Date: Fri, 10 May 2019 21:45:34 +0200 Subject: [PATCH] apply StyleCI patch --- lib/Data/Database.php | 21 ++++++++++----------- lib/Model/AbstractModel.php | 1 - lib/Model/Paste.php | 10 ++++------ lib/Request.php | 4 ++-- tst/Bootstrap.php | 17 +++++++++-------- tst/ControllerTest.php | 8 ++++---- tst/FormatV2Test.php | 28 ++++++++++++++-------------- tst/JsonApiTest.php | 2 +- tst/ModelTest.php | 14 +++++++------- 9 files changed, 51 insertions(+), 54 deletions(-) diff --git a/lib/Data/Database.php b/lib/Data/Database.php index bba53f1..1e0169e 100644 --- a/lib/Data/Database.php +++ b/lib/Data/Database.php @@ -243,20 +243,20 @@ class Database extends AbstractData $isVersion2 = array_key_exists('v', $data) && $data['v'] >= 2; if ($isVersion2) { self::$_cache[$pasteid] = $data; - list($createdKey) = self::_getVersionedKeys(2); + list($createdKey) = self::_getVersionedKeys(2); } else { self::$_cache[$pasteid] = array('data' => $paste['data']); - list($createdKey) = self::_getVersionedKeys(1); + list($createdKey) = self::_getVersionedKeys(1); } $paste['meta'] = json_decode($paste['meta'], true); if (!is_array($paste['meta'])) { $paste['meta'] = array(); } - $paste = self::upgradePreV1Format($paste); - self::$_cache[$pasteid]['meta'] = $paste['meta']; + $paste = self::upgradePreV1Format($paste); + self::$_cache[$pasteid]['meta'] = $paste['meta']; self::$_cache[$pasteid]['meta'][$createdKey] = (int) $paste['postdate']; - $expire_date = (int) $paste['expiredate']; + $expire_date = (int) $paste['expiredate']; if ($expire_date > 0) { self::$_cache[$pasteid]['meta']['expire_date'] = $expire_date; } @@ -341,7 +341,7 @@ class Database extends AbstractData $data = json_encode($comment); } list($createdKey, $iconKey) = self::_getVersionedKeys($version); - $meta = $comment['meta']; + $meta = $comment['meta']; unset($comment['meta']); foreach (array('nickname', $iconKey) as $key) { if (!array_key_exists($key, $meta)) { @@ -381,7 +381,7 @@ class Database extends AbstractData $comments = array(); if (count($rows)) { foreach ($rows as $row) { - $i = $this->getOpenSlot($comments, (int) $row['postdate']); + $i = $this->getOpenSlot($comments, (int) $row['postdate']); $data = json_decode($row['data'], true); if (array_key_exists('v', $data) && $data['v'] >= 2) { $version = 2; @@ -391,9 +391,9 @@ class Database extends AbstractData $comments[$i] = array('data' => $row['data']); } list($createdKey, $iconKey) = self::_getVersionedKeys($version); - $comments[$i]['id'] = $row['dataid']; - $comments[$i]['parentid'] = $row['parentid']; - $comments[$i]['meta'] = array($createdKey => (int) $row['postdate']); + $comments[$i]['id'] = $row['dataid']; + $comments[$i]['parentid'] = $row['parentid']; + $comments[$i]['meta'] = array($createdKey => (int) $row['postdate']); foreach (array('nickname' => 'nickname', 'vizhash' => $iconKey) as $rowKey => $commentKey) { if (array_key_exists($rowKey, $row) && !empty($row[$rowKey])) { $comments[$i]['meta'][$commentKey] = $row[$rowKey]; @@ -486,7 +486,6 @@ class Database extends AbstractData return $result; } - /** * get version dependent key names * diff --git a/lib/Model/AbstractModel.php b/lib/Model/AbstractModel.php index ee3d357..c7f367a 100644 --- a/lib/Model/AbstractModel.php +++ b/lib/Model/AbstractModel.php @@ -177,6 +177,5 @@ abstract class AbstractModel */ protected function _validate(array $data) { - return; } } diff --git a/lib/Model/Paste.php b/lib/Model/Paste.php index f7f919d..a665f50 100644 --- a/lib/Model/Paste.php +++ b/lib/Model/Paste.php @@ -195,10 +195,9 @@ class Paste extends AbstractModel if (!array_key_exists('adata', $this->_data) && !array_key_exists('data', $this->_data)) { $this->get(); } - return ( + return (array_key_exists('adata', $this->_data) && $this->_data['adata'][3] === 1) || - (array_key_exists('burnafterreading', $this->_data['meta']) && $this->_data['meta']['burnafterreading']) - ); + (array_key_exists('burnafterreading', $this->_data['meta']) && $this->_data['meta']['burnafterreading']); } /** @@ -213,10 +212,9 @@ class Paste extends AbstractModel if (!array_key_exists('adata', $this->_data) && !array_key_exists('data', $this->_data)) { $this->get(); } - return ( + return (array_key_exists('adata', $this->_data) && $this->_data['adata'][2] === 1) || - (array_key_exists('opendiscussion', $this->_data['meta']) && $this->_data['meta']['opendiscussion']) - ); + (array_key_exists('opendiscussion', $this->_data['meta']) && $this->_data['meta']['opendiscussion']); } /** diff --git a/lib/Request.php b/lib/Request.php index 7e41f4a..02a3cab 100644 --- a/lib/Request.php +++ b/lib/Request.php @@ -161,10 +161,10 @@ class Request public function getData() { $data = array( - 'adata' => json_decode($this->getParam('adata', '[]'), true) + 'adata' => json_decode($this->getParam('adata', '[]'), true), ); $required_keys = array('v', 'ct'); - $meta = $this->getParam('meta'); + $meta = $this->getParam('meta'); if (empty($meta)) { $required_keys[] = 'pasteid'; $required_keys[] = 'parentid'; diff --git a/tst/Bootstrap.php b/tst/Bootstrap.php index 21e031c..532f71c 100644 --- a/tst/Bootstrap.php +++ b/tst/Bootstrap.php @@ -66,13 +66,13 @@ class Helper ), 'plaintext', 1, - 0 + 0, ), 'meta' => array( 'expire' => '5min', 'created' => 1344803344, ), - 'v' => 2, + 'v' => 2, 'ct' => 'ME5JF/YBEijp2uYMzLZozbKtWc5wfy6R59NBb7SmRig=', ); @@ -155,10 +155,11 @@ class Helper */ public static function getPastePost($version = 2, array $meta = array()) { - $example = self::getPaste($version, $meta); + $example = self::getPaste($version, $meta); $example['meta'] = array('expire' => $example['meta']['expire']); return $example; } + /** * get example paste, as received via POST by the user * @@ -168,9 +169,9 @@ class Helper */ public static function getPastePostJson($version = 2, array $meta = array()) { - $example = self::getPastePost($version, $meta); + $example = self::getPastePost($version, $meta); $example['adata'] = json_encode($example['adata']); - $example['meta'] = json_encode($example['meta']); + $example['meta'] = json_encode($example['meta']); return $example; } @@ -195,9 +196,9 @@ class Helper { $example = $version === 1 ? self::$commentV1 : self::$pasteV2; if ($version === 2) { - $example['pasteid'] = $example['parentid'] = self::getPasteId(); + $example['pasteid'] = $example['parentid'] = self::getPasteId(); $example['meta']['created'] = self::$commentV1['meta']['postdate']; - $example['meta']['icon'] = self::$commentV1['meta']['vizhash']; + $example['meta']['icon'] = self::$commentV1['meta']['vizhash']; unset($example['meta']['expire']); } $example['meta'] = array_merge($example['meta'], $meta); @@ -225,7 +226,7 @@ class Helper */ public static function getCommentPostJson() { - $example = self::getCommentPost(); + $example = self::getCommentPost(); $example['adata'] = json_encode($example['adata']); return $example; } diff --git a/tst/ControllerTest.php b/tst/ControllerTest.php index bcf1c9e..b961697 100644 --- a/tst/ControllerTest.php +++ b/tst/ControllerTest.php @@ -433,7 +433,7 @@ class ControllerTest extends PHPUnit_Framework_TestCase $_SERVER['HTTP_X_REQUESTED_WITH'] = 'JSONHttpRequest'; $_SERVER['REQUEST_METHOD'] = 'POST'; $_SERVER['REMOTE_ADDR'] = '::1'; - $_POST['ct'] = ' '; + $_POST['ct'] = ' '; $this->assertFalse($this->_model->exists(Helper::getPasteId()), 'paste does not exists before posting data'); ob_start(); new Controller; @@ -524,7 +524,7 @@ class ControllerTest extends PHPUnit_Framework_TestCase $_SERVER['REQUEST_METHOD'] = 'POST'; $_SERVER['REMOTE_ADDR'] = '::1'; $paste = Helper::getPaste(); - $paste['adata'][2] = 0; + $paste['adata'][2] = 0; $this->_model->create(Helper::getPasteId(), $paste); ob_start(); new Controller; @@ -638,7 +638,7 @@ class ControllerTest extends PHPUnit_Framework_TestCase */ public function testReadBurn() { - $paste = Helper::getPaste(); + $paste = Helper::getPaste(); $paste['adata'][3] = 1; $this->_model->create(Helper::getPasteId(), $paste); $_SERVER['QUERY_STRING'] = Helper::getPasteId(); @@ -726,7 +726,7 @@ class ControllerTest extends PHPUnit_Framework_TestCase */ public function testReadBurnAfterReading() { - $burnPaste = Helper::getPaste(); + $burnPaste = Helper::getPaste(); $burnPaste['adata'][3] = 1; $this->_model->create(Helper::getPasteId(), $burnPaste); $this->assertTrue($this->_model->exists(Helper::getPasteId()), 'paste exists before deleting data'); diff --git a/tst/FormatV2Test.php b/tst/FormatV2Test.php index 2718f96..8aa4d3c 100644 --- a/tst/FormatV2Test.php +++ b/tst/FormatV2Test.php @@ -9,61 +9,61 @@ class FormatV2Test extends PHPUnit_Framework_TestCase $this->assertTrue(FormatV2::isValid(Helper::getPastePost()), 'valid format'); $this->assertTrue(FormatV2::isValid(Helper::getCommentPost(), true), 'valid format'); - $paste = Helper::getPastePost(); + $paste = Helper::getPastePost(); $paste['adata'][0][0] = '$'; $this->assertFalse(FormatV2::isValid($paste), 'invalid base64 encoding of iv'); - $paste = Helper::getPastePost(); + $paste = Helper::getPastePost(); $paste['adata'][0][1] = '$'; $this->assertFalse(FormatV2::isValid($paste), 'invalid base64 encoding of salt'); - $paste = Helper::getPastePost(); + $paste = Helper::getPastePost(); $paste['ct'] = '$'; $this->assertFalse(FormatV2::isValid($paste), 'invalid base64 encoding of ct'); - $paste = Helper::getPastePost(); + $paste = Helper::getPastePost(); $paste['ct'] = 'bm9kYXRhbm9kYXRhbm9kYXRhbm9kYXRhbm9kYXRhCg=='; $this->assertFalse(FormatV2::isValid($paste), 'low ct entropy'); - $paste = Helper::getPastePost(); + $paste = Helper::getPastePost(); $paste['adata'][0][0] = 'MTIzNDU2Nzg5MDEyMzQ1Njc4OTA='; $this->assertFalse(FormatV2::isValid($paste), 'iv too long'); - $paste = Helper::getPastePost(); + $paste = Helper::getPastePost(); $paste['adata'][0][1] = 'MTIzNDU2Nzg5MDEyMzQ1Njc4OTA='; $this->assertFalse(FormatV2::isValid($paste), 'salt too long'); - $paste = Helper::getPastePost(); + $paste = Helper::getPastePost(); $paste['foo'] = 'bar'; $this->assertFalse(FormatV2::isValid($paste), 'invalid additional key'); unset($paste['meta']); $this->assertFalse(FormatV2::isValid($paste), 'invalid missing key'); - $paste = Helper::getPastePost(); + $paste = Helper::getPastePost(); $paste['v'] = 0.9; $this->assertFalse(FormatV2::isValid($paste), 'unsupported version'); - $paste = Helper::getPastePost(); + $paste = Helper::getPastePost(); $paste['adata'][0][2] = 1000; $this->assertFalse(FormatV2::isValid($paste), 'not enough iterations'); - $paste = Helper::getPastePost(); + $paste = Helper::getPastePost(); $paste['adata'][0][3] = 127; $this->assertFalse(FormatV2::isValid($paste), 'invalid key size'); - $paste = Helper::getPastePost(); + $paste = Helper::getPastePost(); $paste['adata'][0][4] = 63; $this->assertFalse(FormatV2::isValid($paste), 'invalid tag length'); - $paste = Helper::getPastePost(); + $paste = Helper::getPastePost(); $paste['adata'][0][5] = '!#@'; $this->assertFalse(FormatV2::isValid($paste), 'invalid algorithm'); - $paste = Helper::getPastePost(); + $paste = Helper::getPastePost(); $paste['adata'][0][6] = '!#@'; $this->assertFalse(FormatV2::isValid($paste), 'invalid mode'); - $paste = Helper::getPastePost(); + $paste = Helper::getPastePost(); $paste['adata'][0][7] = '!#@'; $this->assertFalse(FormatV2::isValid($paste), 'invalid compression'); diff --git a/tst/JsonApiTest.php b/tst/JsonApiTest.php index cdba232..3206486 100644 --- a/tst/JsonApiTest.php +++ b/tst/JsonApiTest.php @@ -77,7 +77,7 @@ class JsonApiTest extends PHPUnit_Framework_TestCase $options['traffic']['limit'] = 0; Helper::createIniFile(CONF, $options); $paste = Helper::getPastePostJson(); - $file = tempnam(sys_get_temp_dir(), 'FOO'); + $file = tempnam(sys_get_temp_dir(), 'FOO'); file_put_contents($file, http_build_query($paste)); Request::setInputStream($file); $_SERVER['QUERY_STRING'] = Helper::getPasteId(); diff --git a/tst/ModelTest.php b/tst/ModelTest.php index 9673155..5a0006d 100644 --- a/tst/ModelTest.php +++ b/tst/ModelTest.php @@ -90,9 +90,9 @@ class ModelTest extends PHPUnit_Framework_TestCase $comments = $this->_model->getPaste(Helper::getPasteId())->get()['comments']; $this->assertTrue(count($comments) === 1, 'comment exists after storing it'); - $commentData['id'] = Helper::getPasteId(); + $commentData['id'] = Helper::getPasteId(); $commentData['meta']['created'] = current($comments)['meta']['created']; - $commentData['meta']['icon'] = current($comments)['meta']['icon']; + $commentData['meta']['icon'] = current($comments)['meta']['icon']; $this->assertEquals($commentData, current($comments)); // deleting pastes @@ -223,9 +223,9 @@ class ModelTest extends PHPUnit_Framework_TestCase */ public function testInvalidCommentData() { - $pasteData = Helper::getPastePost(); + $pasteData = Helper::getPastePost(); $pasteData['adata'][2] = 0; - $paste = $this->_model->getPaste(Helper::getPasteId()); + $paste = $this->_model->getPaste(Helper::getPasteId()); $paste->setData($pasteData); $paste->store(); @@ -240,7 +240,7 @@ class ModelTest extends PHPUnit_Framework_TestCase public function testInvalidCommentParent() { $paste = $this->_model->getPaste(Helper::getPasteId()); - $comment = $paste->getComment(''); + $comment = $paste->getComment(''); $comment->store(); } @@ -379,8 +379,8 @@ class ModelTest extends PHPUnit_Framework_TestCase $comment->setData($commentData); $comment->store(); - $vz = new Vizhash16x16(); - $pngdata = 'data:image/png;base64,' . base64_encode($vz->generate(TrafficLimiter::getHash())); + $vz = new Vizhash16x16(); + $pngdata = 'data:image/png;base64,' . base64_encode($vz->generate(TrafficLimiter::getHash())); $comment = current($this->_model->getPaste(Helper::getPasteId())->get()['comments']); $this->assertEquals($pngdata, $comment['meta']['icon'], 'nickname triggers vizhash to be set'); }