Skip to content

Commit 8bcc414

Browse files
committed
Namespace consistency, docblock fixes
1 parent b1c61a4 commit 8bcc414

File tree

5 files changed

+14
-12
lines changed

5 files changed

+14
-12
lines changed

autoload.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
spl_autoload_register(function ($class) {
44

55
// project-specific namespace prefix
6-
$prefix = 'Resonantcore\\PHPFuture\\';
6+
$prefix = 'Sarciszewski\\PHPFuture\\';
77

88
// base directory for the namespace prefix
99
$base_dir = __DIR__ . '/src/';
@@ -103,8 +103,8 @@ function hex2bin($data)
103103
*
104104
* @ref https://php.net/hash_equals
105105
*
106-
* @param string $a
107-
* @param string $b
106+
* @param string $known_string
107+
* @param string $user_string
108108
*
109109
* @return boolean
110110
*/
@@ -176,8 +176,8 @@ function getimagesizefromstring($imagedata, &$imageinfo = null)
176176
*
177177
* @param string $password
178178
* @param string $salt
179-
* @param int $iterations
180179
* @param int $length
180+
* @param int $iterations
181181
* @param string $algo
182182
*
183183
* @return string

src/Image.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?php
2-
32
namespace Sarciszewski\PHPFuture;
43

54
/**

src/Security.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ class Security extends BaseFuture
2929
/**
3030
* Equivalent to hash_equals() in PHP 5.6
3131
*
32-
* @param string $knownString
33-
* @param string $userString
32+
* @param string $knownString
33+
* @param string $userString
34+
*
3435
* @return bool
3536
*/
3637
public static function hashEquals($knownString, $userString)
@@ -59,6 +60,8 @@ public static function hashEquals($knownString, $userString)
5960
* @param string $salt
6061
* @param int $iterations
6162
* @param int $length
63+
*
64+
* @return string
6265
*/
6366
public static function pbkdf2($algo, $password, $salt, $iterations, $length = 0)
6467
{

tests/Security.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
2-
use \ResonantCore\PHPFuture as Future;
2+
use \Sarciszewski\PHPFuture as Future;
33

44
class TestSecurity extends PHPUnit_Framework_TestCase
55
{
66
/**
7-
* @covers \ResonantCore\PHPFuture\Security::hashEquals()
7+
* @covers \Sarciszewski\PHPFuture\Security::hashEquals()
88
*/
99
public function testHashEquals()
1010
{
@@ -21,7 +21,7 @@ public function testHashEquals()
2121
}
2222

2323
/**
24-
* @covers \ResonantCore\PHPFuture\Security::pbkdf2()
24+
* @covers \Sarciszewski\PHPFuture\Security::pbkdf2()
2525
* ref https://www.ietf.org/rfc/rfc6070.txt
2626
*/
2727
public function testPBKDF2()

tests/Utility.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
2-
use \ResonantCore\PHPFuture as Future;
2+
use \Sarciszewski\PHPFuture as Future;
33

44
class TestSecurity extends PHPUnit_Framework_TestCase
55
{
66
/**
7-
* @covers \ResonantCore\PHPFuture\Utilty::arrayColumn()
7+
* @covers \Sarciszewski\PHPFuture\Utilty::arrayColumn()
88
*/
99
public function testArrayColumn()
1010
{

0 commit comments

Comments
 (0)