#158 - Redux theme checks no longer prevent theme check plugin from functioning.

Signed-off-by: Kevin Provance <kevin.provance@gmail.com>

Author: kprovance

redux-core/inc/themecheck/checks/class-redux-embedded.php

@@ -19,32 +19,32 @@ class Redux_Embedded implements themecheck {
 	 *
 	 * @var array
 	 */
-	protected $error = array();
+	protected array $error = array();
 
 	/**
 	 * Run checker.
 	 *
-	 * @param array $php_files Files to check.
-	 * @param array $css_files Files to check.
-	 * @param array $other_files Files to check.
+	 * @param array $php_files - Files to check.
+	 * @param array $css_files - Files to check.
+	 * @param array $other_files - Files to check.
 	 *
 	 * @return bool
 	 */
-	public function check( $php_files, $css_files, $other_files ) {
+	public function check( $php_files, $css_files, $other_files ): bool {
 
 		$ret   = true;
 		$check = Redux_ThemeCheck::get_instance();
 		$redux = $check::get_redux_details( $php_files );
 
 		if ( $redux ) {
+			checkcount();
+
 			if ( ! isset( $_POST['redux_wporg'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-				checkcount();
 				$this->error[] = '<div class="redux-error">' . sprintf( '<span class="tc-lead tc-recommended">' . esc_html__( 'RECOMMENDED', 'redux-framework' ) . '</span>: ' . esc_html__( 'If you are submitting to WordPress.org Theme Repository, it is', 'redux-framework' ) . ' <strong>' . esc_html__( 'strongly', 'redux-framework' ) . '</strong> ' . esc_html__( 'suggested that you read', 'redux-framework' ) . ' <a href="%s" target="_blank">' . esc_html__( 'this document', 'redux-framework' ) . '</a>, ' . esc_html__( 'or your theme will be rejected because of Redux.', 'redux-framework' ), 'https://docsv3.redux.io/core/wordpress-org-submissions/' ) . '</div>';
 				$ret           = false;
 			} else {
 				// TODO Granular WP.org tests!!!
 				// Check for Tracking.
-				checkcount();
 				$tracking = $redux['dir'] . 'inc/tracking.php';
 				if ( file_exists( $tracking ) ) {
 					$this->error[] = '<div class="redux-error">' . sprintf( '<span class="tc-lead tc-required">' . esc_html__( 'REQUIRED', 'redux-framework' ) . '</span>: ' . esc_html__( 'You MUST delete', 'redux-framework' ) . ' <strong> %s </strong>, ' . esc_html__( 'or your theme will be rejected by WP.org theme submission because of Redux.', 'redux-framework' ), $tracking ) . '</div>';
@@ -54,7 +54,6 @@ public function check( $php_files, $css_files, $other_files ) {
 				// Embedded CDN package
 				// use_cdn
 				// Arguments.
-				checkcount();
 				$args          = '<ol>';
 				$args         .= "<li><code>'save_defaults' => false</code></li>";
 				$args         .= "<li><code>'use_cdn' => false</code></li>";
@@ -73,7 +72,7 @@ public function check( $php_files, $css_files, $other_files ) {
 	 *
 	 * @return array
 	 */
-	public function getError() {
+	public function getError(): array {
 		return $this->error;
 	}
 

redux-core/inc/themecheck/checks/class-redux-full-package.php

@@ -31,6 +31,7 @@ class Redux_Full_Package implements themecheck {
 	 * @return bool
 	 */
 	public function check( $php_files, $css_files, $other_files ) {
+
 		$ret = true;
 
 		$check = Redux_ThemeCheck::get_instance();
@@ -85,6 +86,4 @@ public function getError() {
 	}
 }
 
-$themechecks = array();
-
 $themechecks[] = new Redux_Full_Package();

redux-core/inc/themecheck/class-redux-themecheck.php

@@ -23,7 +23,7 @@ class Redux_ThemeCheck {
 		 * @since   1.0.0
 		 * @var     string
 		 */
-		protected $version = '1.0.0';
+		protected string $version = '1.0.0';
 
 		/**
 		 * Instance of this class.
@@ -113,10 +113,10 @@ public static function get_redux_instance() {
 		 *
 		 * @param array $php_files Array of files to check.
 		 *
-		 * @since     1.0.0
 		 * @return    object    A single instance of this class.
+		 *@since     1.0.0
 		 */
-		public static function get_redux_details( $php_files = array() ) {
+		public static function get_redux_details( array $php_files = array() ) {
 			if ( null === self::$redux_details ) {
 				foreach ( $php_files as $php_key => $phpfile ) {
 
@@ -215,8 +215,7 @@ public function enqueue_admin_scripts() {
 
 				if ( ! isset( $_POST['themename'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
 
-					$intro  = '';
-					$intro .= '<h2>Redux Theme-Check</h2>';
+					$intro  = '<h2>Redux Theme-Check</h2>';
 					$intro .= '<p>Extra checks for Redux to ensure you\'re ready for marketplace submission to marketplaces.</p>';
 
 					$redux_check_intro['text'] = $intro;