Version 5.0.0 beta 4

applications/convert/modules/admin/manage/manage.php

@@ -39,6 +39,7 @@ use function defined;
 use function file_put_contents;
 use function get_class;
 use function in_array;
+use const IPS\CIC;
 use const IPS\CONVERTERS_DEV_UI;
 use const IPS\DEMO_MODE;
 use const IPS\FOLDER_PERMISSION_NO_WRITE;
@@ -64,7 +65,7 @@ class manage extends Controller
 	 *
 	 * @return	void
 	 */
-	public function execute()
+	public function execute(): void
 	{
 		if ( DEMO_MODE === TRUE )
 		{
@@ -81,7 +82,7 @@ class manage extends Controller
 	 *
 	 * @return	void
 	 */
-	protected function manage()
+	protected function manage() : void
 	{
 		/* If mod_rewrite is not enabled, advise the administrator that old URLs will not redirect to the new locations automatically */
 		if( !Settings::i()->htaccess_mod_rewrite )
@@ -149,6 +150,8 @@ class manage extends Controller
 				try
 				{
 					$classname = get_class( $app->getSource() );
+
+					/* @var Software $classname */
 					return $classname::softwareName();
 				}
 				catch( Exception $ex )
@@ -173,7 +176,7 @@ class manage extends Controller
 			}
 		);
 
-		if( !\IPS\CIC )
+		if( !CIC )
 		{
 			Output::i()->sidebar['actions']['start'] = [
 				'primary' => true,
@@ -240,12 +243,7 @@ class manage extends Controller
 
 				return $return;
 			}
-			catch( InvalidArgumentException $e )
-			{
-				return array();
-			}
-			/* Application has been uninstalled */
-			catch( OutOfRangeException $e )
+			catch( InvalidArgumentException | OutOfRangeException $e )
 			{
 				return array();
 			}
@@ -253,7 +251,7 @@ class manage extends Controller
 
 		/* Display */
 		Output::i()->title		= Member::loggedIn()->language()->addToStack( 'menu__convert_manage' );
-		Output::i()->output	.= (string) $table;
+		Output::i()->output	.= $table;
 	}
 	
 	/**
@@ -261,7 +259,7 @@ class manage extends Controller
 	 *
 	 * @return	void
 	 */
-	public function software()
+	public function software() : void
 	{
 		if ( \IPS\IN_DEV === FALSE )
 		{
@@ -322,7 +320,7 @@ class manage extends Controller
 	 *
 	 * @return	void
 	 */
-	public function library()
+	public function library() : void
 	{
 		if ( \IPS\IN_DEV === FALSE )
 		{
@@ -383,7 +381,7 @@ class manage extends Controller
 	 *
 	 * @return	void
 	 */
-	public function edit()
+	public function edit() : void
 	{
 		if ( !isset( Request::i()->id ) )
 		{