Version 5.0.0 beta 1

applications/core/tasks/sitemapgenerator.php

@@ -11,25 +11,33 @@
 namespace IPS\core\tasks;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use Exception;
+use IPS\Log;
+use IPS\Sitemap;
+use IPS\Task;
+use function count;
+use function defined;
+
+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;
 }
 
 /**
  * Task to generate sitemaps
  */
-class _sitemapgenerator extends \IPS\Task
+class sitemapgenerator extends Task
 {
 	/**
 	 * Execute
 	 *
-	 * @return	void
+	 * @return	mixed
 	 */
-	public function execute()
+	public function execute() : mixed
 	{
-		$generator	= new \IPS\Sitemap;
+		$generator	= new Sitemap;
 
 		$this->runUntilTimeout( function() use( $generator )
 		{
@@ -38,15 +46,15 @@ class _sitemapgenerator extends \IPS\Task
 				/* If it returns false, we're done for now */
 				return $generator->buildNextSitemap();
 			}
-			catch( \Exception $e )
+			catch( Exception $e )
 			{
-				\IPS\Log::log( $e, 'sitemap_generator' );
+				Log::log( $e, 'sitemap_generator' );
 				$generator->log[] = $e->getMessage();
 				return FALSE;
 			}
 		} );
 
-		if( \count( $generator->log ) )
+		if( count( $generator->log ) )
 		{
 			return $generator->log;
 		}