Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-06 04:28:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing test bugs

Browse Source
This commit is contained in:
Dennis Eichhorn 2017-03-11 23:57:37 +01:00
parent fdd5d85a6a
commit aa483c2eb8
3 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Autoloader.php
View File

@ -52,8 +52,12 @@ class Autoloader
$class = ltrim($class, '\\'); $class = ltrim($class, '\\');
$class = str_replace(['_', '\\'], '/', $class); $class = str_replace(['_', '\\'], '/', $class);
if(!file_exists($path = __DIR__ . '/../' . $class . '.php')) {
return;
}
/** @noinspection PhpIncludeInspection */ /** @noinspection PhpIncludeInspection */
include_once __DIR__ . '/../' . $class . '.php'; include_once $path;
} }
/** /**

36
Message/Http/Request.php
View File

@ -83,6 +83,8 @@ class Request extends RequestAbstract
$this->uri = $uri; $this->uri = $uri;
$this->source = RequestSource::WEB; $this->source = RequestSource::WEB;
$this->header = new Header(); $this->header = new Header();
$this->init();
} }
/** /**
@ -97,12 +99,10 @@ class Request extends RequestAbstract
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com> * @author Dennis Eichhorn <d.eichhorn@oms.com>
*/ */
public function init($uri = null) /* : void */ private function init() /* : void */
{ {
if (!isset($uri) && !isset($this->uri)) { if (!isset($this->uri)) {
$this->initCurrentRequest(); $this->initCurrentRequest();
} else {
$this->initPseudoRequest($uri ?? $this->uri->__toString());
} }
$this->data = array_change_key_case($this->data, CASE_LOWER); $this->data = array_change_key_case($this->data, CASE_LOWER);
@ -159,30 +159,16 @@ class Request extends RequestAbstract
*/ */
private function loadRequestLanguage() : string private function loadRequestLanguage() : string
{ {
$lang = $_SERVER['HTTP_ACCEPT_LANGUAGE']; if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
$lang = explode(';', $lang); return 'EN';
}
$lang = explode(';', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
$lang = explode('-', $lang[0]); $lang = explode('-', $lang[0]);
return $lang[0]; return $lang[0];
} }
/**
* Init pseudo request
*
* @param mixed $uri Uri to handle as request
*
* @return void
*
* @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com>
*/
private function initPseudoRequest($uri) /* : void */
{
// todo: $uri can be string and this will fail!!!
$this->setMethod($uri['type']);
$this->uri->set($uri['uri']);
}
/** /**
* Clean up globals that musn't be used any longer * Clean up globals that musn't be used any longer
* *
@ -297,12 +283,12 @@ class Request extends RequestAbstract
/** /**
* Determine request browser. * Determine request browser.
* *
* @return BrowserType * @return string
* *
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com> * @author Dennis Eichhorn <d.eichhorn@oms.com>
*/ */
public function getBrowser() : BrowserType public function getBrowser() : string
{ {
if (!isset($this->browser)) { if (!isset($this->browser)) {
$arr = BrowserType::getConstants(); $arr = BrowserType::getConstants();

4
Utils/StringUtils.php
View File

@ -363,9 +363,9 @@ class StringUtils
return $count; return $count;
} }
public static function getEntropy(string $value) : int public static function getEntropy(string $value) : float
{ {
$entroy = 0; $entroy = 0.0;
$size = mb_strlen($value); $size = mb_strlen($value);
$countChars = self::mb_count_chars($value, 1); $countChars = self::mb_count_chars($value, 1);