-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8783 from codeigniter4/develop
4.5.1 Ready code
- Loading branch information
Showing
106 changed files
with
1,161 additions
and
2,565 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * This file is part of CodeIgniter 4 framework. | ||
| * | ||
| * (c) CodeIgniter Foundation <[email protected]> | ||
| * | ||
| * For the full copyright and license information, please view | ||
| * the LICENSE file that was distributed with this source code. | ||
| */ | ||
|
|
||
| use CodeIgniter\CodingStandard\CodeIgniter4; | ||
| use Nexus\CsConfig\Factory; | ||
| use Nexus\CsConfig\Fixer\Comment\NoCodeSeparatorCommentFixer; | ||
| use Nexus\CsConfig\FixerGenerator; | ||
| use PhpCsFixer\Finder; | ||
|
|
||
| $finder = Finder::create() | ||
| ->files() | ||
| ->in([ | ||
| __DIR__ . '/tests', | ||
| ]) | ||
| ->exclude([ | ||
| ]) | ||
| ->notPath([ | ||
| '_support/View/Cells/multiplier.php', | ||
| '_support/View/Cells/colors.php', | ||
| '_support/View/Cells/addition.php', | ||
| ]) | ||
| ->notName('#Foobar.php$#') | ||
| ->append([ | ||
| ]); | ||
|
|
||
| $overrides = [ | ||
| 'void_return' => true, | ||
| ]; | ||
|
|
||
| $options = [ | ||
| 'cacheFile' => 'build/.php-cs-fixer.tests.cache', | ||
| 'finder' => $finder, | ||
| ]; | ||
|
|
||
| $config = Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary( | ||
| 'CodeIgniter 4 framework', | ||
| 'CodeIgniter Foundation', | ||
| '[email protected]' | ||
| ); | ||
|
|
||
| $config | ||
| ->registerCustomFixers(FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer')) | ||
| ->setRules(array_merge($config->getRules(), [ | ||
| NoCodeSeparatorCommentFixer::name() => true, | ||
| ])); | ||
|
|
||
| return $config; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| See [contributing/css.md](../../../contributing/css.md). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -124,5 +124,3 @@ nb-configuration.xml | |
|
|
||
| /results/ | ||
| /phpunit*.xml | ||
| /.phpunit.*.cache | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,63 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="system/Test/bootstrap.php" backupGlobals="false" colors="true" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache"> | ||
| <coverage includeUncoveredFiles="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> | ||
| <php> | ||
| <server name="app.baseURL" value="http://example.com/"/> | ||
| <!-- 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/"/> | ||
| <!-- Database configuration --> | ||
| <!-- Uncomment to provide your own database for testing | ||
| <env name="database.tests.hostname" value="localhost"/> | ||
| <env name="database.tests.database" value="tests"/> | ||
| <env name="database.tests.username" value="tests_user"/> | ||
| <env name="database.tests.password" value=""/> | ||
| <env name="database.tests.DBDriver" value="MySQLi"/> | ||
| <env name="database.tests.DBPrefix" value="tests_"/> | ||
| --> | ||
| </php> | ||
| <source> | ||
| <include> | ||
| <directory suffix=".php">./app</directory> | ||
| </include> | ||
| <exclude> | ||
| <directory suffix=".php">./app/Views</directory> | ||
| <file>./app/Config/Routes.php</file> | ||
| </exclude> | ||
| </source> | ||
| <phpunit | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/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"> | ||
| <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> | ||
| </include> | ||
| <exclude> | ||
| <directory suffix=".php">./app/Views</directory> | ||
| <file>./app/Config/Routes.php</file> | ||
| </exclude> | ||
| </source> | ||
| <php> | ||
| <server name="app.baseURL" value="http://example.com/"/> | ||
| <server name="CODEIGNITER_SCREAM_DEPRECATIONS" value="0"/> | ||
| <!-- 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/"/> | ||
| <!-- Database configuration --> | ||
| <!-- Uncomment to provide your own database for testing | ||
| <env name="database.tests.hostname" value="localhost"/> | ||
| <env name="database.tests.database" value="tests"/> | ||
| <env name="database.tests.username" value="tests_user"/> | ||
| <env name="database.tests.password" value=""/> | ||
| <env name="database.tests.DBDriver" value="MySQLi"/> | ||
| <env name="database.tests.DBPrefix" value="tests_"/> | ||
| --> | ||
| </php> | ||
| </phpunit> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -124,5 +124,3 @@ nb-configuration.xml | |
|
|
||
| /results/ | ||
| /phpunit*.xml | ||
| /.phpunit.*.cache | ||
|
|
||
Oops, something went wrong.