Version 5.0.0 beta 1

applications/cms/widgets/Wysiwyg.php

@@ -12,43 +12,50 @@
 namespace IPS\cms\widgets;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use Exception;
+use IPS\Db;
+use IPS\File;
+use IPS\Helpers\Form;
+use IPS\Helpers\Form\Editor;
+use IPS\Output;
+use IPS\Widget\StaticCache;
+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;
 }
 
 /**
  * WYSIWYG Widget
  */
-class _Wysiwyg extends \IPS\Widget\StaticCache
+class Wysiwyg extends StaticCache
 {
 	/**
 	 * @brief	Widget Key
 	 */
-	public $key = 'Wysiwyg';
+	public string $key = 'Wysiwyg';
 	
 	/**
 	 * @brief	App
 	 */
-	public $app = 'cms';
+	public string $app = 'cms';
 		
-	/**
-	 * @brief	Plugin
-	 */
-	public $plugin = '';
+
 
 	/**
 	 * Specify widget configuration
 	 *
-	 * @param	\IPS\Helpers\Form|NULL	$form	Form helper
-	 * @return	null|\IPS\Helpers\Form
+	 * @param	Form|NULL	$form	Form helper
+	 * @return	Form
 	 */
-	public function configuration( &$form=null )
+	public function configuration( Form &$form=null ): Form
  	{
 		$form = parent::configuration( $form );
  		
-		$form->add( new \IPS\Helpers\Form\Editor( 'content', ( isset( $this->configuration['content'] ) ? $this->configuration['content'] : NULL ), FALSE, array(
+		$form->add( new Editor( 'content', ( $this->configuration['content'] ?? NULL ), FALSE, array(
 			'app'			=> $this->app,
 			'key'			=> 'Widgets',
 			'autoSaveKey' 	=> 'widget-' . $this->uniqueKey,
@@ -63,25 +70,25 @@ class _Wysiwyg extends \IPS\Widget\StaticCache
 	 *
 	 * @return void
 	 */
-	public function delete()
+	public function delete() : void
 	{
-		foreach( \IPS\Db::i()->select( '*', 'core_attachments_map', array( array( 'location_key=? and id3=?', 'cms_Widgets', $this->uniqueKey ) ) ) as $map )
+		foreach( Db::i()->select( '*', 'core_attachments_map', array( array( 'location_key=? and id3=?', 'cms_Widgets', $this->uniqueKey ) ) ) as $map )
 		{
 			try
 			{				
-				$attachment = \IPS\Db::i()->select( '*', 'core_attachments', array( 'attach_id=?', $map['attachment_id'] ) )->first();
+				$attachment = Db::i()->select( '*', 'core_attachments', array( 'attach_id=?', $map['attachment_id'] ) )->first();
 				
-				\IPS\Db::i()->delete( 'core_attachments_map', array( array( 'attachment_id=?', $attachment['attach_id'] ) ) );
-				\IPS\Db::i()->delete( 'core_attachments', array( 'attach_id=?', $attachment['attach_id'] ) );
+				Db::i()->delete( 'core_attachments_map', array( array( 'attachment_id=?', $attachment['attach_id'] ) ) );
+				Db::i()->delete( 'core_attachments', array( 'attach_id=?', $attachment['attach_id'] ) );
 				
 				
-				\IPS\File::get( 'core_Attachment', $attachment['attach_location'] )->delete();
+				File::get( 'core_Attachment', $attachment['attach_location'] )->delete();
 				if ( $attachment['attach_thumb_location'] )
 				{
-					\IPS\File::get( 'core_Attachment', $attachment['attach_thumb_location'] )->delete();
+					File::get( 'core_Attachment', $attachment['attach_thumb_location'] )->delete();
 				}
 			}
-			catch ( \Exception $e ) { }
+			catch ( Exception $e ) { }
 		}
 	}
 	
@@ -89,11 +96,11 @@ class _Wysiwyg extends \IPS\Widget\StaticCache
  	 * Pre-save config method
  	 *
  	 * @param	array	$values		Form values
- 	 * @return void
+ 	 * @return array
  	 */
- 	public function preConfig( $values=array() )
+ 	public function preConfig( array $values=array() ) : array
  	{
-	 	\IPS\File::claimAttachments( 'widget-' . $this->uniqueKey, 0, 0, $this->uniqueKey );
+	 	File::claimAttachments( 'widget-' . $this->uniqueKey, 0, 0, $this->uniqueKey );
 	 	
 	 	return $values;
  	}
@@ -103,9 +110,9 @@ class _Wysiwyg extends \IPS\Widget\StaticCache
 	 *
 	 * @return	string
 	 */
-	public function render()
+	public function render(): string
 	{
-		\IPS\Output::i()->jsFiles = array_merge( \IPS\Output::i()->jsFiles, \IPS\Output::i()->js( 'front_core.js', 'core' ) );
-		return $this->output( isset( $this->configuration['content'] ) ? $this->configuration['content'] : '' );
+		Output::i()->jsFiles = array_merge( Output::i()->jsFiles, Output::i()->js( 'front_core.js', 'core' ) );
+		return $this->output( $this->configuration['content'] ?? '' );
 	}
 }