Merge pull request #509 from brainstormforce/release-candidate

Build: Release PR Chore v1.6.10
brainstormforce · Mar 29, 2022 · 5efff2e · 5efff2e
2 parents 5f0d09a + fb9b533
commit 5efff2e
Show file tree

Hide file tree

Showing 26 changed files with 7,449 additions and 33,197 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -17,7 +17,7 @@ jobs:
           tools: composer
 
       - name: Use desired version of NodeJS
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
             node-version: 14.15
             cache: 'npm'

diff --git a/.github/workflows/push-asset-readme-update.yml.yml b/.github/workflows/push-asset-readme-update.yml.yml
@@ -8,7 +8,7 @@ jobs:
     name: Push to master
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v3
     - name: WordPress.org plugin asset/readme update
       uses: 10up/action-wordpress-plugin-asset-update@master
       env:

diff --git a/.github/workflows/push-to-deploy.yml b/.github/workflows/push-to-deploy.yml
@@ -8,7 +8,7 @@ jobs:
     name: New tag
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v3
     - name: WordPress Plugin Deploy
       uses: 10up/action-wordpress-plugin-deploy@master
       env:

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 **Requires at least:** 4.4  
 **Requires PHP:** 5.4  
 **Tested up to:** 5.9  
-**Stable tag:** 1.6.9  
+**Stable tag:** 1.6.10  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -137,6 +137,11 @@ This same applies when you are creating your Header/Footer using this plugin.
 5. Default widgets available with Elementor Header & Footer Builder.
 
 ## Changelog ##
+### 1.6.10 ###
+- Improvement: Compatibility with Elementor version 3.6.
+  Removed elementor deprecated functions and replaced with latest functions.
+  Now to work with Elementor Header & Footer Builder, Elementor minimum version 3.5.0 or higher will be required.
+
 ### 1.6.9 ###
 - Improvement: Compatibility with Elementor Pro version 3.6
 - Fix: Navigation Menu - If Polylang language switcher is present in the menu, it closes the menu with a click.

diff --git a/composer.json b/composer.json
@@ -19,5 +19,11 @@
   "scripts": {
     "format": "phpcbf",
     "lint": "phpcs"
+  },
+  "config": {
+    "allow-plugins": {
+      "composer/installers": true,
+      "dealerdirect/phpcodesniffer-composer-installer": true
+    }
   }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/header-footer-elementor.php b/header-footer-elementor.php
@@ -7,14 +7,14 @@
  * Author URI:  https://www.brainstormforce.com/
  * Text Domain: header-footer-elementor
  * Domain Path: /languages
- * Version: 1.6.9
- * Elementor tested up to: 3.5.4
- * Elementor Pro tested up to: 3.6.0
+ * Version: 1.6.10
+ * Elementor tested up to: 3.6.1
+ * Elementor Pro tested up to: 3.6.4
  *
  * @package         header-footer-elementor
  */
 
-define( 'HFE_VER', '1.6.9' );
+define( 'HFE_VER', '1.6.10' );
 define( 'HFE_FILE', __FILE__ );
 define( 'HFE_DIR', plugin_dir_path( __FILE__ ) );
 define( 'HFE_URL', plugins_url( '/', __FILE__ ) );

diff --git a/inc/class-header-footer-elementor.php b/inc/class-header-footer-elementor.php
@@ -53,7 +53,7 @@ function __construct() {
 
 		$is_elementor_callable = ( defined( 'ELEMENTOR_VERSION' ) && is_callable( 'Elementor\Plugin::instance' ) ) ? true : false;
 
-		$required_elementor_version = '3.1.0';
+		$required_elementor_version = '3.5.0';
 
 		$is_elementor_outdated = ( $is_elementor_callable && ( ! version_compare( ELEMENTOR_VERSION, $required_elementor_version, '>=' ) ) ) ? true : false;
 

diff --git a/inc/lib/astra-notices/.phpunit.result.cache b/inc/lib/astra-notices/.phpunit.result.cache
@@ -0,0 +1 @@
+{"version":1,"defects":{"TestDismissNotice::test_user_can_dismiss_notice":4,"TestNoticeVisibleForCorrectRole::test_user_can_see_notice":3,"TestNoticeVisibleForCorrectRole::test_user_can_see_notice_without_capability":6},"times":{"TestDismissNotice::test_user_can_dismiss_notice":0.035999999999999997,"TestNoticeVisibleForCorrectRole::test_user_can_see_notice":0.070999999999999994,"TestNoticeVisibleForCorrectRole::test_user_can_see_notice_without_capability":0.071999999999999995}}
diff --git a/inc/lib/astra-notices/class-astra-notices.php b/inc/lib/astra-notices/class-astra-notices.php
@@ -28,7 +28,7 @@ class Astra_Notices {
 		 * @var array Notices.
 		 * @since 1.0.0
 		 */
-		private static $version = '1.1.8';
+		private static $version = '1.1.11';
 
 		/**
 		 * Notices
@@ -141,6 +141,7 @@ public function dismiss_notice() {
 		 * @return void
 		 */
 		public function enqueue_scripts() {
+			wp_register_style( 'astra-notices', self::get_url() . 'notices.css', array(), self::$version );
 			wp_register_script( 'astra-notices', self::get_url() . 'notices.js', array( 'jquery' ), self::$version, true );
 			wp_localize_script(
 				'astra-notices',
@@ -269,14 +270,15 @@ public function show_notices() {
 		 */
 		public static function markup( $notice = array() ) {
 			wp_enqueue_script( 'astra-notices' );
+			wp_enqueue_style( 'astra-notices' );
 
 			do_action( 'astra_notice_before_markup' );
 
 			do_action( "astra_notice_before_markup_{$notice['id']}" );
 
 			?>
-			<div id="<?php echo esc_attr( $notice['id'] ); ?>" class="<?php echo esc_attr( $notice['classes'] ); ?>" data-repeat-notice-after="<?php echo esc_attr( $notice['repeat-notice-after'] ); ?>">
-				<div class="notice-container">
+			<div id="<?php echo esc_attr( $notice['id'] ); ?>" class="<?php echo 'astra-notice-wrapper ' . esc_attr( $notice['classes'] ); ?>" data-repeat-notice-after="<?php echo esc_attr( $notice['repeat-notice-after'] ); ?>">
+				<div class="astra-notice-container">
 					<?php do_action( "astra_notice_inside_markup_{$notice['id']}" ); ?>
 					<?php echo wp_kses_post( $notice['message'] ); ?>
 				</div>

diff --git a/inc/lib/astra-notices/composer.json b/inc/lib/astra-notices/composer.json
@@ -2,23 +2,32 @@
     "name": "brainstormforce/astra-notices",
     "type": "wordpress-plugin",
     "description": "Easily create admin notices",
-    "version": "1.1.8",
-    "license": "GPL v3",
+    "license": "GPL-3.0-or-later",
     "authors": [
         {
             "name": "Brainstorm Force",
             "email": "[email protected]"
         }
     ],
     "require": {
-        "composer/installers": "^1.11"
+        "composer/installers": "^2.0"
     },
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
         "phpcompatibility/phpcompatibility-wp": "^2.1",
-        "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5",
+        "phpunit/phpunit": "^7",
         "wp-cli/dist-archive-command": "^2.0",
-        "wp-coding-standards/wpcs": "^2.3"
+        "wp-coding-standards/wpcs": "^2.3",
+        "wp-phpunit/wp-phpunit": "^5",
+        "roots/wordpress": "^5.9",
+        "yoast/phpunit-polyfills": "^1.0"
+    },
+    "config": {
+        "allow-plugins": {
+            "composer/installers": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "roots/wordpress-core-installer": true
+        }
     },
     "minimum-stability": "stable",
     "scripts": {

diff --git a/inc/lib/astra-notices/notices.css b/inc/lib/astra-notices/notices.css
@@ -0,0 +1,39 @@
+.astra-review-notice-container {
+	display: flex;
+	align-items: center;
+	padding-top: 10px;
+}
+
+.astra-review-notice-container .dashicons {
+    font-size: 1.4em;
+	padding-left: 10px;
+}
+
+.astra-review-notice-container a {
+    padding-left: 5px;
+    text-decoration: none;
+}
+
+.astra-review-notice-container .dashicons:first-child {
+    padding-left: 0;
+}
+
+.astra-notice-container .notice-image img {
+    max-width: 90px;
+}
+
+.astra-notice-container .notice-content .notice-heading {
+    padding-bottom: 5px;
+}
+
+.astra-notice-container .notice-content {
+    margin-left: 15px;
+}
+
+.astra-notice-container {
+    padding-top: 10px;
+    padding-bottom: 10px;
+    display: flex;
+    justify-content: left;
+    align-items: center;
+}
diff --git a/inc/widgets-manager/class-widgets-loader.php b/inc/widgets-manager/class-widgets-loader.php
@@ -53,7 +53,7 @@ private function __construct() {
 		add_action( 'elementor/elements/categories_registered', [ $this, 'register_widget_category' ] );
 
 		// Register widgets.
-		add_action( 'elementor/widgets/widgets_registered', [ $this, 'register_widgets' ] );
+		add_action( 'elementor/widgets/register', [ $this, 'register_widgets' ] );
 
 		// Add svg support.
 		add_filter( 'upload_mimes', [ $this, 'hfe_svg_mime_types' ] );
@@ -191,16 +191,16 @@ public function register_widgets() {
 		// Its is now safe to include Widgets files.
 		$this->include_widgets_files();
 		// Register Widgets.
-		Plugin::instance()->widgets_manager->register_widget_type( new Widgets\Retina() );
-		Plugin::instance()->widgets_manager->register_widget_type( new Widgets\Copyright() );
-		Plugin::instance()->widgets_manager->register_widget_type( new Widgets\Navigation_Menu() );
-		Plugin::instance()->widgets_manager->register_widget_type( new Widgets\Page_Title() );
-		Plugin::instance()->widgets_manager->register_widget_type( new Widgets\Site_Title() );
-		Plugin::instance()->widgets_manager->register_widget_type( new Widgets\Site_Tagline() );
-		Plugin::instance()->widgets_manager->register_widget_type( new Widgets\Site_Logo() );
-		Plugin::instance()->widgets_manager->register_widget_type( new Widgets\Search_Button() );
+		Plugin::instance()->widgets_manager->register( new Widgets\Retina() );
+		Plugin::instance()->widgets_manager->register( new Widgets\Copyright() );
+		Plugin::instance()->widgets_manager->register( new Widgets\Navigation_Menu() );
+		Plugin::instance()->widgets_manager->register( new Widgets\Page_Title() );
+		Plugin::instance()->widgets_manager->register( new Widgets\Site_Title() );
+		Plugin::instance()->widgets_manager->register( new Widgets\Site_Tagline() );
+		Plugin::instance()->widgets_manager->register( new Widgets\Site_Logo() );
+		Plugin::instance()->widgets_manager->register( new Widgets\Search_Button() );
 		if ( class_exists( 'woocommerce' ) ) {
-			Plugin::instance()->widgets_manager->register_widget_type( new Widgets\Cart() );
+			Plugin::instance()->widgets_manager->register( new Widgets\Cart() );
 		}
 
 	}

diff --git a/inc/widgets-manager/widgets/class-cart.php b/inc/widgets-manager/widgets/class-cart.php
@@ -82,17 +82,6 @@ public function get_categories() {
 		return [ 'hfe-widgets' ];
 	}
 
-	/**
-	 * Register cart controls.
-	 *
-	 * @since 1.4.0
-	 * @access protected
-	 */
-	protected function _register_controls() { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
-
-		$this->register_controls();
-	}
-
 	/**
 	 * Register cart controls.
 	 *
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"version":1,"defects":{"TestDismissNotice::test_user_can_dismiss_notice":4,"TestNoticeVisibleForCorrectRole::test_user_can_see_notice":3,"TestNoticeVisibleForCorrectRole::test_user_can_see_notice_without_capability":6},"times":{"TestDismissNotice::test_user_can_dismiss_notice":0.035999999999999997,"TestNoticeVisibleForCorrectRole::test_user_can_see_notice":0.070999999999999994,"TestNoticeVisibleForCorrectRole::test_user_can_see_notice_without_capability":0.071999999999999995}}