From 5f411b63a2cd484e4269a3870cfab46706c1a38d Mon Sep 17 00:00:00 2001 From: Mike Wilkerson Date: Thu, 17 Jan 2019 06:41:01 -0800 Subject: [PATCH] Release 4.0.0-rc7 --- DEVELOPMENT.md | 2 +- admin/package.json | 2 +- docs/classes/FontAwesome.html | 6 +- .../FontAwesome_Config_Controller.html | 6 +- .../classes/FontAwesome_Release_Provider.html | 6 +- docs/files/font-awesome.html | 8 +-- docs/files/font-awesome.php.txt | 2 +- ...s.class-fontawesome-config-controller.html | 6 +- ...es.class-fontawesome-release-provider.html | 6 +- docs/files/includes.class-fontawesome.html | 6 +- ...class-fontawesome-release-provider.php.txt | 58 +++++++++---------- docs/files/includes/class-fontawesome.php.txt | 16 ++--- docs/graphs/class.html | 2 +- docs/graphs/classes.svg | 32 +++++----- docs/index.html | 6 +- docs/namespaces/default.html | 6 +- docs/reports/deprecated.html | 2 +- docs/reports/errors.html | 18 +++--- docs/reports/markers.html | 52 ++++++++--------- font-awesome.php | 2 +- includes/class-fontawesome.php | 2 +- readme.txt | 9 ++- 22 files changed, 131 insertions(+), 124 deletions(-) diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index e26d17344..e7fa8f4d7 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -380,7 +380,7 @@ $ composer dist This will delete the `vendor` directory, and previous build assets, and will re-install the composer bundle in production mode (`--no-dev --prefer-dist`) and produce the following: -`wp-dist/`: the contents of this directory should be move into the svn repo for the WordPress plugin +`wp-dist/`: the contents of this directory should be moved into the svn repo for the WordPress plugin that will be published through the WordPress plugins directory. `font-awesome.zip`: a zip file of the contents of `wp-dist` with path names fixed up. diff --git a/admin/package.json b/admin/package.json index f9463e33a..d00dc5d81 100644 --- a/admin/package.json +++ b/admin/package.json @@ -1,6 +1,6 @@ { "name": "font-awesome-admin", - "version": "4.0.0-rc6", + "version": "4.0.0-rc7", "private": true, "dependencies": { "@babel/core": "7.1.0", diff --git a/docs/classes/FontAwesome.html b/docs/classes/FontAwesome.html index c52384f60..b90ae4c64 100644 --- a/docs/classes/FontAwesome.html +++ b/docs/classes/FontAwesome.html @@ -136,10 +136,10 @@
- + \
-
+
@@ -1548,7 +1548,7 @@

Documentation is powered by phpDocumentor and authored - on December 14th, 2018 at 22:42. + on January 17th, 2019 at 14:31.
diff --git a/docs/classes/FontAwesome_Config_Controller.html b/docs/classes/FontAwesome_Config_Controller.html index 35af6229f..582928b75 100644 --- a/docs/classes/FontAwesome_Config_Controller.html +++ b/docs/classes/FontAwesome_Config_Controller.html @@ -136,10 +136,10 @@
- + \
-
+
@@ -374,7 +374,7 @@

Documentation is powered by phpDocumentor and authored - on December 14th, 2018 at 22:42. + on January 17th, 2019 at 14:31.
diff --git a/docs/classes/FontAwesome_Release_Provider.html b/docs/classes/FontAwesome_Release_Provider.html index 5efac5926..68097e0d4 100644 --- a/docs/classes/FontAwesome_Release_Provider.html +++ b/docs/classes/FontAwesome_Release_Provider.html @@ -136,10 +136,10 @@
- + \
-
+
@@ -629,7 +629,7 @@

Documentation is powered by phpDocumentor and authored - on December 14th, 2018 at 22:42. + on January 17th, 2019 at 14:31.
diff --git a/docs/files/font-awesome.html b/docs/files/font-awesome.html index 8dfe4e28d..bdd3bc2ae 100644 --- a/docs/files/font-awesome.html +++ b/docs/files/font-awesome.html @@ -136,10 +136,10 @@
- + \
-
+
@@ -167,7 +167,7 @@

font-awesome.php

Plugin Name: Font Awesome Plugin URI: https://fontawesome.com/how-to-use/on-the-web/using-with/wordpress Description: Adds Font Awesome 5 icons to your WordPress site. Supports Font Awesome Pro. Resolves conflicts across many plugins or themes that use Font Awesome.

-

Version: 4.0.0-rc6 +

Version: 4.0.0-rc7 Author: Font Awesome Author URI: https://fontawesome.com/ License: GPLv2 (or later) @@ -287,7 +287,7 @@

Documentation is powered by phpDocumentor and authored - on December 14th, 2018 at 22:42. + on January 17th, 2019 at 14:31.
diff --git a/docs/files/font-awesome.php.txt b/docs/files/font-awesome.php.txt index 0404847c4..c7b7351d8 100644 --- a/docs/files/font-awesome.php.txt +++ b/docs/files/font-awesome.php.txt @@ -3,7 +3,7 @@ * Plugin Name: Font Awesome * Plugin URI: https://fontawesome.com/how-to-use/on-the-web/using-with/wordpress * Description: Adds Font Awesome 5 icons to your WordPress site. Supports Font Awesome Pro. Resolves conflicts across many plugins or themes that use Font Awesome. - * Version: 4.0.0-rc6 + * Version: 4.0.0-rc7 * Author: Font Awesome * Author URI: https://fontawesome.com/ * License: GPLv2 (or later) diff --git a/docs/files/includes.class-fontawesome-config-controller.html b/docs/files/includes.class-fontawesome-config-controller.html index 3c1e905cf..66da63710 100644 --- a/docs/files/includes.class-fontawesome-config-controller.html +++ b/docs/files/includes.class-fontawesome-config-controller.html @@ -136,10 +136,10 @@
- + \
-
+
@@ -251,7 +251,7 @@

Documentation is powered by phpDocumentor and authored - on December 14th, 2018 at 22:42. + on January 17th, 2019 at 14:31.
diff --git a/docs/files/includes.class-fontawesome-release-provider.html b/docs/files/includes.class-fontawesome-release-provider.html index 3bea72f50..a14d2c2c7 100644 --- a/docs/files/includes.class-fontawesome-release-provider.html +++ b/docs/files/includes.class-fontawesome-release-provider.html @@ -136,10 +136,10 @@
- + \
-
+
@@ -297,7 +297,7 @@

Documentation is powered by phpDocumentor and authored - on December 14th, 2018 at 22:42. + on January 17th, 2019 at 14:31.
diff --git a/docs/files/includes.class-fontawesome.html b/docs/files/includes.class-fontawesome.html index e19f732dd..dd8c53270 100644 --- a/docs/files/includes.class-fontawesome.html +++ b/docs/files/includes.class-fontawesome.html @@ -136,10 +136,10 @@
- + \
-
+
@@ -311,7 +311,7 @@

Documentation is powered by phpDocumentor and authored - on December 14th, 2018 at 22:42. + on January 17th, 2019 at 14:31.
diff --git a/docs/files/includes/class-fontawesome-release-provider.php.txt b/docs/files/includes/class-fontawesome-release-provider.php.txt index a5dbf4e42..470efa97c 100644 --- a/docs/files/includes/class-fontawesome-release-provider.php.txt +++ b/docs/files/includes/class-fontawesome-release-provider.php.txt @@ -43,38 +43,38 @@ class FontAwesome_Release_Provider { /** * @ignore */ - protected $_releases = null; + protected $releases = null; // phpcs:ignore Generic.Commenting.DocComment.MissingShort /** * @ignore */ - protected $_status = null; + protected $status = null; // phpcs:ignore Generic.Commenting.DocComment.MissingShort /** * @ignore */ - protected $_api_client = null; + protected $api_client = null; // phpcs:ignore Generic.Commenting.DocComment.MissingShort /** * @ignore */ - protected static $_instance = null; + protected static $instance = null; // phpcs:ignore Generic.Commenting.DocComment.MissingShort /** * @ignore */ - protected static $_handler = null; + protected static $handler = null; // phpcs:ignore Generic.Commenting.DocComment.MissingShort /** * @ignore */ public static function set_handler( $handler ) { - self::$_handler = $handler; + self::$handler = $handler; } /** @@ -83,10 +83,10 @@ class FontAwesome_Release_Provider { * @return FontAwesome_Release_Provider */ public static function instance() { - if ( is_null( self::$_instance ) ) { - self::$_instance = new self(); + if ( is_null( self::$instance ) ) { + self::$instance = new self(); } - return self::$_instance; + return self::$instance; } /** @@ -96,7 +96,7 @@ class FontAwesome_Release_Provider { * @return FontAwesome_Release_Provider */ public static function reset() { - self::$_instance = null; + self::$instance = null; return self::instance(); } @@ -121,7 +121,7 @@ class FontAwesome_Release_Provider { * @return array|null */ public function get_status() { - return $this->_status; + return $this->status; } /** @@ -136,15 +136,15 @@ class FontAwesome_Release_Provider { // You can set any number of default request options. 'timeout' => 2.0, ); - if ( self::$_handler ) { - $client_params['handler'] = self::$_handler; + if ( self::$handler ) { + $client_params['handler'] = self::$handler; } - $this->_api_client = new Client( $client_params ); + $this->api_client = new Client( $client_params ); $cached_releases = get_transient( self::RELEASES_TRANSIENT ); if ( $cached_releases ) { - $this->_releases = $cached_releases; + $this->releases = $cached_releases; } } @@ -175,9 +175,9 @@ class FontAwesome_Release_Provider { ); try { - $response = $this->_api_client->get( 'api/releases' ); + $response = $this->api_client->get( 'api/releases' ); - $this->_status = array_merge( + $this->status = array_merge( $init_status, array( 'code' => $response->getStatusCode(), @@ -207,9 +207,9 @@ class FontAwesome_Release_Provider { throw new Exception(); } - $this->_releases = $releases; + $this->releases = $releases; } catch ( GuzzleHttp\Exception\ConnectException $e ) { - $this->_status = array_merge( + $this->status = array_merge( $init_status, array( 'code' => $e->getCode(), @@ -219,7 +219,7 @@ class FontAwesome_Release_Provider { ) ); } catch ( GuzzleHttp\Exception\ServerException $e ) { - $this->_status = array_merge( + $this->status = array_merge( $init_status, array( 'code' => $e->getCode(), @@ -228,7 +228,7 @@ class FontAwesome_Release_Provider { ) ); } catch ( GuzzleHttp\Exception\ClientException $e ) { - $this->_status = array_merge( + $this->status = array_merge( $init_status, array( 'code' => $e->getCode(), @@ -236,7 +236,7 @@ class FontAwesome_Release_Provider { ) ); } catch ( Exception $e ) { - $this->_status = array_merge( + $this->status = array_merge( $init_status, array( 'code' => 0, @@ -244,7 +244,7 @@ class FontAwesome_Release_Provider { ) ); } catch ( \Error $e ) { - $this->_status = array_merge( + $this->status = array_merge( $init_status, array( 'code' => 0, @@ -301,24 +301,24 @@ class FontAwesome_Release_Provider { * @return array */ protected function releases() { - if ( $this->_releases ) { - return $this->_releases; + if ( $this->releases ) { + return $this->releases; } else { $cached_releases = get_transient( self::RELEASES_TRANSIENT ); if ( $cached_releases ) { return $cached_releases; - } elseif ( is_null( $this->_releases ) ) { + } elseif ( is_null( $this->releases ) ) { $this->load_releases(); // TODO: consider adding retry logic for loading Font Awesome releases. - if ( is_null( $this->_releases ) ) { + if ( is_null( $this->releases ) ) { throw new FontAwesome_NoReleasesException(); } else { - return $this->_releases; + return $this->releases; } } else { - return $this->_releases; + return $this->releases; } } } diff --git a/docs/files/includes/class-fontawesome.php.txt b/docs/files/includes/class-fontawesome.php.txt index 0ec87a6ff..1f298ab2b 100644 --- a/docs/files/includes/class-fontawesome.php.txt +++ b/docs/files/includes/class-fontawesome.php.txt @@ -101,7 +101,7 @@ if ( ! class_exists( 'FontAwesome' ) ) : /** * The version of this WordPress plugin. */ - const PLUGIN_VERSION = '4.0.0-rc6'; + const PLUGIN_VERSION = '4.0.0-rc7'; /** * The version of this plugin's REST API. * @@ -126,7 +126,7 @@ if ( ! class_exists( 'FontAwesome' ) ) : * * @since 4.0.0 */ - const RESOURCE_HANDLE = 'font-awesome'; + const RESOURCE_HANDLE = 'font-awesome-official'; /** * The handle used when enqueuing the v4shim, when it is included in the load specification. * @@ -134,7 +134,7 @@ if ( ! class_exists( 'FontAwesome' ) ) : * * @see FontAwesome::load_spec() */ - const RESOURCE_HANDLE_V4SHIM = 'font-awesome-v4shim'; + const RESOURCE_HANDLE_V4SHIM = 'font-awesome-official-v4shim'; // phpcs:ignore Generic.Commenting.DocComment.MissingShort /** @@ -167,7 +167,7 @@ if ( ! class_exists( 'FontAwesome' ) ) : /** * @ignore */ - protected static $_instance = null; + protected static $instance = null; // phpcs:ignore Generic.Commenting.DocComment.MissingShort /** @@ -214,10 +214,10 @@ if ( ! class_exists( 'FontAwesome' ) ) : * @return FontAwesome */ public static function instance() { - if ( is_null( self::$_instance ) ) { - self::$_instance = new self(); + if ( is_null( self::$instance ) ) { + self::$instance = new self(); } - return self::$_instance; + return self::$instance; } // phpcs:ignore Generic.Commenting.DocComment.MissingShort @@ -654,7 +654,7 @@ if ( ! class_exists( 'FontAwesome' ) ) : * @return FontAwesome */ public static function reset() { - self::$_instance = null; + self::$instance = null; return fa(); } diff --git a/docs/graphs/class.html b/docs/graphs/class.html index 209ef9b1b..6ebf12773 100644 --- a/docs/graphs/class.html +++ b/docs/graphs/class.html @@ -152,7 +152,7 @@

Documentation is powered by phpDocumentor and authored - on December 14th, 2018 at 22:42. + on January 17th, 2019 at 14:31.
diff --git a/docs/graphs/classes.svg b/docs/graphs/classes.svg index e3cd90a94..cb76a0a9b 100644 --- a/docs/graphs/classes.svg +++ b/docs/graphs/classes.svg @@ -14,35 +14,35 @@ Global - - -\\FontAwesome_Release_Provider - -FontAwesome_Release_Provider - - + \\FontAwesome - -FontAwesome + +FontAwesome - + \\FontAwesome_Config_Controller - -FontAwesome_Config_Controller + +FontAwesome_Config_Controller \\WP_REST_Controller - -\WP_REST_Controller + +\WP_REST_Controller \\FontAwesome_Config_Controller->\\WP_REST_Controller - - + + + + + +\\FontAwesome_Release_Provider + +FontAwesome_Release_Provider diff --git a/docs/index.html b/docs/index.html index 54ab118c2..f2df3bc5c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -88,10 +88,10 @@
- + \
-
+
@@ -323,7 +323,7 @@

Documentation is powered by phpDocumentor and authored - on December 14th, 2018 at 22:42. + on January 17th, 2019 at 14:31.
diff --git a/docs/namespaces/default.html b/docs/namespaces/default.html index 54ec64442..eed135245 100644 --- a/docs/namespaces/default.html +++ b/docs/namespaces/default.html @@ -88,10 +88,10 @@
- + \
-
+
@@ -323,7 +323,7 @@

Documentation is powered by phpDocumentor and authored - on December 14th, 2018 at 22:42. + on January 17th, 2019 at 14:31.
diff --git a/docs/reports/deprecated.html b/docs/reports/deprecated.html index a3a883e9a..c9c43d8ab 100644 --- a/docs/reports/deprecated.html +++ b/docs/reports/deprecated.html @@ -142,7 +142,7 @@

Documentation is powered by phpDocumentor and authored - on December 14th, 2018 at 22:42. + on January 17th, 2019 at 14:31.
diff --git a/docs/reports/errors.html b/docs/reports/errors.html index a628cbe19..b6c34d1f7 100644 --- a/docs/reports/errors.html +++ b/docs/reports/errors.html @@ -89,8 +89,8 @@ +
  • includes/class-fontawesome-release-provider.php
    • +
    @@ -100,6 +100,12 @@ +
    +
    +
    +
    +
    +

    @@ -126,12 +132,6 @@

    -
    -
    -
    -
    -
    -
    @@ -171,7 +171,7 @@

    Documentation is powered by phpDocumentor and authored - on December 14th, 2018 at 22:42. + on January 17th, 2019 at 14:31.
    diff --git a/docs/reports/markers.html b/docs/reports/markers.html index 6917f0f26..85806822e 100644 --- a/docs/reports/markers.html +++ b/docs/reports/markers.html @@ -88,9 +88,9 @@
    @@ -103,29 +103,7 @@
    -
    - -

    - - includes/class-fontawesome-release-provider.php - 1 -

    -
    - - - - - - - - - - - -
    TypeLineDescription
    TODO314consider adding retry logic for loading Font Awesome releases.
    -
    -
    -
    +

    @@ -183,6 +161,28 @@

    +
    +
    + +

    + + includes/class-fontawesome-release-provider.php + 1 +

    +
    + + + + + + + + + + + +
    TypeLineDescription
    TODO314consider adding retry logic for loading Font Awesome releases.
    +
    @@ -224,7 +224,7 @@

    Documentation is powered by phpDocumentor and authored - on December 14th, 2018 at 22:42. + on January 17th, 2019 at 14:31.
    diff --git a/font-awesome.php b/font-awesome.php index 3f033c718..3c8bbcbf6 100644 --- a/font-awesome.php +++ b/font-awesome.php @@ -3,7 +3,7 @@ * Plugin Name: Font Awesome * Plugin URI: https://fontawesome.com/how-to-use/on-the-web/using-with/wordpress * Description: Adds Font Awesome 5 icons to your WordPress site. Supports Font Awesome Pro. Resolves conflicts across many plugins or themes that use Font Awesome. - * Version: 4.0.0-rc6 + * Version: 4.0.0-rc7 * Author: Font Awesome * Author URI: https://fontawesome.com/ * License: GPLv2 (or later) diff --git a/includes/class-fontawesome.php b/includes/class-fontawesome.php index 800c37f0c..041569a62 100644 --- a/includes/class-fontawesome.php +++ b/includes/class-fontawesome.php @@ -101,7 +101,7 @@ class FontAwesome { /** * The version of this WordPress plugin. */ - const PLUGIN_VERSION = '4.0.0-rc6'; + const PLUGIN_VERSION = '4.0.0-rc7'; /** * The version of this plugin's REST API. * diff --git a/readme.txt b/readme.txt index 33dc54dfb..468038da2 100644 --- a/readme.txt +++ b/readme.txt @@ -1,6 +1,6 @@ === Font Awesome === Contributors: fontawesome, mlwilkerson, robmadole, rachelbaker -Stable tag: 4.0.0-rc6 +Stable tag: 4.0.0-rc7 Tags: font, awesome, fontawesome, font-awesome, icon, svg, webfont Requires at least: 4.7 Tested up to: 5.0 @@ -144,6 +144,8 @@ If you've been a user of previous versions of this plugin, you'll eventually nee We've tried to smooth the upgrade path for you by keeping that shortcode compatible with Font Awesome 3 names you're used to, while magically transforming them into their Font Awesome 5 equivalents on the fly. You'll still need to change your icon shortcodes in pages, posts, and templates. But our upgrade magic gives you some cushion to take a more leisurely pace. We plan to remove version 3 naming support, and the magic, from this plugin in upcoming releases, though, so don't wait too long! +Note that this automatic translation of version 3 icon names to version 5 icon names will only occur where you've used the `[icon]` shortcode. If you've directly used `` tags to reference version 3 icons, like ``, you'll need to manually revise those to use version 5 names. + == See Also == The [README](https://github.com/FortAwesome/wordpress-fontawesome/blob/master/README.md) on GitHub has some more details for WordPress site owners and developers. @@ -184,6 +186,11 @@ Find the Font Awesome admin settings page either under the "Settings" menu on th == Changelog == += 4.0.0-rc7 = + +* Fix detection and removal of unregistered clients by changing the internal resource name this plugin uses to enqueue its resource. + Change it to something unlikely to be used by other themes or plugins. + = 4.0.0-rc6 = * Fix error when updating options on admin page: handle null releaseProviderStatus in cases where the release provider