Version 5.0.0 beta 1

applications/convert/extensions/core/Queue/RebuildGalleryImages.php

@@ -12,30 +12,43 @@
 namespace IPS\convert\extensions\core\Queue;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use DomainException;
+use Exception;
+use InvalidArgumentException;
+use IPS\Application;
+use IPS\convert\App;
+use IPS\Db;
+use IPS\Member;
+use IPS\Patterns\ActiveRecordIterator;
+use IPS\Task\Queue\OutOfRangeException;
+use function defined;
+use const IPS\REBUILD_SLOW;
+
+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 _RebuildGalleryImages
+class RebuildGalleryImages
 {
 	/**
 	 * Parse data before queuing
 	 *
 	 * @param	array	$data	Data
-	 * @return	array
+	 * @return	array|null
 	 */
-	public function preQueueData( $data )
+	public function preQueueData( array $data ): ?array
 	{
 		try
 		{
-			$data['count'] = \IPS\Db::i()->select( 'count(image_id)', 'gallery_images' )->first();
+			$data['count'] = Db::i()->select( 'count(image_id)', 'gallery_images' )->first();
 		}
-		catch( \Exception $e )
+		catch( Exception $e )
 		{
 			throw new \OutOfRangeException;
 		}
@@ -56,28 +69,28 @@ class _RebuildGalleryImages
 	 * @param	mixed					$data	Data as it was passed to \IPS\Task::queue()
 	 * @param	int						$offset	Offset
 	 * @return	int|null					New offset or NULL if complete
-	 * @throws	\IPS\Task\Queue\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 run( &$data, $offset )
+	public function run( mixed &$data, int $offset ): int
 	{
-		if ( !class_exists( 'IPS\gallery\Image' ) OR !\IPS\Application::appIsEnabled( 'gallery' ) )
+		if ( !class_exists( 'IPS\gallery\Image' ) OR !Application::appIsEnabled( 'gallery' ) )
 		{
-			throw new \IPS\Task\Queue\OutOfRangeException;
+			throw new OutOfRangeException;
 		}
 		
 		/* Intentionally no try/catch as it means app doesn't exist */
 		try
 		{
-			$app = \IPS\convert\App::load( $data['app'] );
+			$app = App::load( $data['app'] );
 		}
 		catch( \OutOfRangeException $e )
 		{
-			throw new \IPS\Task\Queue\OutOfRangeException;
+			throw new OutOfRangeException;
 		}
 
 		$last = NULL;
 		
-		foreach( new \IPS\Patterns\ActiveRecordIterator( \IPS\Db::i()->select( '*', 'gallery_images', array( "image_id>?", $offset ), 'image_id ASC', array( 0, \IPS\REBUILD_INTENSE ) ), 'IPS\gallery\Image' ) AS $image )
+		foreach( new ActiveRecordIterator( Db::i()->select( '*', 'gallery_images', array( "image_id>?", $offset ), 'image_id ASC', array( 0, REBUILD_SLOW ) ), 'IPS\gallery\Image' ) AS $image )
 		{
 			$data['completed']++;
 
@@ -98,12 +111,12 @@ class _RebuildGalleryImages
 				$image->buildThumbnails();
 				$image->save();
 			}
-			catch( \DomainException $e )
+			catch( DomainException $e )
 			{
 				$image->delete();
 			}
 			/* File fails the image type test */
-			catch( \InvalidArgumentException $e )
+			catch( InvalidArgumentException $e )
 			{
 				$image->delete();
 			}
@@ -113,7 +126,7 @@ class _RebuildGalleryImages
 
 		if( $last === NULL )
 		{
-			throw new \IPS\Task\Queue\OutOfRangeException;
+			throw new OutOfRangeException;
 		}
 
 		return $last;
@@ -126,8 +139,8 @@ class _RebuildGalleryImages
 	 * @param	int						$offset	Offset
 	 * @return	array	Text explaning task and percentage complete
 	 */
-	public function getProgress( $data, $offset )
+	public function getProgress( mixed $data, int $offset ): array
 	{
-		return array( 'text' => \IPS\Member::loggedIn()->language()->addToStack( 'queue_rebuilding_gallery_images' ), 'complete' => $data['count'] ? ( round( 100 / $data['count'] * $data['completed'], 2 ) ) : 100 );
+		return array( 'text' => Member::loggedIn()->language()->addToStack( 'queue_rebuilding_gallery_images' ), 'complete' => $data['count'] ? ( round( 100 / $data['count'] * $data['completed'], 2 ) ) : 100 );
 	}	
 }