Release 4.0.0-rc7

FortAwesome · Jan 17, 2019 · 5f411b6 · 5f411b6
1 parent 4eb9366
commit 5f411b6
Show file tree

Hide file tree

Showing 22 changed files with 131 additions and 124 deletions.
diff --git 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
@@ -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
@@ -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-2058459170"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-285201401"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-2058459170" class="accordion-body collapse in">
+            <div id="namespace-285201401" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
 
@@ -1548,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 14th, 2018 at 22:42.
+                    on January 17th, 2019 at 14:31.
                 </section>
             </section>
         </section>

diff --git a/docs/classes/FontAwesome_Config_Controller.html b/docs/classes/FontAwesome_Config_Controller.html
@@ -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-36309681"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1809662297"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-36309681" class="accordion-body collapse in">
+            <div id="namespace-1809662297" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
 
@@ -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 14th, 2018 at 22:42.
+                    on January 17th, 2019 at 14:31.
                 </section>
             </section>
         </section>

diff --git a/docs/classes/FontAwesome_Release_Provider.html b/docs/classes/FontAwesome_Release_Provider.html
@@ -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-1983356033"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-478209715"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1983356033" class="accordion-body collapse in">
+            <div id="namespace-478209715" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
 
@@ -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 14th, 2018 at 22:42.
+                    on January 17th, 2019 at 14:31.
                 </section>
             </section>
         </section>

diff --git a/docs/files/font-awesome.html b/docs/files/font-awesome.html
@@ -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-1912333534"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1836472796"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1912333534" class="accordion-body collapse in">
+            <div id="namespace-1836472796" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
 
@@ -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-rc6
+                    <p>Version:           4.0.0-rc7
 Author:            Font Awesome
 Author URI:        <a href="https://fontawesome.com/">https://fontawesome.com/</a>
 License:           GPLv2 (or later)
@@ -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 14th, 2018 at 22:42.
+                    on January 17th, 2019 at 14:31.
                 </section>
             </section>
         </section>

diff --git 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
@@ -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-882287080"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-314375491"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-882287080" class="accordion-body collapse in">
+            <div id="namespace-314375491" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
 
@@ -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 14th, 2018 at 22:42.
+                    on January 17th, 2019 at 14:31.
                 </section>
             </section>
         </section>

diff --git a/docs/files/includes.class-fontawesome-release-provider.html b/docs/files/includes.class-fontawesome-release-provider.html
@@ -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-1990320946"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1677789558"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1990320946" class="accordion-body collapse in">
+            <div id="namespace-1677789558" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
 
@@ -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 14th, 2018 at 22:42.
+                    on January 17th, 2019 at 14:31.
                 </section>
             </section>
         </section>

diff --git a/docs/files/includes.class-fontawesome.html b/docs/files/includes.class-fontawesome.html
@@ -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-1346529369"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-816985014"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1346529369" class="accordion-body collapse in">
+            <div id="namespace-816985014" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
 
@@ -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 14th, 2018 at 22:42.
+                    on January 17th, 2019 at 14:31.
                 </section>
             </section>
         </section>

diff --git 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,23 +228,23 @@ class FontAwesome_Release_Provider {
 				)
 			);
 		} catch ( GuzzleHttp\Exception\ClientException $e ) {
-			$this->_status = array_merge(
+			$this->status = array_merge(
 				$init_status,
 				array(
 					'code'    => $e->getCode(),
 					'message' => 'Whoops, we could not update the releases data from the Font Awesome server.',
 				)
 			);
 		} catch ( Exception $e ) {
-			$this->_status = array_merge(
+			$this->status = array_merge(
 				$init_status,
 				array(
 					'code'    => 0,
 					'message' => 'Whoops, we failed to update the releases data.',
 				)
 			);
 		} 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;
 			}
 		}
 	}