feat: format

Author: liutao

composer.json

@@ -27,11 +27,11 @@
         "illuminate/database": "^9.0",
         "symfony/console": "^6",
         "symfony/process": "^6",
-        "respect/validation": "^2.2",
         "symfony/finder": "^6",
         "guzzlehttp/guzzle": "^7.7",
         "symfony/dotenv": "^6.0",
         "monolog/monolog": "^3.4",
-        "ext-simplexml": "*"
+        "ext-simplexml": "*",
+        "symfony/validator": "^7.2"
     }
 }

src/Application.php

@@ -23,9 +23,7 @@ final class Application
 {
     private static ContainerInterface $container;
 
-    private function __construct()
-    {
-    }
+    private function __construct() {}
 
     /**
      * @throws Throwable
@@ -40,8 +38,6 @@ public static function boot(): Application
     }
 
     /**
-     * @param OutputInterface $output
-     * @return Application
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      * @throws ReflectionException
@@ -85,6 +81,7 @@ private function init(): void
         $this->initDatabase($config['database']);
         $this->scanAttributes($config['app']['scanner']);
         $router = $this->getRouter($config['routes']);
+        $router->middlewares($config['middlewares']);
         Application::getContainer()->add(Router::class, $router);
     }
 

src/Attribute/Attributes/CMD.php

@@ -7,6 +7,4 @@
 use Attribute;
 
 #[Attribute(Attribute::TARGET_CLASS)]
-class CMD
-{
-}
+class CMD {}

src/Commands/StartCommand.php

@@ -70,8 +70,6 @@ private function roadrunnerStart(OutputInterface $output, ServerConfig $serverCo
     }
 
     /**
-     * @param OutputInterface $output
-     * @return int
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      * @throws ReflectionException
@@ -84,8 +82,6 @@ private function workermanStart(OutputInterface $output): int
     }
 
     /**
-     * @param OutputInterface $output
-     * @return int
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      * @throws ReflectionException

src/Commands/SwaggerGenerateCommand.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace MicroPHP\Framework\Commands;
@@ -16,11 +17,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     {
         Swagger::gen();
         $output->writeln('<info>swagger was generated</info>');
+
         return Command::SUCCESS;
     }
 
     protected function configure(): void
     {
         $this->setName('swagger:gen')->setDescription('Generate swagger file');
     }
-}
+}

src/Config/Config.php

@@ -26,11 +26,9 @@ public static function get(string $key, $default = null)
     }
 
     /**
-     * @param mixed $directory
-     *
      * @throws ReflectionException
      */
-    public static function load($directory): array
+    public static function load(string $directory): array
     {
         static::$config = (new ConfigProviderScanner())->scan();
 

src/Container/Container.php

@@ -4,6 +4,4 @@
 
 namespace MicroPHP\Framework\Container;
 
-class Container extends \League\Container\Container implements ContainerInterface
-{
-}
+class Container extends \League\Container\Container implements ContainerInterface {}

src/Container/ContainerInterface.php

@@ -6,6 +6,4 @@
 
 use League\Container\DefinitionContainerInterface;
 
-interface ContainerInterface extends DefinitionContainerInterface
-{
-}
+interface ContainerInterface extends DefinitionContainerInterface {}

src/Controller.php

@@ -6,15 +6,9 @@
 
 use JsonSerializable;
 use MicroPHP\Framework\Http\Response;
-use Respect\Validation\Validator;
 
 class Controller
 {
-    public function validate(array $rules, array $data): void
-    {
-        Validator::allOf(...$rules)->assert($data);
-    }
-
     protected function json(mixed $data): Response
     {
         if ($data instanceof JsonSerializable) {

src/Dto/ConstraintsTrait.php

@@ -0,0 +1,75 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MicroPHP\Framework\Dto;
+
+use MicroPHP\Data\Util\Str;
+use MicroPHP\Framework\Dto\Request\BaseReq;
+use MicroPHP\Framework\Exception\ValidateException;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\Constraints\NotNull;
+use Symfony\Component\Validator\ConstraintViolationListInterface;
+use Symfony\Component\Validator\Mapping\ClassMetadata;
+use Symfony\Component\Validator\Validation;
+
+trait ConstraintsTrait
+{
+    /**
+     * @var null|array<string, Constraint>
+     */
+    protected static ?array $_constraints = null;
+
+    /**
+     * 添加默认验证器
+     */
+    public function _initConstraints(): void
+    {
+        if (is_null($this::$_constraints)) {
+            $attributeRules = [];
+            foreach ($this->getStaticReflection()->getProperties() as $property) {
+                if ($this->isInsideProperty($property)) {
+                    continue;
+                }
+                $snakePropertyName = Str::snake($property->getName());
+                if (! $property->getType()->allowsNull() && ! $property->hasDefaultValue()) {
+                    $attributeRules[$snakePropertyName][] = [new NotNull()];
+                }
+            }
+            $this::$_constraints = $attributeRules;
+        }
+    }
+
+    /**
+     * 自定义验证器
+     */
+    public static function loadValidatorMetadata(?ClassMetadata $metadata = null): void
+    {
+        foreach (static::$_constraints ?: [] as $property => $constraints) {
+            $metadata->addPropertyConstraint($property, $constraints);
+        }
+    }
+
+    /**
+     * @throws ValidateException
+     */
+    protected function validate(BaseReq $data): void
+    {
+        $data->_initConstraints();
+        $validator = Validation::createValidatorBuilder()
+            ->enableAttributeMapping()
+            ->getValidator();
+        $this->throw($validator->validate($data));
+        $this->throw($validator->validate($data));
+    }
+
+    /**
+     * @throws ValidateException
+     */
+    protected function throw(ConstraintViolationListInterface $errors): void
+    {
+        foreach ($errors as $violation) {
+            throw new ValidateException($violation->getPropertyPath() . ': ' . $violation->getMessage() . PHP_EOL);
+        }
+    }
+}