Skip to content

Commit

Permalink
Release 4.0.0-rc4
Browse files Browse the repository at this point in the history
  • Loading branch information
@mlwilkerson
mlwilkerson committed Dec 12, 2018
1 parent a106f3f commit f94dc28
Show file tree
Hide file tree
Showing 19 changed files with 96 additions and 48 deletions.
2 changes: 1 addition & 1 deletion admin/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "font-awesome-admin",
"version": "4.0.0-rc3",
"version": "4.0.0-rc4",
"private": true,
"dependencies": {
"@babel/core": "7.1.0",
Expand Down
31 changes: 28 additions & 3 deletions docs/classes/FontAwesome.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@
<div class="accordion" style="margin-bottom: 0">
<div class="accordion-group">
<div class="accordion-heading">
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1336861184"></a>
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1752333421"></a>
<a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
</div>
<div id="namespace-1336861184" class="accordion-body collapse in">
<div id="namespace-1752333421" class="accordion-body collapse in">
<div class="accordion-inner">


Expand Down Expand Up @@ -794,6 +794,11 @@ <h3 class="public ">get_latest_version()</h3>



<h4>Throws</h4>
<dl>
<dt>\FontAwesome_NoReleasesException</dt>
<dd></dd>
</dl>

<h4>Returns</h4>
null|string
Expand Down Expand Up @@ -830,6 +835,11 @@ <h3 class="public ">get_latest_semver()</h3>
<p>Example: if the latest version is &quot;5.5.0&quot;, this function returns &quot;~5.5.0&quot;</p>


<h4>Throws</h4>
<dl>
<dt>\FontAwesome_NoReleasesException</dt>
<dd></dd>
</dl>

<h4>Returns</h4>
null|string
Expand Down Expand Up @@ -868,6 +878,11 @@ <h3 class="public ">get_previous_version()</h3>
this function returns &quot;5.4.1&quot;.</p>


<h4>Throws</h4>
<dl>
<dt>\FontAwesome_NoReleasesException</dt>
<dd></dd>
</dl>

<h4>Returns</h4>
null|string
Expand Down Expand Up @@ -904,6 +919,11 @@ <h3 class="public ">get_previous_semver()</h3>
this function returns &quot;~5.4.1&quot;.</p>


<h4>Throws</h4>
<dl>
<dt>\FontAwesome_NoReleasesException</dt>
<dd></dd>
</dl>

<h4>Returns</h4>
null|string
Expand Down Expand Up @@ -942,6 +962,11 @@ <h3 class="public ">get_available_versions()</h3>
this function returns &quot;~5.4.1&quot;.</p>


<h4>Throws</h4>
<dl>
<dt>\FontAwesome_NoReleasesException</dt>
<dd></dd>
</dl>

<h4>Returns</h4>
null|string
Expand Down Expand Up @@ -1523,7 +1548,7 @@ <h1><i class="icon-pushpin"></i></h1>
<section class="span10 offset1">
<hr />
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
on December 12th, 2018 at 20:56.
on December 12th, 2018 at 22:24.
</section>
</section>
</section>
Expand Down
6 changes: 3 additions & 3 deletions docs/classes/FontAwesome_Config_Controller.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@
<div class="accordion" style="margin-bottom: 0">
<div class="accordion-group">
<div class="accordion-heading">
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1187355295"></a>
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-620267867"></a>
<a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
</div>
<div id="namespace-1187355295" class="accordion-body collapse in">
<div id="namespace-620267867" class="accordion-body collapse in">
<div class="accordion-inner">


Expand Down Expand Up @@ -374,7 +374,7 @@ <h1><i class="icon-pushpin"></i></h1>
<section class="span10 offset1">
<hr />
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
on December 12th, 2018 at 20:56.
on December 12th, 2018 at 22:24.
</section>
</section>
</section>
Expand Down
6 changes: 3 additions & 3 deletions docs/classes/FontAwesome_Release_Provider.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@
<div class="accordion" style="margin-bottom: 0">
<div class="accordion-group">
<div class="accordion-heading">
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-401230549"></a>
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1133980411"></a>
<a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
</div>
<div id="namespace-401230549" class="accordion-body collapse in">
<div id="namespace-1133980411" class="accordion-body collapse in">
<div class="accordion-inner">


Expand Down Expand Up @@ -629,7 +629,7 @@ <h1><i class="icon-pushpin"></i></h1>
<section class="span10 offset1">
<hr />
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
on December 12th, 2018 at 20:56.
on December 12th, 2018 at 22:24.
</section>
</section>
</section>
Expand Down
8 changes: 4 additions & 4 deletions docs/files/font-awesome.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@
<div class="accordion" style="margin-bottom: 0">
<div class="accordion-group">
<div class="accordion-heading">
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1463580744"></a>
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1540729442"></a>
<a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
</div>
<div id="namespace-1463580744" class="accordion-body collapse in">
<div id="namespace-1540729442" class="accordion-body collapse in">
<div class="accordion-inner">


Expand Down Expand Up @@ -167,7 +167,7 @@ <h1><small></small>font-awesome.php</h1>
<p><em>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.</em></p>
<p>Version: 4.0.0-rc3
<p>Version: 4.0.0-rc4
Author: Font Awesome
Author URI: <a href="https://fontawesome.com/">https://fontawesome.com/</a>
License: GPLv2 (or later)
Expand Down Expand Up @@ -287,7 +287,7 @@ <h1><i class="icon-pushpin"></i></h1>
<section class="span10 offset1">
<hr />
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
on December 12th, 2018 at 20:56.
on December 12th, 2018 at 22:24.
</section>
</section>
</section>
Expand Down
12 changes: 6 additions & 6 deletions docs/files/font-awesome.php.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-rc3
* Version: 4.0.0-rc4
* Author: Font Awesome
* Author URI: https://fontawesome.com/
* License: GPLv2 (or later)
Expand All @@ -14,18 +14,18 @@

defined( 'WPINC' ) || die;

if ( ! function_exists( 'font_awesome_official_handle_fatal_error' ) ) {
if ( ! function_exists( 'font_awesome_handle_fatal_error' ) ) {
/**
* Handle fatal errors
*
* @ignore
*/
function font_awesome_official_handle_fatal_error( $message = null ) {
function font_awesome_handle_fatal_error( $message = null ) {
add_action(
'admin_notices',
function () use ( $message ) {
?>
<div class="error"><p>The Font Awesome plugin has experienced some fatal error
<div class="error"><p>The Font Awesome plugin has experienced a fatal error
<?php
if ( ! is_null( $message ) ) {
echo esc_html( ": $message" );
Expand Down Expand Up @@ -81,9 +81,9 @@ if ( ! defined( 'FONT_AWESOME_OFFICIAL_LOADED' ) ) {
define( 'FONT_AWESOME_OFFICIAL_LOADED', 1 );
fa()->run();
} catch ( Exception $e ) {
font_awesome_official_handle_fatal_error( $e->getMessage() );
font_awesome_handle_fatal_error( $e->getMessage() );
} catch ( Error $e ) {
font_awesome_official_handle_fatal_error( $e->getMessage() );
font_awesome_handle_fatal_error( $e->getMessage() );
}
}

6 changes: 3 additions & 3 deletions docs/files/includes.class-fontawesome-config-controller.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@
<div class="accordion" style="margin-bottom: 0">
<div class="accordion-group">
<div class="accordion-heading">
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-343159668"></a>
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-734499122"></a>
<a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
</div>
<div id="namespace-343159668" class="accordion-body collapse in">
<div id="namespace-734499122" class="accordion-body collapse in">
<div class="accordion-inner">


Expand Down Expand Up @@ -251,7 +251,7 @@ <h1><i class="icon-pushpin"></i></h1>
<section class="span10 offset1">
<hr />
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
on December 12th, 2018 at 20:56.
on December 12th, 2018 at 22:24.
</section>
</section>
</section>
Expand Down
6 changes: 3 additions & 3 deletions docs/files/includes.class-fontawesome-release-provider.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@
<div class="accordion" style="margin-bottom: 0">
<div class="accordion-group">
<div class="accordion-heading">
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-313078076"></a>
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-996367623"></a>
<a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
</div>
<div id="namespace-313078076" class="accordion-body collapse in">
<div id="namespace-996367623" class="accordion-body collapse in">
<div class="accordion-inner">


Expand Down Expand Up @@ -297,7 +297,7 @@ <h1><i class="icon-pushpin"></i></h1>
<section class="span10 offset1">
<hr />
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
on December 12th, 2018 at 20:56.
on December 12th, 2018 at 22:24.
</section>
</section>
</section>
Expand Down
6 changes: 3 additions & 3 deletions docs/files/includes.class-fontawesome.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@
<div class="accordion" style="margin-bottom: 0">
<div class="accordion-group">
<div class="accordion-heading">
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1432744935"></a>
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-861109787"></a>
<a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
</div>
<div id="namespace-1432744935" class="accordion-body collapse in">
<div id="namespace-861109787" class="accordion-body collapse in">
<div class="accordion-inner">


Expand Down Expand Up @@ -311,7 +311,7 @@ <h1><i class="icon-pushpin"></i></h1>
<section class="span10 offset1">
<hr />
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
on December 12th, 2018 at 20:56.
on December 12th, 2018 at 22:24.
</section>
</section>
</section>
Expand Down
19 changes: 16 additions & 3 deletions docs/files/includes/class-fontawesome.php.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ require_once trailingslashit( FONTAWESOME_DIR_PATH ) . 'includes/class-fontaweso
require_once trailingslashit( FONTAWESOME_DIR_PATH ) . 'includes/class-fontawesome-config-controller.php';
require_once trailingslashit( FONTAWESOME_DIR_PATH ) . 'includes/class-fontawesome-v3deprecation-controller.php';
require_once trailingslashit( FONTAWESOME_DIR_PATH ) . 'includes/class-fontawesome-v3mapper.php';
require_once trailingslashit( FONTAWESOME_DIR_PATH ) . 'includes/class-fontawesome-noreleasesexception.php';
require_once ABSPATH . 'wp-admin/includes/screen.php';

use Composer\Semver\Semver;
Expand Down Expand Up @@ -100,7 +101,7 @@ if ( ! class_exists( 'FontAwesome' ) ) :
/**
* The version of this WordPress plugin.
*/
const PLUGIN_VERSION = '4.0.0-rc3';
const PLUGIN_VERSION = '4.0.0-rc4';
/**
* The version of this plugin's REST API.
*
Expand Down Expand Up @@ -254,10 +255,17 @@ if ( ! class_exists( 'FontAwesome' ) ) :

try {
$fa->load();
} catch ( FontAwesome_NoReleasesException $e ) {
font_awesome_handle_fatal_error(
'Sorry, your WordPress server was unable to contact the Font Awesome server to retrieve available ' .
'releases data. Most likely, just re-loading this page to get it try again should work. But if you\'re running ' .
'WordPress offline, from an airplane, or in some other way that blocks your WordPress server from reaching ' .
'fontawesome.com, then that will block you from proceeding until you can connect successfully.'
);
} catch ( Exception $e ) {
font_awesome_official_handle_fatal_error( $e->getMessage() );
font_awesome_handle_fatal_error( $e->getMessage() );
} catch ( Error $e ) {
font_awesome_official_handle_fatal_error( $e->getMessage() );
font_awesome_handle_fatal_error( $e->getMessage() );
}
},
10,
Expand Down Expand Up @@ -378,6 +386,7 @@ if ( ! class_exists( 'FontAwesome' ) ) :
*
* @since 4.0.0
*
* @throws FontAwesome_NoReleasesException
* @return null|string
*/
public function get_latest_version() {
Expand All @@ -392,6 +401,7 @@ if ( ! class_exists( 'FontAwesome' ) ) :
*
* @since 4.0.0
*
* @throws FontAwesome_NoReleasesException
* @link https://getcomposer.org/doc/articles/versions.md
* @return null|string
*/
Expand All @@ -407,6 +417,7 @@ if ( ! class_exists( 'FontAwesome' ) ) :
*
* @since 4.0.0
*
* @throws FontAwesome_NoReleasesException
* @return null|string
*/
public function get_previous_version() {
Expand All @@ -421,6 +432,7 @@ if ( ! class_exists( 'FontAwesome' ) ) :
*
* @since 4.0.0
*
* @throws FontAwesome_NoReleasesException
* @link https://getcomposer.org/doc/articles/versions.md
* @return null|string
*/
Expand All @@ -436,6 +448,7 @@ if ( ! class_exists( 'FontAwesome' ) ) :
*
* @since 4.0.0
*
* @throws FontAwesome_NoReleasesException
* @see FontAwesome_Release_Provider::versions()
* @return null|string
*/
Expand Down
2 changes: 1 addition & 1 deletion docs/graphs/class.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ <h1><i class="icon-pushpin"></i></h1>
<section class="span10 offset1">
<hr />
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
on December 12th, 2018 at 20:56.
on December 12th, 2018 at 22:24.
</section>
</section>
</section>
Expand Down
6 changes: 3 additions & 3 deletions docs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@
<div class="accordion" style="margin-bottom: 0">
<div class="accordion-group">
<div class="accordion-heading">
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1754191010"></a>
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1142633133"></a>
<a href="namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
</div>
<div id="namespace-1754191010" class="accordion-body collapse in">
<div id="namespace-1142633133" class="accordion-body collapse in">
<div class="accordion-inner">


Expand Down Expand Up @@ -323,7 +323,7 @@ <h1><i class="icon-pushpin"></i></h1>
<section class="span10 offset1">
<hr />
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
on December 12th, 2018 at 20:56.
on December 12th, 2018 at 22:24.
</section>
</section>
</section>
Expand Down
Loading

0 comments on commit f94dc28

Please sign in to comment.