Skip to content

Commit

Permalink
Reverted some changes, as they are in included external frameworks
Browse files Browse the repository at this point in the history
  • Loading branch information
frankmayer committed Sep 25, 2016
1 parent 6c2d7cd commit 8a973a8
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion libraries/fof/database/driver/pdo.php
Expand Up @@ -1047,7 +1047,7 @@ public function __sleep()
// Do not serialize properties that are PDO
if ($property->isStatic() == false && !($this->{$property->name} instanceof PDO))
{
$serializedProperties[] = $property->name;
array_push($serializedProperties, $property->name);
}
}

Expand Down
2 changes: 1 addition & 1 deletion libraries/fof/encrypt/randval.php
Expand Up @@ -112,7 +112,7 @@ public function genRandomBytes($length = 32)
* Collect any entropy available from the PHP system and filesystem.
* If we have ssl data that isn't strong, we use it once.
*/
$entropy = mt_rand() . uniqid(mt_rand(), true) . $sslStr;
$entropy = rand() . uniqid(mt_rand(), true) . $sslStr;
$entropy .= implode('', @fstat(fopen(__FILE__, 'r')));
$entropy .= memory_get_usage();
$sslStr = '';
Expand Down
2 changes: 1 addition & 1 deletion libraries/fof/encrypt/totp.php
Expand Up @@ -171,7 +171,7 @@ public function generateSecret()

for ($i = 1; $i <= $this->_secretLength; $i++)
{
$c = mt_rand(0, 255);
$c = rand(0, 255);
$secret .= pack("c", $c);
}
$base32 = new FOFEncryptBase32;
Expand Down
6 changes: 3 additions & 3 deletions libraries/fof/hal/render/json.php
Expand Up @@ -80,7 +80,7 @@ public function render($options = array())

foreach ($links as $link)
{
$serialiseThis->_links->$rel[] = $this->_getLink($link);
array_push($serialiseThis->_links->$rel, $this->_getLink($link));
}
}
}
Expand All @@ -102,8 +102,8 @@ public function render($options = array())

foreach ($embeddeddocs as $embedded)
{
$renderer = new FOFHalRenderJson($embedded);
$serialiseThis->_embedded->$rel[] = $renderer->render($options);
$renderer = new FOFHalRenderJson($embedded);
array_push($serialiseThis->_embedded->$rel, $renderer->render($options));
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion libraries/fof/utils/object/object.php
Expand Up @@ -197,6 +197,6 @@ public function setProperties($properties)
*/
public function setError($error)
{
$this->_errors[] = $error;
array_push($this->_errors, $error);
}
}
Expand Up @@ -523,7 +523,7 @@ public function prependBody($content)
*/
public function appendBody($content)
{
$this->response->body[] = (string) $content;
array_push($this->response->body, (string) $content);

return $this;
}
Expand Down
2 changes: 1 addition & 1 deletion libraries/vendor/joomla/registry/src/Registry.php
Expand Up @@ -617,7 +617,7 @@ public function append($path, $value)
$node = get_object_vars($node);
}

$node[] = $value;
array_push($node, $value);
$result = $value;
}

Expand Down
2 changes: 1 addition & 1 deletion libraries/vendor/joomla/session/Joomla/Session/Session.php
Expand Up @@ -844,7 +844,7 @@ protected function createToken($length = 32)

for ($i = 0; $i < $length; ++$i)
{
$token .= $chars[(mt_rand(0, $max))];
$token .= $chars[(rand(0, $max))];
}

return md5($token . $name);
Expand Down
2 changes: 1 addition & 1 deletion libraries/vendor/joomla/string/src/Inflector.php
Expand Up @@ -142,7 +142,7 @@ private function addRule($data, $ruleType)
foreach ($data as $rule)
{
// Ensure a string is pushed.
$this->rules[$ruleType][] = (string) $rule;
array_push($this->rules[$ruleType], (string) $rule);
}
}

Expand Down

0 comments on commit 8a973a8

Please sign in to comment.