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

Turn exceptions in false returns

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-02-26 19:46:28 +01:00
parent 2bdc9410b7
commit 5b243ab2da
5 changed files with 19 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Message/Http/Header.php
View File

@ -58,9 +58,6 @@ class Header extends HeaderAbstract
* *
* @return bool * @return bool
* *
* @throws LockException The http header needs to be defined at the beginning. If it is already pushed further interactions are impossible and locked.
* @throws \Exception If the header already exists and cannot be overwritten this exception will be thrown.
*
* @todo Allow to extend header key with additional values. * @todo Allow to extend header key with additional values.
* *
* @since 1.0.0 * @since 1.0.0
@ -68,11 +65,11 @@ class Header extends HeaderAbstract
public function set(string $key, string $header, bool $overwrite = false) : bool public function set(string $key, string $header, bool $overwrite = false) : bool
{ {
if (self::$isLocked) { if (self::$isLocked) {
throw new LockException('HTTP header'); return false;
} }
if (self::isSecurityHeader($key) && isset($this->header[$key])) { if (self::isSecurityHeader($key) && isset($this->header[$key])) {
throw new \Exception('Cannot change security headers.'); return false;
} }
$key = strtolower($key); $key = strtolower($key);
@ -167,14 +164,12 @@ class Header extends HeaderAbstract
* *
* @return bool * @return bool
* *
* @throws LockException The http header needs to be defined at the beginning. If it is already pushed further interactions are impossible and locked.
*
* @since 1.0.0 * @since 1.0.0
*/ */
public function remove($key) : bool public function remove($key) : bool
{ {
if (self::$isLocked) { if (self::$isLocked) {
throw new LockException('HTTP header'); return false;
} }
if (isset($this->header[$key])) { if (isset($this->header[$key])) {

4
tests/Math/Functions/FunctionsTest.php
View File

@ -72,7 +72,7 @@ class FunctionsTest extends \PHPUnit\Framework\TestCase
self::assertEquals([4, 9, 16], Functions::powerInt([2, 3, 4], 2)); self::assertEquals([4, 9, 16], Functions::powerInt([2, 3, 4], 2));
self::assertEquals([8, 27, 64], Functions::powerInt([2, 3, 4], 3)); self::assertEquals([8, 27, 64], Functions::powerInt([2, 3, 4], 3));
self::assertEquals([2.0, 3.0, 4.0], Functions::powerFloat([4, 9, 16], 1/2), '', 0.0); self::assertEquals([2.0, 3.0, 4.0], Functions::powerFloat([4, 9, 16], 1 / 2), '', 0.0);
self::assertEquals([2.0, 3.0, 4.0], Functions::powerFloat([8, 27, 64], 1/3), '', 0.0); self::assertEquals([2.0, 3.0, 4.0], Functions::powerFloat([8, 27, 64], 1 / 3), '', 0.0);
} }
} }

2
tests/Math/Stochastic/Distribution/CauchyDistributionTest.php
View File

@ -45,6 +45,6 @@ class CauchyDistributionTest extends \PHPUnit\Framework\TestCase
{ {
$gamma = 1.5; $gamma = 1.5;
self::assertEquals(log(4 * M_PI * $gamma, CauchyDistribution::getEntropy($gamma), '', 0.01); self::assertEquals(log(4 * M_PI * $gamma), CauchyDistribution::getEntropy($gamma), '', 0.01);
} }
} }

7
tests/Math/Stochastic/Distribution/ChiSquaredDistributionTest.php
View File

@ -17,11 +17,8 @@ use phpOMS\Math\Stochastic\Distribution\ChiSquaredDistribution;
class ChiSquaredDistributionTest extends \PHPUnit\Framework\TestCase class ChiSquaredDistributionTest extends \PHPUnit\Framework\TestCase
{ {
public function testPdf() public function testPlaceholder()
{ {
$df = 15; self::markTestIncomplete();
$x = 18.307;
self::assertEquals(0.24687, ChiSquaredDistribution::getPdf($x, $df));
} }
} }

37
tests/Message/Http/HeaderTest.php
View File

@ -67,36 +67,24 @@ class HeaderTest extends \PHPUnit\Framework\TestCase
self::AssertEquals(2, $header->getAccount(2)); self::AssertEquals(2, $header->getAccount(2));
} }
/**
* @expectedException phpOMS\DataStorage\LockException
*/
public function testLockedHeaderSet() public function testLockedHeaderSet()
{ {
try { $header = new Header();
$header = new Header(); Header::lock();
Header::lock(); self::assertTrue(Header::isLocked());
self::assertTrue(Header::isLocked()); self::assertFalse($header->set('key', 'value'));
$header->set('key', 'value'); TestUtils::setMember('phpOMS\Message\Http\Header', 'isLocked', false);
} finally {
TestUtils::setMember('phpOMS\Message\Http\Header', 'isLocked', false);
}
} }
/**
* @expectedException phpOMS\DataStorage\LockException
*/
public function testLockedHeaderRemove() public function testLockedHeaderRemove()
{ {
try { $header = new Header();
$header = new Header(); Header::lock();
Header::lock(); self::assertTrue(Header::isLocked());
self::assertTrue(Header::isLocked()); self::assertFalse($header->remove('key'));
$header->remove('key'); TestUtils::setMember('phpOMS\Message\Http\Header', 'isLocked', false);
} finally {
TestUtils::setMember('phpOMS\Message\Http\Header', 'isLocked', false);
}
} }
public function testGeneration() public function testGeneration()
@ -122,13 +110,10 @@ class HeaderTest extends \PHPUnit\Framework\TestCase
self::assertEquals(500, \http_response_code()); self::assertEquals(500, \http_response_code());
} }
/**
* @expectedException \Exception
*/
public function testOverwriteSecurityHeader() public function testOverwriteSecurityHeader()
{ {
$header = new Header(); $header = new Header();
self::assertTrue($header->set('content-security-policy', 'header')); self::assertTrue($header->set('content-security-policy', 'header'));
$header->set('content-security-policy', 'header', true); self::assertFalse($header->set('content-security-policy', 'header', true));
} }
} }