Version 5.0.0 beta 4

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

@@ -43,7 +43,7 @@ use function defined;
 use function in_array;
 use function is_array;
 use function is_bool;
-use const IPS\DEMO_MODE;
+use const IPS\CIC;
 
 if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
@@ -66,9 +66,9 @@ class create extends Controller
 	 *
 	 * @return	void
 	 */
-	public function execute()
+	public function execute(): void
 	{
-		if ( \IPS\CIC )
+		if ( CIC )
 		{
 			Output::i()->error( 'module_no_permission', '2V391/3', 403, '' );
 		}
@@ -85,7 +85,7 @@ class create extends Controller
 	 *
 	 * @return	void
 	 */
-	protected function manage()
+	protected function manage() : void
 	{
 		/* We only use the Wizard helper for starting a conversion, so we need to make sure it is always starting new and not using old session data */
 		Output::i()->title		= Member::loggedIn()->language()->addToStack( 'convert_start' );
@@ -105,7 +105,7 @@ class create extends Controller
 	 * @param	array	$data	Wizard data from previous steps
 	 * @return	Form|array
 	 */
-	public function _chooseSoftware( $data )
+	public function _chooseSoftware( array $data ) : Form|array
 	{
 		$options = array();
 		foreach( Software::software()['core'] AS $key => $classname )
@@ -133,7 +133,7 @@ class create extends Controller
 	 * @param	array	$data	Wizard data from previous steps
 	 * @return	Form|array
 	 */
-	public function _chooseApplications( $data )
+	public function _chooseApplications( array $data ) : Form|array
 	{
 		/* Figure out what converter libraries we have for the selected application */
 		$software		= $data['convert_start_source_software'];
@@ -195,7 +195,7 @@ class create extends Controller
 	 * @param	array	$data	Wizard data from previous steps
 	 * @return	Form|array
 	 */
-	public function _setDatabaseDetails( $data )
+	public function _setDatabaseDetails( array $data ) : Form|array
 	{
 		$form = new Form( 'convert_database_details', 'enter_conversion_details' );
 
@@ -438,7 +438,7 @@ class create extends Controller
 	 * @param	array	$data	Wizard data from previous steps
 	 * @return	Form
 	 */
-	public function _setConversionDetails( $data )
+	public function _setConversionDetails( array $data ) : Form
 	{
 		/* We may be coming here from a previously incomplete conversion setup...detect and set the parent app ID appropriately */
 		if( ( !isset( $data['_app_parent'] ) OR !$data['_app_parent'] ) AND isset( Request::i()->id ) )
@@ -489,7 +489,7 @@ class create extends Controller
 	 * @param	Form	$form	Form object
 	 * @return	void
 	 */
-	protected function _addConversionApplication( $app, &$form )
+	protected function _addConversionApplication( App $app, Form $form ) : void
 	{
 		$softwareClass				= $app->getSource();
 		$libraryClass				= $softwareClass->getLibrary();
@@ -504,7 +504,7 @@ class create extends Controller
 		}
 		catch( Exception $e )
 		{
-			$form->addMessage( 'nothing_convertable_found', 'ipsMessage ipsMessage--warning', TRUE );
+			$form->addMessage( 'nothing_convertable_found', 'ipsMessage ipsMessage--warning' );
 			return;
 		}
 
@@ -557,7 +557,7 @@ class create extends Controller
 					foreach( $getMoreInfo as $key => $input )
 					{
 						$fieldClass = $input['field_class'];
-						$formElements[ $key ] = new $fieldClass( $key, $input['field_default'], $input['field_required'], $input['field_extra'], isset( $input['field_validation'] ) ? $input['field_validation'] : NULL, NULL, NULL, $key );
+						$formElements[ $key ] = new $fieldClass( $key, $input['field_default'], $input['field_required'], $input['field_extra'], $input['field_validation'] ?? NULL, NULL, NULL, $key );
 						if ( $input['field_hint'] !== NULL )
 						{
 							Member::loggedIn()->language()->words[ $key . '_desc' ] = $input['field_hint'];
@@ -589,7 +589,7 @@ class create extends Controller
 		/* If there was nothing to convert, show an appropriate message */
 		if( $softwareClass::canConvertSettings() === FALSE AND !count( $menuRows ) )
 		{
-			$form->addMessage( 'nothing_convertable_found', 'ipsMessage ipsMessage--warning', TRUE );
+			$form->addMessage( 'nothing_convertable_found', 'ipsMessage ipsMessage--warning' );
 		}
 
 		/* If there is a message to show, go ahead and show it */