Issue #4969 Added support for FontAwesome v6

e107_handlers/e_parse_class.php

@@ -4027,7 +4027,7 @@ class e_parse
 
 			case "fa":
 			default:
-				if ($this->fontawesome === 5)
+				if ($this->fontawesome === 5 || $this->fontawesome === 6)
 				{
 					$fab = e107::getMedia()->getGlyphs('fab');
 					$fas = e107::getMedia()->getGlyphs('fas');

e107_handlers/library_manager.php

@@ -1003,6 +1003,85 @@ class core_library
 		);
 
 
+		// Font-Awesome 6 (local).
+		$libraries['fontawesome6'] = array(
+			'name'              => 'Font-Awesome 6 (local)',
+			'vendor_url'        => 'https://fontawesome.com/',
+			'version_arguments' => array(
+				'file'    => 'css/all.css',
+				'pattern' => '/(\d\.\d*\.\d+)/',
+				'lines'   => 3,
+			),
+			'files'             => array(
+				'js'  => array(
+					'js/all.min.js' => array(
+						'zone' => 2,
+						'type' => 'footer',
+						'defer' => true,
+					),
+					'js/v4-shims.min.js' => array(
+						'zone' => 2,
+						'type' => 'footer',
+						'defer' => true,
+					),
+				),
+				'css' => array(
+					'css/all.min.css' => array(
+						'zone' => 2,
+					),
+					'css/v4-shims.min.css' => array(
+						'zone' => 2,
+					),
+				),
+			),
+
+			'variants'          => array(),
+			'library_path'      => '{e_WEB}lib/font-awesome',
+			'path'              => '6',
+			'version'           => '6.2.1',
+
+		);
+
+
+	// Font-Awesome 6 (CDN).
+		$libraries['cdn.fontawesome6'] = array(
+			'name'              => 'Font-Awesome 6 (CDN)',
+			'vendor_url'        => 'https://fontawesome.com/',
+			'version_arguments' => array(
+				'file'    => 'css/all.css',
+				'pattern' => '/(\d\.\d*\.\d+)/',
+				'lines'   => 2,
+			),
+			'files'             => array(
+				'js'  => array(
+					'js/all.min.js' => array(
+						'zone' => 2,
+						'type' => 'footer',
+						'defer' => true,
+					),
+					'js/v4-shims.min.js' => array(
+						'zone' => 2,
+						'type' => 'footer',
+						'defer' => true,
+					),
+				),
+				'css' => array(
+					'css/all.min.css' => array(
+						'zone' => 2,
+					),
+					'css/v4-shims.min.css' => array(
+						'zone' => 2,
+					),
+				),
+			),
+			'variants'          => array(),
+			// Override library path to CDN.
+			'library_path'      => 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.2.1',
+			'path'              => '',
+			'version'           => '6.2.1',
+		);
+
+
 
 		// Animate (local).
 		$libraries['animate.css'] = array(

e107_tests/tests/unit/e_themeTest.php

@@ -65,7 +65,7 @@ class e_themeTest extends \Codeception\Test\Unit
 					'fontawesome' =>
 						array(
 							'name'    => 'fontawesome',
-							'version' => '5',
+							'version' => '6',
 						),
 				)
 			),
@@ -82,7 +82,7 @@ class e_themeTest extends \Codeception\Test\Unit
 					'fontawesome'        =>
 						array(
 							'name'    => 'fontawesome',
-							'version' => '5',
+							'version' => '6',
 						),
 					'bootstrap.editable' =>
 						array(
@@ -104,7 +104,7 @@ class e_themeTest extends \Codeception\Test\Unit
 					'fontawesome'        =>
 						array(
 							'name'    => 'fontawesome',
-							'version' => '5',
+							'version' => '6',
 						),
 					'bootstrap.editable' =>
 						array(
@@ -281,8 +281,8 @@ class e_themeTest extends \Codeception\Test\Unit
 				array(
 					'css' =>
 						array(
-							0 => '{e_WEB}lib/font-awesome/5/css/all.min.css',
-							1 => '{e_WEB}lib/font-awesome/5/css/v4-shims.min.css',
+							0 => '{e_WEB}lib/font-awesome/6/css/all.min.css',
+							1 => '{e_WEB}lib/font-awesome/6/css/v4-shims.min.css',
 						),
 
 				),
@@ -310,8 +310,8 @@ class e_themeTest extends \Codeception\Test\Unit
 				array(
 					'css' =>
 						array(
-							0 => '{e_WEB}lib/font-awesome/5/css/all.min.css',
-							1 => '{e_WEB}lib/font-awesome/5/css/v4-shims.min.css',
+							0 => '{e_WEB}lib/font-awesome/6/css/all.min.css',
+							1 => '{e_WEB}lib/font-awesome/6/css/v4-shims.min.css',
 						),
 
 				),
@@ -376,12 +376,12 @@ class e_themeTest extends \Codeception\Test\Unit
 			0 => array(
 				'theme'    => 'front',
 				'scope'    => 'front',
-				'expected' => ['bootstrap', 'fontawesome5']
+				'expected' => ['bootstrap', 'fontawesome6']
 			),
 			1 => array(
 				'theme'    => 'front',
 				'scope'    => 'admin',
-				'expected' => ['bootstrap', 'fontawesome5', 'bootstrap.editable']
+				'expected' => ['bootstrap', 'fontawesome6', 'bootstrap.editable']
 			),
 			2 => array(
 				'theme'    => '_blank',
@@ -424,7 +424,7 @@ class e_themeTest extends \Codeception\Test\Unit
 					1 =>
 						array(
 							'name'    => 'fontawesome',
-							'version' => '5',
+							'version' => '6',
 							'scope'   => 'front,admin,wysiwyg',
 						),
 					2 =>
@@ -448,7 +448,7 @@ class e_themeTest extends \Codeception\Test\Unit
 					1 =>
 						array(
 							'name'    => 'fontawesome',
-							'version' => '5',
+							'version' => '6',
 							'scope'   => 'front,admin,wysiwyg',
 						),
 					2 =>
@@ -633,7 +633,7 @@ class e_themeTest extends \Codeception\Test\Unit
 				    1 =>
 				    array (
 				      'name' => 'fontawesome',
-				      'version' => '5',
+				      'version' => '6',
 				      'scope' => 'front,admin,wysiwyg',
 				    ),
 				    2 =>

e107_tests/tests/unit/plugins/tinymce4/wysiwygTest.php

@@ -45,8 +45,8 @@ class wysiwygTest extends \Codeception\Test\Unit
 		$tests = array(
 			'bootstrap3' => array(
 				0 => '/e107_web/lib/bootstrap/3/css/bootstrap.min.css',
-				1 => '/e107_web/lib/font-awesome/5/css/all.min.css',
-				2 => '/e107_web/lib/font-awesome/5/css/v4-shims.min.css',
+				1 => '/e107_web/lib/font-awesome/6/css/all.min.css',
+				2 => '/e107_web/lib/font-awesome/6/css/v4-shims.min.css',
 				3 => '/e107_web/lib/animate.css/animate.min.css',
 				4 => '/e107_plugins/tinymce4/editor.css',
 			),

e107_themes/bootstrap3/theme.xml

@@ -20,7 +20,7 @@
 	</screenshots>
 	<libraries>
 		<library name="bootstrap" version="3" scope="front,admin,wysiwyg"/>
-		<library name="fontawesome" version="5"  scope="front,admin,wysiwyg"/>
+		<library name="fontawesome" version="6"  scope="front,admin,wysiwyg"/>
 		<library name="bootstrap.editable" scope="admin"/>
 	</libraries>
 	<stylesheets>

e107_web/lib/font-awesome/6/LICENSE.txt

@@ -0,0 +1,165 @@
+Fonticons, Inc. (https://fontawesome.com)
+
+--------------------------------------------------------------------------------
+
+Font Awesome Free License
+
+Font Awesome Free is free, open source, and GPL friendly. You can use it for
+commercial projects, open source projects, or really almost whatever you want.
+Full Font Awesome Free license: https://fontawesome.com/license/free.
+
+--------------------------------------------------------------------------------
+
+# Icons: CC BY 4.0 License (https://creativecommons.org/licenses/by/4.0/)
+
+The Font Awesome Free download is licensed under a Creative Commons
+Attribution 4.0 International License and applies to all icons packaged
+as SVG and JS file types.
+
+--------------------------------------------------------------------------------
+
+# Fonts: SIL OFL 1.1 License
+
+In the Font Awesome Free download, the SIL OFL license applies to all icons
+packaged as web and desktop font files.
+
+Copyright (c) 2022 Fonticons, Inc. (https://fontawesome.com)
+with Reserved Font Name: "Font Awesome".
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+SIL OPEN FONT LICENSE
+Version 1.1 - 26 February 2007
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting — in part or in whole — any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+
+--------------------------------------------------------------------------------
+
+# Code: MIT License (https://opensource.org/licenses/MIT)
+
+In the Font Awesome Free download, the MIT license applies to all non-font and
+non-icon files.
+
+Copyright 2022 Fonticons, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in the
+Software without restriction, including without limitation the rights to use, copy,
+modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so, subject to the
+following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+--------------------------------------------------------------------------------
+
+# Attribution
+
+Attribution is required by MIT, SIL OFL, and CC BY licenses. Downloaded Font
+Awesome Free files already contain embedded comments with sufficient
+attribution, so you shouldn't need to do anything additional when using these
+files normally.
+
+We've kept attribution comments terse, so we ask that you do not actively work
+to remove them from files, especially code. They're a great way for folks to
+learn about Font Awesome.
+
+--------------------------------------------------------------------------------
+
+# Brand Icons
+
+All brand icons are trademarks of their respective owners. The use of these
+trademarks does not indicate endorsement of the trademark holder by Font
+Awesome, nor vice versa. **Please do not use brand logos for any purpose except
+to represent the company, product, or service to which they refer.**