Skip to content

Commit c1ea95c

Browse files
pfefferlepfefferle
authored
Merge pull request #241 from indieweb/tested-up-to-6-2
version bump
2 parents f8f2225 + 8ce9578 commit c1ea95c

File tree

277 files changed

+287
-88
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

277 files changed

+287
-88
lines changed

‎.github/workflows/phpunit.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Unit Testing
2-
on:
2+
on:
33
push:
44
pull_request:
55
jobs:
@@ -15,7 +15,7 @@ jobs:
1515
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=10s --health-retries=10
1616
strategy:
1717
matrix:
18-
php-versions: ['5.6', '7.2', '7.3', '7.4', '8.0']
18+
php-versions: ['7.0', '7.2', '7.3', '7.4', '8.0']
1919
steps:
2020
- name: Checkout
2121
uses: actions/checkout@v3

‎.github/workflows/update-assets.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
steps:
1111
- uses: actions/checkout@v3
1212
- name: WordPress.org plugin asset/readme update
13-
uses: 10up/action-wordpress-plugin-asset-update@master
13+
uses: 10up/action-wordpress-plugin-asset-update@stable
1414
env:
1515
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
1616
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}

‎includes/class-general-settings.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ public static function register_settings() {
6565
'default' => 0,
6666
)
6767
);
68-
6968
}
7069

7170
public static function admin_settings() {
@@ -126,7 +125,6 @@ public static function admin_settings() {
126125
'disabled' => false,
127126
)
128127
);
129-
130128
}
131129

132130

‎includes/class-hcard-author-widget.php‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ function indieweb_register_hcard() {
66
register_widget( 'HCard_Author_Widget' );
77
}
88

9+
// phpcs:ignore Universal.Files.SeparateFunctionsFromOO.Mixed
910
class HCard_Author_Widget extends WP_Widget {
1011
/**
1112
* Register widget with WordPress.
@@ -19,7 +20,6 @@ public function __construct() {
1920
'description' => __( 'A widget that allows you to display author profile marked up as an h-card', 'indieweb' ),
2021
)
2122
);
22-
2323
} // end constructor
2424

2525
/**
@@ -33,13 +33,11 @@ public function __construct() {
3333
public function widget( $args, $instance ) {
3434
if ( 1 === (int) get_option( 'iw_single_author' ) ) {
3535
$display_author = get_option( 'iw_default_author' );
36-
} else {
37-
if ( is_single() ) {
36+
} elseif ( is_single() ) {
3837
global $wp_query;
3938
$display_author = $wp_query->post->post_author;
40-
} else {
41-
return;
42-
}
39+
} else {
40+
return;
4341
}
4442

4543
$user_info = get_userdata( $display_author );

‎includes/class-hcard-user.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public static function rest_fields() {
202202
'user',
203203
'me',
204204
array(
205-
'get_callback' => function( $user, $attr, $request, $object_type ) {
205+
'get_callback' => function ( $user, $attr, $request, $object_type ) {
206206
return array_values( self::get_rel_me( $user['id'] ) );
207207
},
208208
)
@@ -211,7 +211,7 @@ public static function rest_fields() {
211211
'user',
212212
'first_name',
213213
array(
214-
'get_callback' => function( $user, $attr, $request, $object_type ) {
214+
'get_callback' => function ( $user, $attr, $request, $object_type ) {
215215
return get_user_meta( $user['id'], 'first_name' );
216216
},
217217
)
@@ -432,7 +432,7 @@ public static function get_hcard_display_defaults() {
432432
*/
433433
public static function get_template_file( $file_name ) {
434434
$theme_template_file = locate_template( 'templates/' . $file_name );
435-
return $theme_template_file ? $theme_template_file : dirname( __FILE__ ) . '/../templates/' . $file_name;
435+
return $theme_template_file ? $theme_template_file : __DIR__ . '/../templates/' . $file_name;
436436
}
437437

438438
public static function hcard( $user, $args = array() ) {

‎includes/class-plugin-installer.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public function start() {
2727
add_action( 'admin_enqueue_scripts', array( &$this, 'enqueue_scripts' ) ); // Enqueue scripts and Localize
2828
add_action( 'wp_ajax_cnkt_plugin_installer', array( &$this, 'cnkt_plugin_installer' ) ); // Install plugin
2929
add_action( 'wp_ajax_cnkt_plugin_activation', array( &$this, 'cnkt_plugin_activation' ) ); // Activate plugin
30-
3130
}
3231

3332

@@ -231,7 +230,6 @@ public function cnkt_plugin_installer() {
231230
);
232231

233232
wp_send_json( $json );
234-
235233
}
236234

237235

@@ -303,7 +301,6 @@ public function cnkt_plugin_activation() {
303301
);
304302

305303
wp_send_json( $json );
306-
307304
}
308305

309306

@@ -388,7 +385,6 @@ public function enqueue_scripts() {
388385

389386
wp_enqueue_style( 'plugin-installer', CNKT_INSTALLER_PATH . 'static/css/installer.css', array(), IndieWeb_Plugin::$version );
390387
}
391-
392388
}
393389

394390

‎includes/class-relme-domain-icon-map.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,4 @@ public static function url_to_name( $url ) {
161161
$return = apply_filters( 'indieweb_links_url_to_name', $return, $url );
162162
return $return;
163163
}
164-
165164
}
166-

‎includes/simple-icons.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -909,7 +909,6 @@ function simpleicons_iw_get_names() {
909909
'hackster' => 'Hackster',
910910
'handlebarsdotjs' => 'Handlebars.js',
911911
'handshake' => 'Handshake',
912-
'handshake' => 'Handshake',
913912
'happycow' => 'HappyCow',
914913
'harbor' => 'Harbor',
915914
'harmonyos' => 'HarmonyOS',
@@ -934,7 +933,6 @@ function simpleicons_iw_get_names() {
934933
'hilton' => 'Hilton',
935934
'hitachi' => 'Hitachi',
936935
'hive' => 'Hive',
937-
'hive' => 'Hive',
938936
'homeassistant' => 'Home Assistant',
939937
'homeassistantcommunitystore' => 'Home Assistant Community Store',
940938
'homeadvisor' => 'HomeAdvisor',
@@ -1931,7 +1929,6 @@ function simpleicons_iw_get_names() {
19311929
'spreadshirt' => 'Spreadshirt',
19321930
'spreaker' => 'Spreaker',
19331931
'spring' => 'Spring',
1934-
'spring' => 'Spring',
19351932
'springboot' => 'Spring Boot',
19361933
'springsecurity' => 'Spring Security',
19371934
'spyderide' => 'Spyder IDE',

‎indieweb.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,31 +36,31 @@ public static function init() {
3636
// enable translation
3737
self::enable_translation();
3838

39-
require_once dirname( __FILE__ ) . '/includes/class-plugin-installer.php';
39+
require_once __DIR__ . '/includes/class-plugin-installer.php';
4040

4141
if ( INDIEWEB_ADD_HCARD_SUPPORT ) {
4242
// Require H-Card Enhancements to User Profile
4343

44-
require_once dirname( __FILE__ ) . '/includes/class-relme-domain-icon-map.php';
45-
require_once dirname( __FILE__ ) . '/includes/class-hcard-user.php';
46-
require_once dirname( __FILE__ ) . '/includes/class-hcard-author-widget.php';
44+
require_once __DIR__ . '/includes/class-relme-domain-icon-map.php';
45+
require_once __DIR__ . '/includes/class-hcard-user.php';
46+
require_once __DIR__ . '/includes/class-hcard-author-widget.php';
4747

4848
}
4949

5050
if ( INDIEWEB_ADD_RELME_SUPPORT ) {
5151
// Require Rel Me Widget Class
52-
require_once dirname( __FILE__ ) . '/includes/class-relme-widget.php';
52+
require_once __DIR__ . '/includes/class-relme-widget.php';
5353
}
5454

5555
add_action( 'wp_enqueue_scripts', array( 'IndieWeb_Plugin', 'enqueue_style' ) );
5656

5757
add_action( 'admin_enqueue_scripts', array( 'IndieWeb_Plugin', 'enqueue_admin_style' ) );
5858

5959
// Add General Settings Page
60-
require_once dirname( __FILE__ ) . '/includes/class-general-settings.php';
60+
require_once __DIR__ . '/includes/class-general-settings.php';
6161

6262
// Add third party integrations
63-
require_once dirname( __FILE__ ) . '/includes/class-integrations.php';
63+
require_once __DIR__ . '/includes/class-integrations.php';
6464

6565
// add menu
6666
add_action( 'admin_menu', array( 'IndieWeb_Plugin', 'add_menu_item' ), 9 );
@@ -137,7 +137,7 @@ public static function change_menu_title() {
137137
* Callback from `add_plugins_page()` that shows the "Getting Started" page.
138138
*/
139139
public static function getting_started() {
140-
require_once dirname( __FILE__ ) . '/includes/getting-started.php';
140+
require_once __DIR__ . '/includes/getting-started.php';
141141
}
142142

143143
public static function plugin_installer() {

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
},
1212
"devDependencies": {
1313
"genericons-neue": "^4.0.5",
14-
"grunt": "^1.4.1",
14+
"grunt": "^1.6.1",
1515
"grunt-checktextdomain": "^1.0.1",
1616
"grunt-contrib-copy": "^1.0.0",
1717
"grunt-contrib-sass": "^2.0.0",
1818
"grunt-wp-readme-to-markdown": "~2.1.0",
19-
"simple-icons": "^9.0"
19+
"simple-icons": "^9.12"
2020
},
2121
"license": "MIT",
2222
"bugs": {

0 commit comments

Comments
 (0)