Version 5.0.0 beta 1

applications/core/tasks/weeklyCleanup.php

@@ -12,16 +12,26 @@
 namespace IPS\core\tasks;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use DateInterval;
+use IPS\DateTime;
+use IPS\Db;
+use IPS\Settings;
+use IPS\Task;
+use IPS\Task\Exception;
+use function defined;
+use function in_array;
+
+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;
 }
 
 /**
  * weeklyCleanup Task
  */
-class _weeklyCleanup extends \IPS\Task
+class weeklyCleanup extends Task
 {
 	/**
 	 * Execute
@@ -32,14 +42,14 @@ class _weeklyCleanup 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
 	{
 		/* If we are currently pruning any large tables via a bg task, find out so we don't try to prune them normally here as well. The bg task should finish first. */
 		$currentlyPruning = array();
 
-		foreach( \IPS\Db::i()->select( '*', 'core_queue', array( '`key`=?', 'PruneLargeTable' ) ) as $pruneTask )
+		foreach( Db::i()->select( '*', 'core_queue', array( '`key`=?', 'PruneLargeTable' ) ) as $pruneTask )
 		{
 			$data = json_decode( $pruneTask['data'], true );
 
@@ -47,13 +57,15 @@ class _weeklyCleanup extends \IPS\Task
 		}
 
 		/* Delete old follows */
-		if ( \IPS\Settings::i()->prune_follows AND !\in_array( 'core_follow', $currentlyPruning ) )
+		if ( Settings::i()->prune_follows AND !in_array( 'core_follow', $currentlyPruning ) )
 		{
-			\IPS\Db::i()->delete( 'core_follow', array( 'follow_app!=? AND follow_area!=? AND follow_member_id IN(?)', 'core', 'member', \IPS\Db::i()->select( 'member_id', 'core_members', array( 'last_activity < ?', \IPS\DateTime::create()->sub( new \DateInterval( 'P' . \IPS\Settings::i()->prune_follows . 'D' ) )->getTimestamp() ) ) ) );
+			Db::i()->delete( 'core_follow', array( 'follow_app!=? AND follow_area!=? AND follow_member_id IN(?)', 'core', 'member', Db::i()->select( 'member_id', 'core_members', array( 'last_activity < ?', DateTime::create()->sub( new DateInterval( 'P' . Settings::i()->prune_follows . 'D' ) )->getTimestamp() ) ) ) );
 
 			/* And clear the cache so it can rebuild */
-			\IPS\Db::i()->delete( 'core_follow_count_cache' );
+			Db::i()->delete( 'core_follow_count_cache' );
 		}
+
+		return null;
 	}
 	
 	/**