StaticPHP v3

.github/workflows/tests.yml

@@ -2,7 +2,7 @@ name: Tests
 
 on:
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "v3" ]
     types: [ opened, synchronize, reopened ]
     paths:
       - 'src/**'

.gitignore

@@ -1,8 +1,8 @@
 .idea
-runtime/
-docker/libraries/
-docker/extensions/
-docker/source/
+/runtime/
+/docker/libraries/
+/docker/extensions/
+/docker/source/
 
 # Vendor files
 /vendor/**

.php-cs-fixer.php

@@ -69,6 +69,6 @@
         'php_unit_data_provider_method_order' => false,
     ])
     ->setFinder(
-        PhpCsFixer\Finder::create()->in([__DIR__ . '/src', __DIR__ . '/tests/SPC'])
+        PhpCsFixer\Finder::create()->in([__DIR__ . '/src', __DIR__ . '/tests/StaticPHP'])
     )
     ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect());

bin/spc

@@ -1,13 +1,9 @@
 #!/usr/bin/env php
 <?php
 
-use SPC\ConsoleApplication;
-use SPC\exception\ExceptionHandler;
-
-// Load custom php if exists
-if (PHP_OS_FAMILY !== 'Windows' && PHP_BINARY !== (__DIR__ . '/php') && file_exists(__DIR__ . '/php') && is_executable(__DIR__ . '/php')) {
-    pcntl_exec(__DIR__ . '/php', $argv);
-}
+use StaticPHP\ConsoleApplication;
+use StaticPHP\Exception\ExceptionHandler;
+use StaticPHP\Exception\SPCException;
 
 if (file_exists(dirname(__DIR__) . '/vendor/autoload.php')) {
     // Current: ./bin (git/project mode)
@@ -17,19 +13,18 @@ if (file_exists(dirname(__DIR__) . '/vendor/autoload.php')) {
     require_once dirname(__DIR__, 3) . '/autoload.php';
 }
 
-// 防止 Micro 打包状态下不支持中文的显示（虽然这个项目目前好像没输出过中文？）
-if (PHP_OS_FAMILY === 'Windows' && Phar::running()) {
-    exec('CHCP 65001');
-}
-
 // Print deprecation notice on PHP < 8.4, use red and highlight background
 if (PHP_VERSION_ID < 80400) {
     echo "\e[43mDeprecation Notice: PHP < 8.4 is deprecated, please upgrade your PHP version.\e[0m\n";
 }
 
 try {
     (new ConsoleApplication())->run();
-} catch (Exception $e) {
-    ExceptionHandler::getInstance()->handle($e);
+} catch (SPCException $e) {
+    ExceptionHandler::handleSPCException($e);
+    exit(1);
+} catch (\Throwable $e) {
+    ExceptionHandler::handleDefaultException($e);
     exit(1);
 }
+

bin/spc-alpine-docker

@@ -3,7 +3,7 @@
 set -e
 
 # This file is using docker to run commands
-SPC_DOCKER_VERSION=v6
+SPC_DOCKER_VERSION=v7
 
 # Detect docker can run
 if ! which docker >/dev/null; then
@@ -108,8 +108,7 @@ RUN apk update; \
         wget \
         xz \
         gettext-dev \
-        binutils-gold \
-        patchelf
+        binutils-gold
 
 RUN curl -#fSL https://dl.static-php.dev/static-php-cli/bulk/php-8.4.4-cli-linux-\$(uname -m).tar.gz | tar -xz -C /usr/local/bin && \
     chmod +x /usr/local/bin/php
@@ -123,6 +122,7 @@ COPY ./composer.* /app/
 ADD ./bin /app/bin
 RUN composer install --no-dev
 ADD ./config /app/config
+ADD ./spc.registry.json /app/spc.registry.json
 RUN bin/spc doctor --auto-fix
 RUN bin/spc install-pkg upx
 

bin/spc-debug

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+# This script runs the 'spc' command with Xdebug enabled for debugging purposes.
+php -d xdebug.mode=debug -d xdebug.client_host=127.0.0.1 -d xdebug.client_port=9003 -d xdebug.start_with_request=yes "$(dirname "$0")/../bin/spc" "$@"

bin/spc-gnu-docker

@@ -92,11 +92,6 @@ RUN echo "source scl_source enable devtoolset-10" >> /etc/bashrc
 RUN source /etc/bashrc
 RUN yum install -y which
 
-RUN curl -fsSL -o patchelf.tgz https://github.com/NixOS/patchelf/releases/download/0.18.0/patchelf-0.18.0-$SPC_USE_ARCH.tar.gz && \
-    mkdir -p /patchelf && \
-    tar -xzf patchelf.tgz -C /patchelf --strip-components=1 && \
-    cp /patchelf/bin/patchelf /usr/bin/
-
 RUN curl -o cmake.tgz -#fSL https://github.com/Kitware/CMake/releases/download/v3.31.4/cmake-3.31.4-linux-$SPC_USE_ARCH.tar.gz && \
     mkdir /cmake && \
     tar -xzf cmake.tgz -C /cmake --strip-components 1

captainhook.json

@@ -3,21 +3,30 @@
         "enabled": true,
         "actions": [
             {
-                "action": "composer analyse"
+                "action": "php vendor/bin/phpstan analyse --memory-limit 300M"
             }
         ]
     },
     "pre-commit": {
         "enabled": true,
         "actions": [
             {
-                "action": "composer cs-fix -- --config=.php-cs-fixer.php --dry-run --diff {$STAGED_FILES|of-type:php}",
+                "action": "php vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --dry-run --diff {$STAGED_FILES|of-type:php} --sequential",
                 "conditions": [
                     {
                         "exec": "\\CaptainHook\\App\\Hook\\Condition\\FileStaged\\OfType",
                         "args": ["php"]
                     }
                 ]
+            },
+            {
+                "action": "bin/spc dev:lint-config --check",
+                "conditions": [
+                    {
+                        "exec": "\\CaptainHook\\App\\Hook\\Condition\\FileStaged\\InDirectory",
+                        "args": ["config"]
+                    }
+                ]
             }
         ]
     },

composer.json

@@ -9,26 +9,30 @@
         }
     ],
     "require": {
-        "php": ">= 8.3",
+        "php": ">=8.4",
         "ext-mbstring": "*",
         "ext-zlib": "*",
-        "laravel/prompts": "^0.1.12",
+        "laravel/prompts": "~0.1",
+        "nette/php-generator": "^4.2",
+        "php-di/php-di": "^7.1",
         "symfony/console": "^5.4 || ^6 || ^7",
         "symfony/process": "^7.2",
         "symfony/yaml": "^7.2",
-        "zhamao/logger": "^1.1.3"
+        "zhamao/logger": "^1.1.4"
     },
     "require-dev": {
         "captainhook/captainhook-phar": "^5.23",
         "captainhook/hook-installer": "^1.0",
         "friendsofphp/php-cs-fixer": "^3.60",
         "humbug/box": "^4.5.0 || ^4.6.0",
-        "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan": "^2.1",
         "phpunit/phpunit": "^10.3 || ^9.5"
     },
     "autoload": {
         "psr-4": {
-            "SPC\\": "src/SPC"
+            "SPC\\": "src/SPC",
+            "StaticPHP\\": "src/StaticPHP",
+            "Package\\": "src/Package"
         },
         "files": [
             "src/globals/defines.php",
@@ -37,7 +41,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "SPC\\Tests\\": "tests/SPC"
+            "Tests\\StaticPHP\\": "tests/StaticPHP"
         }
     },
     "bin": [
@@ -46,6 +50,7 @@
     "scripts": {
         "analyse": "phpstan analyse --memory-limit 300M",
         "cs-fix": "php-cs-fixer fix",
+        "lint-config": "bin/spc dev:lint-config",
         "test": "vendor/bin/phpunit tests/ --no-coverage",
         "build:phar": "vendor/bin/box compile"
     },