style(coding-standard): 移除严格类型声明并调整代码格式

- 将 .php-cs-fixer.dist.php 中的 declare_strict_types 设置为 false - 从所有 PHP 类文件中移除 declare(strict_types=1) 声明 - 在 CompilerBase.php 中添加缺失的空行以改善代码可读性 - 恢复 Translator.php 中关于 noLiteralStrings 的原始配置逻辑
7 months ago · 2c90437a99
parent 0e4a332519
commit 2c90437a99
25 changed files with 5 additions and 51 deletions
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@ -23,7 +23,7 @@ return (new PhpCsFixer\Config())
        'concat_space'                                     => ['spacing' => 'one'],
        'constant_case'                                    => ['case' => 'lower'],
        'combine_consecutive_unsets'                       => true,
-        'declare_strict_types'                             => true,
+        'declare_strict_types'                             => false,
        'fully_qualified_strict_types'                     => ['phpdoc_tags' => []],
        'general_phpdoc_annotation_remove'                 => ['annotations' => ['author']],
        'header_comment'                                   => ['comment_type' => 'PHPDoc', 'header' => $header, 'location' => 'after_open', 'separate' => 'bottom'],
--- a/src/Php/ArgInfo.php
+++ b/src/Php/ArgInfo.php
@ -6,8 +6,6 @@
 * @contact  service@swoole.com
 */

-declare(strict_types=1);
-
 namespace PhpAot\Php;

 class ArgInfo
--- a/src/Php/AstNodeType.php
+++ b/src/Php/AstNodeType.php
@ -6,8 +6,6 @@
 * @contact  service@swoole.com
 */

-declare(strict_types=1);
-
 namespace PhpAot\Php;

 use PhpParser\Node;
--- a/src/Php/ClassDef.php
+++ b/src/Php/ClassDef.php
@ -6,8 +6,6 @@
 * @contact  service@swoole.com
 */

-declare(strict_types=1);
-
 namespace PhpAot\Php;

 class ClassDef extends ClassLikeDef
--- a/src/Php/ClassLikeDef.php
+++ b/src/Php/ClassLikeDef.php
@ -6,8 +6,6 @@
 * @contact  service@swoole.com
 */

-declare(strict_types=1);
-
 namespace PhpAot\Php;

 class ClassLikeDef
--- a/src/Php/CompilerBase.php
+++ b/src/Php/CompilerBase.php
@ -6,8 +6,6 @@
 * @contact  service@swoole.com
 */

-declare(strict_types=1);
-
 namespace PhpAot\Php;

 use League\CLImate\CLImate;
@ -54,6 +52,7 @@ class CompilerBase extends \PhpAot\Core\Translator
    public const string LITERAL_STRINGS = '_literal_strings';

    public const string CLASS_ENTRY_MAP = 'class_entry_map';
+
    public const string FUNC_MAP = 'func_map';

    public const string EXPR_VARIABLE = 'Expr_Variable';
@ -86,7 +85,9 @@ class CompilerBase extends \PhpAot\Core\Translator
     * @var array<string, int>
     */
    protected array $classMap = [];
+
    protected int $funcIndex = 0;
+
    protected array $funcMap = [];

    protected array $zendTypeMap = [
--- a/src/Php/ConstantDef.php
+++ b/src/Php/ConstantDef.php
@ -6,8 +6,6 @@
 * @contact  service@swoole.com
 */

-declare(strict_types=1);
-
 namespace PhpAot\Php;

 class ConstantDef
--- a/src/Php/Constants.php
+++ b/src/Php/Constants.php
@ -6,8 +6,6 @@
 * @contact  service@swoole.com
 */

-declare(strict_types=1);
-
 namespace PhpAot\Php;

 class Constants
--- a/src/Php/Encryptor.php
+++ b/src/Php/Encryptor.php
@ -6,8 +6,6 @@
 * @contact  service@swoole.com
 */

-declare(strict_types=1);
-
 namespace PhpAot\Php;

 use PhpParser\PrettyPrinter\Standard;
--- a/src/Php/Extractor.php
+++ b/src/Php/Extractor.php
@ -6,8 +6,6 @@
 * @contact  service@swoole.com
 */

-declare(strict_types=1);
-
 namespace PhpAot\Php;

 class Extractor
--- a/src/Php/FileScanner.php
+++ b/src/Php/FileScanner.php
@ -6,8 +6,6 @@
 * @contact  service@swoole.com
 */

-declare(strict_types=1);
-
 namespace PhpAot\Php;

 class FileScanner
--- a/src/Php/FileSorter.php
+++ b/src/Php/FileSorter.php
@ -6,8 +6,6 @@
 * @contact  service@swoole.com
 */

-declare(strict_types=1);
-
 namespace PhpAot\Php;

 class FileSorter
--- a/src/Php/FuncCallOptimizer.php
+++ b/src/Php/FuncCallOptimizer.php
@ -6,8 +6,6 @@
 * @contact  service@swoole.com
 */

-declare(strict_types=1);
-
 namespace PhpAot\Php;

 use PhpParser\Node;
--- a/src/Php/FunctionDef.php
+++ b/src/Php/FunctionDef.php
@ -6,8 +6,6 @@
 * @contact  service@swoole.com
 */

-declare(strict_types=1);
-
 namespace PhpAot\Php;

 class FunctionDef
--- a/src/Php/InterfaceDef.php
+++ b/src/Php/InterfaceDef.php
@ -6,8 +6,6 @@
 * @contact  service@swoole.com
 */

-declare(strict_types=1);
-
 namespace PhpAot\Php;

 class InterfaceDef extends ClassLikeDef
--- a/src/Php/MagicMethodDetector.php
+++ b/src/Php/MagicMethodDetector.php
@ -6,8 +6,6 @@
 * @contact  service@swoole.com
 */

-declare(strict_types=1);
-
 namespace PhpAot\Php;

 use PhpParser\NodeAbstract;
--- a/src/Php/MethodDef.php
+++ b/src/Php/MethodDef.php
@ -6,8 +6,6 @@
 * @contact  service@swoole.com
 */

-declare(strict_types=1);
-
 namespace PhpAot\Php;

 class MethodDef
--- a/src/Php/Preprocessor.php
+++ b/src/Php/Preprocessor.php
@ -6,8 +6,6 @@
 * @contact  service@swoole.com
 */

-declare(strict_types=1);
-
 namespace PhpAot\Php;

 use PhpParser\Node;
--- a/src/Php/PropertyDef.php
+++ b/src/Php/PropertyDef.php
@ -6,8 +6,6 @@
 * @contact  service@swoole.com
 */

-declare(strict_types=1);
-
 namespace PhpAot\Php;

 use PhpParser\Modifiers;
--- a/src/Php/RedoException.php
+++ b/src/Php/RedoException.php
@ -6,8 +6,6 @@
 * @contact  service@swoole.com
 */

-declare(strict_types=1);
-
 namespace PhpAot\Php;

 class RedoException extends \RuntimeException
--- a/src/Php/Reflection.php
+++ b/src/Php/Reflection.php
@ -6,8 +6,6 @@
 * @contact  service@swoole.com
 */

-declare(strict_types=1);
-
 namespace PhpAot\Php;

 class Reflection
--- a/src/Php/SyntaxError.php
+++ b/src/Php/SyntaxError.php
@ -6,8 +6,6 @@
 * @contact  service@swoole.com
 */

-declare(strict_types=1);
-
 namespace PhpAot\Php;

 class SyntaxError extends \RuntimeException
--- a/src/Php/Translator.php
+++ b/src/Php/Translator.php
@ -6,8 +6,6 @@
 * @contact  service@swoole.com
 */

-declare(strict_types=1);
-
 namespace PhpAot\Php;

 use MJS\TopSort\Implementations\StringSort;
@ -47,8 +45,7 @@ class Translator extends Preprocessor
        $this->optimizeLevel = $this->climate->arguments->get('optimize');
        $this->buildMode     = $this->climate->arguments->get('mode');
        $this->debugLine     = intval($this->climate->arguments->get('debug-line'));
-        //        $this->noLiteralStrings = $this->climate->arguments->get('noLiteralStrings');
-        $this->noLiteralStrings  = true;
+        $this->noLiteralStrings = $this->climate->arguments->get('noLiteralStrings');
        $this->enableProfiler    = $this->climate->arguments->defined('profile');
        $this->internalFunctions = array_flip(get_defined_functions()['internal']);
        if ($this->climate->arguments->defined('help')) {
--- a/src/Php/Unsupported.php
+++ b/src/Php/Unsupported.php
@ -6,8 +6,6 @@
 * @contact  service@swoole.com
 */

-declare(strict_types=1);
-
 namespace PhpAot\Php;

 class Unsupported extends \RuntimeException
--- a/src/Php/Visitor.php
+++ b/src/Php/Visitor.php
@ -6,8 +6,6 @@
 * @contact  service@swoole.com
 */

-declare(strict_types=1);
-
 namespace PhpAot\Php;

 use PhpParser\NodeVisitorAbstract;