Version 5.0.0 beta 1

applications/downloads/sources/File/Comment.php

@@ -12,43 +12,66 @@
 namespace IPS\downloads\File;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use IPS\Content\Anonymous;
+use IPS\Content\Comment as ContentComment;
+use IPS\Content\EditHistory;
+use IPS\Content\Embeddable;
+use IPS\Content\Filter;
+use IPS\Content\Hideable;
+use IPS\Content\Featurable;
+use IPS\Content\Reactable;
+use IPS\Content\Reportable;
+use IPS\Content\Shareable;
+use IPS\Http\Url;
+use IPS\Output;
+use IPS\Theme;
+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;
 }
 
 /**
  * File Comment Model
  */
-class _Comment extends \IPS\Content\Comment implements \IPS\Content\EditHistory, \IPS\Content\Hideable, \IPS\Content\Searchable, \IPS\Content\Embeddable, \IPS\Content\Shareable, \IPS\Content\Anonymous
+class Comment extends ContentComment implements Embeddable,
+	Filter
 {
-	use \IPS\Content\Reactable, \IPS\Content\Reportable;
+	use	Reactable,
+		Reportable,
+		Anonymous,
+		Shareable,
+		EditHistory,
+		Hideable,
+		Featurable;
 	
 	/**
 	 * @brief	[ActiveRecord] Multiton Store
 	 */
-	protected static $multitons;
+	protected static array $multitons;
 	
 	/**
 	 * @brief	[Content\Comment]	Item Class
 	 */
-	public static $itemClass = 'IPS\downloads\File';
+	public static ?string $itemClass = 'IPS\downloads\File';
 	
 	/**
 	 * @brief	[ActiveRecord] Database Table
 	 */
-	public static $databaseTable = 'downloads_comments';
+	public static ?string $databaseTable = 'downloads_comments';
 	
 	/**
 	 * @brief	[ActiveRecord] Database Prefix
 	 */
-	public static $databasePrefix = 'comment_';
+	public static string $databasePrefix = 'comment_';
 	
 	/**
 	 * @brief	Database Column Map
 	 */
-	public static $databaseColumnMap = array(
+	public static array $databaseColumnMap = array(
 		'item'				=> 'fid',
 		'author'			=> 'mid',
 		'author_name'		=> 'author',
@@ -65,64 +88,40 @@ class _Comment extends \IPS\Content\Comment implements \IPS\Content\EditHistory,
 	/**
 	 * @brief	Application
 	 */
-	public static $application = 'downloads';
+	public static string $application = 'downloads';
 	
 	/**
 	 * @brief	Title
 	 */
-	public static $title = 'downloads_file_comment';
+	public static string $title = 'downloads_file_comment';
 	
 	/**
 	 * @brief	Icon
 	 */
-	public static $icon = 'download';
+	public static string $icon = 'download';
 	
 	/**
 	 * @brief	[Content]	Key for hide reasons
 	 */
-	public static $hideLogKey = 'downloads-files';
+	public static ?string $hideLogKey = 'downloads-files';
 	
 	/**
 	 * Get URL for doing stuff
 	 *
 	 * @param	string|NULL		$action		Action
-	 * @return	\IPS\Http\Url
+	 * @return	Url
 	 */
-	public function url( $action='find' )
+	public function url( ?string $action='find' ): Url
 	{
 		return parent::url( $action )->setQueryString( 'tab', 'comments' );
 	}
-
-	/**
-	 * Get snippet HTML for search result display
-	 *
-	 * @param	array		$indexData		Data from the search index
-	 * @param	array		$authorData		Basic data about the author. Only includes columns returned by \IPS\Member::columnsForPhoto()
-	 * @param	array		$itemData		Basic data about the item. Only includes columns returned by item::basicDataColumns()
-	 * @param	array|NULL	$containerData	Basic data about the container. Only includes columns returned by container::basicDataColumns()
-	 * @param	array		$reputationData	Array of people who have given reputation and the reputation they gave
-	 * @param	int|NULL	$reviewRating	If this is a review, the rating
-	 * @param	string		$view			'expanded' or 'condensed'
-	 * @return	callable
-	 */
-	public static function searchResultSnippet( array $indexData, array $authorData, array $itemData, ?array $containerData, array $reputationData, $reviewRating, $view )
-	{
-		$screenshot = NULL;
-		if ( isset( $itemData['extra'] ) )
-		{
-			$screenshot = isset( $itemData['extra']['record_thumb'] ) ? $itemData['extra']['record_thumb'] : $itemData['extra']['record_location'];
-		}
-		$url = \IPS\Http\Url::internal( \IPS\downloads\File::$urlBase . $indexData['index_item_id'], 'front', \IPS\downloads\File::$urlTemplate, \IPS\Http\Url\Friendly::seoTitle( $indexData['index_title'] ?: $itemData[ \IPS\downloads\File::$databasePrefix . \IPS\downloads\File::$databaseColumnMap['title'] ] ) );
-		
-		return \IPS\Theme::i()->getTemplate( 'global', 'downloads', 'front' )->searchResultCommentSnippet( $indexData, $screenshot, $url, $reviewRating, $view == 'condensed' );
-	}
 	
 	/**
 	 * Reaction Type
 	 *
 	 * @return	string
 	 */
-	public static function reactionType()
+	public static function reactionType(): string
 	{
 		return 'comment_id';
 	}
@@ -133,9 +132,9 @@ class _Comment extends \IPS\Content\Comment implements \IPS\Content\EditHistory,
 	 * @param	array	$params	Additional parameters to add to URL
 	 * @return	string
 	 */
-	public function embedContent( $params )
+	public function embedContent( array $params ): string
 	{
-		\IPS\Output::i()->cssFiles = array_merge( \IPS\Output::i()->cssFiles, \IPS\Theme::i()->css( 'embed.css', 'downloads', 'front' ) );
-		return \IPS\Theme::i()->getTemplate( 'global', 'downloads' )->embedFileComment( $this, $this->item(), $this->url()->setQueryString( $params ) );
+		Output::i()->cssFiles = array_merge( Output::i()->cssFiles, Theme::i()->css( 'embed.css', 'downloads', 'front' ) );
+		return Theme::i()->getTemplate( 'global', 'downloads' )->embedFileComment( $this, $this->item(), $this->url()->setQueryString( $params ) );
 	}
 }