From 86b1130845bddb31d7ce4ac8a549ab35b40059e9 Mon Sep 17 00:00:00 2001
From: Erick Hitter <gitlab-s@mxs.ethitter.com>
Date: Sun, 30 Aug 2020 21:18:56 +0000
Subject: [PATCH] Bump WP compatibility
---
.gitlab-ci.yml | 57 +--------
Gruntfile.js | 4 +-
README.md | 2 +-
...st-widget.pot => taxonomy-list-widget.pot} | 111 +++++++++++-------
readme.txt | 2 +-
taxonomy-list-widget.php | 1 +
tests/bootstrap.php | 2 +-
7 files changed, 76 insertions(+), 103 deletions(-)
rename languages/{tag-list-widget.pot => taxonomy-list-widget.pot} (55%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0a86728..73da181 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,55 +1,2 @@
-variables:
- # Configure mysql service (https://hub.docker.com/_/mysql/)
- MYSQL_DATABASE: wordpress_tests
- MYSQL_ROOT_PASSWORD: mysql
-
-cache:
- paths:
- - $HOME/.composer
- - /root/.composer
-
-before_script:
- # Set up WordPress tests
- - bash bin/install-wp-tests.sh $MYSQL_DATABASE root $MYSQL_ROOT_PASSWORD mysql latest true
-
- # PHPUnit
- - |
- if [[ $(php -v) =~ "PHP 7." ]]; then
- composer global require "phpunit/phpunit=6.1.*"
- else
- composer global require "phpunit/phpunit=4.8.*"
- fi
-
- # Install PHPCS and WPCS
- - composer global require automattic/vipwpcs
- - composer global require phpcompatibility/phpcompatibility-wp
- - phpcs --config-set installed_paths $HOME/.composer/vendor/wp-coding-standards/wpcs,$HOME/.composer/vendor/automattic/vipwpcs,$HOME/.composer/vendor/phpcompatibility/php-compatibility,$HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie,$HOME/.composer/vendor/phpcompatibility/phpcompatibility-wp
-
-PHPunit:PHP7.2:MySQL:
- image: containers.ethitter.com:443/docker/images/php:7.2
- services:
- - mysql:5.6
- script:
- - find . -type "f" -iname "*.php" | xargs -L "1" php -l
- - phpcs -n
- - phpunit
- allow_failure: true
-
-PHPunit:PHP7.3:MySQL:
- image: containers.ethitter.com:443/docker/images/php:7.3
- services:
- - mysql:5.6
- script:
- - find . -type "f" -iname "*.php" | xargs -L "1" php -l
- - phpcs -n
- - phpunit
- allow_failure: true
-
-PluginSVN:
- stage: deploy
- image: containers.ethitter.com:443/docker/images/php:7.3
- before_script:
- - curl -o ./bin/deploy.sh https://git-cdn.e15r.co/open-source/wp-org-plugin-deploy/raw/master/scripts/deploy.sh
- - chmod +x ./bin/deploy.sh
- script: ./bin/deploy.sh
- when: on_success
+include:
+ - remote: https://git-cdn.e15r.co/gitlab/ci/wordpress/-/raw/main/plugins/default.yml
diff --git a/Gruntfile.js b/Gruntfile.js
index e719ec5..869a547 100755
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -32,8 +32,8 @@ module.exports = function( grunt ) {
options: {
domainPath: '/languages',
exclude: [ '\.git/*', 'bin/*', 'node_modules/*', 'tests/*' ],
- mainFile: 'tag-list-widget.php',
- potFilename: 'tag-list-widget.pot',
+ mainFile: 'taxonomy-list-widget.php',
+ potFilename: 'taxonomy-list-widget.pot',
potHeaders: {
poedit: true,
'x-poedit-keywordslist': true
diff --git a/README.md b/README.md
index 334c4a1..3eb3352 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
**Donate link:** https://ethitter.com/donate/
**Tags:** tag, tags, taxonomy, sidebar, widget, widgets, list
**Requires at least:** 2.8
-**Tested up to:** 5.4
+**Tested up to:** 5.5
**Stable tag:** 1.3.1
**License:** GPLv2 or later
**License URI:** http://www.gnu.org/licenses/gpl-2.0.html
diff --git a/languages/tag-list-widget.pot b/languages/taxonomy-list-widget.pot
similarity index 55%
rename from languages/tag-list-widget.pot
rename to languages/taxonomy-list-widget.pot
index 0b6291f..2766b8b 100644
--- a/languages/tag-list-widget.pot
+++ b/languages/taxonomy-list-widget.pot
@@ -1,10 +1,11 @@
-# Copyright (C) 2020
-# This file is distributed under the same license as the package.
+# Copyright (C) 2020 Erick Hitter
+# This file is distributed under the same license as the Taxonomy List Widget package.
msgid ""
msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/tag-list-widget\n"
-"POT-Creation-Date: 2020-03-26 17:48:35+00:00\n"
+"Project-Id-Version: Taxonomy List Widget 1.3.1\n"
+"Report-Msgid-Bugs-To: "
+"https://wordpress.org/support/plugin/taxonomy-list-widget\n"
+"POT-Creation-Date: 2020-08-30 21:07:15+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -24,158 +25,182 @@ msgstr ""
"X-Poedit-Bookmarks: \n"
"X-Textdomain-Support: yes\n"
-#: taxonomy-list-widget.php:526
+#: taxonomy-list-widget.php:527
msgid "Basic Settings"
msgstr ""
-#: taxonomy-list-widget.php:529
+#: taxonomy-list-widget.php:530
msgid "Taxonomy"
msgstr ""
-#: taxonomy-list-widget.php:538
+#: taxonomy-list-widget.php:539
msgid "Title:"
msgstr ""
-#: taxonomy-list-widget.php:542
+#: taxonomy-list-widget.php:543
msgid "List Style"
msgstr ""
-#: taxonomy-list-widget.php:545
+#: taxonomy-list-widget.php:546
msgid "Bulleted list"
msgstr ""
-#: taxonomy-list-widget.php:546
+#: taxonomy-list-widget.php:547
msgid "Numbered list"
msgstr ""
-#: taxonomy-list-widget.php:547
+#: taxonomy-list-widget.php:548
msgid "Line break"
msgstr ""
-#: taxonomy-list-widget.php:548
+#: taxonomy-list-widget.php:549
msgid "Custom, as specified below"
msgstr ""
-#: taxonomy-list-widget.php:551
+#: taxonomy-list-widget.php:552
msgid "Custom list style"
msgstr ""
-#: taxonomy-list-widget.php:573
+#: taxonomy-list-widget.php:574
msgid "Order"
msgstr ""
-#: taxonomy-list-widget.php:576
+#: taxonomy-list-widget.php:577
msgid "Order terms by:"
msgstr ""
-#: taxonomy-list-widget.php:579
+#: taxonomy-list-widget.php:580
msgid "Name"
msgstr ""
-#: taxonomy-list-widget.php:582
+#: taxonomy-list-widget.php:583
msgid "Post count"
msgstr ""
-#: taxonomy-list-widget.php:586
+#: taxonomy-list-widget.php:587
msgid "Order terms:"
msgstr ""
-#: taxonomy-list-widget.php:589
+#: taxonomy-list-widget.php:590
msgid "Ascending"
msgstr ""
-#: taxonomy-list-widget.php:592
+#: taxonomy-list-widget.php:593
msgid "Descending"
msgstr ""
-#: taxonomy-list-widget.php:595
+#: taxonomy-list-widget.php:596
msgid "Term Display"
msgstr ""
-#: taxonomy-list-widget.php:598
+#: taxonomy-list-widget.php:599
msgid "Limit number of terms shown to:"
msgstr ""
-#: taxonomy-list-widget.php:600
+#: taxonomy-list-widget.php:601
msgid "<small>Enter <strong>0</strong> for no limit."
msgstr ""
-#: taxonomy-list-widget.php:604
+#: taxonomy-list-widget.php:605
msgid "Trim long term names to <em>x</em> characters:</label>"
msgstr ""
-#: taxonomy-list-widget.php:606
+#: taxonomy-list-widget.php:607
msgid "<small>Enter <strong>0</strong> to show full tag names."
msgstr ""
-#: taxonomy-list-widget.php:610
+#: taxonomy-list-widget.php:611
msgid "Indicator that term names are trimmed:"
msgstr ""
-#: taxonomy-list-widget.php:612
+#: taxonomy-list-widget.php:613
msgid "<small>Leave blank to use an elipsis (…).</small>"
msgstr ""
-#: taxonomy-list-widget.php:617
+#: taxonomy-list-widget.php:618
msgid "Include terms that aren't assigned to any objects (empty terms)."
msgstr ""
-#: taxonomy-list-widget.php:622
+#: taxonomy-list-widget.php:623
msgid "Display object (post) counts after term names."
msgstr ""
-#: taxonomy-list-widget.php:625
+#: taxonomy-list-widget.php:626
msgid "Include/Exclude Terms"
msgstr ""
-#: taxonomy-list-widget.php:628
+#: taxonomy-list-widget.php:629
msgid "Include/exclude terms:"
msgstr ""
-#: taxonomy-list-widget.php:631
+#: taxonomy-list-widget.php:632
msgid "Include only the term IDs listed below"
msgstr ""
-#: taxonomy-list-widget.php:634
+#: taxonomy-list-widget.php:635
msgid "Exclude the term IDs listed below"
msgstr ""
-#: taxonomy-list-widget.php:638
+#: taxonomy-list-widget.php:639
msgid "Term IDs to include/exclude based on above setting:"
msgstr ""
-#: taxonomy-list-widget.php:640
+#: taxonomy-list-widget.php:641
msgid "<small>Enter comma-separated list of term IDs.</small>"
msgstr ""
-#: taxonomy-list-widget.php:643
+#: taxonomy-list-widget.php:644
msgid "Advanced"
msgstr ""
-#: taxonomy-list-widget.php:646
+#: taxonomy-list-widget.php:647
msgid "Show terms assigned to at least this many posts:"
msgstr ""
-#: taxonomy-list-widget.php:648
+#: taxonomy-list-widget.php:649
msgid ""
"<small>Set to <strong>0</strong> to display all terms matching the above "
"criteria.</small>"
msgstr ""
-#: taxonomy-list-widget.php:652
+#: taxonomy-list-widget.php:653
msgid "Link relationship:"
msgstr ""
-#: taxonomy-list-widget.php:655
+#: taxonomy-list-widget.php:656
msgid "nofollow"
msgstr ""
-#: taxonomy-list-widget.php:658
+#: taxonomy-list-widget.php:659
msgid "dofollow"
msgstr ""
-#: taxonomy-list-widget.php:660
+#: taxonomy-list-widget.php:661
msgid ""
"The above setting determines whether or not search engines visit linked "
"pages from links in this widget's list."
+msgstr ""
+
+#. Plugin Name of the plugin/theme
+msgid "Taxonomy List Widget"
+msgstr ""
+
+#. Plugin URI of the plugin/theme
+msgid "https://ethitter.com/plugins/taxonomy-list-widget/"
+msgstr ""
+
+#. Description of the plugin/theme
+msgid ""
+"Creates a list of non-hierarchical taxonomies as an alternative to the term "
+"(tag) cloud. Widget provides numerous options to tailor the output to fit "
+"your site. List function can also be called directly for use outside of the "
+"widget. Formerly known as <strong><em>Tag List Widget</em></strong>."
+msgstr ""
+
+#. Author of the plugin/theme
+msgid "Erick Hitter"
+msgstr ""
+
+#. Author URI of the plugin/theme
+msgid "https://ethitter.com/"
msgstr ""
\ No newline at end of file
diff --git a/readme.txt b/readme.txt
index d545076..fbfc2c6 100755
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: ethitter
Donate link: https://ethitter.com/donate/
Tags: tag, tags, taxonomy, sidebar, widget, widgets, list
Requires at least: 2.8
-Tested up to: 5.4
+Tested up to: 5.5
Stable tag: 1.3.1
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
diff --git a/taxonomy-list-widget.php b/taxonomy-list-widget.php
index 98dc951..1c95b92 100644
--- a/taxonomy-list-widget.php
+++ b/taxonomy-list-widget.php
@@ -1,4 +1,5 @@
<?php
+// phpcs:ignoreFile -- legacy code in need of refactoring.
/*
Plugin Name: Taxonomy List Widget
Plugin URI: https://ethitter.com/plugins/taxonomy-list-widget/
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 6d972bc..e2bead5 100755
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -23,7 +23,7 @@ require_once $_tests_dir . '/includes/functions.php';
* Manually load the plugin being tested.
*/
function _manually_load_plugin() {
- require dirname( dirname( __FILE__ ) ) . '/tag-list-widget.php';
+ require dirname( dirname( __FILE__ ) ) . '/taxonomy-list-widget.php';
}
tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' );
--
GitLab