htaccess and routing in subdir fixes

Author: webdevlabs

bootstrap.php

@@ -71,7 +71,7 @@
 $modules->loadRoutes($router);
 
 // Cache the routes data
-$item = $cache->getItem('req_'.$requestURI);
+$item = $cache->getItem('routes');
 $routesData = $item->get();
 if ($item->isMiss()) {
 	$item->lock();    
@@ -86,7 +86,6 @@
 // Create Route Dispatcher object
 $dispatcher = new Phroute\Phroute\Dispatcher($routesData, $resolver);
 
-
 /**
  * Load Middlewares
  */
@@ -95,10 +94,10 @@
 $relay = new Relay\RelayBuilder();
 
 $relaydispatcher = $relay->newInstance([
+    Middleware::basePath(BASE_PATH),
+    Middleware::trailingSlash(),
     Middleware::responseTime(),
     new Plugins\Middlewares\LanguageDetect($language),
     new Plugins\Middlewares\Phroute($dispatcher)    
 ]);
 $response = $relaydispatcher($request, $response);
-$emitter =  new \Zend\Diactoros\Response\SapiEmitter;
-$emitter->emit($response);

config/system.php

@@ -3,7 +3,7 @@
 
 /* BASE SETTINGS */
 //define('BASE_URL',"http://".$_SERVER['HTTP_HOST']."/cms");
-define('BASE_PATH',""); // leave empty if not in subdir
+define('BASE_PATH',"/phreak"); // leave empty if not in subdir or "/phreak" for example subdir
 define('BASE_URL',"http://localhost:8080".BASE_PATH);
 define('ROOT_DIR', dirname(__DIR__));
 

plugins/middlewares/LanguageDetect.php

@@ -45,7 +45,6 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
                 $language = $first;
                 //remove the language in the path
                 $request = $request->withUri($uri->withPath('/'.array_shift($dirs)));
-                $_SESSION['requestURI']=$request->getUri()->getPath();
                 $this->language->current = $language;
             }
         return $next($request, $response);

plugins/middlewares/Phroute.php

@@ -33,12 +33,10 @@ public function __construct(Dispatcher $router)
      * @return ResponseInterface
      */
     public function __invoke(ServerRequestInterface $request, ResponseInterface $response, callable $next) {
-        // Create the Response Emitter
-        $emitter =  new \Zend\Diactoros\Response\SapiEmitter;
-
         // Application is loaded. Execute Route Dispatcher
         // WITH PSR7 REQUEST/RESPONSE HANDLERS
         try {
+            $_SESSION['requestURI']=$request->getUri()->getPath();
             ob_start();
             $this->router->dispatch($request->getMethod(), $request->getUri()->getPath());
             $bufferedBody = ob_get_clean();

public/.htaccess

@@ -6,8 +6,8 @@
     RewriteEngine On
 
     # Redirect Trailing Slashes If Not A Folder...
-    RewriteCond %{REQUEST_FILENAME} !-d
-    RewriteRule ^(.*)/$ /$1 [L,R=301]
+#    RewriteCond %{REQUEST_FILENAME} !-d
+#    RewriteRule ^(.*)/$ /$1 [L,R=301]
 
     # Handle Front Controller...
     RewriteCond %{REQUEST_FILENAME} !-d

public/index.php

@@ -12,4 +12,6 @@
  */
 require_once __DIR__.'/../bootstrap.php';
 
-
+// Emit the response
+$emitter =  new \Zend\Diactoros\Response\SapiEmitter;
+$emitter->emit($response);