Version 5.0.0 beta 1

applications/cms/sources/Selector/Databases.php

@@ -12,71 +12,76 @@
 namespace IPS\cms\Selector;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use IPS\Node\Model;
+use IPS\Node\Permissions;
+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;
 }
 
 /**
  * @brief	Databases Model
  */
-class _Databases extends \IPS\Node\Model implements \IPS\Node\Permissions
+class Databases extends Model implements Permissions
 {
 	/**
 	 * @brief	[ActiveRecord] Multiton Store
 	 */
-	protected static $multitons = array();
+	protected static array $multitons = array();
 	
 	/**
 	 * @brief	[ActiveRecord] Database Prefix
 	 */
-	public static $databasePrefix = 'database_';
+	public static string $databasePrefix = 'database_';
 	
 	/**
 	 * @brief	[ActiveRecord] ID Database Table
 	 */
-	public static $databaseTable = 'cms_databases';
+	public static ?string $databaseTable = 'cms_databases';
 	
 	/**
 	 * @brief	[ActiveRecord] ID Database Column
 	 */
-	public static $databaseColumnId = 'id';
+	public static string $databaseColumnId = 'id';
 	
 	/**
 	 * @brief	[ActiveRecord] Database ID Fields
 	 */
-	protected static $databaseIdFields = array( 'database_key', 'database_page_id' );
+	protected static array $databaseIdFields = array( 'database_key', 'database_page_id' );
 	
 	/**
 	 * @brief	[ActiveRecord] Multiton Map
 	 */
-	protected static $multitonMap	= array();
+	protected static array $multitonMap	= array();
 	
 	/**
 	 * @brief	[Node] Parent ID Database Column
 	 */
-	public static $databaseColumnOrder = 'id';
+	public static ?string $databaseColumnOrder = 'id';
 	
 	/**
 	 * @brief	[Node] Sortable?
 	 */
-	public static $nodeSortable = FALSE;
+	public static bool $nodeSortable = FALSE;
 	
 	/**
 	 * @brief	[Node] Node Title
 	 */
-	public static $nodeTitle = '';
+	public static string $nodeTitle = '';
 	
 	/**
 	 * @brief	[Node] Subnode class
 	 */
-	public static $subnodeClass = 'IPS\cms\Selector\Categories';
+	public static ?string $subnodeClass = 'IPS\cms\Selector\Categories';
 	
 	/**
 	 * @brief	The map of permission columns
 	 */
-	public static $permissionMap = array(
+	public static array $permissionMap = array(
 			'view' 				=> 'view',
 			'read'				=> 2,
 			'add'				=> 3,
@@ -89,25 +94,25 @@ class _Databases extends \IPS\Node\Model implements \IPS\Node\Permissions
 	/**
 	 * @brief	[Node] App for permission index
 	 */
-	public static $permApp = 'cms';
+	public static ?string $permApp = 'cms';
 	
 	/**
 	 * @brief	[Node] Type for permission index
 	 */
-	public static $permType = 'databases';
+	public static ?string $permType = 'databases';
 	
 	/**
 	 * @brief	[Node] Prefix string that is automatically prepended to permission matrix language strings
 	 */
-	public static $permissionLangPrefix = 'perm_content_';
+	public static string $permissionLangPrefix = 'perm_content_';
 	
 	/**
 	 * @brief	[Node] Title prefix.  If specified, will look for a language key with "{$titleLangPrefix}_{$id}" as the key
 	 */
-	public static $titleLangPrefix = 'content_db_';
+	public static ?string $titleLangPrefix = 'content_db_';
 	
 	/**
 	 * @brief	[Node] Description suffix.  If specified, will look for a language key with "{$titleLangPrefix}_{$id}_{$descriptionLangSuffix}" as the key
 	 */
-	public static $descriptionLangSuffix = 'desc';
+	public static ?string $descriptionLangSuffix = 'desc';
 }