Merge remote-tracking branch 'origin/master'

swoole · Dec 22, 2023 · 16f2857 · 16f2857
2 parents 4872908 + 21f44c8
commit 16f2857
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -25,6 +25,7 @@ sudo cp bin/phpx /usr/local/bin
 cmake .
 make -j 4
 sudo make install
+sudo ldconfig
 ```
 
 ## Create Project

diff --git a/build.sh b/build.sh
@@ -1,5 +1,5 @@
-cd console
-echo "composer update"
-composer update
-cd ../
+cd console && \
+echo "composer update" && \
+composer update && \
+cd ../ && \
 /usr/bin/env php -d phar.readonly=off script/pack.php
diff --git a/console/composer.json b/console/composer.json
@@ -1,6 +1,11 @@
 {
     "require": {
-        "matyhtf/swoole_framework": "^1.20",
+        "matyhtf/framework": "^3.0",
         "nikic/php-parser": "4.9.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "phpx\\": "src/"
+        }
     }
 }
diff --git a/console/console.php b/console/console.php
@@ -4,8 +4,6 @@
 use Symfony\Component\Console\Application;
 
 define('WEBPATH', __DIR__);
-Swoole\Loader::vendorInit();
-Swoole\Loader::addNameSpace('phpx', __DIR__.'/src');
 
 $application = new Application("PHP-X Console Tool", "0.0.1");
 $application->add(new phpx\Command\Create());

diff --git a/console/src/Builder.php b/console/src/Builder.php
@@ -2,7 +2,7 @@
 
 namespace phpx;
 
-use Swoole\Upload;
+use SPF\Upload;
 use Symfony\Component\Console\Exception\RuntimeException;
 
 class Builder