mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 17:59:48 +00:00
Code Issues Projects Releases Wiki Activity

Replaced array() with []

Browse Source
This commit is contained in:
Shoghi Cervantes
2014-08-28 17:04:22 +02:00
parent 2f2afe2336
commit eab86f5f90
122 changed files with 535 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/utils/Binary.php
View File

@ -163,7 +163,7 @@ class Binary{
}
if($types === true){
$m[$bottom] = array("value" => $r, "type" => $type);
$m[$bottom] = ["value" => $r, "type" => $type];
}else{
$m[$bottom] = $r;
}

2
src/pocketmine/utils/Cache.php
View File

@ -33,7 +33,7 @@ class Cache{
* @param float|int $minTTL The data will remain cached for at least $minTTL seconds
*/
public static function add($identifier, $blob, $minTTL = 30){
self::$cached[$identifier] = array($blob, microtime(true) + $minTTL, $minTTL);
self::$cached[$identifier] = [$blob, microtime(true) + $minTTL, $minTTL];
}
/**

4
src/pocketmine/utils/Config.php
View File

@ -47,7 +47,7 @@ class Config{
/** @var integer */
private $type = Config::DETECT;
public static $formats = array(
public static $formats = [
"properties" => Config::PROPERTIES,
"cnf" => Config::CNF,
"conf" => Config::CNF,
@ -63,7 +63,7 @@ class Config{
"txt" => Config::ENUM,
"list" => Config::ENUM,
"enum" => Config::ENUM,
);
];
/**
* @param string $file Path of the file to be loaded

2
src/pocketmine/utils/TextFormat.php
View File

@ -69,7 +69,7 @@ class TextFormat{
* @return mixed
*/
public static function clean($string){
return preg_replace(array("/§[0123456789abcdefklmnor]/", "/\\x1b*/"), "", $string);
return preg_replace(["/§[0123456789abcdefklmnor]/", "/\\x1b*/"], "", $string);
}
/**

12
src/pocketmine/utils/Utils.php
View File

@ -217,7 +217,7 @@ class Utils{
$drop = 0;
while(!isset($output{$length - 1})){
//some entropy, but works ^^
$weakEntropy = array(
$weakEntropy = [
is_array($startEntropy) ? implode($startEntropy) : $startEntropy,
serialize(@stat(__FILE__)),
__DIR__,
@ -249,7 +249,7 @@ class Utils{
(string) disk_total_space("."),
uniqid(microtime(), true),
file_exists("/proc/cpuinfo") ? file_get_contents("/proc/cpuinfo") : microtime(),
);
];
shuffle($weakEntropy);
$value = hash("sha512", implode($weakEntropy), true);
@ -261,13 +261,13 @@ class Utils{
unset($weakEntropy);
if($secure === true){
$strongEntropyValues = array(
$strongEntropyValues = [
is_array($startEntropy) ? hash("sha512", $startEntropy[($rounds + $drop) % count($startEntropy)], true) : hash("sha512", $startEntropy, true), //Get a random index of the startEntropy, or just read it
file_exists("/dev/urandom") ? fread(fopen("/dev/urandom", "rb"), 64) : str_repeat("\x00", 64),
function_exists("openssl_random_pseudo_bytes") ? openssl_random_pseudo_bytes(64) : str_repeat("\x00", 64),
function_exists("mcrypt_create_iv") ? mcrypt_create_iv(64, MCRYPT_DEV_URANDOM) : str_repeat("\x00", 64),
$value,
);
];
$strongEntropy = array_pop($strongEntropyValues);
foreach($strongEntropyValues as $value){
$strongEntropy = $strongEntropy ^ $value;
@ -330,7 +330,7 @@ class Utils{
}
$ch = curl_init($page);
curl_setopt($ch, CURLOPT_HTTPHEADER, array("User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:12.0) Gecko/20100101 Firefox/12.0 PocketMine-MP"));
curl_setopt($ch, CURLOPT_HTTPHEADER, ["User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:12.0) Gecko/20100101 Firefox/12.0 PocketMine-MP"]);
curl_setopt($ch, CURLOPT_AUTOREFERER, true);
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
@ -368,7 +368,7 @@ class Utils{
curl_setopt($ch, CURLOPT_POSTFIELDS, $args);
curl_setopt($ch, CURLOPT_AUTOREFERER, true);
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
curl_setopt($ch, CURLOPT_HTTPHEADER, array("User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:12.0) Gecko/20100101 Firefox/12.0 PocketMine-MP"));
curl_setopt($ch, CURLOPT_HTTPHEADER, ["User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:12.0) Gecko/20100101 Firefox/12.0 PocketMine-MP"]);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, (int) $timeout);
$ret = curl_exec($ch);

4
src/pocketmine/utils/VersionString.php
View File

@ -26,14 +26,14 @@ namespace pocketmine\utils;
* Manages PocketMine-MP version strings, and compares them
*/
class VersionString{
public static $stageOrder = array(
public static $stageOrder = [
"alpha" => 0,
"a" => 0,
"beta" => 1,
"b" => 1,
"final" => 2,
"f" => 2,
);
];
private $stage;
private $major;
private $build;