update less.php to v3.4.0

Author: dleffler

external/ExtPrograms3.csv

@@ -4,7 +4,7 @@ Doctrine Lexer,3.0.1,github.com/doctrine/lexer,3.0.1,needed by swiftmailer v6
 EmailValidator,4.0.2,github.com/egulias/EmailValidator,4.0.4,needed by swiftmailer v6; change folder structure and add autoloader to main file
 ups-php,0.2,github.com/sanbornm/ups-php,0.2,"updated/fixed xml, etc to work"
 fedex-php,31.0.0,www.fedex.com/wpor/web/jsp/drclinks.jsp?links=wss/getstarted.html,31.0.0,copy/edit RateAvailableServicesWebServiceClient.php into fedexshippingcalculator->getRates()
-Smarty,4.4.1,smarty.net,4.5.5/5.4.5,
+Smarty,4.4.1,smarty.net,4.5.5/5.5.2,
 phpthumb,1.7.23exp,github.com/JamesHeinrich/phpThumb,1.7.23,phpThumb.config.php - we also allow &amp in parsing and err command
 getid3,1.9.23,github.com/JamesHeinrich/getID3,1.9.23,
 minify,2.3.3,github.com/mrclay/minify,2.3.3/3.0.4/4.0.1,modify config.php
@@ -23,11 +23,11 @@ class.upload,2.1.6exp,github.com/verot/class.upload.php,2.1.6,"Correct flip oper
 iCalCreator,2.28.2,github.com/iCalcreator/iCalcreator,2.40.10/2.41.92,uncomment load utilities; php 8 fix
 scssphp,1.11.1exp,github.com/scssphp/scssphp,1.13.0/2.0.1,includes example server; hack to compile newui
 lessphp,0.5.0exp,github.com/leafo/lessphp,0.5.0,"will not compile bootstrap v3+, hack to allow prefix"
-less.php,5.1.2,github.com/wikimedia/less.php,5.3.1,
+less.php,5.40,github.com/wikimedia/less.php,5.4.0,
 Twitter-Bootstrap2,2.3.2,github.com/twbs/bootstrap,2.3.2,"patched bootstrap.less includes swatches, fontawesome & exp variables"
 Bootstrap3,3.4.1,github.com/twbs/bootstrap,3.4.1,patched bootstrap.less includes swatches & exp variables
 Bootstrap4,4.6.2,github.com/twbs/bootstrap,4.6.2,"patched bootstrap.scss includes swatches & exp variables, remove @page"
-Bootstrap5,5.3.7,github.com/twbs/bootstrap,5.3.7,patched bootstrap.scss includes swatches & exp variables
+Bootstrap5,5.3.8,github.com/twbs/bootstrap,5.3.8,patched bootstrap.scss includes swatches & exp variables
 popper.js/floating-ui,1.16.1,github.com/FezVrasta/popper.js,1.16.1/2.11.8,needed by BS4/BS5 (umd)
 Bootswatch2,2.3.2,bootswatch.com,2.3.2,
 Bootswatch3,3.4.1+1,bootswatch.com,3.4.1+1,change 1st line variables.less comment to output to .css file
@@ -36,7 +36,7 @@ Bootswatch5,5.3.7,bootswatch.com,5.3.7,change 1st line variables.scss comment to
 Font-Awesome3,3.2.1,fontawesome.github.com/Font-Awesome,3.2.1,updated FontAwesomePath in variables.less
 Font-Awesome4,4.7.0,fontawesome.github.com/Font-Awesome,4.7.0,
 Font-Awesome5,5.15.4,fontawesome.com,5.15.4,add import all 'fonts' sheets into main sheet
-Font-Awesome6,6.7.2,fontawesome.com,6.7.2,add import all 'fonts' sheets into main sheet
+Font-Awesome6,6.7.2,fontawesome.com,6.7.2/7.0.0,add import all 'fonts' sheets into main sheet
 Bootstrap-Icons,1.13.1,icons.getbootstrap.com,1.13.1,"patched bootstrap-icons.scss for custom folder structure, includes animation & size variables"
 Adminer,4.8.1exp,www.adminer.org,4.8.4evo,"customized plugins: tinymce, ckeditor, previewSerialized, edit-textarea & edit-calendar; edit sql tweak"
 SimpleAjaxUploader,2.6.7,github.com/LPology/Simple-Ajax-Uploader,2.6.7,also converted to yui module 2.5.3
@@ -50,7 +50,7 @@ html5shiv,3.7.3,github.com/aFarkas/html5shiv,3.7.3,IE6-8 shim
 csshover.htc,3.11,peterned.home.xs4all.nl/csshover.html,3.11,IE6 shim
 CKEditor,4.21.0,ckeditor.com,4.22.1/45.2.0,"add fieldinsert (exp), autosave, sourcedialog & kama and moono skins"
 TinyMCE,4.9.11,tiny.cloud,4.9.11,"add localautosave, fieldinsert (exp) & quickupload (exp) plugins, & xenmce skin"
-TinyMCE v5,5.10.9,tiny.cloud,5.10.9/6.8.6/7.9.1,"add localautosave, fieldinsert (exp) & quickupload (exp) plugins"
+TinyMCE v5,5.10.9,tiny.cloud,5.10.9/6.8.6/8.0.2,"add localautosave, fieldinsert (exp) & quickupload (exp) plugins"
 PLUpload,2.3.9,github.com/moxiecode/plupload,2.3.9/3.1.5,"needed for TinyMCE Quick Upload, placed in that plugin folder"
 elFinder,2.1.65,elfinder.org,2.1.65,customized in /framework with Exponent php classes and .js files
 jQuery1,1.12.4,jquery.com,1.12.4,v1.11.3 still needed for old firefox
@@ -64,7 +64,7 @@ validate,1.21.0exp,jqueryvalidation.org,1.21.0,edit for 'undefined' in 'min' & '
 Countdown,1.1,tutorialzine.com/2011/12/countdown-jquery,1.1,
 timepicker,1.6.3,trentrichardson.com/examples/timepicker,1.6.3,used by adminer
 TimeCircles,1.5.3,github.com/wimbarelds/TimeCircles,1.5.3,
-DataTables,2.3.2,www.datatables.net,1.13.8/2.3.2,includes boostrap2 integration w/ renamed 1.10.7 version
+DataTables,2.3.3,www.datatables.net,1.13.8/2.3.3,includes boostrap2 integration w/ renamed 1.10.7 version
 DataTables Checkboxes,1.3.0,github.com/gyrocode/jquery-datatables-checkboxes,1.3.0,
 DataTables Tabletools,2.2.4,www.datatables.net,2.2.4,replaced by 'Buttons' in 1.10.8
 Responsive DataTables,0.2.0,github.com/Comanche/datatables-responsive,0.2.0,replaced by 'Responsive' in 1.10.8
@@ -78,7 +78,7 @@ Searcher,0.3.0,github.com/lloiser/jquery-searcher,0.3.0,
 DateTimePicker,2.5.21exp,github.com/xdan/datetimepicker,2.5.21,rename .full version; we add .js auto-close on inline date select and extra 'reset' work & remove .css z-index issue
 Bootstrap DateTimePicker,4.17.49,github.com/Eonasdan/bootstrap-datetimepicker,4.17.49,"patch for 'today' button in side-by-side view, modded version placed in bootstrap4theme & bootstrap5theme to help yadcf"
 Tempus Dominus Bootstrap 4,5.39.0,github.com/tempusdominus/bootstrap-4,5.39.0,
-Tempus Dominus Bootstrap 5,6.10.2,github.com/Eonasdan/tempus-dominus,6.10.4,added .inline z-index style; scss change @use color
+Tempus Dominus Bootstrap 5,6.10.4,github.com/Eonasdan/tempus-dominus,6.10.4,added .inline z-index style; scss change @use color
 moment.js,2.30.1,github.com/moment/moment,2.30.1,needed for Bootstrap DateTimePicker; min/moment-with-locales.js renamed
 strength-meter,1.1.4,github.com/kartik-v/strength-meter,1.1.4,
 Sortable,1.15.6,github.com/SortableJS/Sortable,1.15.6,
@@ -95,21 +95,21 @@ select2,4.0.13,github.com/select2/select2,4.0.13,renamed select2.full.js to sele
 shuffle.js,v3.1.1,github.com/glen-cheney/Shuffle,4.2.0/5.4.1/6.1.2,
 Jasny Bootstrap2,2.3.1,jasny.github.io/bootstrap,2.3.1,only using bootstrap-fileupload at this time
 Jasny Bootstrap,4.0.0,jasny.github.io/bootstrap,4.0.0,only using fileinput at this time
-easypost sdk,7.4.2,github.com/EasyPost/easypost-php,8.2.0,
+easypost sdk,8.2.0,github.com/EasyPost/easypost-php,8.2.0,
 jquery.cookie.js,1.4.1,github.com/carhartl/jquery-cookie,1.4.1,
 jquery.history.js,1.8b2,github.com/browserstate/history.js,1.8.0,
 Webshim,1.16.0,github.com/aFarkas/webshim,1.16.0,
 ,,,,
 "Optional, not included",,,,
 dompdf,3.0.1exp/1.2.2exp,github.com/dompdf/dompdf,3.1.0,"optional, patched to display our images and not break on bad tables and disable links"
-mPDF,8.2.5,github.com/mpdf/mpdf,8.2.5,optional
+mPDF,8.2.5,github.com/mpdf/mpdf,8.2.6,optional
 HTML2PDF,5.2.8,github.com/spipu/html2pdf,5.3.3,"optional, we tweak tcpdfConfig.php"
 iLess,2.2.0,github.com/mishal/iless,2.2.0,"optional, has issues with bootstrap v2"
 Kint,1.1/2.2/6.0.1,github.com/kint-php/kint,6.0.1,"optional, for formatted edebug output"
 ,,,,
 Not included yet,,,,
-DataTables Buttons,,www.datatables.net,2.4.2/3.2.3,
-DataTables Responsive,,www.datatables.net,2.5.0/3.0.4,
+DataTables Buttons,,www.datatables.net,2.4.2/3.2.4,
+DataTables Responsive,,www.datatables.net,2.5.0/3.0.6,
 ,,,,
 No longer included,,,,
 pwstrength-bootstrap,2.0.0,github.com/ablanco/jquery.pwstrength.bootstrap,,

external/less.php/CHANGES.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v5.4.0
+
+Added:
+* Add support for Logical Functions `if()` and `boolean()`. (Hannah Okwelum) [T393383](https://phabricator.wikimedia.org/T393383)
+
+Changed:
+* Remove support for PHP 7.4 and 8.0. Raise requirement to PHP 8.1+. (James D. Forrester)
+
 ## v5.3.1
 
 Fixed:

external/less.php/README.md

@@ -48,6 +48,7 @@ _See also [SECURITY](./SECURITY.md)._
 * **[Icinga](https://en.wikipedia.org/wiki/Icinga)** in Icinga Web ([docs](https://github.com/Icinga/icingaweb2)).
 * **[Shopware](https://de.wikipedia.org/wiki/Shopware)** ([docs](https://developers.shopware.com/designers-guide/less/)).
 * **[Winter CMS](https://wintercms.com/)** ([docs](https://wintercms.com/docs/v1.2/docs/themes/development))
+* **[Flarum](https://en.wikipedia.org/wiki/Flarum)** ([docs](https://docs.flarum.org/themes/))
 
 ## Integrations
 

external/less.php/lib/Less/Autoloader.php

@@ -5,16 +5,14 @@
  */
 class Less_Autoloader {
 
-	/** @var bool */
-	protected static $registered = false;
+	protected static bool $registered = false;
 
 	/**
 	 * Register the autoloader in the SPL autoloader
 	 *
-	 * @return void
 	 * @throws Exception If there was an error in registration
 	 */
-	public static function register() {
+	public static function register(): void {
 		if ( self::$registered ) {
 			return;
 		}
@@ -28,10 +26,8 @@ public static function register() {
 
 	/**
 	 * Unregister the autoloader
-	 *
-	 * @return void
 	 */
-	public static function unregister() {
+	public static function unregister(): void {
 		spl_autoload_unregister( [ __CLASS__, 'loadClass' ] );
 		self::$registered = false;
 	}
@@ -41,17 +37,16 @@ public static function unregister() {
 	 *
 	 * @param string $className The class to load
 	 */
-	public static function loadClass( $className ) {
+	public static function loadClass( string $className ): void {
 		// handle only package classes
-		if ( strpos( $className, 'Less_' ) !== 0 ) {
+		if ( !str_starts_with( $className, 'Less_' ) ) {
 			return;
 		}
 
 		$className = substr( $className, 5 );
 		$fileName = __DIR__ . DIRECTORY_SEPARATOR . str_replace( '_', DIRECTORY_SEPARATOR, $className ) . '.php';
 
 		require $fileName;
-		return true;
 	}
 
 }

external/less.php/lib/Less/Cache.php

@@ -147,7 +147,7 @@ public static function Cache( &$less_files, $parser_options = [] ) {
 		foreach ( $less_files as $file_path => $uri_or_less ) {
 
 			// treat as less markup if there are newline characters
-			if ( strpos( $uri_or_less, "\n" ) !== false ) {
+			if ( str_contains( $uri_or_less, "\n" ) ) {
 				$parser->Parse( $uri_or_less );
 				continue;
 			}
@@ -236,7 +236,7 @@ public static function CleanCache( $dir = null ) {
 		foreach ( $files as $file ) {
 
 			// don't delete if the file wasn't created with less.php
-			if ( strpos( $file, self::$prefix ) !== 0 ) {
+			if ( !str_starts_with( $file, self::$prefix ) ) {
 				continue;
 			}
 

external/less.php/lib/Less/Exception/Chunk.php

@@ -32,6 +32,7 @@ public function __construct( $input, ?Exception $previous = null, $index = null,
 
 		$this->Chunks();
 		$this->genMessage();
+		$this->getFinalMessage();
 	}
 
 	/**

external/less.php/lib/Less/Exception/Parser.php

@@ -19,6 +19,9 @@ class Less_Exception_Parser extends Exception {
 	 */
 	public $index;
 
+	/** @var string */
+	public $finalMessage = '';
+
 	/** @var string|null */
 	protected $input;
 
@@ -49,14 +52,14 @@ protected function getInput() {
 	 */
 	public function genMessage() {
 		if ( $this->currentFile && $this->currentFile['filename'] ) {
-			$this->message .= ' in ' . basename( $this->currentFile['filename'] );
+			$this->finalMessage .= ' in ' . basename( $this->currentFile['filename'] );
 		}
 
 		if ( $this->index !== null ) {
 			$this->getInput();
 			if ( $this->input ) {
 				$line = self::getLineNumber();
-				$this->message .= ' on line ' . $line . ', column ' . self::getColumn();
+				$this->finalMessage .= ' on line ' . $line . ', column ' . self::getColumn();
 
 				$lines = explode( "\n", $this->input );
 
@@ -65,7 +68,7 @@ public function genMessage() {
 				$last_line = min( $count, $start_line + 6 );
 				$num_len = strlen( $last_line );
 				for ( $i = $start_line; $i < $last_line; $i++ ) {
-					$this->message .= "\n" . str_pad( (string)( $i + 1 ), $num_len, '0', STR_PAD_LEFT ) . '| ' . $lines[$i];
+					$this->finalMessage .= "\n" . str_pad( (string)( $i + 1 ), $num_len, '0', STR_PAD_LEFT ) . '| ' . $lines[$i];
 				}
 			}
 		}
@@ -78,12 +81,7 @@ public function genMessage() {
 	 */
 	public function getLineNumber() {
 		if ( $this->index ) {
-			// https://bugs.php.net/bug.php?id=49790
-			if ( ini_get( "mbstring.func_overload" ) ) {
-				return substr_count( substr( $this->input, 0, $this->index ), "\n" ) + 1;
-			} else {
-				return substr_count( $this->input, "\n", 0, $this->index ) + 1;
-			}
+			return substr_count( $this->input, "\n", 0, $this->index ) + 1;
 		}
 		return 1;
 	}
@@ -99,4 +97,7 @@ public function getColumn() {
 		return $this->index - $pos;
 	}
 
+	public function getFinalMessage() {
+		$this->message .= $this->finalMessage;
+	}
 }

external/less.php/lib/Less/Functions.php

@@ -1388,4 +1388,13 @@ private function colorBlendNegation( $cb, $cs ) {
 
 	// ~ End of Color Blending
 
+	public function if( $condition, $trueValue, $falseValue = null ) {
+		return $condition->compile( $this->env ) ? $trueValue->compile( $this->env )
+		  : ( $falseValue ? $falseValue->compile( $this->env ) : new Less_Tree_Anonymous( '' ) );
+	}
+
+	public function boolean( $condition ) {
+		return $condition ? new Less_Tree_Keyword( 'true' ) : new Less_Tree_Keyword( 'false' );
+	}
+
 }

external/less.php/lib/Less/Output.php

@@ -25,15 +25,6 @@ public function add( $chunk, $fileInfo = null, $index = 0, $mapLines = null ) {
 		$this->strs[] = $chunk;
 	}
 
-	/**
-	 * Is the output empty?
-	 *
-	 * @return bool
-	 */
-	public function isEmpty() {
-		return count( $this->strs ) === 0;
-	}
-
 	/**
 	 * Converts the output to string
 	 *