Version 5.0.0 beta 1

applications/core/tasks/queue.php

@@ -11,16 +11,22 @@
 namespace IPS\core\tasks;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use IPS\Task;
+use IPS\Task\Exception;
+use UnderflowException;
+use function defined;
+
+if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
-	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+	header( ( $_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
 }
 
 /**
  * Queue Task
  */
-class _queue extends \IPS\Task
+class queue extends Task
 {
 	/**
 	 * Execute
@@ -31,28 +37,30 @@ class _queue extends \IPS\Task
 	 * Tasks should execute within the time of a normal HTTP request.
 	 *
 	 * @return	mixed	Message to log or NULL
-	 * @throws	\IPS\Task\Exception
+	 * @throws	Exception
 	 */
-	public function execute()
+	public function execute() : mixed
 	{
 		$this->runUntilTimeout( function(){
 			/* Try and get a queue item */
 			try
 			{
 				/* Run the next queue task, if any */
-				\IPS\Task::runQueue();
+				Task::runQueue();
 
 				/* Continue */
 				return TRUE;
 			}
 			/* If there's no queue items left, disable this task and return */
-			catch ( \UnderflowException $e )
+			catch ( UnderflowException $e )
 			{				
 				$this->enabled = FALSE;
 				$this->save();
 				return FALSE;
 			}
 		});
+
+		return null;
 	}
 		
 	/**