Merge branch 'release/2.1.2'

Jazz-Man · Jun 6, 2021 · e1e1c4d · e1e1c4d
2 parents 5501993 + 33e6b38
commit e1e1c4d
Show file tree

Hide file tree

Showing 6 changed files with 570 additions and 242 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,159 @@
+
+2.1.2 / 2021-06-06
+==================
+
+  * fix all phpmd style
+  * added translation
+  * update phpmd rules
+
+2.1.1 / 2021-04-14
+==================
+
+  * update plugin version
+  * fix cash prefix and update redis parameters
+  * removed ext-ctype
+
+2.1.0 / 2021-04-03
+==================
+
+  * update admin page panel
+  * install jazzman/wp-app-config
+
+2.0.1 / 2021-04-03
+==================
+
+  * update license
+
+2.0.0 / 2021-04-03
+==================
+
+  * deleted OutputCache
+  * refactor code style
+  * refactor RedisAdapter class
+  * init phpmd rules
+  * install phpstan
+  * init RedisAdapter
+  * add ext-ctype
+  * update composer.json and code style
+  * added advanced-cache.php
+  * optimise performance
+  * added output_cache group
+  * simplified page caching checking methods
+  * ini OutputCache class
+
+v1.3 / 2019-05-01
+=================
+
+  * updated plugin version
+  * removed unused private fields
+  * prefix initialization has been updated
+  * fixed multisite prefix
+  * install symfony/var-dumper
+  * removed admin_enqueue_scripts action
+
+v1.1 / 2019-05-01
+=================
+
+
+
+v1.2 / 2019-05-01
+=================
+
+  * removed version and suggest from composer.json
+  * removed version from composer.json
+  * updated version of plugin
+
+v1.0 / 2019-05-01
+=================
+
+  * Revert "sanitize pool prefix"
+  * sanitize pool prefix
+  * updated performance for driver config
+  * removed $multisite prop
+  * removed isIgnoredGroup method
+  * removed $delay params
+  * using var_export for showing data from cache
+  * removed $delay params
+  * renamed driverSet method to driverSetting
+  * removed $config params from constructor
+  * escaping link urls
+  * create link string
+  * removed getLink method from admin template
+  * used filter_input function for $_GET
+  * used filter_input function for $_GET
+  * fix accesses the super-global variable $_GET.
+  * removed helper.php
+  * escape translation string
+  * saved paths to files in variables
+  * moved object-cache.php file to include dir
+
+v1.0-beta / 2019-05-01
+======================
+
+  * removed jazzman/parameter-bag
+  * removed debug statement
+  * added admin page
+  * updated driver config
+  * added suggest
+  * removed OutputCache class
+  * removed memstatic instance
+  * added cache_misses and cache_hits property
+  * removed comments
+  * added prefix for pool
+  * removed getters
+  * updated DriverAdapter
+  * updated driver config
+  * removed ObjectCache class
+  * used DriverAdapter class
+  * updated DriverAdapter class
+  * refactored getCache method
+  * init DriverAdapter class
+  * updated "add", "set" and "get" methods
+  * used InternalCache trait
+  * rename class to Driver
+  * rename class to Driver
+  * added InternalCache trait
+  * refactored setCache method
+  * added memstatic driver
+  * added getters
+  * added base config for ObjectCacheDriver
+  * install phpfastcache/phpfastcache
+  * fix wp_cache_close function and added default parameters to wp_cache_get
+  * init ObjectCacheDriver class
+  * refactoring addGlobalGroups method
+  * init memcached by group
+  * updated validateExpiration method
+  * refactor success method
+  * build cache key
+  * set cache_key_salt
+  * remove unnecessary functions
+  * Dependencies updated
+  * updated group permissions
+  * updated internal cache management
+  * use ArrayObject class for internal cache
+  * init ObjectCache class
+  * init ObjectCacheBase class
+  * init OutputCache class
+  * updated wp_object_cache methods
+  * init dev version
+  * remove dev dependencies
+  * added description to composer
+
+0.2 / 2019-03-15
+================
+
+  * removed version from composer.json
+  * added init actions
+
+0.1 / 2019-03-12
+================
+
+  * rm composer.lock from repo
+  * rm composer.lock from repo
+  * Create README.md
+  * added composer/installers as dependencies
+  * Bump roots/wordpress from 4.9.9 to 5.1
+  * updated license
+  * added wp object cache methods
+  * install jazzman/wp-memcached
+  * Initial commit
diff --git a/include/object-cache.php b/include/object-cache.php
@@ -103,12 +103,12 @@ function wp_cache_set(string $key, $value = null, string $group = 'default', int
 
 /**
  * Switch blog prefix, which changes the cache that is accessed.
- * @param  int  $blogId
+ * @param  int|string  $blogId
  * @return bool
  */
-function wp_cache_switch_to_blog(int $blogId): bool
+function wp_cache_switch_to_blog($blogId): bool
 {
-    return wp_object_cache()->switchToBlog($blogId);
+    return wp_object_cache()->switchToBlog((int) $blogId);
 }
 
 /**

diff --git a/languages/wp-object-cache.pot b/languages/wp-object-cache.pot
@@ -0,0 +1,94 @@
+# Copyright (C) 2021 Vasyl Sokolyk
+# This file is distributed under the same license as the WP Object Cache plugin.
+msgid ""
+msgstr ""
+"Project-Id-Version: WP Object Cache v2.0\n"
+"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/wp-object-cache\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2021-06-06T03:04:52+03:00\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"X-Generator: WP-CLI 2.4.0\n"
+"X-Domain: wp-object-cache\n"
+
+#. Plugin Name of the plugin
+#: wp-object-cache.php:101
+#: wp-object-cache.php:102
+#: wp-object-cache.php:396
+msgid "WP Object Cache"
+msgstr ""
+
+#. Description of the plugin
+msgid "Redis, Memcached or Apcu backend for the WP Object Cache"
+msgstr ""
+
+#. Author of the plugin
+msgid "Vasyl Sokolyk"
+msgstr ""
+
+#: wp-object-cache.php:125
+msgid "<strong>The object cache drop-in is outdated.</strong> Please <a href=\"%s\">update it now</a>."
+msgstr ""
+
+#: wp-object-cache.php:134
+msgid "<strong>An unknown object cache drop-in was found</strong>. To use WP Object Cache , <a href=\"%s\">please replace it now</a>."
+msgstr ""
+
+#: wp-object-cache.php:149
+msgid "<strong>WP Object Cache is not used.</strong> To use WP Object Cache , <a href=\"%s\">please enable it now</a>."
+msgstr ""
+
+#: wp-object-cache.php:225
+msgid "Enable Object Cache"
+msgstr ""
+
+#: wp-object-cache.php:230
+msgid "Disable Object Cache"
+msgstr ""
+
+#: wp-object-cache.php:235
+msgid "Flush Cache"
+msgstr ""
+
+#: wp-object-cache.php:240
+msgid "Settings"
+msgstr ""
+
+#: wp-object-cache.php:451
+msgid "This plugin requires PHP 5.4 or greater."
+msgstr ""
+
+#: wp-object-cache.php:464
+msgid "Object cache enabled."
+msgstr ""
+
+#: wp-object-cache.php:469
+msgid "Object cache could not be enabled."
+msgstr ""
+
+#: wp-object-cache.php:474
+msgid "Object cache disabled."
+msgstr ""
+
+#: wp-object-cache.php:479
+msgid "Object cache could not be disabled."
+msgstr ""
+
+#: wp-object-cache.php:484
+msgid "Object cache flushed."
+msgstr ""
+
+#: wp-object-cache.php:489
+msgid "Object cache could not be flushed."
+msgstr ""
+
+#: wp-object-cache.php:494
+msgid "Updated object cache drop-in and enabled Redis object cache."
+msgstr ""
+
+#: wp-object-cache.php:499
+msgid "Object cache drop-in could not be updated."
+msgstr ""
diff --git a/phpmd.ruleset.xml b/phpmd.ruleset.xml
@@ -1,26 +1,83 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ruleset name="phpmd-no-controversial"
+<ruleset name="phpmd-wp-object-cache"
     xmlns="http://pmd.sf.net/ruleset/1.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
     xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
   <description>
     Enable all rulesets, except Controversial ("camelCase" rules).
-    Required for WordPress development.
   </description>
+
+  <rule ref="rulesets/design.xml">
+    <exclude name="ExitExpression"/>
+  </rule>
+
+  <rule ref="rulesets/cleancode.xml/ElseExpression"/>
+  <rule ref="rulesets/cleancode.xml/StaticAccess"/>
+  <rule ref="rulesets/cleancode.xml/IfStatementAssignment"/>
+  <rule ref="rulesets/cleancode.xml/DuplicatedArrayKey"/>
+  <rule ref="rulesets/cleancode.xml/ErrorControlOperator"/>
+  <rule ref="rulesets/cleancode.xml/MissingImport"/>
+  <rule ref="rulesets/cleancode.xml/UndefinedVariable"/>
+
+  <rule ref="rulesets/codesize.xml/CyclomaticComplexity"/>
+  <rule ref="rulesets/codesize.xml/NPathComplexity"/>
+  <rule ref="rulesets/codesize.xml/ExcessivePublicCount"/>
+  <rule ref="rulesets/codesize.xml/TooManyFields"/>
+  <rule ref="rulesets/codesize.xml/TooManyMethods"/>
+  <rule ref="rulesets/codesize.xml/TooManyPublicMethods"/>
+  <rule ref="rulesets/codesize.xml/ExcessiveClassComplexity"/>
+  <rule ref="rulesets/codesize.xml/ExcessiveParameterList"/>
+  <rule ref="rulesets/codesize.xml/ExcessiveMethodLength">
+    <properties>
+      <property name="ignore-whitespace" value="true"/>
+    </properties>
+  </rule>
+  <rule ref="rulesets/codesize.xml/ExcessiveClassLength">
+    <properties>
+      <property name="ignore-whitespace" value="true"/>
+    </properties>
+  </rule>
+
+  <rule ref="rulesets/controversial.xml/CamelCaseClassName"/>
+  <rule ref="rulesets/controversial.xml/CamelCaseParameterName">
+    <properties>
+      <property name="allow-underscore" value="true"/>
+    </properties>
+  </rule>
+  <rule ref="rulesets/controversial.xml/CamelCaseMethodName">
+    <properties>
+      <property name="allow-underscore" value="true"/>
+      <property name="allow-underscore-test" value="true"/>
+    </properties>
+  </rule>
+  <rule ref="rulesets/controversial.xml/CamelCasePropertyName">
+    <properties>
+      <property name="allow-underscore" value="true"/>
+      <property name="allow-underscore-test" value="true"/>
+    </properties>
+  </rule>
+<!--  <rule ref="rulesets/controversial.xml/CamelCaseVariableName">-->
+<!--    <properties>-->
+<!--      <property name="allow-underscore" value="true"/>-->
+<!--    </properties>-->
+<!--  </rule>-->
+
+
+  <rule ref="rulesets/naming.xml/LongClassName"/>
+  <rule ref="rulesets/naming.xml/ShortClassName"/>
+  <rule ref="rulesets/naming.xml/LongVariable"/>
+  <rule ref="rulesets/naming.xml/ShortMethodName"/>
+  <rule ref="rulesets/naming.xml/ConstructorWithNameAsEnclosingClass"/>
+  <rule ref="rulesets/naming.xml/ConstantNamingConventions"/>
   <rule ref="rulesets/naming.xml/ShortVariable">
     <properties>
       <!-- common in WP -->
       <property name="exceptions" value="id,wp" />
     </properties>
   </rule>
 
-  <rule ref="rulesets/codesize.xml"/>
-  <rule ref="rulesets/design.xml">
-    <!-- normal in WP for redirects, etc -->
-    <exclude name="ExitExpression" />
+  <rule ref="rulesets/unusedcode.xml">
+    <exclude name="UnusedFormalParameter"/>
   </rule>
-  <rule ref="rulesets/naming.xml"/>
-  <rule ref="rulesets/unusedcode.xml"/>
-  <rule ref="rulesets/cleancode.xml"/>
 </ruleset>