arno/privatebin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

followed Style CI code styke recommendations

Browse Source
This commit is contained in:
El RIDO 2017-02-26 17:04:08 +01:00
parent b80ce78e01
commit 7277eef7f2
No known key found for this signature in database
GPG Key ID: 0F5C940A6BD81F92
4 changed files with 64 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tst/Bootstrap.php
View File

@ -1,7 +1,7 @@
<?php <?php
use PrivateBin\Persistence\ServerSalt;
use Eris\Generator; use Eris\Generator;
use PrivateBin\Persistence\ServerSalt;
error_reporting(E_ALL | E_STRICT); error_reporting(E_ALL | E_STRICT);

76
tst/FilterTest.php
View File

@ -1,7 +1,7 @@
<?php <?php
use PrivateBin\Filter;
use Eris\Generator; use Eris\Generator;
use PrivateBin\Filter;
class FilterTest extends PHPUnit_Framework_TestCase class FilterTest extends PHPUnit_Framework_TestCase
{ {
@ -23,8 +23,7 @@ class FilterTest extends PHPUnit_Framework_TestCase
'sec', 'second', 'seconds' 'sec', 'second', 'seconds'
) )
)->then( )->then(
function ($int, $unit) function ($int, $unit) {
{
$suffix = $int === 1 ? '' : 's'; $suffix = $int === 1 ? '' : 's';
$this->assertEquals($int . ' second' . $suffix, Filter::formatHumanReadableTime($int . $unit)); $this->assertEquals($int . ' second' . $suffix, Filter::formatHumanReadableTime($int . $unit));
} }
@ -35,8 +34,7 @@ class FilterTest extends PHPUnit_Framework_TestCase
'min', 'minute', 'minutes' 'min', 'minute', 'minutes'
) )
)->then( )->then(
function ($int, $unit) function ($int, $unit) {
{
$suffix = $int === 1 ? '' : 's'; $suffix = $int === 1 ? '' : 's';
$this->assertEquals($int . ' minute' . $suffix, Filter::formatHumanReadableTime($int . $unit)); $this->assertEquals($int . ' minute' . $suffix, Filter::formatHumanReadableTime($int . $unit));
} }
@ -48,8 +46,7 @@ class FilterTest extends PHPUnit_Framework_TestCase
'month', 'months', 'year', 'years' 'month', 'months', 'year', 'years'
) )
)->then( )->then(
function ($int, $unit) function ($int, $unit) {
{
$suffix = $int === 1 ? '' : 's'; $suffix = $int === 1 ? '' : 's';
$this->assertEquals($int . ' ' . rtrim($unit, 's') . $suffix, Filter::formatHumanReadableTime($int . $unit)); $this->assertEquals($int . ' ' . rtrim($unit, 's') . $suffix, Filter::formatHumanReadableTime($int . $unit));
} }
@ -65,8 +62,7 @@ class FilterTest extends PHPUnit_Framework_TestCase
$this->forAll( $this->forAll(
Generator\string() Generator\string()
)->then( )->then(
function ($string) function ($string) {
{
Filter::formatHumanReadableTime($string); Filter::formatHumanReadableTime($string);
} }
); );
@ -77,8 +73,7 @@ class FilterTest extends PHPUnit_Framework_TestCase
$this->forAll( $this->forAll(
Generator\neg() Generator\neg()
)->then( )->then(
function ($int) function ($int) {
{
$this->assertEquals(number_format($int, 0, '.', ' ') . ' B', Filter::formatHumanReadableSize($int)); $this->assertEquals(number_format($int, 0, '.', ' ') . ' B', Filter::formatHumanReadableSize($int));
} }
); );
@ -88,8 +83,7 @@ class FilterTest extends PHPUnit_Framework_TestCase
$this->forAll( $this->forAll(
Generator\choose($from, $to) Generator\choose($from, $to)
)->then( )->then(
function ($int) function ($int) {
{
$this->assertEquals(number_format($int, 0, '.', ' ') . ' B', Filter::formatHumanReadableSize($int)); $this->assertEquals(number_format($int, 0, '.', ' ') . ' B', Filter::formatHumanReadableSize($int));
} }
); );
@ -100,8 +94,7 @@ class FilterTest extends PHPUnit_Framework_TestCase
Generator\choose($from, $to), Generator\choose($from, $to),
$from $from
)->then( )->then(
function ($int, $divisor) function ($int, $divisor) {
{
$this->assertEquals(number_format($int / $divisor, 2, '.', ' ') . ' KiB', Filter::formatHumanReadableSize($int)); $this->assertEquals(number_format($int / $divisor, 2, '.', ' ') . ' KiB', Filter::formatHumanReadableSize($int));
} }
); );
@ -112,8 +105,7 @@ class FilterTest extends PHPUnit_Framework_TestCase
Generator\choose($from, $to), Generator\choose($from, $to),
$from $from
)->then( )->then(
function ($int, $divisor) function ($int, $divisor) {
{
$this->assertEquals(number_format($int / $divisor, 2, '.', ' ') . ' MiB', Filter::formatHumanReadableSize($int)); $this->assertEquals(number_format($int / $divisor, 2, '.', ' ') . ' MiB', Filter::formatHumanReadableSize($int));
} }
); );
@ -124,8 +116,7 @@ class FilterTest extends PHPUnit_Framework_TestCase
Generator\choose($from, $to), Generator\choose($from, $to),
$from $from
)->then( )->then(
function ($int, $divisor) function ($int, $divisor) {
{
$this->assertEquals(number_format($int / $divisor, 2, '.', ' ') . ' GiB', Filter::formatHumanReadableSize($int)); $this->assertEquals(number_format($int / $divisor, 2, '.', ' ') . ' GiB', Filter::formatHumanReadableSize($int));
} }
); );
@ -136,8 +127,7 @@ class FilterTest extends PHPUnit_Framework_TestCase
Generator\choose($from, $to), Generator\choose($from, $to),
$from $from
)->then( )->then(
function ($int, $divisor) function ($int, $divisor) {
{
$this->assertEquals(number_format($int / $divisor, 2, '.', ' ') . ' TiB', Filter::formatHumanReadableSize($int)); $this->assertEquals(number_format($int / $divisor, 2, '.', ' ') . ' TiB', Filter::formatHumanReadableSize($int));
} }
); );
@ -148,14 +138,14 @@ class FilterTest extends PHPUnit_Framework_TestCase
Generator\choose($from, $to), Generator\choose($from, $to),
$from $from
)->then( )->then(
function ($int, $divisor) function ($int, $divisor) {
{
$this->assertEquals(number_format($int / $divisor, 2, '.', ' ') . ' PiB', Filter::formatHumanReadableSize($int)); $this->assertEquals(number_format($int / $divisor, 2, '.', ' ') . ' PiB', Filter::formatHumanReadableSize($int));
} }
); );
$from = $exponent; $from = $exponent;
$exponent *= 1024; $exponent *= 1024;
$to = $exponent - 1; $to = $exponent - 1;
// on 64bit systems, this gets larger then PHP_INT_MAX, so PHP casts it // on 64bit systems, this gets larger then PHP_INT_MAX, so PHP casts it
// to double and the "choose" generator can't handle it // to double and the "choose" generator can't handle it
if ($to > PHP_INT_MAX) { if ($to > PHP_INT_MAX) {
@ -173,8 +163,7 @@ class FilterTest extends PHPUnit_Framework_TestCase
Generator\choose($from, $to), Generator\choose($from, $to),
$from $from
)->then( )->then(
function ($int, $divisor) function ($int, $divisor) {
{
$this->assertEquals(number_format($int / $divisor, 2, '.', ' ') . ' EiB', Filter::formatHumanReadableSize($int)); $this->assertEquals(number_format($int / $divisor, 2, '.', ' ') . ' EiB', Filter::formatHumanReadableSize($int));
} }
); );
@ -185,8 +174,7 @@ class FilterTest extends PHPUnit_Framework_TestCase
Generator\choose($from, $to), Generator\choose($from, $to),
$from $from
)->then( )->then(
function ($int, $divisor) function ($int, $divisor) {
{
$this->assertEquals(number_format($int / $divisor, 2, '.', ' ') . ' ZiB', Filter::formatHumanReadableSize($int)); $this->assertEquals(number_format($int / $divisor, 2, '.', ' ') . ' ZiB', Filter::formatHumanReadableSize($int));
} }
); );
@ -197,8 +185,7 @@ class FilterTest extends PHPUnit_Framework_TestCase
Generator\choose($from, $to), Generator\choose($from, $to),
$from $from
)->then( )->then(
function ($int, $divisor) function ($int, $divisor) {
{
$this->assertEquals(number_format($int / $divisor, 2, '.', ' ') . ' YiB', Filter::formatHumanReadableSize($int)); $this->assertEquals(number_format($int / $divisor, 2, '.', ' ') . ' YiB', Filter::formatHumanReadableSize($int));
} }
); );
@ -210,40 +197,35 @@ class FilterTest extends PHPUnit_Framework_TestCase
$this->forAll( $this->forAll(
Generator\string() Generator\string()
)->then( )->then(
function ($string) function ($string) {
{
$this->assertTrue(Filter::slowEquals($string, $string), 'same string'); $this->assertTrue(Filter::slowEquals($string, $string), 'same string');
} }
); );
$this->forAll( $this->forAll(
Generator\int() Generator\int()
)->then( )->then(
function ($int) function ($int) {
{
$this->assertTrue(Filter::slowEquals($int, $int), 'same integer'); $this->assertTrue(Filter::slowEquals($int, $int), 'same integer');
} }
); );
$this->forAll( $this->forAll(
Generator\float() Generator\float()
)->then( )->then(
function ($float) function ($float) {
{
$this->assertTrue(Filter::slowEquals($float, $float), 'same float'); $this->assertTrue(Filter::slowEquals($float, $float), 'same float');
} }
); );
$this->forAll( $this->forAll(
Generator\string() Generator\string()
)->then( )->then(
function ($string) function ($string) {
{
$this->assertFalse(Filter::slowEquals($string, true), 'string and boolean true'); $this->assertFalse(Filter::slowEquals($string, true), 'string and boolean true');
} }
); );
$this->forAll( $this->forAll(
Generator\string() Generator\string()
)->then( )->then(
function ($string) function ($string) {
{
// false is casted into an empty string // false is casted into an empty string
if ($string !== '') { if ($string !== '') {
$this->assertFalse(Filter::slowEquals($string, false), 'string and boolean false'); $this->assertFalse(Filter::slowEquals($string, false), 'string and boolean false');
@ -263,8 +245,7 @@ class FilterTest extends PHPUnit_Framework_TestCase
Generator\string(), Generator\string(),
Generator\float() Generator\float()
)->then( )->then(
function ($string, $float) function ($string, $float) {
{
$this->assertFalse(Filter::slowEquals($string, $float), 'string and float'); $this->assertFalse(Filter::slowEquals($string, $float), 'string and float');
} }
); );
@ -272,8 +253,7 @@ class FilterTest extends PHPUnit_Framework_TestCase
Generator\string(), Generator\string(),
Generator\string() Generator\string()
)->then( )->then(
function ($string1, $string2) function ($string1, $string2) {
{
if ($string1 !== $string2) { if ($string1 !== $string2) {
$this->assertFalse(Filter::slowEquals($string1, $string2), 'different strings'); $this->assertFalse(Filter::slowEquals($string1, $string2), 'different strings');
} }
@ -282,27 +262,25 @@ class FilterTest extends PHPUnit_Framework_TestCase
$this->forAll( $this->forAll(
Generator\string() Generator\string()
)->then( )->then(
function ($string) function ($string) {
{
$this->assertFalse(Filter::slowEquals($string, ' ' . $string), 'strings with space'); $this->assertFalse(Filter::slowEquals($string, ' ' . $string), 'strings with space');
} }
); );
$this->forAll( $this->forAll(
Generator\float() Generator\float()
)->then( )->then(
function ($float) function ($float) {
{
$this->assertFalse(Filter::slowEquals(strval($float), $float . '0'), 'floats as strings'); $this->assertFalse(Filter::slowEquals(strval($float), $float . '0'), 'floats as strings');
} }
); );
$this->forAll( $this->forAll(
Generator\int() Generator\int()
)->then( )->then(
function ($int) function ($int) {
{
$this->assertFalse(Filter::slowEquals($int . 'e3', $int . '000'), 'integers as strings'); $this->assertFalse(Filter::slowEquals($int . 'e3', $int . '000'), 'integers as strings');
} }
); );
// these two tests would be compared equal if casted to integers as they are larger then PHP_INT_MAX // these two tests would be compared equal if casted to integers as they are larger then PHP_INT_MAX
$this->assertFalse(Filter::slowEquals('9223372036854775807', '9223372036854775808'), 'large integers as strings'); $this->assertFalse(Filter::slowEquals('9223372036854775807', '9223372036854775808'), 'large integers as strings');
$this->assertFalse(Filter::slowEquals('61529519452809720693702583126814', '61529519452809720000000000000000'), 'larger integers as strings'); $this->assertFalse(Filter::slowEquals('61529519452809720693702583126814', '61529519452809720000000000000000'), 'larger integers as strings');

5
tst/SjclTest.php
View File

@ -1,7 +1,7 @@
<?php <?php
use PrivateBin\Sjcl;
use Eris\Generator; use Eris\Generator;
use PrivateBin\Sjcl;
class SjclTest extends PHPUnit_Framework_TestCase class SjclTest extends PHPUnit_Framework_TestCase
{ {
@ -15,8 +15,7 @@ class SjclTest extends PHPUnit_Framework_TestCase
Generator\string(), Generator\string(),
Generator\choose(0,100) Generator\choose(0,100)
)->then( )->then(
function ($pasteArray, $key, $value, $lowInt) function ($pasteArray, $key, $value, $lowInt) {
{
$paste = Helper::getPasteFromGeneratedArray($pasteArray); $paste = Helper::getPasteFromGeneratedArray($pasteArray);
$this->assertTrue(Sjcl::isValid($paste['data']), 'valid sjcl'); $this->assertTrue(Sjcl::isValid($paste['data']), 'valid sjcl');
$this->assertTrue(Sjcl::isValid($paste['attachment']), 'valid sjcl'); $this->assertTrue(Sjcl::isValid($paste['attachment']), 'valid sjcl');

11
tst/Vizhash16x16Test.php
View File

@ -1,8 +1,8 @@
<?php <?php
use Eris\Generator;
use PrivateBin\Persistence\ServerSalt; use PrivateBin\Persistence\ServerSalt;
use PrivateBin\Vizhash16x16; use PrivateBin\Vizhash16x16;
use Eris\Generator;
class Vizhash16x16Test extends PHPUnit_Framework_TestCase class Vizhash16x16Test extends PHPUnit_Framework_TestCase
{ {
@ -36,8 +36,7 @@ class Vizhash16x16Test extends PHPUnit_Framework_TestCase
Generator\string(), Generator\string(),
Generator\string() Generator\string()
)->then( )->then(
function ($string1, $string2) function ($string1, $string2) {
{
$vz = new Vizhash16x16(); $vz = new Vizhash16x16();
$pngdata = $vz->generate($string1); $pngdata = $vz->generate($string1);
@ -62,8 +61,7 @@ class Vizhash16x16Test extends PHPUnit_Framework_TestCase
$this->forAll( $this->forAll(
Generator\vector(2, Generator\vector(4, Generator\byte())) Generator\vector(2, Generator\vector(4, Generator\byte()))
)->then( )->then(
function ($ips) function ($ips) {
{
$hash1 = hash('sha512', implode('.', $ips[0])); $hash1 = hash('sha512', implode('.', $ips[0]));
$hash2 = hash('sha512', implode('.', $ips[1])); $hash2 = hash('sha512', implode('.', $ips[1]));
$vz = new Vizhash16x16(); $vz = new Vizhash16x16();
@ -84,8 +82,7 @@ class Vizhash16x16Test extends PHPUnit_Framework_TestCase
$this->forAll( $this->forAll(
Generator\vector(2, Generator\vector(16, Generator\byte())) Generator\vector(2, Generator\vector(16, Generator\byte()))
)->then( )->then(
function ($ips) function ($ips) {
{
$hash1 = hash('sha512', inet_ntop(implode(array_map('chr', $ips[0])))); $hash1 = hash('sha512', inet_ntop(implode(array_map('chr', $ips[0]))));
$hash2 = hash('sha512', inet_ntop(implode(array_map('chr', $ips[1])))); $hash2 = hash('sha512', inet_ntop(implode(array_map('chr', $ips[1]))));
$vz = new Vizhash16x16(); $vz = new Vizhash16x16();