EPS-1645: Use Common workflow file for PHPCS and fix reported issues

.github/workflows/ci.yml

@@ -1,47 +1,48 @@
-name: CI
-
+name: Code Analysis
 on: pull_request
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+  cancel-in-progress: true
+
 jobs:
-  CI:
+  analysis:
     runs-on: ubuntu-latest
-
     strategy:
       matrix:
-        node: [ 14.15 ]
-        php: ['7.4']
-
+        node: [ 18.15.0 ]
+        php: ['8.1', '8.2']
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           coverage: none
-          tools: composer
-            
+          tools: composer, cs2pr
+
       - name: Install composer dependencies
         run: composer config github-oauth.github.com ${{ secrets.PRIVATE_ACCESS_TOKEN }} && composer install --prefer-dist --no-suggest --no-progress
 
-      - name: PHPCS check
-        if: always()
-        uses: chekalsky/phpcs-action@v1
-        with:
-          phpcs_bin_path: './vendor/bin/phpcs'
-
-      - name: Use desired version of NodeJS
-        uses: actions/setup-node@v3
+      - name: Run PHPCS with annotations
+        run: vendor/bin/phpcs -q --report=checkstyle | cs2pr
+
+      - name: Setup NodeJS
+        uses: actions/setup-node@v4
         with:
-            node-version: ${{ matrix.node }}
-            cache: 'npm'
+          node-version: ${{ matrix.node }}
+          cache: 'npm'
 
-      - name: npm install
+      - name: Install NPM dependencies
         run: npm ci
 
-      - name: Build project
-      run: npm run build
-
       - name: Lint JS
         run: npm run lint:js
+
+      - name: Build project
+        run: npm run build
+
+      - name: Lint CSS
+        run: npm run lint:css

admin/class-hfe-addons-actions.php

@@ -114,11 +114,10 @@ public function hfe_flush_permalink_notice() {
 				wp_send_json_error( 'Unauthorized user' );
 			}
 
-			$permalink_structure = get_option('permalink_structure');
+			$permalink_structure = get_option( 'permalink_structure' );
 			// Check if the permalink structure is not empty.
-			if ( '' !== $permalink_structure )
-			{ 
-				update_option('permalink_structure', $permalink_structure);
+			if ( '' !== $permalink_structure ) { 
+				update_option( 'permalink_structure', $permalink_structure );
 				flush_rewrite_rules(); 
 				// Update the option to true.
 				update_user_meta( get_current_user_id(), 'hfe_permalink_notice_option', 'notice-dismissed' );
@@ -316,7 +315,7 @@ public static function bulk_deactivate_unused_widgets() {
 			// Compare slugs from widget_list to keys in $used_widgets
 			foreach ( self::$widget_list as $slug => $value ) {
 				if ( ! isset( $used_widgets[ $value['slug'] ] ) ) {
-					if( $slug === 'Scroll_To_Top' || $slug === 'Reading_Progress_Bar' ){
+					if ( $slug === 'Scroll_To_Top' || $slug === 'Reading_Progress_Bar' ) {
 						continue;
 					}
 					$unused_widgets[] = $slug;
@@ -329,7 +328,7 @@ public static function bulk_deactivate_unused_widgets() {
 			foreach ( self::$widget_list as $slug => $value ) {
 				if ( in_array( $slug, $unused_widgets ) ) {
 					$widgets[ $slug ] = 'disabled';
-					$deactivated[] = $slug;
+					$deactivated[]    = $slug;
 				}
 			}
 

admin/class-hfe-admin.php

@@ -120,24 +120,24 @@ private function __construct() {
 		add_action( 'elementor/editor/before_enqueue_scripts', [ $this, 'enqueue_permalink_clear_notice_js' ] );
 		add_action( 'elementor/editor/before_enqueue_styles', [ $this, 'enqueue_permalink_clear_notice_css' ] );
 		// Hook into Elementor's editor styles
-		add_action('elementor/editor/before_enqueue_scripts', [$this, 'enqueue_editor_scripts']);
+		add_action( 'elementor/editor/before_enqueue_scripts', [ $this, 'enqueue_editor_scripts' ] );
 		if ( 'yes' === get_option( 'uae_analytics_optin', false ) ) {
-			add_action('shutdown', [ $this, 'maybe_run_hfe_widgets_usage_check' ] );
+			add_action( 'shutdown', [ $this, 'maybe_run_hfe_widgets_usage_check' ] );
 		}
 	}
 
 	/**
 	 * Enqueuing Promotion widget scripts.
 	 */
 	public function enqueue_editor_scripts() {
-               wp_enqueue_script(
-                       'uae-pro-promotion',
-                       HFE_URL . 'build/promotion-widget.js',
-                       [ 'jquery', 'wp-element', 'wp-dom-ready' ],
-                       HFE_VER,
-                       true
-               );
-       }
+			wp_enqueue_script(
+				'uae-pro-promotion',
+				HFE_URL . 'build/promotion-widget.js',
+				[ 'jquery', 'wp-element', 'wp-dom-ready' ],
+				HFE_VER,
+				true
+			);
+	}
 
 	/**
 	 * Check the page on which Widget check need to be run.
@@ -147,7 +147,7 @@ public function maybe_run_hfe_widgets_usage_check() {
 		if (
 			is_admin() &&
 			isset( $_GET['page'] ) &&
-			( 'uaepro' === $_GET['page'] || 'hfe' === $_GET['page'])
+			( 'uaepro' === $_GET['page'] || 'hfe' === $_GET['page'] )
 		) {
 			$this->hfe_check_widgets_data_usage();
 		}
@@ -184,7 +184,7 @@ public function enqueue_permalink_clear_notice_css() {
 			return;
 		}
 
-		if(isset(self::$elementor_instance)){
+		if ( isset( self::$elementor_instance ) ) {
 			$current_post_type = get_post_type( self::$elementor_instance->editor->get_post_id() );
 
 			if ( $current_post_type !== 'elementor-hf' ) {
@@ -211,7 +211,7 @@ public function enqueue_permalink_clear_notice_js() {
 			return;
 		}
 
-		if(isset(self::$elementor_instance)){
+		if ( isset( self::$elementor_instance ) ) {
 			$current_post_type = get_post_type( self::$elementor_instance->editor->get_post_id() );
 
 			if ( $current_post_type !== 'elementor-hf' ) {
@@ -247,14 +247,14 @@ public function print_permalink_clear_notice() {
 				return;
 			}
 
-			if(isset(self::$elementor_instance)){
+			if ( isset( self::$elementor_instance ) ) {
 				$current_post_type = get_post_type( self::$elementor_instance->editor->get_post_id() );
 
 				if ( $current_post_type !== 'elementor-hf' ) {
 					return;
 				}
 			}
-?>
+			?>
 			<div class="uae-permalink-clear-notice" id="uae-permalink-clear-notice">
 				<header>
 					<i class="eicon-warning"></i>
@@ -266,15 +266,15 @@ public function print_permalink_clear_notice() {
 					<?php echo esc_html__( 'Try clearing your cache or resetting permalinks (Settings > Permalinks > Save Changes).', 'header-footer-elementor' ); ?>
 					<a href="<?php echo esc_url( 'https://ultimateelementor.com/docs/elementor-header-footer-template-not-loading-or-stuck-on-loading/' ); ?>" target="_blank"><?php echo esc_html_e( 'Learn More', 'header-footer-elementor' ); ?></a>
 					<br>
-					<?php if(!is_multisite()){ ?>
+					<?php if ( ! is_multisite() ) { ?>
 						<button class="uae-permalink-flush-btn" type="button">
 							<span class="uae-btn-main-text"><?php echo esc_html__( 'Flush Permalink', 'header-footer-elementor' ); ?></span>
 							<span class="uae-notice-loader"></span>
 						</button>
 					<?php } ?>
 				</div>
 			</div>
-<?php 
+			<?php 
 		} 
 	}
 

build/promotion-widget.asset.php

@@ -1 +1,4 @@
-<?php return array('dependencies' => array('wp-dom-ready', 'wp-element'), 'version' => '6c05e450e9d92239760e');
+<?php return [
+	'dependencies' => [ 'wp-dom-ready', 'wp-element' ],
+	'version'      => '6c05e450e9d92239760e',
+];