Version 5.0.0 beta 1

applications/core/tasks/chunkcleanup.php

@@ -11,16 +11,24 @@
 namespace IPS\core\tasks;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use DirectoryIterator;
+use IPS\File;
+use IPS\Task;
+use IPS\Task\Exception;
+use function defined;
+use function is_dir;
+
+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;
 }
 
 /**
  * chunkcleanup Task
  */
-class _chunkcleanup extends \IPS\Task
+class chunkcleanup extends Task
 {
 	/**
 	 * Execute
@@ -31,26 +39,26 @@ class _chunkcleanup 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
 	{
 		$chunksCleanedUp = 0;
 
 		/* Loop over file storage configurations */
-		foreach( \IPS\File::getStore() as $configuration )
+		foreach( File::getStore() as $configuration )
 		{
 			/* If this is a filesystem config... */
 			if( $configuration['method'] == 'FileSystem' )
 			{
 				/* Get the configuration object */
-				$fileStorageObject = \IPS\File::getClass( $configuration['id'] );
+				$fileStorageObject = File::getClass( $configuration['id'] );
 
 				/* If we have a chunks folder */
-				if( \is_dir( $fileStorageObject->configuration['dir'] . '/chunks' ) )
+				if( is_dir( $fileStorageObject->configuration['dir'] . '/chunks' ) )
 				{
 					/* Loop over all the files in the directory */
-					$iterator = new \DirectoryIterator( $fileStorageObject->configuration['dir'] . '/chunks' );
+					$iterator = new DirectoryIterator( $fileStorageObject->configuration['dir'] . '/chunks' );
 
 					foreach( $iterator as $file )
 					{