Version 5.0.0 beta 1

applications/calendar/tasks/icalendar.php

@@ -12,16 +12,24 @@
 namespace IPS\calendar\tasks;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use IPS\calendar\Icalendar as iCalendarClass;
+use IPS\Db;
+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;
 }
 
 /**
  * icalendar Task
  */
-class _icalendar extends \IPS\Task
+class icalendar extends Task
 {
 	/**
 	 * Execute
@@ -32,34 +40,34 @@ class _icalendar 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
 	{
 		try
 		{
-			$next	= \IPS\Db::i()->select( '*', 'calendar_import_feeds', NULL, 'feed_last_run ASC', 1 )->first();
+			$next	= Db::i()->select( '*', 'calendar_import_feeds', NULL, 'feed_last_run ASC', 1 )->first();
 
 			if( $next['feed_id'] )
 			{
 				/* Refresh the feed */
 				try
 				{
-					$count	= \IPS\calendar\Icalendar::load( $next['feed_id'] )->refresh();
+					$count	= iCalendarClass::load( $next['feed_id'] )->refresh();
 				}
 				catch( \Exception $e )
 				{
-					throw new \IPS\Task\Exception( $this, array( 'task_' . $e->getMessage(), $next['feed_title'] ) );
+					throw new Exception( $this, array( 'task_' . $e->getMessage(), $next['feed_title'] ) );
 				}
-
-				/* Task log */
-				return NULL;
 			}
 		}
-		catch( \UnderflowException $e )
+		catch( UnderflowException $e )
 		{
 			return NULL;
 		}
+
+		/* Task log */
+		return NULL;
 	}
 	
 	/**