Merge pull request #14 from kenjis/fix-code-coverage

Fixes for generating code coverage report

Author: lonnieezell

phpunit.xml

@@ -23,6 +23,7 @@
                 <file>./system/ComposerScripts.php</file>
                 <file>./system/View/Escaper.php</file>
                 <directory suffix=".php">./system/View/Exception</directory>
+                <directory suffix=".php">./system/Debug/Toolbar/View</directory>
             </exclude>
         </whitelist>
     </filter>

system/Debug/Exceptions.php

@@ -35,7 +35,7 @@
  * @filesource
  */
 
-require dirname(__FILE__).'/CustomExceptions.php';
+require_once dirname(__FILE__).'/CustomExceptions.php';
 
 class Exceptions
 {

system/HTTP/ContentSecurityPolicy.php

@@ -621,7 +621,7 @@ protected function buildHeaders(ResponseInterface &$response)
 	 * @param array|string|null $values
 	 * @param ResponseInterface $response
 	 */
-	protected function addToHeader(\string $name, $values = null, ResponseInterface &$response)
+	protected function addToHeader(string $name, $values = null, ResponseInterface &$response)
 	{
 		if ( empty($values))
 		{

system/Session/Handlers/MemcachedHandler.php

@@ -308,7 +308,7 @@ public function gc($maxlifetime)
 	 *
 	 * @return    bool
 	 */
-	protected function lockSession($session_id)
+	protected function lockSession(string $session_id): bool
 	{
 		if (isset($this->lockKey))
 		{
@@ -360,7 +360,7 @@ protected function lockSession($session_id)
 	 *
 	 * @return    bool
 	 */
-	protected function releaseLock()
+	protected function releaseLock(): bool
 	{
 		if (isset($this->memcached, $this->lockKey) && $this->lock)
 		{

system/Session/Handlers/RedisHandler.php

@@ -311,7 +311,7 @@ public function gc($maxlifetime)
 	 * @param	string	$session_id	Session ID
 	 * @return	bool
 	 */
-	protected function lockSession($session_id)
+	protected function lockSession(string $session_id): bool
 	{
 		if (isset($this->lockKey))
 		{
@@ -364,7 +364,7 @@ protected function lockSession($session_id)
 	 *
 	 * @return	bool
 	 */
-	protected function releaseLock()
+	protected function releaseLock(): bool
 	{
 		if (isset($this->redis, $this->lockKey) && $this->lock)
 		{