From 9e30fbec8c29f364f25c3e34def3e7775f463278 Mon Sep 17 00:00:00 2001
From: Matthew Baggett <matthew@baggett.me>
Date: Sat, 18 Jun 2022 02:40:03 +0200
Subject: [PATCH] Fixup

---
 src/Controllers/AbstractCrudController.php        |  1 +
 src/Middleware/JsonResponseExecTimeMiddleware.php |  6 ++++--
 src/Router/Router.php                             | 10 +++++++++-
 tests/AbstractRoutesTestCase.php                  |  4 ++++
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/Controllers/AbstractCrudController.php b/src/Controllers/AbstractCrudController.php
index 60cb12b..6f33ad7 100644
--- a/src/Controllers/AbstractCrudController.php
+++ b/src/Controllers/AbstractCrudController.php
@@ -123,4 +123,5 @@ abstract class AbstractCrudController extends AbstractController
             $response
         );
     }
+
 }
diff --git a/src/Middleware/JsonResponseExecTimeMiddleware.php b/src/Middleware/JsonResponseExecTimeMiddleware.php
index 7b255ed..d0fb0cc 100644
--- a/src/Middleware/JsonResponseExecTimeMiddleware.php
+++ b/src/Middleware/JsonResponseExecTimeMiddleware.php
@@ -27,9 +27,11 @@ class JsonResponseExecTimeMiddleware implements MiddlewareInterface{
 
             return $response;
         }
+        $memoryUsageBytes = memory_get_peak_usage();
         $responseJson['Exec'] = [
-            'TimeSeconds' => microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'],
-            'MemoryBytes' => memory_get_peak_usage(),
+            'TimeSeconds' => (float) number_format(microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'],5),
+            'MemoryBytes' => $memoryUsageBytes,
+            'MemoryMegaBytes' => (float) number_format($memoryUsageBytes/1024/1024,3),
         ];
 
         $replacementResponse = new Response();
diff --git a/src/Router/Router.php b/src/Router/Router.php
index e5f2f6d..a88d151 100644
--- a/src/Router/Router.php
+++ b/src/Router/Router.php
@@ -55,10 +55,15 @@ class Router
                         continue;
                     }
 
+
                     $rc = new \ReflectionClass($expectedClass);
                     if ($rc->isAbstract()) {
                         continue;
                     }
+                    #\Kint::dump(
+                    #    $expectedClass,
+                    #    $rc
+                    #);
 
                     foreach ($rc->getMethods() as $method) {
                         if (!$method->isPublic()) {
@@ -73,10 +78,13 @@ class Router
                         foreach ($routeAnnotation->methods as $httpMethod) {
                             $newRoute = new Route();
 
+                            #\Kint::dump($method);
+                            #exit;
+
                             $newRoute
                                 ->setHttpMethod($httpMethod)
                                 ->setRouterPattern('/'.ltrim($routeAnnotation->path, '/'))
-                                ->setCallback($method->class.':'.$method->name)
+                                ->setCallback($expectedClass.':'.$method->name)
                                 ->setWeight($routeAnnotation->weight)
                             ;
 
diff --git a/tests/AbstractRoutesTestCase.php b/tests/AbstractRoutesTestCase.php
index 7d75e44..c7c89ec 100644
--- a/tests/AbstractRoutesTestCase.php
+++ b/tests/AbstractRoutesTestCase.php
@@ -15,6 +15,10 @@ abstract class AbstractRoutesTestCase extends AbstractBaseTestCase
         parent::setUp();
     }
 
+    public function getApp(){
+        return $this->slimApp;
+    }
+
     /**
      * @deprecated this has been deprecated in favour of the calls inside AppTestTrait
      *