Merge branch 'master' into dev

Author: monkenWu

.gitignore

@@ -1 +1,5 @@
-.vscode
+.vscode
+vendor/
+.idea/
+composer.lock
+.php-cs-fixer.cache

.php-cs-fixer.dist.php

@@ -0,0 +1,25 @@
+<?php
+
+use CodeIgniter\CodingStandard\CodeIgniter4;
+use Nexus\CsConfig\Factory;
+use PhpCsFixer\Finder;
+
+$finder = Finder::create()
+    ->files()
+    ->in([
+        __DIR__ . '/src/',
+        // __DIR__ . '/tests/',
+        __DIR__ . '/dev/app/',
+        __DIR__ . '/dev/tests/',
+    ])
+    ->exclude('build')
+    ->append([__FILE__]);
+
+$overrides = [];
+
+$options = [
+    'finder'    => $finder,
+    'cacheFile' => 'build/.php-cs-fixer.cache',
+];
+
+return Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects();

README.md

@@ -13,7 +13,7 @@ Codeigniter4-RoadRunner provides the synchroniztion of the Request and Response
 ## Install
 
 ### Prerequisites
-1. CodeIgniter Framework 4.1.1^
+1. CodeIgniter Framework 4.1.9^
 2. Composer
 3. Enable `php-curl` extension
 4. Enable `php-zip` extension
@@ -44,6 +44,8 @@ Run the command in the root directory of your project:
 ## Server Settings
 The server settings are all in the project root directory ".rr.yaml". The default file will look like this:
 ```yaml
+version: "2.7"
+
 rpc:
   listen: tcp://127.0.0.1:6001
 
@@ -121,8 +123,8 @@ class Home extends BaseController
 
   public function index()
   {
-    //Don't use :
-    //echo view('welcome_message');
+    // Don't use:
+    // echo view('welcome_message');
     return view('welcome_message');
   }
 

build/.gitkeep

@@ -18,10 +18,11 @@
             "homepage": "https://github.com/SDPM-lab"
         }
     ],
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "require": {
-        "php" : "^7.3",
-        "codeigniter4/framework": "^4.1.5",
+        "php" : "^7.4 || ^8.0",
+        "codeigniter4/framework": "^4.1.9",
         "spiral/roadrunner": "^2",
         "spiral/dumper": "^2.8",
         "laminas/laminas-diactoros": "^2.8",
@@ -31,5 +32,14 @@
 		"psr-4": {
 			"SDPMlab\\Ci4Roadrunner\\": "src/"
 		}
-	}
-}
+	},
+    "require-dev": {
+        "codeigniter4/devkit": "^1.0",
+        "rector/rector": "0.12.16"
+    },
+    "config": {
+        "allow-plugins": {
+            "phpstan/extension-installer": true
+        }
+    }
+}

composer.json

@@ -125,6 +125,7 @@ nb-configuration.xml
 /phpunit*.xml
 /.phpunit.*.cache
 
+rr
 rr.exe
 .rr.yaml
-psr-worker.php
+psr-worker.php

dev/.gitignore

@@ -2,11 +2,11 @@
 
 This is the Codeigniter4-RoadRunner test case project, it is built by Codeigniter4, and has loaded the Codeigniter4-Roadrunner library class inside the upper directory included in the `src` in.
 
-You can run the test right after you modified the Codeigniter4-Roadrunner project files, verify if the funtions are complete; Or wirte some related program logic in this project to assist your development.
+You can run the test right after you modified the Codeigniter4-Roadrunner project files, verify if the functions are complete; Or write some related program logic in this project to assist your development.
 
 ## Test Range
 
-This test case takes the acutal sent CURL Request as test approach, because what Codeigniter4-Roadrunner provide is the synchronization on HTTP Request and Response objects of Roadrunner-Worker and Codeigniter4 (Since Codeigniter4 doesn't implement PSR-7 interface standard). In other words, we just have to verify if the server workes as what we wanted under the actual HTTP connection.
+This test case takes the actual sent CURL Request as test approach, because what Codeigniter4-Roadrunner provide is the synchronization on HTTP Request and Response objects of Roadrunner-Worker and Codeigniter4 (Since Codeigniter4 doesn't implement PSR-7 interface standard). In other words, we just have to verify if the server workes as what we wanted under the actual HTTP connection.
 
 1. BasicTest：Test HTTP `GET`、`POST`、`query`、`form-data`, and the `php echo` output command, and if `header` can process normally and give us outputs.
 2. FileUploadTest：Test if file upload class can work correctly and move files.
@@ -15,23 +15,23 @@ This test case takes the acutal sent CURL Request as test approach, because what
 
 ## Requirements
 
-We recommend you to use the latest PHPUnit. While we're writing scripts, the version we're running at is version `9.5.10`. You might need to use Composer to download the library your project needed back to your develop environment.
+We recommend you to use the latest PHPUnit. While we're writing scripts, the version we're running at is version `9.5.19`. You might need to use Composer to download the library your project needed back to your develop environment.
 
 ```
 composer install
 ```
 
-Next, you must initiallize the environment that Roadrunner needed.
+Next, you must initialize the environment that Roadrunner needed.
 
 ```
 php spark ciroad:init
 ```
 
-Finally, please confirm if the directory has these threee files including `rr`(if your developing under Windows, you will see `rr.exe`), `rr.yaml`, `psr-worker.php`.
+Finally, please confirm if the directory has these three files including `rr` (if you are developing under Windows, you will see `rr.exe`), `.rr.yaml`, `psr-worker.php`.
 
 ## Run Tests
 
-Before running tests, please open `rr.yaml` file first, and ensure this configuration file has these settings:
+Before running tests, please open `.rr.yaml` file first, and ensure this configuration file has these settings:
 
 ```yaml
 rpc:
@@ -49,12 +49,12 @@ http:
     num_workers: 1  
 ```
 
-Since Roadrunner-Worker lasts inside RAMs, HTTP requests will reuse Workers to process. Hence we need to test the stability under the environment with only one worker to prove that it can work properly under several workers.
+Since Roadrunner-Worker lasts inside RAMs, HTTP requests will reuse Workers to process. Hence, we need to test the stability under the environment with only one worker to prove that it can work properly under several workers.
 
 Next, you have to open a terminal and cd to the root directory, type the commands below to run the Roadrunner server:
 
 ```
-rr serve -d
+./rr serve -d
 ```
 
 Finally, open another new terminal and cd to the test project, type the commands below to run tests:
@@ -67,4 +67,4 @@ If you're running tests under Windows CMD, your command should be like this:
 
 ```
 vendor\bin\phpunit
-```
+```

dev/README.md

@@ -41,9 +41,9 @@ class Autoload extends AutoloadConfig
      * @var array<string, string>
      */
     public $psr4 = [
-        APP_NAMESPACE => APPPATH, // For custom app namespace
-        'Config'      => APPPATH . 'Config',
-        "SDPMlab\\Ci4Roadrunner\\" =>  ROOTPATH . ".." . DIRECTORY_SEPARATOR . "src" . DIRECTORY_SEPARATOR,
+        APP_NAMESPACE              => APPPATH, // For custom app namespace
+        'Config'                   => APPPATH . 'Config',
+        'SDPMlab\\Ci4Roadrunner\\' => ROOTPATH . '..' . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR,
     ];
 
     /**

dev/app/Config/Autoload.php

@@ -32,9 +32,7 @@
             ob_end_flush();
         }
 
-        ob_start(static function ($buffer) {
-            return $buffer;
-        });
+        ob_start(static fn ($buffer) => $buffer);
     }
 
     /*

dev/app/Config/Events.php

@@ -33,8 +33,8 @@
 // route since we don't have to scan directories.
 $routes->get('/', 'Home::index');
 
-$routes->resource('testRest',[
-    'controller' =>'\App\Controllers\TestRest',
+$routes->resource('testRest', [
+    'controller' => '\App\Controllers\TestRest',
 ]);
 
 /*