Init

Author: odan

.cs.php

@@ -37,8 +37,6 @@
     ->setFinder(PhpCsFixer\Finder::create()
         ->in(__DIR__ . '/src')
         ->in(__DIR__ . '/tests')
-        ->in(__DIR__ . '/config')
-        ->in(__DIR__ . '/public')
         ->name('*.php')
         ->ignoreDotFiles(true)
         ->ignoreVCS(true));

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "selective/basepath",
     "type": "library",
-    "description": "A URL base path detector for Slim 3 and 4",
+    "description": "A URL base path detector for Slim 4",
     "keywords": [
         "basepath",
         "slim",

src/BasePathDetector.php

@@ -12,14 +12,21 @@ class BasePathDetector
      */
     private $server = [];
 
+    /**
+     * @var string The PHP_SAPI value
+     */
+    private $phpSapi = '';
+
     /**
      * The constructor.
      *
      * @param array $server The SERVER data to use
+     * @param string $phpSapi The PHP_SAPI value
      */
-    public function __construct(array $server)
+    public function __construct(array $server, string $phpSapi)
     {
         $this->server = $server;
+        $this->phpSapi = $phpSapi;
     }
 
     /**
@@ -29,13 +36,17 @@ public function __construct(array $server)
      */
     public function getBasePath(): string
     {
+        // For apache
+        if ($this->phpSapi === 'apache2handler') {
+            return $this->getBasePathFromApache($this->server);
+        }
+
         // For built-in server
-        if (PHP_SAPI === 'cli-server') {
+        if ($this->phpSapi === 'cli-server') {
             return $this->getBasePathFromBuiltIn($this->server);
         }
 
-        // For apache
-        return $this->getBasePathFromApache($this->server);
+        return '';
     }
 
     /**

tests/ApacheTest.php

@@ -0,0 +1,103 @@
+<?php
+
+namespace Selective\BasePath\Test;
+
+use PHPUnit\Framework\TestCase;
+use Selective\BasePath\BasePathDetector;
+
+/**
+ * Test.
+ */
+class ApacheTest extends TestCase
+{
+    /**
+     * @var array
+     */
+    private $server;
+
+    /**
+     * Set Up.
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        $this->server = [
+            'REQUEST_METHOD' => 'GET',
+            'REQUEST_SCHEME' => 'http',
+            'HTTP_HOST' => 'localhost',
+            'SERVER_PORT' => '80',
+            'REQUEST_URI' => '/',
+            'SERVER_PROTOCOL' => 'HTTP/1.1',
+            'SCRIPT_NAME' => '',
+            'REQUEST_TIME_FLOAT' => microtime(true),
+            'REQUEST_TIME' => microtime(),
+        ];
+    }
+
+    /**
+     * Create instance.
+     *
+     * @return BasePathDetector The detector
+     */
+    private function createInstance(): BasePathDetector
+    {
+        return new BasePathDetector($this->server, 'apache2handler');
+    }
+
+    /**
+     * Test.
+     *
+     * @return void
+     */
+    public function testDefault(): void
+    {
+        $detector = $this->createInstance();
+        $basePath = $detector->getBasePath();
+
+        static::assertSame('', $basePath);
+    }
+
+    /**
+     * Test.
+     *
+     * @return void
+     */
+    public function testUnknownServer(): void
+    {
+        $detector = new BasePathDetector($this->server, '');
+        $basePath = $detector->getBasePath();
+
+        static::assertSame('', $basePath);
+    }
+
+    /**
+     * Test.
+     *
+     * @return void
+     */
+    public function testSubdirectory(): void
+    {
+        $this->server['REQUEST_URI'] = '/public';
+
+        $detector = $this->createInstance();
+        $basePath = $detector->getBasePath();
+
+        static::assertSame('/public', $basePath);
+    }
+
+    /**
+     * Test.
+     *
+     * @return void
+     */
+    public function testWithoutRequestUri(): void
+    {
+        unset($this->server['REQUEST_URI']);
+
+        $detector = $this->createInstance();
+        $basePath = $detector->getBasePath();
+
+        static::assertSame('', $basePath);
+    }
+}

tests/InternalServerTest.php

@@ -3,19 +3,79 @@
 namespace Selective\BasePath\Test;
 
 use PHPUnit\Framework\TestCase;
+use Selective\BasePath\BasePathDetector;
 
 /**
  * Test.
  */
 class InternalServerTest extends TestCase
 {
+    /**
+     * @var array
+     */
+    private $server;
+
+    /**
+     * Set Up.
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        $this->server = [
+            'REQUEST_METHOD' => 'GET',
+            'REQUEST_SCHEME' => 'http',
+            'HTTP_HOST' => 'localhost',
+            'SERVER_PORT' => '80',
+            'REQUEST_URI' => '/',
+            'SERVER_PROTOCOL' => 'HTTP/1.1',
+            'SCRIPT_NAME' => '',
+            'REQUEST_TIME_FLOAT' => microtime(true),
+            'REQUEST_TIME' => microtime(),
+        ];
+    }
+
+    /**
+     * Create instance.
+     *
+     * @return BasePathDetector The detector
+     */
+    private function createInstance(): BasePathDetector
+    {
+        return new BasePathDetector($this->server, 'cli-server');
+    }
+
+    /**
+     * Test.
+     *
+     * @return void
+     */
+    public function testDefault(): void
+    {
+        $detector = $this->createInstance();
+        $basePath = $detector->getBasePath();
+
+        static::assertSame('', $basePath);
+
+        $this->server['SCRIPT_NAME'] = '/index.php';
+        $detector = $this->createInstance();
+        $basePath = $detector->getBasePath();
+
+        static::assertSame('', $basePath);
+    }
+
     /**
      * Test.
      *
      * @return void
      */
-    public function testInternalServer(): void
+    public function testSubdirectory(): void
     {
-        $this->assertTrue(true);
+        $this->server['SCRIPT_NAME'] = '/public/index.php';
+
+        $detector = $this->createInstance();
+        $basePath = $detector->getBasePath();
+
+        static::assertSame('/public', $basePath);
     }
 }