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

Type fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-03-14 18:12:08 +01:00
parent 7b8b0cc227
commit 6f6a0e1bd1
4 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Message/HeaderAbstract.php
View File

@ -199,11 +199,11 @@ abstract class HeaderAbstract
* @param string $value Header value * @param string $value Header value
* @param bool $overwrite Overwrite if key already exists * @param bool $overwrite Overwrite if key already exists
* *
* @return void * @return bool
* *
* @since 1.0.0 * @since 1.0.0
*/ */
abstract public function set(string $key, string $value, bool $overwrite = false) : void; abstract public function set(string $key, string $value, bool $overwrite = false) : bool;
/** /**
* Get header by key. * Get header by key.

18
Utils/Parser/Markdown/Markdown.php
View File

@ -29,7 +29,7 @@ class Markdown
/** /**
* Blocktypes. * Blocktypes.
* *
* @var string[] * @var string[][]
* @since 1.0.0 * @since 1.0.0
*/ */
protected static $blockTypes = [ protected static $blockTypes = [
@ -138,7 +138,7 @@ class Markdown
/** /**
* Inline identifiers. * Inline identifiers.
* *
* @var string[] * @var string[][]
* @since 1.0.0 * @since 1.0.0
*/ */
protected static $inlineTypes = [ protected static $inlineTypes = [
@ -414,7 +414,7 @@ class Markdown
* *
* @since 1.0.0 * @since 1.0.0
*/ */
protected static function blockCodeComplete(array $block) : array protected static function blockCodeComplete(?array $block) : ?array
{ {
return $block; return $block;
} }
@ -498,7 +498,7 @@ class Markdown
* *
* @since 1.0.0 * @since 1.0.0
*/ */
protected static function blockFencedCodeComplete(array $block) : array protected static function blockFencedCodeComplete(?array $block) : ?array
{ {
return $block; return $block;
} }
@ -635,6 +635,8 @@ class Markdown
return $block; return $block;
} }
return null;
} }
/** /**
@ -690,6 +692,8 @@ class Markdown
return $block; return $block;
} }
return null;
} }
/** /**
@ -857,6 +861,8 @@ class Markdown
return $block; return $block;
} }
return null;
} }
/** /**
@ -934,7 +940,7 @@ class Markdown
* *
* @param string $text Line of text * @param string $text Line of text
* *
* @return array * @return string
* *
* @since 1.0.0 * @since 1.0.0
*/ */
@ -1475,7 +1481,7 @@ class Markdown
* Escape html elements * Escape html elements
* *
* @param string $text Text to escape * @param string $text Text to escape
* @param string $allowQuotes Are quotes allowed * @param bool $allowQuotes Are quotes allowed
* *
* @return string * @return string
* *

5
tests/DataStorage/Database/DatabasePoolTest.php
View File

@ -14,6 +14,7 @@
namespace phpOMS\tests\DataStorage\Database; namespace phpOMS\tests\DataStorage\Database;
use phpOMS\DataStorage\Database\Connection\MysqlConnection; use phpOMS\DataStorage\Database\Connection\MysqlConnection;
use phpOMS\DataStorage\Database\Connection\NullConnection;
use phpOMS\DataStorage\Database\DatabaseStatus; use phpOMS\DataStorage\Database\DatabaseStatus;
use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\DataStorage\Database\DatabasePool;
@ -37,13 +38,13 @@ class DatabasePoolTest extends \PHPUnit\Framework\TestCase
self::assertFalse($dbPool->create('core', $GLOBALS['CONFIG']['db']['core']['masters']['admin'])); self::assertFalse($dbPool->create('core', $GLOBALS['CONFIG']['db']['core']['masters']['admin']));
self::assertInstanceOf('\phpOMS\DataStorage\Database\Connection\ConnectionAbstract', $dbPool->get()); self::assertInstanceOf('\phpOMS\DataStorage\Database\Connection\ConnectionAbstract', $dbPool->get());
self::assertNull($dbPool->get('doesNotExist')); self::assertInstanceOf('\phpOMS\DataStorage\Database\Connection\NullConnection', $dbPool->get('doesNotExist'));
self::assertEquals($dbPool->get('core'), $dbPool->get()); self::assertEquals($dbPool->get('core'), $dbPool->get());
self::assertFalse($dbPool->remove('cores')); self::assertFalse($dbPool->remove('cores'));
self::assertTrue($dbPool->remove('core')); self::assertTrue($dbPool->remove('core'));
self::assertNull($dbPool->get()); self::assertInstanceOf('\phpOMS\DataStorage\Database\Connection\NullConnection', $dbPool->get());
self::assertTrue($dbPool->add('core', new MysqlConnection($GLOBALS['CONFIG']['db']['core']['masters']['admin']))); self::assertTrue($dbPool->add('core', new MysqlConnection($GLOBALS['CONFIG']['db']['core']['masters']['admin'])));
self::assertFalse($dbPool->add('core', new MysqlConnection($GLOBALS['CONFIG']['db']['core']['masters']['admin']))); self::assertFalse($dbPool->add('core', new MysqlConnection($GLOBALS['CONFIG']['db']['core']['masters']['admin'])));

4
tests/Message/HeaderAbstractTest.php
View File

@ -34,9 +34,9 @@ class HeaderAbstractTest extends \PHPUnit\Framework\TestCase
return '1'; return '1';
} }
public function set(string $key, string $value, bool $overwrite = false) : void public function set(string $key, string $value, bool $overwrite = false) : bool
{ {
return true;
} }
public function get(string $key) : array public function get(string $key) : array