Merge pull request #2 from DevNet-Framework/1.1

Bug fix and improvement

Author: Machometec

lib/Diagnostics/ExceptionHandler.php

@@ -40,7 +40,6 @@ public function parse(Throwable $error): array
             E_USER_ERROR        => 'User Error',
             E_USER_WARNING      => 'User Warning',
             E_USER_NOTICE       => 'User Notice',
-            E_STRICT            => 'Strict Error',
             E_RECOVERABLE_ERROR => 'Recoverable Error',
             E_DEPRECATED        => 'Deprecated',
             E_USER_DEPRECATED   => 'User Deprecated'

lib/Endpoint/Binder/ModelBinderProvider.php

@@ -16,7 +16,7 @@ class ModelBinderProvider implements IteratorAggregate
 {
     private array $modelBinders = [];
 
-    public function __construct(IModelBinder $modelBinder = null)
+    public function __construct(?IModelBinder $modelBinder = null)
     {
         if ($modelBinder) {
             $this->modelBinders[] = $modelBinder;

lib/Endpoint/Binder/ParameterBinder.php

@@ -15,7 +15,7 @@ class ParameterBinder
     private IValueProvider $valueProvider;
     private ModelBinderProvider $modelBinderProvider;
 
-    public function __construct(IValueProvider $valueProvider, ModelBinderProvider $modelBinderProvider = null)
+    public function __construct(IValueProvider $valueProvider, ?ModelBinderProvider $modelBinderProvider = null)
     {
         if (!$modelBinderProvider) {
             $modelBinderProvider = new ModelBinderProvider(new ModelBinder());

lib/Endpoint/Binder/Providers/FileValueProvider.php

@@ -18,7 +18,7 @@ class FileValueProvider implements IValueProvider
 {
     private FormFileCollection $files;
 
-    public function __construct(FormFileCollection $files = null)
+    public function __construct(?FormFileCollection $files = null)
     {
         if (!$files) {
             $files = new FormFileCollection();

lib/Endpoint/Binder/Providers/FormValueProvider.php

@@ -13,9 +13,9 @@
  */
 class FormValueProvider extends ValueProvider
 {
-    public function __construct(array $values = null)
+    public function __construct(array $values = [])
     {
-        if (!$values) {
+        if ($values == []) {
             $this->values = $_POST;
         }
     }

lib/Endpoint/Binder/Providers/QueryValueProvider.php

@@ -13,9 +13,9 @@
  */
 class QueryValueProvider extends ValueProvider
 {
-    public function __construct(array $values = null)
+    public function __construct(array $values = [])
     {
-        if (!$values) {
+        if ($values == []) {
             $this->values = $_GET;
         }
     }

lib/Endpoint/EndpointRouteBuilder.php

@@ -102,7 +102,7 @@ public function mapPatch(string $path, callable $handler): RouteHandlerBuilder
     /**
      * Maps routes from controllers.
      */
-    public function mapControllers(?string $area = null, Closure $configure = null)
+    public function mapControllers(?string $area = null, ?Closure $configure = null)
     {
         $options = new ControllerOptions();
         if ($configure) {
@@ -132,9 +132,6 @@ public function mapControllers(?string $area = null, Closure $configure = null)
                                     if ($attribute) {
                                         $route = $attribute[0]->newInstance();
                                         $path = $route->Path;
-                                        if ($area) {
-                                            $path = '/' . $area . $route->Path;
-                                        }
                                         $this->builder->map($path, new ControllerRouteHandler([$className, $method->getName()], $options), $route->Method);
                                     }
                                 }

lib/Extensions/ApplicationBuilderExtensions.php

@@ -30,7 +30,7 @@ public static function useMiddleware(IApplicationBuilder $app, string $middlewar
 
         $interfaces = class_implements($middlewareName);
         if (!in_array(IMiddleware::class, $interfaces)) {
-            throw new ClassException("{$middlewareName} must implements IMiddleware inteface", 0, 1);
+            throw new ClassException("{$middlewareName} must implements IMiddleware interface", 0, 1);
         }
 
         $reflection = new ReflectionClass($middlewareName);

lib/Extensions/ServiceCollectionExtensions.php

@@ -29,12 +29,12 @@
 
 class ServiceCollectionExtensions
 {
-    public static function addLogging(IServiceCollection $services, Closure $configure = null)
+    public static function addLogging(IServiceCollection $services, ?Closure $configure = null)
     {
         $services->addSingleton(ILoggerFactory::class, fn (): ILoggerFactory => LoggerFactory::Create($configure));
     }
 
-    public static function addHttpClient(IServiceCollection $services, Closure $configure = null)
+    public static function addHttpClient(IServiceCollection $services, ?Closure $configure = null)
     {
         $options = new HttpClientOptions();
         if ($configure) {
@@ -44,7 +44,7 @@ public static function addHttpClient(IServiceCollection $services, Closure $conf
         $services->addSingleton(HttpClient::class, fn (): HttpClient => new HttpClient($options));
     }
 
-    public static function addAntiForgery(IServiceCollection $services, Closure $configure = null)
+    public static function addAntiForgery(IServiceCollection $services, ?Closure $configure = null)
     {
         $options = new AntiForgeryOptions();
         if ($configure) {
@@ -63,7 +63,7 @@ public static function addAuthentication(IServiceCollection $services, Closure $
         });
     }
 
-    public static function addAuthorization(IServiceCollection $services, Closure $configure = null)
+    public static function addAuthorization(IServiceCollection $services, ?Closure $configure = null)
     {
         $options = new AuthorizationOptions();
         if ($configure) {
@@ -78,7 +78,7 @@ public static function addDbConnection(IServiceCollection $services, string $dat
         $services->addSingleton(DbConnection::class, fn (): DbConnection => new DbConnection($dataSource, $username, $password));
     }
 
-    public static function addEntityContext(IServiceCollection $services, string $contextType, Closure $configure = null)
+    public static function addEntityContext(IServiceCollection $services, string $contextType, ?Closure $configure = null)
     {
         $options = new EntityOptions();
         if ($configure) {

lib/Routing/RoutePathContext.php

@@ -13,7 +13,7 @@ class RoutePathContext
     private ?string $routeName;
     private array $parameters;
 
-    public function __construct(string $routeName = null, array $parameters = [])
+    public function __construct(?string $routeName = null, array $parameters = [])
     {
         $this->routeName = $routeName;
         $this->parameters = $parameters;