Version 5.0.0 beta 4

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

@@ -39,8 +39,8 @@ use function defined;
 use function in_array;
 use function is_array;
 use function is_bool;
+use const IPS\CIC;
 use const IPS\CONVERTERS_DEV_UI;
-use const IPS\DEMO_MODE;
 
 if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
@@ -63,9 +63,9 @@ class convert extends Controller
 	 *
 	 * @return	void
 	 */
-	public function execute()
+	public function execute(): void
 	{
-		if ( \IPS\CIC )
+		if ( CIC )
 		{
 			Output::i()->error( 'module_no_permission', '2V368/2', 403, '' );
 		}
@@ -80,7 +80,7 @@ class convert extends Controller
 	 *
 	 * @return	void
 	 */
-	protected function manage()
+	protected function manage() : void
 	{
 		/* Do we have an id? */
 		if ( ! isset( Request::i()->id ) )
@@ -193,7 +193,7 @@ class convert extends Controller
 	 * @param	bool					$count			Count database rows
 	 * @return	array
 	 */
-	public static function getMenuRows( $softwareClass, $filter=TRUE, $return=FALSE, $count=TRUE )
+	public static function getMenuRows( Software $softwareClass, bool $filter=TRUE, bool $return=FALSE, bool $count=TRUE ) : array
 	{
 		$libraryClass	= $softwareClass->getLibrary();
 
@@ -231,7 +231,7 @@ class convert extends Controller
 				throw $e;
 			}
 
-			Output::i()->error( $e->getMessage(), '1V101/3', 500 );
+			Output::i()->error( $e->getMessage(), '1V101/3' );
 		}
 
 		return $menuRows;
@@ -243,7 +243,7 @@ class convert extends Controller
 	 * @param	App	$app	Application we are converting
 	 * @return	array
 	 */
-	protected function _getNextStep( $app )
+	protected function _getNextStep( App $app ) : array
 	{
 		/* Set our variables */
 		$appId	= $app->app_id;
@@ -376,7 +376,7 @@ class convert extends Controller
 	 *
 	 * @return	void
 	 */
-	protected function emptyData()
+	protected function emptyData() : void
 	{
 		Session::i()->csrfCheck();
 
@@ -418,7 +418,7 @@ class convert extends Controller
 	 *
 	 * @return	void
 	 */
-	protected function runStep()
+	protected function runStep() : void
 	{
 		Session::i()->csrfCheck();
 
@@ -615,7 +615,7 @@ class convert extends Controller
 	 * @param	App	$app	App we are converting
 	 * @return	bool
 	 */
-	protected function _checkMethodConfiguration( $app )
+	protected function _checkMethodConfiguration( App $app ) : bool
 	{
 		$softwareClass	= $app->getSource();
 
@@ -636,7 +636,7 @@ class convert extends Controller
 				foreach( $getMoreInfo as $key => $input )
 				{
 					$fieldClass = $input['field_class'];
-					$form->add( new $fieldClass( $key, $input['field_default'], $input['field_required'], $input['field_extra'], isset( $input['field_validation'] ) ? $input['field_validation'] : NULL ) );
+					$form->add( new $fieldClass( $key, $input['field_default'], $input['field_required'], $input['field_extra'], $input['field_validation'] ?? NULL ) );
 					if ( $input['field_hint'] !== NULL )
 					{
 						$form->addMessage( $input['field_hint'], 'ipsMessage ipsMessage--info' );
@@ -667,7 +667,7 @@ class convert extends Controller
 	 *
 	 * @return	void
 	 */
-	public function error()
+	public function error() : void
 	{
 		if ( !isset( Request::i()->id ) )
 		{
@@ -695,7 +695,7 @@ class convert extends Controller
 	 *
 	 * @return	void
 	 */
-	public function settings()
+	public function settings() : void
 	{
 		if ( !isset( Request::i()->id ) )
 		{
@@ -747,7 +747,7 @@ class convert extends Controller
 	 *
 	 * @return	void
 	 */
-	public function finish()
+	public function finish() : void
 	{
 		if ( !isset( Request::i()->id ) )
 		{