Version 5.0.0 beta 1

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

@@ -12,34 +12,42 @@
 namespace IPS\convert\extensions\core\Queue;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use IPS\Application;
+use IPS\convert\App;
+use IPS\Member;
+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 _RebuildNonContent
+class RebuildNonContent
 {
 	/**
 	 * @brief Number of content items to rebuild per cycle
 	 */
-	public $rebuild	= \IPS\REBUILD_SLOW;
+	public $rebuild	= REBUILD_SLOW;
 
 	/**
 	 * Parse data before queuing
 	 *
 	 * @param	array	$data	Data
-	 * @return	array
+	 * @return	array|null
 	 */
-	public function preQueueData( $data )
+	public function preQueueData( array $data ): ?array
 	{
 		$data['count']	= 0;
 		$_extensionData = explode( '_', $data['extension'] );
 
-		foreach( \IPS\Application::load( $_extensionData[0] )->extensions( 'core', 'EditorLocations' ) as $_key => $extension )
+		foreach( Application::load( $_extensionData[0] )->extensions( 'core', 'EditorLocations' ) as $_key => $extension )
 		{
 			if( $_key != $_extensionData[1] )
 			{
@@ -63,11 +71,11 @@ class _RebuildNonContent
 	 * @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( array &$data, int $offset ): int
 	{
-		foreach( \IPS\Application::allExtensions( 'core', 'EditorLocations', FALSE, NULL, NULL, TRUE ) as $_key => $extension )
+		foreach( Application::allExtensions( 'core', 'EditorLocations', FALSE, NULL, NULL, TRUE ) as $_key => $extension )
 		{
 			if( $_key != $data['extension'] )
 			{
@@ -76,11 +84,11 @@ class _RebuildNonContent
 			
 			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;
 			}
 
 			if( method_exists( $extension, 'rebuildContent' ) )
@@ -99,7 +107,7 @@ class _RebuildNonContent
 		}
 
 		/* Rebuild is complete */
-		throw new \IPS\Task\Queue\OutOfRangeException;
+		throw new OutOfRangeException;
 	}
 	
 	/**
@@ -109,8 +117,8 @@ class _RebuildNonContent
 	 * @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( 'rebuilding_noncontent_posts', FALSE, array( 'sprintf' => \IPS\Member::loggedIn()->language()->addToStack( 'editor__' . $data['extension'] ) ) ), 'complete' => $data['count'] ? ( round( 100 / $data['count'] * $offset, 2 ) ) : 100 );
+        return array( 'text' => Member::loggedIn()->language()->addToStack( 'rebuilding_noncontent_posts', FALSE, array( 'sprintf' => Member::loggedIn()->language()->addToStack( 'editor__' . $data['extension'] ) ) ), 'complete' => $data['count'] ? ( round( 100 / $data['count'] * $offset, 2 ) ) : 100 );
     }	
 }