integrate trails, fixes #4102

Closes #4102

Merge request studip/studip!3034

4 files changed, 32 insertions, 17 deletions

diff --git a/tests/unit/_bootstrap.php b/tests/unit/_bootstrap.php
index a1dbdd1..87dedca 100644
--- a/tests/unit/_bootstrap.php
+++ b/tests/unit/_bootstrap.php
@@ -62,18 +62,7 @@ StudipAutoloader::addAutoloadPath('lib/flexi', 'Flexi');
 StudipAutoloader::addAutoloadPath('lib/plugins/engine');
 StudipAutoloader::addAutoloadPath('lib/plugins/core');
 StudipAutoloader::addAutoloadPath('lib/plugins/db');
-
-$trails_classes = [
-    'Trails_Dispatcher', 'Trails_Response', 'Trails_Controller',
-    'Trails_Inflector', 'Trails_Flash',
-    'Trails_Exception', 'Trails_DoubleRenderError', 'Trails_MissingFile',
-    'Trails_RoutingError', 'Trails_UnknownAction', 'Trails_UnknownController',
-    'Trails_SessionRequiredException',
-];
-StudipAutoloader::addClassLookup(
-    $trails_classes,
-    'vendor/trails/trails.php'
-);
+StudipAutoloader::addAutoloadPath('lib/trails', 'Trails');
 
 // load config-variables
 $added_configs = [];
diff --git a/tests/unit/lib/FunctionsTest.php b/tests/unit/lib/FunctionsTest.php
index 670d00c..c254fda 100644
--- a/tests/unit/lib/FunctionsTest.php
+++ b/tests/unit/lib/FunctionsTest.php
@@ -75,11 +75,12 @@ class FunctionsTest extends \Codeception\Test\Unit
     }
 
     /**
-     * @covers Trails_Controller::extract_action_and_args()
+     * @covers Trails\Controller::extract_action_and_args()
      */
     public function testTrailsControllerExtractActionAndArgs()
     {
-        $controller = new Trails_Controller(null);
+        $dispatcher = new Trails\Dispatcher('', '', '');
+        $controller = new Trails\Controller($dispatcher);
         [$action, $args, $format] = $controller->extract_action_and_args('foo/bar//42.html');
 
         $this->assertEquals('foo', $action);
diff --git a/tests/unit/lib/classes/StudipControllerTest.php b/tests/unit/lib/classes/StudipControllerTest.php
index f7e4ef4..51359ab 100644
--- a/tests/unit/lib/classes/StudipControllerTest.php
+++ b/tests/unit/lib/classes/StudipControllerTest.php
@@ -27,13 +27,13 @@ final class StudipControllerTest extends Codeception\Test\Unit
         parent::tearDown();
     }
 
-    private function getDispatcher(): Trails_Dispatcher
+    private function getDispatcher(): Trails\Dispatcher
     {
         $trails_root = $GLOBALS['STUDIP_BASE_PATH'] . DIRECTORY_SEPARATOR . 'app';
         $trails_uri = rtrim($GLOBALS['ABSOLUTE_URI_STUDIP'], '/') . '/dispatch.php';
         $default_controller = 'default';
 
-        return new Trails_Dispatcher($trails_root, $trails_uri, $default_controller);
+        return new Trails\Dispatcher($trails_root, $trails_uri, $default_controller);
     }
 
     private function getController(): StudipController
@@ -247,7 +247,7 @@ final class StudipControllerTest extends Codeception\Test\Unit
     {
         $args = [$should_fail];
 
-        $this->expectException(Trails_Exception::class);
+        $this->expectException(Trails\Exception::class);
         $this->getController()->validate_args($args);
     }
 
diff --git a/tests/unit/lib/classes/TrailsTest.php b/tests/unit/lib/classes/TrailsTest.php
new file mode 100644
index 0000000..d51b795
--- /dev/null
+++ b/tests/unit/lib/classes/TrailsTest.php
@@ -0,0 +1,25 @@
+<?php
+class TrailsTest extends \Codeception\Test\Unit
+{
+    /**
+     * @covers Trails\Inflector::camelize
+     */
+    public function testInflectorCamelize(): void
+    {
+        $this->assertEquals(
+            'Path_SubPath_UnderscoreController',
+            Trails\Inflector::camelize('path/sub_path/underscore_controller')
+        );
+    }
+
+    /**
+     * @covers Trails\Inflector::underscore
+     */
+    public function testInflectorUnderscore(): void
+    {
+        $this->assertEquals(
+            'path/sub_path/underscore_controller',
+            Trails\Inflector::underscore('Path_SubPath_UnderscoreController')
+        );
+    }
+}