Skip to content
This repository was archived by the owner on Sep 20, 2024. It is now read-only.

Commit a923c4f

Browse files
authored
Merge pull request #58 from shinsenter/develop
v2.4.1
2 parents a3fdebd + 21dba28 commit a923c4f

File tree

9 files changed

+62
-56
lines changed

9 files changed

+62
-56
lines changed

.php_cs renamed to .php-cs-fixer.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,13 @@
6060
'no_binary_string' => true,
6161
'no_empty_phpdoc' => true,
6262
'no_null_property_initialization' => true,
63-
'no_short_echo_tag' => true,
6463
'no_superfluous_elseif' => true,
6564
'no_unneeded_curly_braces' => true,
6665
'no_useless_else' => true,
6766
'no_useless_return' => true,
6867
'ordered_class_elements' => true,
6968
'ordered_imports' => true,
7069
'php_unit_internal_class' => true,
71-
'php_unit_ordered_covers' => true,
7270
'php_unit_test_class_requires_covers' => true,
7371
'phpdoc_add_missing_param_annotation' => true,
7472
'phpdoc_order' => true,
@@ -110,7 +108,7 @@
110108
->ignoreDotFiles(true)
111109
->ignoreVCS(true);
112110

113-
return \PhpCsFixer\Config::create()
111+
return (new \PhpCsFixer\Config())
114112
->setFinder($finder)
115113
->setRules($rules)
116114
->setIndent(' ')

README.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ This plugin incorporates tips used a lot by experienced web experts, as well as
2222
Rate [5 stars (⭐️⭐️⭐️⭐️⭐️)](https://wordpress.org/support/plugin/shins-pageload-magic/reviews/?filter=5#new-post) if you guys like it.
2323

2424

25-
### Good points
25+
### What people loves
2626

2727
- ⚡️ Native API, blazing fast
2828
- 👍 Legacy browsers support (IE9+)
@@ -163,6 +163,8 @@ We recommend you use it with another page-caching plugin for best performance.
163163

164164
== Changelog ==
165165

166+
2.4 Small updates and documentations
167+
166168
2.3 Bug fixes and improvements
167169

168170
2.2 Code improvements

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.0
1+
2.4.1

admin/partials/defer-wordpress-admin-display.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
<div id="message" class="<?php echo $err; ?> fade">
4040
<p><strong><?php echo esc_html($msg); ?></strong></p>
4141
</div>
42-
<?php } ?>
42+
<?php
43+
} ?>
4344

4445
<?php if (!isset($reset_settings) && !isset($save_settings)) { ?>
4546
<div id="message" class="notice notice-info fade">

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
}
3131
],
3232
"scripts": {
33-
"fixer": "php-cs-fixer fix --show-progress=estimating --verbose --ansi",
33+
"fixer": "php-cs-fixer fix --show-progress=dots --verbose --ansi",
3434
"pull": [
3535
"rm -rf ./cache/*/ ./vendor/ ./node_modules/ ./composer.lock ./package-lock.json",
3636
"composer clearcache --ansi",
@@ -54,7 +54,7 @@
5454
},
5555
"require": {
5656
"php": ">=5.6",
57-
"shinsenter/defer.php": "^2.3",
57+
"shinsenter/defer.php": "^2.4",
5858
"symfony/polyfill-mbstring": "<=1.22.0",
5959
"dangoodman/composer-for-wordpress": "^2.0"
6060
},

composer.lock

Lines changed: 42 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

defer-wordpress.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* Plugin Name: A faster website! (aka defer.js)
2929
* Plugin URI: https://wordpress.org/plugins/shins-pageload-magic/
3030
* Description: 💯 Latest web technologies in website optimization by experienced web experts. 🔰 Very easy to use.
31-
* Version: 2.4.0
31+
* Version: 2.4.1
3232
* Author: Mai Nhut Tan
3333
* Author URI: https://code.shin.company/
3434
* License: GPL-2.0+
@@ -44,7 +44,7 @@
4444
if (!defined('DEFER_WP_PLUGIN_VERSION')) {
4545
define('DEFER_WP_PLUGIN_BASE', plugin_basename(__FILE__));
4646
define('DEFER_WP_PLUGIN_NAME', 'defer-wordpress');
47-
define('DEFER_WP_PLUGIN_VERSION', '2.4.0');
47+
define('DEFER_WP_PLUGIN_VERSION', '2.4.1');
4848
define('DEFER_WP_PLUGIN_PREFIX', DEFER_WP_PLUGIN_NAME . '_');
4949

5050
define('DEFER_WP_PLUGIN_HOOK', 'plugin_action_links_' . DEFER_WP_PLUGIN_BASE);
@@ -58,7 +58,7 @@
5858
$has_deferjs = file_exists(__DIR__ . '/public/lib/defer_plus.min.js');
5959
define('DEFER_WP_SRC_DEFERJS_CDN', $has_deferjs
6060
? __DIR__ . '/public/lib/defer_plus.min.js'
61-
: 'https://cdn.jsdelivr.net/npm/@shinsenter/[email protected].0/dist/defer_plus.min.js');
61+
: 'https://cdn.jsdelivr.net/npm/@shinsenter/[email protected].2/dist/defer_plus.min.js');
6262

6363
$has_polyfill = file_exists(__DIR__ . '/public/lib/polyfill.min.js');
6464
define('DEFER_WP_SRC_POLYFILL_CDN', $has_polyfill

package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"author": "Mai Nhut Tan <[email protected]>",
66
"license": "GPL-2.0",
77
"dependencies": {
8-
"@shinsenter/defer.js": "^2.4.1"
8+
"@shinsenter/defer.js": "^2.4.2"
99
},
1010
"repository": {
1111
"type": "git",

0 commit comments

Comments
 (0)