Fix code smells
This commit is contained in:
parent
d4918dd893
commit
94dfa17290
|
@ -13,9 +13,9 @@ declare(strict_types = 1);
|
||||||
*/
|
*/
|
||||||
final class MD_JAIL {
|
final class MD_JAIL {
|
||||||
|
|
||||||
const STATUS_NONE = 0;
|
public const STATUS_NONE = 0;
|
||||||
const STATUS_STARTED = 1;
|
public const STATUS_STARTED = 1;
|
||||||
const STATUS_SPECIFIED = 2; // Determines that everything is fine.
|
public const STATUS_SPECIFIED = 2; // Determines that everything is fine.
|
||||||
|
|
||||||
/** @var integer */
|
/** @var integer */
|
||||||
private int $_status = self::STATUS_NONE;
|
private int $_status = self::STATUS_NONE;
|
||||||
|
|
|
@ -445,7 +445,7 @@ final class MD_STD {
|
||||||
*
|
*
|
||||||
* @param string $url URL to validate.
|
* @param string $url URL to validate.
|
||||||
*
|
*
|
||||||
* @return bool
|
* @return boolean
|
||||||
*/
|
*/
|
||||||
public static function checkUrlIsReachable(string $url):bool {
|
public static function checkUrlIsReachable(string $url):bool {
|
||||||
|
|
||||||
|
@ -952,7 +952,7 @@ final class MD_STD {
|
||||||
* 0000-01-01 > 101; 2001-01-01 > 20010101.
|
* 0000-01-01 > 101; 2001-01-01 > 20010101.
|
||||||
* Needed to retrieve negative dates (BC) stored in MySQL.
|
* Needed to retrieve negative dates (BC) stored in MySQL.
|
||||||
*
|
*
|
||||||
* @param int $date_int Date represented as an integer.
|
* @param integer $date_int Date represented as an integer.
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
|
@ -979,6 +979,5 @@ final class MD_STD {
|
||||||
false => '',
|
false => '',
|
||||||
} . $year . '-' . $month . '-' . $day;
|
} . $year . '-' . $month . '-' . $day;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,9 +34,9 @@ final class MD_STD_CACHE {
|
||||||
* Caches and serves a page through redis. Should be called at the start
|
* Caches and serves a page through redis. Should be called at the start
|
||||||
* of the script generating a page.
|
* of the script generating a page.
|
||||||
*
|
*
|
||||||
|
* @param Redis $redis Redis connection.
|
||||||
* @param string $redisKey Key to cache by in redis.
|
* @param string $redisKey Key to cache by in redis.
|
||||||
* @param integer $expiry Expiration time in seconds.
|
* @param integer $expiry Expiration time in seconds.
|
||||||
* @param Redis $redis Redis connection.
|
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -216,7 +216,7 @@ final class MD_STD_IN {
|
||||||
}
|
}
|
||||||
$rewritten .= $parsed['host'];
|
$rewritten .= $parsed['host'];
|
||||||
if (!empty($parsed['port'])) $rewritten .= ':' . $parsed['port'];
|
if (!empty($parsed['port'])) $rewritten .= ':' . $parsed['port'];
|
||||||
$rewritten .= str_replace('%2F' , '/', urlencode($parsed['path']));
|
$rewritten .= str_replace('%2F', '/', urlencode($parsed['path']));
|
||||||
if (!empty($parsed['query'])) {
|
if (!empty($parsed['query'])) {
|
||||||
$rewritten .= '?' . str_replace('%3D', '=', urlencode($parsed['query']));
|
$rewritten .= '?' . str_replace('%3D', '=', urlencode($parsed['query']));
|
||||||
}
|
}
|
||||||
|
@ -267,7 +267,7 @@ final class MD_STD_IN {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (($output = \filter_var($input, FILTER_VALIDATE_EMAIL)) === false) {
|
if (($output = \filter_var($input, FILTER_VALIDATE_EMAIL)) === false) {
|
||||||
throw new MDInvalidEmail("Invalid input email address" . ' '. $input);
|
throw new MDInvalidEmail("Invalid input email address" . ' ' . $input);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $output;
|
return $output;
|
||||||
|
|
|
@ -9,14 +9,14 @@ declare(strict_types = 1);
|
||||||
*/
|
*/
|
||||||
final class MD_STD_SEC {
|
final class MD_STD_SEC {
|
||||||
|
|
||||||
const REFRESH_TIME_GENERAL = 60; // Time until the comp. with the whole service is cleared.
|
private const REFRESH_TIME_GENERAL = 60; // Time until the comp. with the whole service is cleared.
|
||||||
const REFRESH_TIME_USER = 600; // Time until the comp. with the same username service is cleared.
|
private const REFRESH_TIME_USER = 600; // Time until the comp. with the same username service is cleared.
|
||||||
const REFRESH_TIME_IP = 180; // Time until the comp. with the same IP is cleared. This should be lower than the user-level one, as people working together may be using a common IP.
|
private const REFRESH_TIME_IP = 180; // Time until the comp. with the same IP is cleared. This should be lower than the user-level one, as people working together may be using a common IP.
|
||||||
|
|
||||||
const BRUTE_FORCE_DELAY_DEFAULT = 2000; // 2000 microseconds = 2 milliseconds
|
private const BRUTE_FORCE_DELAY_DEFAULT = 2000; // 2000 microseconds = 2 milliseconds
|
||||||
const BRUTE_FORCE_DELAY_MULTIPLIER_COMMON = 1.04;
|
private const BRUTE_FORCE_DELAY_MULTIPLIER_COMMON = 1.04;
|
||||||
const BRUTE_FORCE_DELAY_MULTIPLIER_PER_USER = 2.0;
|
private const BRUTE_FORCE_DELAY_MULTIPLIER_PER_USER = 2.0;
|
||||||
const BRUTE_FORCE_DELAY_MULTIPLIER_PER_IP = 1.6;
|
private const BRUTE_FORCE_DELAY_MULTIPLIER_PER_IP = 1.6;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function for retrieving the anti-csrf token or generating it if need be.
|
* Function for retrieving the anti-csrf token or generating it if need be.
|
||||||
|
|
|
@ -47,6 +47,7 @@ final class MD_STD_IN_Test extends TestCase {
|
||||||
*/
|
*/
|
||||||
public function test_sanitize_id_works(mixed $to_validate, int $expected):void {
|
public function test_sanitize_id_works(mixed $to_validate, int $expected):void {
|
||||||
self::assertEquals($expected, MD_STD_IN::sanitize_id($to_validate));
|
self::assertEquals($expected, MD_STD_IN::sanitize_id($to_validate));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -79,6 +80,7 @@ final class MD_STD_IN_Test extends TestCase {
|
||||||
MD_STD_IN::sanitize_id($to_validate);
|
MD_STD_IN::sanitize_id($to_validate);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Data provider for valid IDs.
|
* Data provider for valid IDs.
|
||||||
*
|
*
|
||||||
|
@ -316,7 +318,6 @@ final class MD_STD_IN_Test extends TestCase {
|
||||||
self::expectException(MDpageParameterNotFromListException::class);
|
self::expectException(MDpageParameterNotFromListException::class);
|
||||||
MD_STD_IN::get_http_input_text("a", "", ['a']);
|
MD_STD_IN::get_http_input_text("a", "", ['a']);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -342,7 +343,6 @@ final class MD_STD_IN_Test extends TestCase {
|
||||||
self::expectException(MDpageParameterNotFromListException::class);
|
self::expectException(MDpageParameterNotFromListException::class);
|
||||||
MD_STD_IN::get_http_post_text("a", "", ['a']);
|
MD_STD_IN::get_http_post_text("a", "", ['a']);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -425,6 +425,7 @@ final class MD_STD_IN_Test extends TestCase {
|
||||||
*/
|
*/
|
||||||
public function test_sanitize_email_works(string $to_validate, string $expected):void {
|
public function test_sanitize_email_works(string $to_validate, string $expected):void {
|
||||||
self::assertEquals($expected, MD_STD_IN::sanitize_email($to_validate));
|
self::assertEquals($expected, MD_STD_IN::sanitize_email($to_validate));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -12,7 +12,6 @@ use PHPUnit\Framework\TestCase;
|
||||||
* Tests for MD_STD.
|
* Tests for MD_STD.
|
||||||
*/
|
*/
|
||||||
final class MD_STD_Test extends TestCase {
|
final class MD_STD_Test extends TestCase {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns sample dates and their equivalent integer values according
|
* Returns sample dates and their equivalent integer values according
|
||||||
* to MD_STD::date_to_int().
|
* to MD_STD::date_to_int().
|
||||||
|
@ -58,5 +57,4 @@ final class MD_STD_Test extends TestCase {
|
||||||
self::assertEquals($date, $toStr);
|
self::assertEquals($date, $toStr);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,6 +20,5 @@ declare(strict_types = 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user