update to 2.3.1 version (build 388)

cleanup code and fix a bug
This commit is contained in:
2021-03-18 14:56:35 +08:00
parent 456b102c15
commit e77b9d4970
57 changed files with 179 additions and 508 deletions

View File

@@ -12,7 +12,7 @@ abstract class AnnotationBase
public $class;
public function __toString() {
public function __toString(): string {
$str = __CLASS__ . ": ";
foreach ($this as $k => $v) {
$str .= "\n\t" . $k . " => ";

View File

@@ -125,10 +125,7 @@ class AnnotationParser
Console::debug("解析注解完毕!");
}
/**
* @return array
*/
public function generateAnnotationEvents() {
public function generateAnnotationEvents(): array {
$o = [];
foreach ($this->annotation_map as $module => $obj) {
foreach (($obj["class_annotations"] ?? []) as $class_annotation) {
@@ -151,17 +148,17 @@ class AnnotationParser
/**
* @return array
*/
public function getMiddlewares() { return $this->middlewares; }
public function getMiddlewares(): array { return $this->middlewares; }
/**
* @return array
*/
public function getMiddlewareMap() { return $this->middleware_map; }
public function getMiddlewareMap(): array { return $this->middleware_map; }
/**
* @return array
*/
public function getReqMapping() { return $this->req_mapping; }
public function getReqMapping(): array { return $this->req_mapping; }
/**
* @param $path
@@ -171,7 +168,7 @@ class AnnotationParser
//private function below
private function registerMiddleware(MiddlewareClass $vs, ReflectionClass $reflection_class) {
private function registerMiddleware(MiddlewareClass $vs, ReflectionClass $reflection_class): array {
$result = [
"class" => "\\" . $reflection_class->getName(),
"name" => $vs->name

View File

@@ -26,7 +26,7 @@ class CQAfter extends AnnotationBase implements Level
/**
* @return mixed
*/
public function getLevel() {
public function getLevel(): int {
return $this->level;
}

View File

@@ -28,7 +28,7 @@ class CQBefore extends AnnotationBase implements Level
/**
* @return mixed
*/
public function getLevel() {
public function getLevel(): int {
return $this->level;
}

View File

@@ -32,7 +32,7 @@ class CQMessage extends AnnotationBase implements Level
/** @var int */
public $level = 20;
public function getLevel() { return $this->level; }
public function getLevel(): int { return $this->level; }
public function setLevel(int $level) {
$this->level = $level;

View File

@@ -27,7 +27,7 @@ class CQMetaEvent extends AnnotationBase implements Level
/**
* @return mixed
*/
public function getLevel() { return $this->level; }
public function getLevel(): int { return $this->level; }
/**
* @param int $level

View File

@@ -30,7 +30,7 @@ class OnTask extends AnnotationBase implements Rule
/**
* @return mixed
*/
public function getRule() {
public function getRule(): string {
return $this->rule;
}
}