Merge branch 'develop'

.travis.yml

@@ -12,26 +12,40 @@ php:
   - 7.0
   - 7.1
   - 7.2
+  - 7.3
 
 env:
   - WP_VERSION=latest WP_MULTISITE=0
   - WP_VERSION=latest WP_MULTISITE=1
+  - WP_VERSION=nightly
+
+cache:
+  apt: true
+  directories:
+    - node_modules
+    - vendor
+    - $HOME/.composer/cache
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - php 7.3
 
 before_script:
   - bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
-  - export PATH="$HOME/.config/composer/vendor:$PATH"
-  - phpunit --version
+  - export PATH="$HOME/.composer/vendor/bin:$PATH"
   - |
     if [[ ${TRAVIS_PHP_VERSION:0:2} == "7." ]]; then
       composer global require "phpunit/phpunit:^6"
     elif [[ ${TRAVIS_PHP_VERSION:0:3} != "5.2" ]]; then
       composer global require "phpunit/phpunit:^4"
     fi
-  - $HOME/.config/composer/vendor/phpunit/phpunit/phpunit --version
+  - $HOME/.composer/vendor/bin/phpunit --version
+  - phpunit --version
 
 script:
-- phpenv config-rm xdebug.ini
-- $HOME/.config/composer/vendor/phpunit/phpunit/phpunit
+- phpenv config-rm xdebug.ini || echo "xdebug.ini does not exist"
+- phpunit
 
 before_deploy:
   - git archive -o /tmp/github-updater-${TRAVIS_TAG}.zip --prefix=github-updater/ ${TRAVIS_COMMIT}

CHANGES.md

@@ -1,5 +1,13 @@
 #### [unreleased]
 
+#### 8.6.1 / 2019-01-11
+* remove `tmp-readme.txt` after parsing, fixes [#754](https://github.com/afragen/github-updater/issues/754)
+* directly call `wp_cron()` after refreshing cache
+* update POT via `composer.json` and wp-cli
+* moved `get_file_headers()` to `trait GHU_Trait`
+* cleanup extra header key/value pairs
+* add endpoint to Bitbucket to get more than default number of tags, branches, or release assets. Fixes [#752](https://github.com/afragen/github-updater/issues/752) thanks @idpaterson
+
 #### 8.6.0 / 2018-12-28 🎂
 * add action hook `github_updater_post_rest_process_request` for @Raruto
 * add filter hook `github_updater_set_rollback_package` for @sc0ttclark and @moderntribe

README.md

@@ -8,7 +8,7 @@
 * Tags: plugin, theme, update, updater, github, bitbucket, gitlab, remote install
 * Requires at least: 4.6
 * Requires PHP: 5.6
-* Tested up to: 5.0
+* Tested up to: 5.1
 * Stable tag: [master](https://github.com/afragen/github-updater/releases/latest)
 * Donate link: <https://thefragens.com/github-updater-donate>
 * License: GPLv2 or later

composer.json

@@ -39,5 +39,10 @@
     "psr-4": {
       "Fragen\\GitHub_Updater\\": "src/GitHub_Updater/"
     }
+  },
+  "scripts": {
+    "post-update-cmd": [
+      "wp i18n make-pot . languages/github-updater.pot"
+    ]
   }
 }

github-updater.php

@@ -12,7 +12,7 @@
  * Plugin Name:       GitHub Updater
  * Plugin URI:        https://github.com/afragen/github-updater
  * Description:       A plugin to automatically update GitHub, Bitbucket, GitLab, or Gitea hosted plugins, themes, and language packs. It also allows for remote installation of plugins or themes into WordPress.
- * Version:           8.6.0
+ * Version:           8.6.1
  * Author:            Andy Fragen
  * License:           GNU General Public License v2
  * License URI:       http://www.gnu.org/licenses/gpl-2.0.html
@@ -25,6 +25,8 @@
  * Requires PHP:      5.6
  */
 
+namespace Fragen\GitHub_Updater;
+
 /*
  * Exit if called directly.
  * PHP version check and exit.
@@ -46,8 +48,6 @@
 	return false;
 }
 
-define( 'GITHUB_UPDATER_FILE', __FILE__ );
-define( 'GITHUB_UPDATER_DIR', __DIR__ );
-
 // Setup plugin loading.
 require_once __DIR__ . '/src/GitHub_Updater/Bootstrap.php';
+( new Bootstrap( __FILE__ ) )->run();

languages/github-updater.pot

@@ -1,15 +1,15 @@
-# Copyright (C) 2018 Andy Fragen
+# Copyright (C) 2019 Andy Fragen
 # This file is distributed under the same license as the GitHub Updater plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: GitHub Updater 8.6.0\n"
+"Project-Id-Version: GitHub Updater 8.6.1\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/github-updater\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2018-12-27T23:59:31+00:00\n"
+"POT-Creation-Date: 2019-01-11T17:52:58+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.1.0\n"
 "X-Domain: github-updater\n"
@@ -33,12 +33,12 @@ msgstr ""
 msgid "Andy Fragen"
 msgstr ""
 
-#: mu/ghu-loader.php:66
+#: mu/ghu-loader.php:65
 msgid "Activated as mu-plugin"
 msgstr ""
 
 #. translators: 1: minimum PHP version required, 2: Upgrade PHP URL
-#: github-updater.php:40
+#: github-updater.php:42
 msgid "GitHub Updater cannot run on PHP versions older than %1$s. <a href=\"%2$s\">Learn about upgrading your PHP.</a>"
 msgstr ""
 
@@ -157,65 +157,65 @@ msgstr ""
 msgid "Installed Plugins and Themes"
 msgstr ""
 
-#: src/GitHub_Updater/Plugin.php:326
+#: src/GitHub_Updater/Plugin.php:322
 msgid "View details"
 msgstr ""
 
 #. translators: %s: theme name
-#: src/GitHub_Updater/Theme.php:337
-#: src/GitHub_Updater/Theme.php:533
+#: src/GitHub_Updater/Theme.php:335
+#: src/GitHub_Updater/Theme.php:531
 msgid "There is a new version of %s available."
 msgstr ""
 
 #. translators: %s: theme version
-#: src/GitHub_Updater/Theme.php:349
+#: src/GitHub_Updater/Theme.php:347
 msgid "View version %s details."
 msgstr ""
 
-#: src/GitHub_Updater/Theme.php:353
+#: src/GitHub_Updater/Theme.php:351
 msgid "Automatic update is unavailable for this theme."
 msgstr ""
 
 #. translators: 1: version number, 2: closing anchor tag, 3: update URL
-#: src/GitHub_Updater/Theme.php:358
-#: src/GitHub_Updater/Theme.php:543
+#: src/GitHub_Updater/Theme.php:356
+#: src/GitHub_Updater/Theme.php:541
 msgid "View version %1$s details%2$s or %3$supdate now%2$s."
 msgstr ""
 
 #. translators: %s: theme name
-#: src/GitHub_Updater/Theme.php:363
-#: src/GitHub_Updater/Theme.php:548
+#: src/GitHub_Updater/Theme.php:361
+#: src/GitHub_Updater/Theme.php:546
 msgid "Update %s now"
 msgstr ""
 
 #. translators: 1: branch name, 2: jQuery dropdown, 3: closing tag
-#: src/GitHub_Updater/Theme.php:585
-#: src/GitHub_Updater/Base.php:896
+#: src/GitHub_Updater/Theme.php:583
+#: src/GitHub_Updater/Base.php:895
 msgid "Current branch is `%1$s`, try %2$sanother version%3$s"
 msgstr ""
 
-#: src/GitHub_Updater/Theme.php:593
+#: src/GitHub_Updater/Theme.php:591
 msgid "Choose a Version"
 msgstr ""
 
-#: src/GitHub_Updater/Theme.php:611
-#: src/GitHub_Updater/Base.php:931
+#: src/GitHub_Updater/Theme.php:609
+#: src/GitHub_Updater/Base.php:930
 msgid "No previous tags to rollback to."
 msgstr ""
 
-#: src/GitHub_Updater/Theme.php:615
+#: src/GitHub_Updater/Theme.php:613
 msgid "Install"
 msgstr ""
 
-#: src/GitHub_Updater/Base.php:449
+#: src/GitHub_Updater/Base.php:448
 msgid "There may be a problem with WP-Cron. A GitHub Updater WP-Cron event is overdue."
 msgstr ""
 
-#: src/GitHub_Updater/Base.php:907
+#: src/GitHub_Updater/Base.php:906
 msgid "Switch to branch "
 msgstr ""
 
-#: src/GitHub_Updater/Base.php:923
+#: src/GitHub_Updater/Base.php:922
 msgid "Switch to release "
 msgstr ""
 
@@ -228,57 +228,58 @@ msgstr ""
 msgid "Reset RESTful key"
 msgstr ""
 
-#: src/GitHub_Updater/Remote_Management.php:231
-msgid "Please refer to README for complete list of attributes. RESTful endpoints begin at:"
+#. translators: %s: Link to wiki
+#: src/GitHub_Updater/Remote_Management.php:235
+msgid "Please refer to the <a href=\"%s\">wiki</a> for complete list of attributes. RESTful endpoints begin at:"
 msgstr ""
 
-#: src/GitHub_Updater/Remote_Management.php:235
+#: src/GitHub_Updater/Remote_Management.php:243
 msgid "Use of Remote Management services may result increase some page load speeds only for `admin` level users in the dashboard."
 msgstr ""
 
-#: src/GitHub_Updater/API/Bitbucket_API.php:326
+#: src/GitHub_Updater/API/Bitbucket_API.php:351
 msgid "Bitbucket Private Settings"
 msgstr ""
 
-#: src/GitHub_Updater/API/Bitbucket_API.php:333
-#: src/GitHub_Updater/API/Bitbucket_API.php:421
+#: src/GitHub_Updater/API/Bitbucket_API.php:358
+#: src/GitHub_Updater/API/Bitbucket_API.php:446
 msgid "Bitbucket Username"
 msgstr ""
 
-#: src/GitHub_Updater/API/Bitbucket_API.php:342
-#: src/GitHub_Updater/API/Bitbucket_API.php:429
+#: src/GitHub_Updater/API/Bitbucket_API.php:367
+#: src/GitHub_Updater/API/Bitbucket_API.php:454
 msgid "Bitbucket Password"
 msgstr ""
 
-#: src/GitHub_Updater/API/Bitbucket_API.php:358
+#: src/GitHub_Updater/API/Bitbucket_API.php:383
 msgid "Bitbucket Private Repositories"
 msgstr ""
 
-#: src/GitHub_Updater/API/Bitbucket_API.php:388
+#: src/GitHub_Updater/API/Bitbucket_API.php:413
 msgid "Bitbucket"
 msgstr ""
 
-#: src/GitHub_Updater/API/Bitbucket_API.php:397
+#: src/GitHub_Updater/API/Bitbucket_API.php:422
 msgid "Check box if private repository. Leave unchecked for public repositories."
 msgstr ""
 
-#: src/GitHub_Updater/API/Bitbucket_API.php:404
+#: src/GitHub_Updater/API/Bitbucket_API.php:429
 msgid "Enter your personal Bitbucket username and password."
 msgstr ""
 
-#: src/GitHub_Updater/API/Bitbucket_API.php:438
+#: src/GitHub_Updater/API/Bitbucket_API.php:463
 msgid "Private Bitbucket Repository"
 msgstr ""
 
-#: src/GitHub_Updater/API/Bitbucket_API.php:454
+#: src/GitHub_Updater/API/Bitbucket_API.php:479
 msgid "Check for private Bitbucket repositories."
 msgstr ""
 
-#: src/GitHub_Updater/API/Bitbucket_API.php:469
+#: src/GitHub_Updater/API/Bitbucket_API.php:494
 msgid "Enter Bitbucket username."
 msgstr ""
 
-#: src/GitHub_Updater/API/Bitbucket_API.php:484
+#: src/GitHub_Updater/API/Bitbucket_API.php:509
 msgid "Enter Bitbucket password."
 msgstr ""