Fixed array offset error in Server::collectRoutes; updated test refer…

…ences to InternalClient
d-miles · Aug 9, 2024 · bccfee5 · bccfee5
1 parent d655aff
commit bccfee5
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ PHP REST Service is a simple and fast PHP class for RESTful JSON APIs.
 
 
 ## Requirements
-* PHP 7.4+ (Tested on PHP 7.4 - 8.2)
+* PHP 8.0+ (Tested on PHP 7.4 - 8.2)
 ## Installation
 `php composer require cdgco/php-rest-service`
 

diff --git a/RestService/Server.php b/RestService/Server.php
@@ -810,7 +810,7 @@ public function collectRoutes() {
                     $this->routes[$phpDocs['url']][$httpMethod] = $method;
                 } else {
                     foreach($phpDocs['url'] as $urlAnnotation) {
-                        $this->routes[$urlAnnotation['url']][$httpMethod] = $method;
+                        $this->routes[$urlAnnotation][$httpMethod] = $method;
                     }
                 }
             } else {

diff --git a/Test/Basic/BasicTest.php b/Test/Basic/BasicTest.php
@@ -2,15 +2,15 @@
 
 namespace Test\Synthetic;
 
-use RestService\Server;
+use RestService\{Server, InternalClient};
 use Test\Controller\MyRoutes;
 
 class BasicTest extends \PHPUnit\Framework\TestCase
 {
     public function testCustomUrl()
     {
         $restService = Server::create('/', new MyRoutes)
-            ->setClient('RestService\\InternalClient')
+            ->setClient(InternalClient::class)
             ->collectRoutes();
 
         $response = $restService->simulateCall('/test/test', 'get');

diff --git a/Test/Synthetic/CollectTest.php b/Test/Synthetic/CollectTest.php
@@ -2,7 +2,7 @@
 
 namespace Test\Synthetic;
 
-use RestService\Server;
+use RestService\{Server, InternalClient};
 use Test\Controller\MyRoutes;
 
 class CollectTest extends \PHPUnit\Framework\TestCase
@@ -15,7 +15,7 @@ class CollectTest extends \PHPUnit\Framework\TestCase
     public function setUp() : void
     {
         $this->restService = Server::create('/', new MyRoutes)
-            ->setClient('RestService\\InternalClient')
+            ->setClient(InternalClient::class)
             ->collectRoutes();
     }
     public function testNonPhpDocMethod()

diff --git a/Test/Synthetic/CustomRoutesTest.php b/Test/Synthetic/CustomRoutesTest.php
@@ -2,7 +2,7 @@
 
 namespace Test\Synthetic;
 
-use RestService\Server;
+use RestService\{Server, InternalClient};
 use Test\Controller\MyRoutes;
 
 class CustomRoutesTest extends \PHPUnit\Framework\TestCase
@@ -11,7 +11,7 @@ class CustomRoutesTest extends \PHPUnit\Framework\TestCase
     public function testOwnController()
     {
         $restService = Server::create('/', new MyRoutes)
-            ->setClient('RestService\\InternalClient')
+            ->setClient(InternalClient::class)
             ->addPostRoute('login', 'postLogin');
 
         $response = $restService->simulateCall('/#?', 'post');
@@ -50,7 +50,7 @@ public function testOwnController()
     public function testOwnControllerWithDifferentPrefix()
     {
         $restService = Server::create('/v1', new MyRoutes)
-            ->setClient('RestService\\InternalClient')
+            ->setClient(InternalClient::class)
             ->addPostRoute('login', 'postLogin');
 
         $response = $restService->simulateCall('/v1/#?username=peter&password=pwd', 'post');
@@ -61,7 +61,7 @@ public function testOwnControllerWithDifferentPrefix()
 }', $response);
 
         $restService = Server::create('/v1/', new MyRoutes)
-            ->setClient('RestService\\InternalClient')
+            ->setClient(InternalClient::class)
             ->addPostRoute('login', 'postLogin');
 
         $response = $restService->simulateCall('/v1/#?username=peter&password=pwd', 'post');
@@ -72,7 +72,7 @@ public function testOwnControllerWithDifferentPrefix()
 }', $response);
 
         $restService = Server::create('v1', new MyRoutes)
-            ->setClient('RestService\\InternalClient')
+            ->setClient(InternalClient::class)
             ->addPostRoute('login', 'postLogin');
 
         $response = $restService->simulateCall('/v1/#?username=peter&password=pwd', 'post');
@@ -87,7 +87,7 @@ public function testOwnControllerWithDifferentPrefix()
     public function testSubController()
     {
         $restService = Server::create('v1', new MyRoutes)
-            ->setClient('RestService\\InternalClient')
+            ->setClient(InternalClient::class)
             ->addPostRoute('login', 'postLogin')
             ->addSubController('sub', new MyRoutes())
                 ->addPostRoute('login', 'postLogin')
@@ -106,7 +106,7 @@ public function testSubController()
     public function testSubControllerWithSlashRootParent()
     {
         $restService = Server::create('/', new MyRoutes)
-            ->setClient('RestService\\InternalClient')
+            ->setClient(InternalClient::class)
             ->addSubController('sub', new MyRoutes())
                 ->addPostRoute('login', 'postLogin')
             ->done()

diff --git a/Test/Synthetic/RouteTest.php b/Test/Synthetic/RouteTest.php
@@ -2,7 +2,7 @@
 
 namespace Test\Synthetic;
 
-use RestService\Server;
+use RestService\{Server, InternalClient};
 
 class RouteTest extends \PHPUnit\Framework\TestCase
 {
@@ -11,7 +11,7 @@ public function testAllRoutesClosures()
     {
 
         $restService = Server::create('/')
-            ->setClient('RestService\\InternalClient')
+            ->setClient(InternalClient::class)
             ->addGetRoute('test', function(){
                 return 'getTest';
             })