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
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ phpmetrics.json export-ignore
phpstan-baseline.php export-ignore
phpstan-bootstrap.php export-ignore
phpstan.neon.dist export-ignore
phpunit.xml.dist export-ignore
phpunit.dist.xml export-ignore
psalm-baseline.xml export-ignore
psalm.xml export-ignore
psalm_autoload.php export-ignore
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,6 @@ _modules/*
.vscode/

/results/
/phpunit*.xml
/phpunit.xml

/.php-cs-fixer.php
2 changes: 1 addition & 1 deletion admin/framework/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,4 @@ _modules/*
.vscode/

/results/
/phpunit*.xml
/phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
bootstrap="system/Test/bootstrap.php"
backupGlobals="false"
beStrictAboutOutputDuringTests="true"
colors="true"
columns="max"
failOnRisky="true"
failOnWarning="true"
cacheDirectory="build/.phpunit.cache">
<coverage
includeUncoveredFiles="true"
pathCoverage="false"
ignoreDeprecatedCodeUnits="true"
disableCodeCoverageIgnore="true">
cacheDirectory="build/.phpunit.cache"
>
<coverage pathCoverage="false" ignoreDeprecatedCodeUnits="true">
<report>
<clover outputFile="build/logs/clover.xml"/>
<html outputDirectory="build/logs/html"/>
<php outputFile="build/logs/coverage.serialized"/>
<text outputFile="php://stdout" showUncoveredFiles="false"/>
</report>
</coverage>

<testsuites>
<testsuite name="App">
<directory>./tests</directory>
</testsuite>
</testsuites>

<logging>
<testdoxHtml outputFile="build/logs/testdox.html"/>
<testdoxText outputFile="build/logs/testdox.txt"/>
<junit outputFile="build/logs/logfile.xml"/>
</logging>

<source>
<include>
<directory suffix=".php">./app</directory>
Expand All @@ -41,6 +41,7 @@
<file>./app/Config/Routes.php</file>
</exclude>
</source>

<php>
<server name="app.baseURL" value="http://example.com/"/>
<server name="CODEIGNITER_SCREAM_DEPRECATIONS" value="0"/>
Expand Down
2 changes: 1 addition & 1 deletion admin/starter/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,4 @@ _modules/*
.vscode/

/results/
/phpunit*.xml
/phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
bootstrap="vendor/codeigniter4/framework/system/Test/bootstrap.php"
backupGlobals="false"
beStrictAboutOutputDuringTests="true"
colors="true"
columns="max"
failOnRisky="true"
failOnWarning="true"
cacheDirectory="build/.phpunit.cache">
<coverage
includeUncoveredFiles="true"
pathCoverage="false"
ignoreDeprecatedCodeUnits="true"
disableCodeCoverageIgnore="true">
cacheDirectory="build/.phpunit.cache"
>
<coverage pathCoverage="false" ignoreDeprecatedCodeUnits="true">
<report>
<clover outputFile="build/logs/clover.xml"/>
<html outputDirectory="build/logs/html"/>
<php outputFile="build/logs/coverage.serialized"/>
<text outputFile="php://stdout" showUncoveredFiles="false"/>
</report>
</coverage>

<testsuites>
<testsuite name="App">
<directory>./tests</directory>
</testsuite>
</testsuites>

<logging>
<testdoxHtml outputFile="build/logs/testdox.html"/>
<testdoxText outputFile="build/logs/testdox.txt"/>
<junit outputFile="build/logs/logfile.xml"/>
</logging>

<source>
<include>
<directory suffix=".php">./app</directory>
Expand All @@ -41,6 +41,7 @@
<file>./app/Config/Routes.php</file>
</exclude>
</source>

<php>
<server name="app.baseURL" value="http://example.com/"/>
<server name="CODEIGNITER_SCREAM_DEPRECATIONS" value="0"/>
Expand Down
11 changes: 6 additions & 5 deletions phpunit.xml.dist → phpunit.dist.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
bootstrap="system/Test/bootstrap.php"
backupGlobals="false"
beStrictAboutOutputDuringTests="true"
Expand All @@ -12,27 +12,27 @@
failOnRisky="true"
failOnWarning="true"
>
<coverage
pathCoverage="false"
ignoreDeprecatedCodeUnits="true"
disableCodeCoverageIgnore="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>
</testsuites>

<source>
<include>
<directory suffix=".php">system</directory>
Expand All @@ -51,6 +51,7 @@
<file>system/Test/FeatureTestCase.php</file>
</exclude>
</source>

<php>
<server name="app.baseURL" value="http://example.com/"/>
<server name="CODEIGNITER_SCREAM_DEPRECATIONS" value="1"/>
Expand Down
2 changes: 1 addition & 1 deletion tests/system/Files/FileTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public function testGuessExtension(): void
$file = new File(SYSTEMPATH . 'index.html');
$this->assertSame('html', $file->guessExtension());

$file = new File(ROOTPATH . 'phpunit.xml.dist');
$file = new File(ROOTPATH . 'phpunit.dist.xml');
$this->assertSame('xml', $file->guessExtension());

$tmp = tempnam(SUPPORTPATH, 'foo');
Expand Down
Loading