Type fixes

This commit is contained in:
Dennis Eichhorn 2017-02-03 20:37:08 +01:00
parent 3397adacb2
commit 2188c25f01
9 changed files with 14 additions and 12 deletions

View File

@ -241,7 +241,7 @@ class Location implements \JsonSerializable, \Serializable
*/ */
public function serialize() public function serialize()
{ {
return $this->jsonSerialize(); return json_encode($this->jsonSerialize());
} }
/** /**

View File

@ -200,7 +200,7 @@ class Money implements \Serializable
$left = substr($value, 0, -self::MAX_DECIMALS); $left = substr($value, 0, -self::MAX_DECIMALS);
$right = substr($value, -self::MAX_DECIMALS); $right = substr($value, -self::MAX_DECIMALS);
return ($decimals > 0) ? number_format($left, 0, $this->decimal, $this->thousands) . $this->decimal . substr($right, 0, $decimals) : (string) $left; return ($decimals > 0) ? number_format((float) $left, 0, $this->decimal, $this->thousands) . $this->decimal . substr($right, 0, $decimals) : (string) $left;
} }
/** /**

View File

@ -65,9 +65,11 @@ class Numbers
*/ */
public static function isSelfdescribing(int $n) : bool public static function isSelfdescribing(int $n) : bool
{ {
$n = (string) $n;
$split = str_split($n); $split = str_split($n);
foreach ($split as $place => $value) { foreach ($split as $place => $value) {
if (substr_count($n, $place) != $value) { if (substr_count($n, (string) $place) != $value) {
return false; return false;
} }
} }

View File

@ -94,14 +94,14 @@ class Prime
for ($i = 0; $i < $k; $i++) { for ($i = 0; $i < $k; $i++) {
$a = mt_rand(2, $n - 1); $a = mt_rand(2, $n - 1);
$x = bcpowmod($a, $d, $n); $x = bcpowmod((string) $a, (string) $d, (string) $n);
if ($x == 1 || $x == $n - 1) { if ($x == 1 || $x == $n - 1) {
continue; continue;
} }
for ($j = 1; $j < $s; $j++) { for ($j = 1; $j < $s; $j++) {
$x = bcmod(bcmul($x, $x), $n); $x = bcmod(bcmul($x, $x), (string) $n);
if ($x == 1) { if ($x == 1) {
return false; return false;

View File

@ -111,7 +111,7 @@ abstract class ResponseAbstract implements MessageInterface, \JsonSerializable
*/ */
public function set($key, $response, bool $overwrite = true) /* : void */ public function set($key, $response, bool $overwrite = true) /* : void */
{ {
$this->response = ArrayUtils::setArray($key, $this->response, $response, ':', $overwrite); $this->response = ArrayUtils::setArray((string) $key, $this->response, $response, ':', $overwrite);
} }
/** /**

View File

@ -390,7 +390,7 @@ class Encryption
{ {
$pad = ord($value[($len = strlen($value)) - 1]); $pad = ord($value[($len = strlen($value)) - 1]);
return $this->paddingIsValid($pad, $value) ? substr($value, 0, $len - $pad) : $value; return $this->paddingIsValid((string) $pad, $value) ? substr($value, 0, $len - $pad) : $value;
} }
/** /**
@ -408,7 +408,7 @@ class Encryption
{ {
$beforePad = strlen($value) - $pad; $beforePad = strlen($value) - $pad;
return substr($value, $beforePad) == str_repeat(substr($value, -1), $pad); return substr($value, $beforePad) == str_repeat(substr($value, -1), (int) $pad);
} }
/** /**

View File

@ -95,7 +95,7 @@ abstract class FileAbstract implements ContainerInterface
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
protected $permission = '0000'; protected $permission = 0644;
/** /**
* Constructor. * Constructor.
@ -194,6 +194,6 @@ abstract class FileAbstract implements ContainerInterface
$this->createdAt->setTimestamp(filemtime($this->path)); $this->createdAt->setTimestamp(filemtime($this->path));
$this->changedAt->setTimestamp(filectime($this->path)); $this->changedAt->setTimestamp(filectime($this->path));
$this->owner = fileowner($this->path); $this->owner = fileowner($this->path);
$this->permission = substr(sprintf('%o', fileperms($this->path)), -4); $this->permission = (int) substr(sprintf('%o', fileperms($this->path)), -4);
} }
} }

View File

@ -193,7 +193,7 @@ class Http implements UriInterface
*/ */
public static function isValid(string $uri) : bool public static function isValid(string $uri) : bool
{ {
return filter_var($uri, FILTER_VALIDATE_URL); return (bool) filter_var($uri, FILTER_VALIDATE_URL);
} }
/** /**

View File

@ -252,7 +252,7 @@ class MemberParser
} elseif (is_string($value)) { } elseif (is_string($value)) {
return '"' . $value . '"'; return '"' . $value . '"';
} elseif (is_scalar($value)) { } elseif (is_scalar($value)) {
return $value; return (string) $value;
} elseif (is_null($value)) { } elseif (is_null($value)) {
return 'null'; return 'null';
} elseif (is_bool($value)) { } elseif (is_bool($value)) {