Version 5.0.0 beta 1

applications/nexus/modules/admin/store/fields.php

@@ -12,35 +12,47 @@
 namespace IPS\nexus\modules\admin\store;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use IPS\Db;
+use IPS\Dispatcher;
+use IPS\Node\Controller;
+use IPS\Node\Model;
+use IPS\Output;
+use IPS\Patterns\ActiveRecordIterator;
+use IPS\Request;
+use IPS\Theme;
+use function count;
+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;
 }
 
 /**
  * fields
  */
-class _fields extends \IPS\Node\Controller
+class fields extends Controller
 {
 	/**
 	 * @brief	Has been CSRF-protected
 	 */
-	public static $csrfProtected = TRUE;
+	public static bool $csrfProtected = TRUE;
 	
 	/**
 	 * Node Class
 	 */
-	protected $nodeClass = 'IPS\nexus\Package\CustomField';
+	protected string $nodeClass = 'IPS\nexus\Package\CustomField';
 	
 	/**
 	 * Execute
 	 *
 	 * @return	void
 	 */
-	public function execute()
+	public function execute() : void
 	{
-		\IPS\Dispatcher::i()->checkAcpPermission( 'package_fields_manage' );
+		Dispatcher::i()->checkAcpPermission( 'package_fields_manage' );
 		parent::execute();
 	}
 	
@@ -49,10 +61,10 @@ class _fields extends \IPS\Node\Controller
 	 *
 	 * @return	void
 	 */
-	protected function manage()
+	protected function manage() : void
 	{
-		\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'forms', 'core' )->blurb( 'custom_package_fields_blurb' );
-		return parent::manage();
+		Output::i()->output = Theme::i()->getTemplate( 'forms', 'core' )->blurb( 'custom_package_fields_blurb' );
+		parent::manage();
 	}
 	
 	/**
@@ -60,11 +72,11 @@ class _fields extends \IPS\Node\Controller
 	 *
 	 * @return	void
 	 */
-	protected function warning()
+	protected function warning() : void
 	{
-		\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'store' )->productOptionsChanged(
-			new \IPS\Patterns\ActiveRecordIterator(
-				\IPS\Db::i()->select( '*', 'nexus_packages', \IPS\Db::i()->in( 'p_id', explode( ',', \IPS\Request::i()->ids ) ) ),
+		Output::i()->output = Theme::i()->getTemplate( 'store' )->productOptionsChanged(
+			new ActiveRecordIterator(
+				Db::i()->select( '*', 'nexus_packages', Db::i()->in( 'p_id', explode( ',', Request::i()->ids ) ) ),
 				'IPS\nexus\Package'
 			)
 		);
@@ -72,19 +84,19 @@ class _fields extends \IPS\Node\Controller
 	/**
 	 * Redirect after save
 	 *
-	 * @param	\IPS\Node\Model	$old			A clone of the node as it was before or NULL if this is a creation
-	 * @param	\IPS\Node\Model	$new			The node now
+	 * @param	Model|null	$old			A clone of the node as it was before or NULL if this is a creation
+	 * @param	Model	$new			The node now
 	 * @param	string			$lastUsedTab	The tab last used in the form
 	 * @return	void
 	 */
-	protected function _afterSave( ?\IPS\Node\Model $old, \IPS\Node\Model $new, $lastUsedTab = FALSE )
+	protected function _afterSave( ?Model $old, Model $new, mixed $lastUsedTab = FALSE ): void
 	{
 		if ( $old AND $old->extra != $new->extra )
 		{
-			$products = \IPS\Db::i()->select( 'DISTINCT(opt_package)', 'nexus_product_options', "opt_values LIKE '%\"{$new->_id}\":%'" );
-			if ( \count( $products ) )
+			$products = Db::i()->select( 'DISTINCT(opt_package)', 'nexus_product_options', "opt_values LIKE '%\"{$new->_id}\":%'" );
+			if ( count( $products ) )
 			{
-				\IPS\Output::i()->redirect( $this->url->setQueryString( array( 'do' => 'warning', 'ids' => implode( ',', iterator_to_array( $products ) ) ) ) );
+				Output::i()->redirect( $this->url->setQueryString( array( 'do' => 'warning', 'ids' => implode( ',', iterator_to_array( $products ) ) ) ) );
 			}
 		}