Fixed issue related with regex for running path.

izniburak · Jan 21, 2022 · 2fa8fd5 · 2fa8fd5
1 parent d2c1002
commit 2fa8fd5
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 18 deletions.
diff --git a/src/Router.php b/src/Router.php
@@ -40,7 +40,7 @@ class Router
     /**
      * Router Version
      */
-    const VERSION = '2.4.0';
+    const VERSION = '2.4.1';
 
     /**
      * @var string $baseFolder Pattern definitions for parameters of Route
@@ -790,8 +790,10 @@ protected function getRequestUri(): string
         $dirname = dirname($script);
         $dirname = $dirname === '/' ? '' : $dirname;
         $basename = basename($script);
+
         $uri = str_replace([$dirname, $basename], '', $this->request()->server->get('REQUEST_URI'));
-        $uri = preg_replace('/\/'.str_replace(['.'],['\.'], $this->baseFolder).'/', '', $uri, 1);
+        $uri = preg_replace('/'.str_replace(['\\', '/', '.',], ['/', '\/', '\.'], $this->baseFolder).'/', '', $uri, 1);
+
         return $this->clearRouteName(explode('?', $uri)[0]);
     }
 }
diff --git a/tests/fixtures/.htaccess → tests/example/.htaccess b/tests/fixtures/.htaccess → tests/example/.htaccess
@@ -1,5 +1,5 @@
 RewriteEngine On
-RewriteBase /tests/fixtures
+RewriteBase /tests
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
 RewriteRule ^ index.php [QSA,L]
diff --git a/...s/fixtures/controllers/TestController.php → tests/example/Controllers/TestController.php b/...s/fixtures/controllers/TestController.php → tests/example/Controllers/TestController.php
diff --git a/tests/fixtures/index.php → tests/example/index.php b/tests/fixtures/index.php → tests/example/index.php
@@ -2,20 +2,20 @@
 
 require __DIR__ . '/../../vendor/autoload.php';
 
-use Buki\Router;
-
 $params = [
     'paths' => [
-        'controllers' => 'controllers/',
+        'Controllers' => 'Controllers',
+        'middlewares' => 'Middlewares',
     ],
     'namespaces' => [
-        'controllers' => 'Controllers\\',
+        'Controllers' => 'Controllers\\',
+        'middlewares' => 'Middlewares\\',
     ],
     'base_folder' => __DIR__,
     'main_method' => 'main',
 ];
 
-$router = new Router($params);
+$router = new \Buki\Router\Router($params);
 
 $router->get('/', function() {
     return 'Hello World!';

diff --git a/tests/fixtures/travis-ci-apache → tests/example/travis-ci-apache b/tests/fixtures/travis-ci-apache → tests/example/travis-ci-apache
@@ -13,7 +13,6 @@
     Action php-fcgi /php-fcgi
     Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi
     FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host 127.0.0.1:9000 -pass-header Authorization
-
     <Directory /usr/lib/cgi-bin>
       Require all granted
     </Directory>

diff --git a/tests/fixtures/www.conf.default → tests/example/www.conf.default b/tests/fixtures/www.conf.default → tests/example/www.conf.default
diff --git a/tests/fixtures/TestController.php b/tests/fixtures/TestController.php