Merge pull request #241 from indieweb/tested-up-to-6-2

version bump
indieweb · Sep 1, 2023 · c1ea95c · c1ea95c
2 parents f8f2225 + 8ce9578
commit c1ea95c
Show file tree

Hide file tree

Showing 277 changed files with 287 additions and 88 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -1,5 +1,5 @@
 name: Unit Testing
-on: 
+on:
     push:
     pull_request:
 jobs:
@@ -15,7 +15,7 @@ jobs:
        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=10s --health-retries=10
     strategy:
       matrix:
-        php-versions: ['5.6', '7.2', '7.3', '7.4', '8.0']
+        php-versions: ['7.0', '7.2', '7.3', '7.4', '8.0']
     steps:
       - name: Checkout
         uses: actions/checkout@v3

diff --git a/.github/workflows/update-assets.yml b/.github/workflows/update-assets.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: WordPress.org plugin asset/readme update
-      uses: 10up/action-wordpress-plugin-asset-update@master
+      uses: 10up/action-wordpress-plugin-asset-update@stable
       env:
         SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
         SVN_USERNAME: ${{ secrets.SVN_USERNAME }}

diff --git a/includes/class-general-settings.php b/includes/class-general-settings.php
@@ -65,7 +65,6 @@ public static function register_settings() {
 				'default'      => 0,
 			)
 		);
-
 	}
 
 	public static function admin_settings() {
@@ -126,7 +125,6 @@ public static function admin_settings() {
 				'disabled'    => false,
 			)
 		);
-
 	}
 
 

diff --git a/includes/class-hcard-author-widget.php b/includes/class-hcard-author-widget.php
@@ -6,6 +6,7 @@ function indieweb_register_hcard() {
 	register_widget( 'HCard_Author_Widget' );
 }
 
+// phpcs:ignore Universal.Files.SeparateFunctionsFromOO.Mixed
 class HCard_Author_Widget extends WP_Widget {
 	/**
 	 * Register widget with WordPress.
@@ -19,7 +20,6 @@ public function __construct() {
 				'description' => __( 'A widget that allows you to display author profile marked up as an h-card', 'indieweb' ),
 			)
 		);
-
 	} // end constructor
 
 	/**
@@ -33,13 +33,11 @@ public function __construct() {
 	public function widget( $args, $instance ) {
 		if ( 1 === (int) get_option( 'iw_single_author' ) ) {
 			$display_author = get_option( 'iw_default_author' );
-		} else {
-			if ( is_single() ) {
+		} elseif ( is_single() ) {
 				global $wp_query;
 				$display_author = $wp_query->post->post_author;
-			} else {
-				return;
-			}
+		} else {
+			return;
 		}
 
 		$user_info = get_userdata( $display_author );

diff --git a/includes/class-hcard-user.php b/includes/class-hcard-user.php
@@ -202,7 +202,7 @@ public static function rest_fields() {
 			'user',
 			'me',
 			array(
-				'get_callback' => function( $user, $attr, $request, $object_type ) {
+				'get_callback' => function ( $user, $attr, $request, $object_type ) {
 					return array_values( self::get_rel_me( $user['id'] ) );
 				},
 			)
@@ -211,7 +211,7 @@ public static function rest_fields() {
 			'user',
 			'first_name',
 			array(
-				'get_callback' => function( $user, $attr, $request, $object_type ) {
+				'get_callback' => function ( $user, $attr, $request, $object_type ) {
 					return get_user_meta( $user['id'], 'first_name' );
 				},
 			)
@@ -432,7 +432,7 @@ public static function get_hcard_display_defaults() {
 	 */
 	public static function get_template_file( $file_name ) {
 		$theme_template_file = locate_template( 'templates/' . $file_name );
-		return $theme_template_file ? $theme_template_file : dirname( __FILE__ ) . '/../templates/' . $file_name;
+		return $theme_template_file ? $theme_template_file : __DIR__ . '/../templates/' . $file_name;
 	}
 
 	public static function hcard( $user, $args = array() ) {

diff --git a/includes/class-plugin-installer.php b/includes/class-plugin-installer.php
@@ -27,7 +27,6 @@ public function start() {
 			add_action( 'admin_enqueue_scripts', array( &$this, 'enqueue_scripts' ) ); // Enqueue scripts and Localize
 			add_action( 'wp_ajax_cnkt_plugin_installer', array( &$this, 'cnkt_plugin_installer' ) ); // Install plugin
 			add_action( 'wp_ajax_cnkt_plugin_activation', array( &$this, 'cnkt_plugin_activation' ) ); // Activate plugin
-
 		}
 
 
@@ -231,7 +230,6 @@ public function cnkt_plugin_installer() {
 			);
 
 			wp_send_json( $json );
-
 		}
 
 
@@ -303,7 +301,6 @@ public function cnkt_plugin_activation() {
 			);
 
 			wp_send_json( $json );
-
 		}
 
 
@@ -388,7 +385,6 @@ public function enqueue_scripts() {
 
 			wp_enqueue_style( 'plugin-installer', CNKT_INSTALLER_PATH . 'static/css/installer.css', array(), IndieWeb_Plugin::$version );
 		}
-
 	}
 
 

diff --git a/includes/class-relme-domain-icon-map.php b/includes/class-relme-domain-icon-map.php
@@ -161,6 +161,4 @@ public static function url_to_name( $url ) {
 		$return               = apply_filters( 'indieweb_links_url_to_name', $return, $url );
 		return $return;
 	}
-
 }
-
diff --git a/includes/simple-icons.php b/includes/simple-icons.php
@@ -909,7 +909,6 @@ function simpleicons_iw_get_names() {
 		'hackster'                     => 'Hackster',
 		'handlebarsdotjs'              => 'Handlebars.js',
 		'handshake'                    => 'Handshake',
-		'handshake'                    => 'Handshake',
 		'happycow'                     => 'HappyCow',
 		'harbor'                       => 'Harbor',
 		'harmonyos'                    => 'HarmonyOS',
@@ -934,7 +933,6 @@ function simpleicons_iw_get_names() {
 		'hilton'                       => 'Hilton',
 		'hitachi'                      => 'Hitachi',
 		'hive'                         => 'Hive',
-		'hive'                         => 'Hive',
 		'homeassistant'                => 'Home Assistant',
 		'homeassistantcommunitystore'  => 'Home Assistant Community Store',
 		'homeadvisor'                  => 'HomeAdvisor',
@@ -1931,7 +1929,6 @@ function simpleicons_iw_get_names() {
 		'spreadshirt'                  => 'Spreadshirt',
 		'spreaker'                     => 'Spreaker',
 		'spring'                       => 'Spring',
-		'spring'                       => 'Spring',
 		'springboot'                   => 'Spring Boot',
 		'springsecurity'               => 'Spring Security',
 		'spyderide'                    => 'Spyder IDE',

diff --git a/indieweb.php b/indieweb.php
@@ -36,31 +36,31 @@ public static function init() {
 		// enable translation
 		self::enable_translation();
 
-		require_once dirname( __FILE__ ) . '/includes/class-plugin-installer.php';
+		require_once __DIR__ . '/includes/class-plugin-installer.php';
 
 		if ( INDIEWEB_ADD_HCARD_SUPPORT ) {
 			// Require H-Card Enhancements to User Profile
 
-			require_once dirname( __FILE__ ) . '/includes/class-relme-domain-icon-map.php';
-			require_once dirname( __FILE__ ) . '/includes/class-hcard-user.php';
-			require_once dirname( __FILE__ ) . '/includes/class-hcard-author-widget.php';
+			require_once __DIR__ . '/includes/class-relme-domain-icon-map.php';
+			require_once __DIR__ . '/includes/class-hcard-user.php';
+			require_once __DIR__ . '/includes/class-hcard-author-widget.php';
 
 		}
 
 		if ( INDIEWEB_ADD_RELME_SUPPORT ) {
 			// Require Rel Me Widget Class
-			require_once dirname( __FILE__ ) . '/includes/class-relme-widget.php';
+			require_once __DIR__ . '/includes/class-relme-widget.php';
 		}
 
 		add_action( 'wp_enqueue_scripts', array( 'IndieWeb_Plugin', 'enqueue_style' ) );
 
 		add_action( 'admin_enqueue_scripts', array( 'IndieWeb_Plugin', 'enqueue_admin_style' ) );
 
 		// Add General Settings Page
-		require_once dirname( __FILE__ ) . '/includes/class-general-settings.php';
+		require_once __DIR__ . '/includes/class-general-settings.php';
 
 		// Add third party integrations
-		require_once dirname( __FILE__ ) . '/includes/class-integrations.php';
+		require_once __DIR__ . '/includes/class-integrations.php';
 
 		// add menu
 		add_action( 'admin_menu', array( 'IndieWeb_Plugin', 'add_menu_item' ), 9 );
@@ -137,7 +137,7 @@ public static function change_menu_title() {
 	 * Callback from `add_plugins_page()` that shows the "Getting Started" page.
 	 */
 	public static function getting_started() {
-		require_once dirname( __FILE__ ) . '/includes/getting-started.php';
+		require_once __DIR__ . '/includes/getting-started.php';
 	}
 
 	public static function plugin_installer() {

diff --git a/package.json b/package.json
@@ -11,12 +11,12 @@
   },
   "devDependencies": {
     "genericons-neue": "^4.0.5",
-    "grunt": "^1.4.1",
+    "grunt": "^1.6.1",
     "grunt-checktextdomain": "^1.0.1",
     "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-sass": "^2.0.0",
     "grunt-wp-readme-to-markdown": "~2.1.0",
-    "simple-icons": "^9.0"
+    "simple-icons": "^9.12"
   },
   "license": "MIT",
   "bugs": {

diff --git a/readme.md b/readme.md
@@ -4,7 +4,7 @@
 **Tags:** indieweb, webmention, POSSE, indieauth  
 **Requires at least:** 4.7  
 **Requires PHP:** 5.6  
-**Tested up to:** 6.2  
+**Tested up to:** 6.3  
 **Stable tag:** 4.0.1  
 **License:** MIT  
 **License URI:** http://opensource.org/licenses/MIT  

diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Donate link: https://indieweb.org/how-to-sponsor
 Tags: indieweb, webmention, POSSE, indieauth
 Requires at least: 4.7
 Requires PHP: 5.6
-Tested up to: 6.2
+Tested up to: 6.3
 Stable tag: 4.0.1
 License: MIT
 License URI: http://opensource.org/licenses/MIT

diff --git a/static/svg/1password.svg b/static/svg/1password.svg
diff --git a/static/svg/acura.svg b/static/svg/acura.svg
diff --git a/static/svg/adobexd.svg b/static/svg/adobexd.svg
diff --git a/static/svg/adroll.svg b/static/svg/adroll.svg
diff --git a/static/svg/airbrakedotio.svg b/static/svg/airbrakedotio.svg
diff --git a/static/svg/airindia.svg b/static/svg/airindia.svg
diff --git a/static/svg/alby.svg b/static/svg/alby.svg
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,7 +65,6 @@ public static function register_settings() { @@
     				'default'      => 0,
     			)
     		);
     	}
     	public static function admin_settings() {
@@ Expand Down Expand Up / @@ -126,7 +125,6 @@ public static function admin_settings() { @@
     				'disabled'    => false,
     			)
     		);
     	}
@@ Expand Down @@