Merge pull request #58 from shinsenter/develop

v2.4.1
shinsenter · Jun 6, 2021 · a923c4f · a923c4f
2 parents a3fdebd + 21dba28
commit a923c4f
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 56 deletions.
diff --git a/.php_cs → .php-cs-fixer.php b/.php_cs → .php-cs-fixer.php
@@ -60,15 +60,13 @@
   'no_binary_string'                    => true,
   'no_empty_phpdoc'                     => true,
   'no_null_property_initialization'     => true,
-  'no_short_echo_tag'                   => true,
   'no_superfluous_elseif'               => true,
   'no_unneeded_curly_braces'            => true,
   'no_useless_else'                     => true,
   'no_useless_return'                   => true,
   'ordered_class_elements'              => true,
   'ordered_imports'                     => true,
   'php_unit_internal_class'             => true,
-  'php_unit_ordered_covers'             => true,
   'php_unit_test_class_requires_covers' => true,
   'phpdoc_add_missing_param_annotation' => true,
   'phpdoc_order'                        => true,
@@ -110,7 +108,7 @@
   ->ignoreDotFiles(true)
   ->ignoreVCS(true);
 
-return \PhpCsFixer\Config::create()
+return (new \PhpCsFixer\Config())
   ->setFinder($finder)
   ->setRules($rules)
   ->setIndent('  ')

diff --git a/README.txt b/README.txt
@@ -22,7 +22,7 @@ This plugin incorporates tips used a lot by experienced web experts, as well as
 Rate [5 stars (⭐️⭐️⭐️⭐️⭐️)](https://wordpress.org/support/plugin/shins-pageload-magic/reviews/?filter=5#new-post) if you guys like it.
 
 
-### Good points
+### What people loves
 
 - ⚡️ Native API, blazing fast
 - 👍 Legacy browsers support (IE9+)
@@ -163,6 +163,8 @@ We recommend you use it with another page-caching plugin for best performance.
 
 == Changelog ==
 
+2.4 Small updates and documentations
+
 2.3 Bug fixes and improvements
 
 2.2 Code improvements

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.4.0
+2.4.1
diff --git a/admin/partials/defer-wordpress-admin-display.php b/admin/partials/defer-wordpress-admin-display.php
@@ -39,7 +39,8 @@
             <div id="message" class="<?php echo $err; ?> fade">
                 <p><strong><?php echo esc_html($msg); ?></strong></p>
             </div>
-        <?php } ?>
+        <?php
+} ?>
 
         <?php if (!isset($reset_settings) && !isset($save_settings)) { ?>
             <div id="message" class="notice notice-info fade">

diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
         }
     ],
     "scripts": {
-        "fixer": "php-cs-fixer fix --show-progress=estimating --verbose --ansi",
+        "fixer": "php-cs-fixer fix --show-progress=dots --verbose --ansi",
         "pull": [
             "rm -rf ./cache/*/ ./vendor/ ./node_modules/ ./composer.lock ./package-lock.json",
             "composer clearcache --ansi",
@@ -54,7 +54,7 @@
     },
     "require": {
         "php": ">=5.6",
-        "shinsenter/defer.php": "^2.3",
+        "shinsenter/defer.php": "^2.4",
         "symfony/polyfill-mbstring": "<=1.22.0",
         "dangoodman/composer-for-wordpress": "^2.0"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/defer-wordpress.php b/defer-wordpress.php
@@ -28,7 +28,7 @@
  * Plugin Name:       A faster website! (aka defer.js)
  * Plugin URI:        https://wordpress.org/plugins/shins-pageload-magic/
  * Description:       💯 Latest web technologies in website optimization by experienced web experts. 🔰 Very easy to use.
- * Version:           2.4.0
+ * Version:           2.4.1
  * Author:            Mai Nhut Tan
  * Author URI:        https://code.shin.company/
  * License:           GPL-2.0+
@@ -44,7 +44,7 @@
 if (!defined('DEFER_WP_PLUGIN_VERSION')) {
   define('DEFER_WP_PLUGIN_BASE', plugin_basename(__FILE__));
   define('DEFER_WP_PLUGIN_NAME', 'defer-wordpress');
-  define('DEFER_WP_PLUGIN_VERSION', '2.4.0');
+  define('DEFER_WP_PLUGIN_VERSION', '2.4.1');
   define('DEFER_WP_PLUGIN_PREFIX', DEFER_WP_PLUGIN_NAME . '_');
 
   define('DEFER_WP_PLUGIN_HOOK', 'plugin_action_links_' . DEFER_WP_PLUGIN_BASE);
@@ -58,7 +58,7 @@
   $has_deferjs = file_exists(__DIR__ . '/public/lib/defer_plus.min.js');
   define('DEFER_WP_SRC_DEFERJS_CDN', $has_deferjs
         ? __DIR__ . '/public/lib/defer_plus.min.js'
-        : 'https://cdn.jsdelivr.net/npm/@shinsenter/defer.js@2.4.0/dist/defer_plus.min.js');
+        : 'https://cdn.jsdelivr.net/npm/@shinsenter/defer.js@2.4.2/dist/defer_plus.min.js');
 
   $has_polyfill = file_exists(__DIR__ . '/public/lib/polyfill.min.js');
   define('DEFER_WP_SRC_POLYFILL_CDN', $has_polyfill

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
     "author": "Mai Nhut Tan <shin@shin.company>",
     "license": "GPL-2.0",
     "dependencies": {
-        "@shinsenter/defer.js": "^2.4.1"
+        "@shinsenter/defer.js": "^2.4.2"
     },
     "repository": {
         "type": "git",