Merge branch 'release-3.0' into removemw

.github/workflows/php.yml

@@ -35,6 +35,7 @@ jobs:
         php ./vendor/simplemachines/build-tools/check-eof.php
         php ./vendor/simplemachines/build-tools/check-smf-license.php
         php ./vendor/simplemachines/build-tools/check-smf-languages.php
+        php ./vendor/simplemachines/build-tools/check-smf-index.php
         php ./vendor/simplemachines/build-tools/check-version.php
 
   lint:

.gitignore

@@ -23,6 +23,9 @@ Themes/default/scripts/minified_deferred*.js
 custom_avatar/
 !custom_avatar/index.php
 !custom_avatar/blank.png
+Sources/Unicode/*.php
+!Sources/Unicode/index.php
+!Sources/Unicode/Utf8String.php
 
 # Compiled source #
 ###################
@@ -73,5 +76,6 @@ Themes/default/scripts/minified.js
 Themes/default/css/minified.css
 upgrade-helper.php
 .vscode/
-
-vendor/
+.php-cs-fixer.cache
+vendor/
+.phplint-cache

.php-cs-fixer.dist.php

@@ -0,0 +1,192 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2023 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 1
+ */
+
+$finder = (new PhpCsFixer\Finder())
+	->in(__DIR__)
+	// Don't touch libraries.
+	->exclude([
+		'cache',
+		'other',
+		'Packages',
+		'Smileys',
+		'Sources/minify',
+		'Sources/random_compat',
+		'Sources/ReCaptcha',
+		'Themes',
+	])
+	// Skip all index.php files and ssi_example.php.
+	->notName(['index.php', 'ssi_examples.php'])
+	// Skip anything being ignored in .gitignore.
+	->ignoreVCSIgnored(true);
+
+return (new PhpCsFixer\Config())
+	->setRules([
+		'@PSR12' => true,
+
+		// PSR12 overrides.
+		'no_closing_tag' => false,
+		'no_break_comment' => false,  // A bit buggy with comments.
+		'statement_indentation' => false, // A bit buggy with comments.
+
+		// Array notation.
+		'array_syntax' => ['syntax' => 'short'],
+		'normalize_index_brace' => true,
+		'whitespace_after_comma_in_array' => true,
+
+		// Basic.
+		'no_trailing_comma_in_singleline' => true,
+
+		// Casing.
+		'class_reference_name_casing' => true,
+
+		// Cast notation.
+		'cast_spaces' => ['space' => 'single'],
+
+		// Control structure.
+		'include' => true,
+		'no_superfluous_elseif' => true,
+		'no_useless_else' => true,
+		'simplified_if_return' => true,
+		'trailing_comma_in_multiline' => [
+			'after_heredoc' => true,
+			'elements' => [
+				'arguments',
+				'arrays',
+				'match',
+				'parameters',
+			],
+		],
+
+		// Function notation.
+		'lambda_not_used_import' => true,
+		'nullable_type_declaration_for_default_null_value' => true,
+
+		// Import.
+		'no_unused_imports' => true,
+		'ordered_imports' => [
+			'imports_order' => [
+				'class',
+				'function',
+				'const',
+			],
+			'sort_algorithm' => 'alpha',
+		],
+
+		// Language construct.
+		'combine_consecutive_issets' => true,
+		'combine_consecutive_unsets' => true,
+		'nullable_type_declaration' => ['syntax' => 'question_mark'],
+
+		// Namespace notation.
+		'no_leading_namespace_whitespace' => true,
+
+		// Operator.
+		'concat_space' => ['spacing' => 'one'],
+		'operator_linebreak' => [
+			'only_booleans' => true,
+			'position' => 'beginning',
+		],
+		'standardize_not_equals' => true,
+		'ternary_to_null_coalescing' => true,
+
+		// PHPDoc.
+		'phpdoc_indent' => true,
+		'phpdoc_line_span' => [
+			'const' => 'multi',
+			'property' => 'multi',
+			'method' => 'multi',
+		],
+		'phpdoc_no_access' => true,
+		'phpdoc_no_useless_inheritdoc' => true,
+		'phpdoc_order' => [
+			'order' => [
+				'param',
+				'throws',
+				'return',
+			],
+		],
+		'phpdoc_no_empty_return' => true,
+		'phpdoc_param_order' => true,
+		'phpdoc_scalar' => [
+			'types' => [
+				'boolean',
+				'callback',
+				'double',
+				'integer',
+				'real',
+				'str',
+			],
+		],
+		'phpdoc_to_comment' => [
+			'ignored_tags' => ['todo'],
+		],
+		'phpdoc_trim_consecutive_blank_line_separation' => true,
+		'phpdoc_types' => [
+			'groups' => ['alias', 'meta', 'simple'],
+		],
+		'phpdoc_var_without_name' => true,
+
+		// Return notation.
+		'no_useless_return' => true,
+		'simplified_null_return' => true,
+
+		// Semicolon.
+		'multiline_whitespace_before_semicolons' => true,
+		'no_empty_statement' => true,
+		'no_singleline_whitespace_before_semicolons' => true,
+
+		// String notation.
+		'explicit_string_variable' => true,
+		'simple_to_complex_string_variable' => true,
+		'single_quote' => true,
+
+		// Whitespace.
+		'array_indentation' => true,
+		'blank_line_before_statement' => [
+			'statements' => [
+				'case',
+				'continue',
+				'declare',
+				'default',
+				'do',
+				'exit',
+				'for',
+				'foreach',
+				'goto',
+				'if',
+				'include',
+				'include_once',
+				'require',
+				'require_once',
+				'return',
+				'switch',
+				'throw',
+				'try',
+				'while',
+				'yield',
+				'yield_from',
+			],
+		],
+		'heredoc_indentation' => ['indentation' => 'start_plus_one'],
+		'method_chaining_indentation' => true,
+		'no_spaces_around_offset' => [
+			'positions' => ['inside', 'outside'],
+		],
+		'type_declaration_spaces' => [
+			'elements' => ['function', 'property'],
+		],
+	])
+	->setIndent("\t")
+	->setFinder($finder);
+
+?>

Packages/backups/index.php

@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 

Packages/index.php

@@ -1,17 +1,8 @@
 <?php
 
-/**
- * This file is here solely to protect your Packages directory.
- */
-
-// Look for Settings.php....
-if (file_exists(dirname(dirname(__FILE__)) . '/Settings.php'))
-{
-	// Found it!
-	require(dirname(dirname(__FILE__)) . '/Settings.php');
-	header('location: ' . $boardurl);
-}
-// Can't find it... just forget it.
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 

SSI.php

@@ -29,14 +29,12 @@
  * @version 3.0 Alpha 1
  */
 
-// Don't do anything if SMF is already loaded.
-if (defined('SMF'))
-	return true;
-
-define('SMF', 'SSI');
+if (!defined('SMF')) {
+	define('SMF', 'SSI');
+}
 
 // Initialize.
-require_once(__DIR__ . '/index.php');
+require_once __DIR__ . '/index.php';
 
 $ssi = new SMF\ServerSideIncludes();
 $ssi->execute();

Smileys/alienine/index.php

@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 

Smileys/fugue/index.php

@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 

Smileys/index.php

@@ -1,17 +1,8 @@
 <?php
 
-/**
- * This file is here solely to protect your Smileys directory.
- */
-
-// Look for Settings.php....
-if (file_exists(dirname(dirname(__FILE__)) . '/Settings.php'))
-{
-	// Found it!
-	require(dirname(dirname(__FILE__)) . '/Settings.php');
-	header('location: ' . $boardurl);
-}
-// Can't find it... just forget it.
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;