Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 4 additions & 46 deletions phpunit.dist.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,64 +2,22 @@
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
bootstrap="system/Test/bootstrap.php"
bootstrap="vendor/autoload.php"
backupGlobals="false"
beStrictAboutOutputDuringTests="true"
cacheDirectory="build/.phpunit.cache"
colors="true"
columns="max"
displayDetailsOnAllIssues="true"
failOnRisky="true"
failOnWarning="true"
>
<coverage pathCoverage="false" ignoreDeprecatedCodeUnits="true">
<report>
<clover outputFile="build/logs/clover.xml"/>
<html outputDirectory="build/coverage/html" highLowerBound="80"/>
<text outputFile="build/coverage/coverage.txt"/>
</report>
</coverage>

<extensions>
<bootstrap class="Nexus\PHPUnit\Tachycardia\TachycardiaExtension">
<parameter name="time-limit" value="0.50" />
<parameter name="report-count" value="30" />
</bootstrap>
</extensions>

<testsuites>
<testsuite name="System">
<directory>tests/system</directory>
<testsuite name="WizdamDebugToolbar">
<directory>tests</directory>
</testsuite>
</testsuites>

<source>
<include>
<directory suffix=".php">system</directory>
<directory suffix=".php">src</directory>
</include>
<exclude>
<directory>system/Commands/Generators/Views</directory>
<directory>system/Debug/Toolbar/Views</directory>
<directory>system/Pager/Views</directory>
<directory>system/ThirdParty</directory>
<directory>system/Validation/Views</directory>
<file>system/bootstrap.php</file>
<file>system/ComposerScripts.php</file>
<file>system/Config/Routes.php</file>
<file>system/Test/bootstrap.php</file>
<file>system/Test/ControllerTester.php</file>
<file>system/Test/FeatureTestCase.php</file>
</exclude>
</source>

<php>
<server name="app.baseURL" value="http://example.com/"/>
<server name="CODEIGNITER_SCREAM_DEPRECATIONS" value="1"/>
<!-- Directory containing phpunit.xml -->
<const name="HOMEPATH" value="./"/>
<!-- Directory containing the Paths config file -->
<const name="CONFIGPATH" value="./app/Config/"/>
<!-- Directory containing the front controller (index.php) -->
<const name="PUBLICPATH" value="./public/"/>
</php>
</phpunit>
18 changes: 10 additions & 8 deletions src/Adapters/AdodbDatabaseAdapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,19 +57,21 @@
* Catat satu query ke dalam log.
* Dipanggil dari kode aplikasi saat query dieksekusi.
*
* @param string $sql Query SQL yang dieksekusi
* @param float $duration Durasi dalam milidetik
* @param array $params Bind parameter (opsional)
* @param string $sql Query SQL yang dieksekusi
* @param float $duration Durasi dalam milidetik
* @param array $params Bind parameter (opsional)
* @param float|null $startTime microtime(true) saat query dimulai (untuk timeline)

Check warning

Code scanning / Phpcs (reported by Codacy)

Line exceeds 85 characters; contains 87 characters Warning

Line exceeds 85 characters; contains 87 characters
*/
public static function logQuery(string $sql, float $duration, array $params = []): void
public static function logQuery(string $sql, float $duration, array $params = [], ?float $startTime = null): void

Check warning

Code scanning / Phpcs (reported by Codacy)

Line exceeds 85 characters; contains 117 characters Warning

Line exceeds 85 characters; contains 117 characters
{
$sql = trim($sql);

self::$queries[] = [
'sql' => $sql,
'duration' => round($duration, 4),
'params' => $params,
'trace' => self::buildShortTrace(),
'sql' => $sql,
'duration' => round($duration, 4),
'params' => $params,
'trace' => self::buildShortTrace(),
'startTime' => $startTime ?? (microtime(true) - $duration / 1000.0),
];

self::$totalTime += $duration;
Expand Down
6 changes: 3 additions & 3 deletions src/Collectors/BaseCollector.php
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,13 @@ public function display()
}

/**
* This makes nicer looking paths for the error output.
* Normalize a file path for display (forward slashes, no trailing sep).
*
* @deprecated Use the dedicated `clean_path()` function.
* @deprecated No longer needed — paths are normalized per-collector.
*/
public function cleanPath(string $file): string
{
return clean_path($file);
return str_replace('\\', '/', $file);
}

/**
Expand Down
6 changes: 4 additions & 2 deletions src/Collectors/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,20 @@
* Adapted from CodeIgniter 4 to be framework-agnostic.
* Returns basic PHP and environment information.
*/
class Config extends BaseCollector
class Config
{
/**
* Return toolbar config values as an array.
*/
public static function display(): array
public static function display(array $config = []): array
{
return [
'phpVersion' => PHP_VERSION,
'phpSAPI' => PHP_SAPI,
'timezone' => date_default_timezone_get(),
'serverOS' => PHP_OS,
'baseURL' => $config['baseURL'] ?? '',
'environment' => $config['environment'] ?? '',
];
}
}
Loading
Loading