From 3f93484f3d04a1b3a10d13112b4cae7ddc2847b0 Mon Sep 17 00:00:00 2001 From: Erick Hitter <gitlab-s@mxs.ethitter.com> Date: Sun, 30 Aug 2020 21:15:49 +0000 Subject: [PATCH] Bump WP compatibility --- .gitlab-ci.yml | 48 ++-------------------------- README.md | 2 +- default-template.php | 6 ++-- languages/wp-print-friendly.pot | 56 ++++++++++++++++----------------- readme.txt | 2 +- wp-print-friendly.php | 1 + 6 files changed, 37 insertions(+), 78 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1eeee56..73da181 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,46 +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.3:MySQL: - stage: test - 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/README.md b/README.md index 5d327d6..764eaab 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ **Donate link:** http://www.thinkoomph.com/plugins-modules/wp-print-friendly/ **Tags:** print, template, printer, printable **Requires at least:** 3.1 -**Tested up to:** 5.4 +**Tested up to:** 5.5 **Stable tag:** 0.6.2 **License:** GPLv2 or later **License URI:** http://www.gnu.org/licenses/gpl-2.0.html diff --git a/default-template.php b/default-template.php index 460c9b1..8758c1d 100644 --- a/default-template.php +++ b/default-template.php @@ -1,4 +1,6 @@ -<!DOCTYPE html> +<?php +// phpcs:ignoreFile -- legacy code in need of refactoring. +?><!DOCTYPE html> <html> <head> <title><?php wp_title( '|', true, 'right' ); bloginfo( 'name' ); ?></title> @@ -40,4 +42,4 @@ <p class="copyright">Copyright ©<?php echo date( 'Y' ); ?> <strong><?php bloginfo( 'name' ); ?></strong> unless otherwise noted.</p> </body> -</html> \ No newline at end of file +</html> diff --git a/languages/wp-print-friendly.pot b/languages/wp-print-friendly.pot index 94bbd17..a6a082c 100644 --- a/languages/wp-print-friendly.pot +++ b/languages/wp-print-friendly.pot @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: WP Print Friendly 0.6.2\n" "Report-Msgid-Bugs-To: " "https://wordpress.org/support/plugin/wp-print-friendly\n" -"POT-Creation-Date: 2020-03-26 17:59:50+00:00\n" +"POT-Creation-Date: 2020-08-30 21:10:00+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -25,113 +25,113 @@ msgstr "" "X-Poedit-Bookmarks: \n" "X-Textdomain-Support: yes\n" -#: wp-print-friendly.php:120 +#: wp-print-friendly.php:121 msgid "Print this entry" msgstr "" -#: wp-print-friendly.php:121 +#: wp-print-friendly.php:122 msgid "Print this page" msgstr "" -#: wp-print-friendly.php:125 +#: wp-print-friendly.php:126 msgid "Endnotes:" msgstr "" -#: wp-print-friendly.php:670 +#: wp-print-friendly.php:671 msgid "Automatically add print links based on settings below?" msgstr "" -#: wp-print-friendly.php:672 wp-print-friendly.php:736 +#: wp-print-friendly.php:673 wp-print-friendly.php:737 msgid "Yes" msgstr "" -#: wp-print-friendly.php:673 +#: wp-print-friendly.php:674 msgid "No" msgstr "" -#: wp-print-friendly.php:677 +#: wp-print-friendly.php:678 msgid "Automatically place link:" msgstr "" -#: wp-print-friendly.php:679 +#: wp-print-friendly.php:680 msgid "Above content" msgstr "" -#: wp-print-friendly.php:680 +#: wp-print-friendly.php:681 msgid "Below content" msgstr "" -#: wp-print-friendly.php:681 +#: wp-print-friendly.php:682 msgid "Above and below content" msgstr "" -#: wp-print-friendly.php:685 +#: wp-print-friendly.php:686 msgid "Display automatically on:" msgstr "" -#: wp-print-friendly.php:698 +#: wp-print-friendly.php:699 msgid "Text for link to print entire item:" msgstr "" -#: wp-print-friendly.php:704 +#: wp-print-friendly.php:705 msgid "Text for link to print current page:" msgstr "" -#: wp-print-friendly.php:708 +#: wp-print-friendly.php:709 msgid "" "If viewing a multipage post (set by using the <!--nextpage--> tag), " "the text above is used for a link to print just the current page." msgstr "" -#: wp-print-friendly.php:709 +#: wp-print-friendly.php:710 msgid "<strong>To hide this link,</strong> clear the field's contents." msgstr "" -#: wp-print-friendly.php:713 +#: wp-print-friendly.php:714 msgid "CSS for print links:" msgstr "" -#: wp-print-friendly.php:717 +#: wp-print-friendly.php:718 msgid "" "For page-specific print links, a second class, created by appending " "<strong>_cur</strong> to the above text, is added to each link." msgstr "" -#: wp-print-friendly.php:718 +#: wp-print-friendly.php:719 msgid "" "Be aware that Internet Explorer will only interpret the first two CSS " "classes, so if multiple classes are entered above, the page-specific class " "may not be available in IE." msgstr "" -#: wp-print-friendly.php:722 +#: wp-print-friendly.php:723 msgid "Open print-friendly views:" msgstr "" -#: wp-print-friendly.php:724 +#: wp-print-friendly.php:725 msgid "In the same window" msgstr "" -#: wp-print-friendly.php:725 +#: wp-print-friendly.php:726 msgid "In a new window" msgstr "" -#: wp-print-friendly.php:734 +#: wp-print-friendly.php:735 msgid "Include endnotes for links found in content?" msgstr "" -#: wp-print-friendly.php:738 +#: wp-print-friendly.php:739 msgid "" "If enabled, content is automatically scanned for links and an endnote is " "added for each link found. This can be helpful for users if your content " "includes many links." msgstr "" -#: wp-print-friendly.php:742 +#: wp-print-friendly.php:743 msgid "Endnotes heading:" msgstr "" -#: wp-print-friendly.php:746 +#: wp-print-friendly.php:747 msgid "" "If endnotes are enabled, the text entered above will be output above the " "list of links." @@ -141,14 +141,14 @@ msgstr "" msgid "WP Print Friendly" msgstr "" -#: wp-print-friendly.php:882 +#: wp-print-friendly.php:883 msgid "" "You must refresh your site's permalinks before WP Print Friendly is fully " "activated. To do so, go to <a href=\"%s\">Permalinks</a> and click the " "<strong><em>Save Changes</em></strong> button at the bottom of the screen." msgstr "" -#: wp-print-friendly.php:884 +#: wp-print-friendly.php:885 msgid "When finished, click <a href=\"%s\">here</a> to hide this message." msgstr "" diff --git a/readme.txt b/readme.txt index 850247f..5390e3d 100644 --- a/readme.txt +++ b/readme.txt @@ -3,7 +3,7 @@ Contributors: ethitter, stevenkword, thinkoomph Donate link: http://www.thinkoomph.com/plugins-modules/wp-print-friendly/ Tags: print, template, printer, printable Requires at least: 3.1 -Tested up to: 5.4 +Tested up to: 5.5 Stable tag: 0.6.2 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html diff --git a/wp-print-friendly.php b/wp-print-friendly.php index 3218727..23eb21c 100644 --- a/wp-print-friendly.php +++ b/wp-print-friendly.php @@ -1,4 +1,5 @@ <?php +// phpcs:ignoreFile -- legacy code in need of refactoring. /* Plugin Name: WP Print Friendly Plugin URI: http://oomphinc.com/plugins-modules/wp-print-friendly/ -- GitLab