Version 5.0.0 beta 1

applications/nexus/extensions/core/Queue/RecountTotalSpend.php

@@ -12,32 +12,42 @@
 namespace IPS\nexus\extensions\core\Queue;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use Exception;
+use IPS\Db;
+use IPS\Extensions\QueueAbstract;
+use IPS\Member;
+use IPS\nexus\Customer;
+use OutOfRangeException;
+use function defined;
+use const IPS\REBUILD_QUICK;
+
+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;
 }
 
 /**
  * Background Task
  */
-class _RecountTotalSpend
+class RecountTotalSpend extends QueueAbstract
 {
 
 	/**
 	 * @brief	Number of records to process per cycle
 	 */
-	public $perCycle = \IPS\REBUILD_QUICK;
+	public int $perCycle = REBUILD_QUICK;
 
 	/**
 	 * Parse data before queuing
 	 *
 	 * @param	array	$data
-	 * @return	array
+	 * @return	array|null
 	 */
-	public function preQueueData( $data )
+	public function preQueueData( array $data ): ?array
 	{
-		$data['count'] = (int) \IPS\Db::i()->select( 'count(*)', 'nexus_customers' )->first();
+		$data['count'] = (int) Db::i()->select( 'count(*)', 'nexus_customers' )->first();
 
 		if( $data['count'] == 0 )
 		{
@@ -57,22 +67,22 @@ class _RecountTotalSpend
 	 * @return	int							New offset
 	 * @throws	\IPS\Task\Queue\OutOfRangeException	Indicates offset doesn't exist and thus task is complete
 	 */
-	public function run( &$data, $offset )
+	public function run( mixed &$data, int $offset ): int
 	{
 		$last	= null;
 
 		/* Loop over members to fix them */
-		foreach( \IPS\Db::i()->select( '*', 'nexus_customers', array( 'member_id > ?', $offset ), 'member_id ASC', array( 0, $this->perCycle ) ) as $customer )
+		foreach( Db::i()->select( '*', 'nexus_customers', array( 'member_id > ?', $offset ), 'member_id ASC', array( 0, $this->perCycle ) ) as $customer )
 		{
 			$last = $customer['member_id'];
 			$data['completed']++;
 
 			try
 			{
-				$customer = \IPS\nexus\Customer::load( $customer['member_id'] );
+				$customer = Customer::load( $customer['member_id'] );
 				$customer->recountTotalSpend();
 			}
-			catch( \Exception $ex ) { }
+			catch( Exception ) { }
 		}
 
 		if( $last === NULL )
@@ -89,10 +99,10 @@ class _RecountTotalSpend
 	 * @param	mixed					$data	Data as it was passed to \IPS\Task::queue()
 	 * @param	int						$offset	Offset
 	 * @return	array( 'text' => 'Doing something...', 'complete' => 50 )	Text explaining task and percentage complete
-	 * @throws	\OutOfRangeException	Indicates offset doesn't exist and thus task is complete
+	 * @throws	OutOfRangeException	Indicates offset doesn't exist and thus task is complete
 	 */
-	public function getProgress( $data, $offset )
+	public function getProgress( mixed $data, int $offset ): array
 	{
-		return array( 'text' => \IPS\Member::loggedIn()->language()->addToStack( 'recounting_total_spend' ), 'complete' => $data['count'] ? ( round(  100 / $data['count'] * $data['completed'], 2 ) ) : 100 );
+		return array( 'text' => Member::loggedIn()->language()->addToStack( 'recounting_total_spend' ), 'complete' => $data['count'] ? ( round(  100 / $data['count'] * $data['completed'], 2 ) ) : 100 );
 	}
 }