Skip to content

Commit

Permalink
Merge pull request #7901 from kenjis/fix-cli-base_url
Browse files Browse the repository at this point in the history 
fix: base_url()/site_url() does not work on CLI
  • Loading branch information
@kenjis
kenjis authored Sep 12, 2023
2 parents 0333436 + e0df5f2 commit a42b84f
Show file tree
Hide file tree
Showing 2 changed files with 336 additions and 0 deletions.
3 changes: 3 additions & 0 deletions system/HTTP/CLIRequest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ public function __construct(App $config)
ignore_user_abort(true);

$this->parseCommand();

// Set SiteURI for this request
$this->uri = new SiteURI($config, $this->getPath());
}

/**
Expand Down
333 changes: 333 additions & 0 deletions tests/system/Helpers/URLHelper/SiteUrlCliTest.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,333 @@
<?php

/**
* This file is part of CodeIgniter 4 framework.
*
* (c) CodeIgniter Foundation <admin@codeigniter.com>
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/

namespace CodeIgniter\Helpers\URLHelper;

use CodeIgniter\Config\Factories;
use CodeIgniter\Config\Services;
use CodeIgniter\HTTP\CLIRequest;
use CodeIgniter\Test\CIUnitTestCase;
use Config\App;

/**
* Since base_url() only slightly modifies
* site_url() these functions are tested
* simultaneously.
*
* @backupGlobals enabled
*
* @internal
*
* @group Others
*/
final class SiteUrlCliTest extends CIUnitTestCase
{
private App $config;

protected function setUp(): void
{
parent::setUp();

Services::reset(true);

$this->config = new App();
}

protected function tearDown(): void
{
parent::tearDown();

$_SERVER = [];
}

private function createRequest(?App $config = null): void
{
$config ??= new App();

$request = new CLIRequest($config);
Services::injectMock('request', $request);

Factories::injectMock('config', 'App', $config);
}

/**
* Takes a multitude of various config input and verifies
* that base_url() and site_url() return the expected result.
*
* @param string $baseURL
* @param string $indexPage
* @param string|null $scheme
* @param bool $secure
* @param string $path
* @param string $expectedSiteUrl
* @param string $expectedBaseUrl
*
* @dataProvider provideUrls
*/
public function testUrls(
$baseURL,
$indexPage,
$scheme,
$secure,
$path,
$expectedSiteUrl,
$expectedBaseUrl
): void {
// Set the config
$this->config->baseURL = $baseURL;
$this->config->indexPage = $indexPage;
$this->config->forceGlobalSecureRequests = $secure;

$this->createRequest($this->config);

$this->assertSame($expectedSiteUrl, site_url($path, $scheme, $this->config));
$this->assertSame($expectedBaseUrl, base_url($path, $scheme));
}

public static function provideUrls(): iterable
{
// baseURL, indexPage, scheme, secure, path, expectedSiteUrl, expectedBaseUrl
return [
'forceGlobalSecure' => [
'http://example.com/',
'index.php',
null,
true,
'',
'https://example.com/index.php',
'https://example.com/',
],
[
'http://example.com/',
'index.php',
null,
false,
'',
'http://example.com/index.php',
'http://example.com/',
],
'baseURL missing /' => [
'http://example.com',
'index.php',
null,
false,
'',
'http://example.com/index.php',
'http://example.com/',
],
[
'http://example.com/',
'',
null,
false,
'',
'http://example.com/',
'http://example.com/',
],
[
'http://example.com/',
'banana.php',
null,
false,
'',
'http://example.com/banana.php',
'http://example.com/',
],
[
'http://example.com/',
'',
null,
false,
'abc',
'http://example.com/abc',
'http://example.com/abc',
],
[
'http://example.com/',
'',
null,
false,
'/abc',
'http://example.com/abc',
'http://example.com/abc',
],
[
'http://example.com/',
'',
null,
false,
'/abc/',
'http://example.com/abc/',
'http://example.com/abc/',
],
[
'http://example.com/',
'',
null,
false,
'/abc/def',
'http://example.com/abc/def',
'http://example.com/abc/def',
],
'URL decode' => [
'http://example.com/',
'',
null,
false,
'template/meet-%26-greet',
'http://example.com/template/meet-&-greet',
'http://example.com/template/meet-&-greet',
],
'URL encode' => [
'http://example.com/',
'',
null,
false,
'<s>alert</s>',
'http://example.com/%3Cs%3Ealert%3C/s%3E',
'http://example.com/%3Cs%3Ealert%3C/s%3E',
],
[
'http://example.com/public/',
'index.php',
null,
false,
'',
'http://example.com/public/index.php',
'http://example.com/public/',
],
[
'http://example.com/public/',
'',
null,
false,
'',
'http://example.com/public/',
'http://example.com/public/',
],
[
'http://example.com/public',
'',
null,
false,
'',
'http://example.com/public/',
'http://example.com/public/',
],
[
'http://example.com/public',
'index.php',
null,
false,
'/',
'http://example.com/public/index.php/',
'http://example.com/public/',
],
[
'http://example.com/public/',
'index.php',
null,
false,
'/',
'http://example.com/public/index.php/',
'http://example.com/public/',
],
[
'http://example.com/',
'index.php',
null,
false,
'foo',
'http://example.com/index.php/foo',
'http://example.com/foo',
],
[
'http://example.com/',
'index.php',
null,
false,
'0',
'http://example.com/index.php/0',
'http://example.com/0',
],
[
'http://example.com/public',
'index.php',
null,
false,
'foo',
'http://example.com/public/index.php/foo',
'http://example.com/public/foo',
],
[
'http://example.com/',
'index.php',
null,
false,
'foo?bar=bam',
'http://example.com/index.php/foo?bar=bam',
'http://example.com/foo?bar=bam',
],
[
'http://example.com/',
'index.php',
null,
false,
'test#banana',
'http://example.com/index.php/test#banana',
'http://example.com/test#banana',
],
[
'http://example.com/',
'index.php',
'ftp',
false,
'foo',
'ftp://example.com/index.php/foo',
'ftp://example.com/foo',
],
[
'http://example.com/',
'index.php',
null,
false,
'news/local/123',
'http://example.com/index.php/news/local/123',
'http://example.com/news/local/123',
],
[
'http://example.com/',
'index.php',
null,
false,
['news', 'local', '123'],
'http://example.com/index.php/news/local/123',
'http://example.com/news/local/123',
],
];
}

public function testSiteURLWithEmptyStringScheme(): void
{
$this->config->baseURL = 'http://example.com/';
$this->config->indexPage = 'index.php';
$this->config->forceGlobalSecureRequests = false;

$this->assertSame(
'//example.com/index.php/test',
site_url('test', '', $this->config)
);
$this->assertSame(
'//example.com/img/test.jpg',
base_url('img/test.jpg', '')
);
}
}

0 comments on commit a42b84f

Please sign in to comment.