Dependencies and dev env (#4)

samizdam · n.gnato · web-flow · commit 373f3d84d0ad · 2025-06-22T16:10:41.000+03:00
* Remove di as required

* Add author

* Add lib type

* Add cs fixer

* Configure php-cs-fixer

* cs fix

* Try set PHP_CS_FIXER_IGNORE_ENV

* run cs on lowest version

* try change cs fixer version

* Up dep

* Up dep

* v0.0.3

---------

Co-authored-by: n.gnato &lt;n.gnato@ya.ru&gt;
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -54,3 +54,8 @@ jobs:
         env:
           XDEBUG_MODE: coverage
         run: vendor/bin/phpunit
+
+      - name: Code style
+        env:
+          PHP_CS_FIXER_IGNORE_ENV: true
+        run: vendor/bin/php-cs-fixer fix --dry-run
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,9 @@
 # Local
 .env
 
+# PHP-CS
+.php-cs-fixer.cache
+
 # PHPUnit
 .phpunit.result.cache
 phpunit.xml
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -0,0 +1,10 @@
+<?php
+declare(strict_types=1);
+
+$finder = PhpCsFixer\Finder::create()
+    ->in([
+        './src/',
+        './tests/',
+    ]);
+
+return \FreeElephants\PhpCsFixer\build_config($finder);
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.3] - 2025-06-22
+
+### Removed
+- Not required dependencies move to suggested and replaced with psr interfaces
+
+### Internal
+- Use php-cs-fixer
+
 ## [0.0.2] - 2025-06-17
 
 ### Added
@@ -24,6 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Router, RequestHandlerFactory and FastRoute backed implementation of basics
 
-[Unreleased]: https://github.com/FreeElephants/psr-router/compare/0.0.2...HEAD
+[Unreleased]: https://github.com/FreeElephants/psr-router/compare/0.0.3...HEAD
+[0.0.3]: https://github.com/FreeElephants/psr-router/releases/tag/0.0.3
 [0.0.2]: https://github.com/FreeElephants/psr-router/releases/tag/0.0.2
 [0.0.1]: https://github.com/FreeElephants/psr-router/releases/tag/0.0.1
diff --git a/composer.json b/composer.json
@@ -2,8 +2,15 @@
   "name": "free-elephants/psr-router",
   "description": "Framework Agnostic PSR Router",
   "license": "BSD-2-Clause",
-  "authors": [],
+  "authors": [
+    {
+      "email": "samizdam@inbox.ru",
+      "name": "samizdam"
+    }
+  ],
+  "type": "library",
   "require-dev": {
+    "free-elephants/php-cs-fixer-ruleset": "^1.0.1",
     "nyholm/psr7": "^1.8",
     "phpunit/phpunit": "^9|^10|^11|^12.1"
   },
@@ -18,11 +25,14 @@
     }
   },
   "require": {
-    "free-elephants/di": "^4.1",
     "nikic/fast-route": "^1.3",
+    "psr/container": "^2.0",
     "psr/http-message": "^2.0",
     "psr/http-server-handler": "^1.0"
   },
+  "suggest": {
+    "free-elephants/di": "*"
+  },
   "config": {
     "sort-packages": true
   }
diff --git a/src/FreeElephants/PsrRouter/Exception/ExceptionInterface.php b/src/FreeElephants/PsrRouter/Exception/ExceptionInterface.php
@@ -1,9 +1,7 @@
 <?php
+
 declare(strict_types=1);
 
 namespace FreeElephants\PsrRouter\Exception;
 
-interface ExceptionInterface
-{
-
-}
+interface ExceptionInterface {}
diff --git a/src/FreeElephants/PsrRouter/Exception/MethodNotAllowed.php b/src/FreeElephants/PsrRouter/Exception/MethodNotAllowed.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace FreeElephants\PsrRouter\Exception;
diff --git a/src/FreeElephants/PsrRouter/Exception/NotFound.php b/src/FreeElephants/PsrRouter/Exception/NotFound.php
@@ -1,9 +1,7 @@
 <?php
+
 declare(strict_types=1);
 
 namespace FreeElephants\PsrRouter\Exception;
 
-class NotFound extends \RuntimeException implements ExceptionInterface
-{
-
-}
+class NotFound extends \RuntimeException implements ExceptionInterface {}
diff --git a/src/FreeElephants/PsrRouter/FastRoute/DispatcherBuilder.php b/src/FreeElephants/PsrRouter/FastRoute/DispatcherBuilder.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace FreeElephants\PsrRouter\FastRoute;
@@ -17,9 +18,8 @@ class DispatcherBuilder
     private OptionsHandlerInterface $optionsHandlerPrototype;
 
     public function __construct(
-        PathNormalizerInterface $pathNormalizer = null
-    )
-    {
+        ?PathNormalizerInterface $pathNormalizer = null
+    ) {
         $this->pathNormalizer = $pathNormalizer ?? new Dummy();
     }
 
diff --git a/src/FreeElephants/PsrRouter/HandlerAndRequestWithArgsContainer.php b/src/FreeElephants/PsrRouter/HandlerAndRequestWithArgsContainer.php
@@ -13,9 +13,7 @@ class HandlerAndRequestWithArgsContainer
     public function __construct(
         ServerRequestInterface $request,
         RequestHandlerInterface $handler
-    )
-    {
-
+    ) {
         $this->request = $request;
         $this->handler = $handler;
     }
diff --git a/src/FreeElephants/PsrRouter/MethodNotAllowedHandlerInterface.php b/src/FreeElephants/PsrRouter/MethodNotAllowedHandlerInterface.php
@@ -1,11 +1,9 @@
 <?php
+
 declare(strict_types=1);
 
 namespace FreeElephants\PsrRouter;
 
 use Psr\Http\Server\RequestHandlerInterface;
 
-interface MethodNotAllowedHandlerInterface extends RequestHandlerInterface
-{
-
-}
+interface MethodNotAllowedHandlerInterface extends RequestHandlerInterface {}
diff --git a/src/FreeElephants/PsrRouter/RequestHandlerFactory.php b/src/FreeElephants/PsrRouter/RequestHandlerFactory.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace FreeElephants\PsrRouter;
@@ -8,7 +9,6 @@
 
 class RequestHandlerFactory implements RequestHandlerFactoryInterface
 {
-
     private ContainerInterface $container;
 
     public function __construct(ContainerInterface $container)
diff --git a/src/FreeElephants/PsrRouter/RequestHandlerFactoryInterface.php b/src/FreeElephants/PsrRouter/RequestHandlerFactoryInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace FreeElephants\PsrRouter;
diff --git a/src/FreeElephants/PsrRouter/Router.php b/src/FreeElephants/PsrRouter/Router.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace FreeElephants\PsrRouter;
@@ -13,21 +14,19 @@
 
 class Router
 {
-
     private RequestHandlerFactoryInterface $requestHandlerFactory;
     private Dispatcher $dispatcher;
     private PathNormalizerInterface $pathNormalizer;
     private ?RequestHandlerInterface $notFoundHandler;
     private ?MethodNotAllowedHandlerInterface $methodNotAllowedHandler;
 
     public function __construct(
-        Dispatcher                       $dispatcher,
-        RequestHandlerFactoryInterface   $requestHandlerFactory,
-        RequestHandlerInterface          $notFoundHandler = null,
-        MethodNotAllowedHandlerInterface $methodNotAllowedHandler = null,
-        PathNormalizerInterface          $pathNormalizer = null
-    )
-    {
+        Dispatcher $dispatcher,
+        RequestHandlerFactoryInterface $requestHandlerFactory,
+        ?RequestHandlerInterface $notFoundHandler = null,
+        ?MethodNotAllowedHandlerInterface $methodNotAllowedHandler = null,
+        ?PathNormalizerInterface $pathNormalizer = null
+    ) {
         $this->dispatcher = $dispatcher;
         $this->requestHandlerFactory = $requestHandlerFactory;
         $this->notFoundHandler = $notFoundHandler;
@@ -50,9 +49,10 @@ public function getHandler(ServerRequestInterface $request): HandlerAndRequestWi
                 if (is_string($handler)) {
                     $handler = $this->requestHandlerFactory->create($handler);
                 }
+
                 return new HandlerAndRequestWithArgsContainer(
                     $request,
-                    $handler
+                    $handler,
                 );
             case Dispatcher::NOT_FOUND:
                 if (isset($this->notFoundHandler)) {
diff --git a/tests/FreeElephants/PsrRouter/FastRoute/DispatcherBuilderTest.php b/tests/FreeElephants/PsrRouter/FastRoute/DispatcherBuilderTest.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace FreeElephants\PsrRouter\FastRoute;
@@ -9,7 +10,6 @@
 
 class DispatcherBuilderTest extends TestCase
 {
-
     public function testBuild(): void
     {
         $builder = new DispatcherBuilder(new TrailingSlashTrimmer());
@@ -18,17 +18,18 @@ public function testBuild(): void
             ->addRoute('/users/{id}', 'get user by id')
             ->addConfig([
                 '/users/{id}' => [
-                    'PATCH' => 'update user',
+                    'PATCH'  => 'update user',
                     'DELETE' => 'delete user',
                 ],
-                '/users' => 'get users',
+                '/users'      => 'get users',
             ])
             ->addConfig([
                 '/users/' => [ // trailing slash will be normalized with given PathNormalizerInterface
                     'POST' => 'post user to collection',
                 ],
             ])
-            ->build();
+            ->build()
+        ;
 
         $this->assertSame([
             Dispatcher::FOUND,
diff --git a/tests/FreeElephants/PsrRouter/RouterTest.php b/tests/FreeElephants/PsrRouter/RouterTest.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace FreeElephants\PsrRouter;
@@ -14,7 +15,7 @@ class RouterTest extends TestCase
 {
     public function testGetHandler(): void
     {
-        $dispatcher = simpleDispatcher(function(RouteCollector $r) {
+        $dispatcher = simpleDispatcher(function (RouteCollector $r) {
             // {id} must be a number (\d+)
             $r->addRoute('GET', '/users/{id:\d+}', 'get_user_handler');
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`<?php`
	`2`	`+`
`2`	`3`	`declare(strict_types=1);`
`3`	`4`
`4`	`5`	`namespace FreeElephants\PsrRouter\Exception;`