-
Notifications
You must be signed in to change notification settings - Fork 254
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 #601 from FriendsOfCake/cake-5
Cake 5
- Loading branch information
Showing
28 changed files
with
313 additions
and
354 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 |
|---|---|---|
| @@ -1,90 +1,22 @@ | ||
| name: CI | ||
|
|
||
| on: [push, pull_request] | ||
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
| - cake-5 | ||
| pull_request: | ||
| branches: | ||
| - '*' | ||
|
|
||
| permissions: | ||
| contents: read | ||
|
|
||
| jobs: | ||
| testsuite: | ||
| runs-on: ubuntu-18.04 | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| php-version: ['7.4', '8.0', '8.1'] | ||
| db-type: [mysql, pgsql] | ||
| prefer-lowest: [''] | ||
| include: | ||
| - php-version: '7.2' | ||
| db-type: 'sqlite' | ||
| prefer-lowest: 'prefer-lowest' | ||
|
|
||
| services: | ||
| postgres: | ||
| image: postgres | ||
| ports: | ||
| - 5432:5432 | ||
| env: | ||
| POSTGRES_PASSWORD: postgres | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
|
|
||
| - name: Setup Service | ||
| if: matrix.db-type == 'mysql' | ||
| run: | | ||
| sudo service mysql start | ||
| mysql -h 127.0.0.1 -u root -proot -e 'CREATE DATABASE cakephp;' | ||
| - name: Setup PHP | ||
| uses: shivammathur/setup-php@v2 | ||
| with: | ||
| php-version: ${{ matrix.php-version }} | ||
| extensions: mbstring, intl, pdo_${{ matrix.db-type }} | ||
| coverage: pcov | ||
|
|
||
| - name: Composer install | ||
| run: | | ||
| if ${{ matrix.prefer-lowest == 'prefer-lowest' }}; then | ||
| composer update --prefer-lowest --prefer-stable | ||
| else | ||
| composer install | ||
| fi | ||
| - name: Run PHPUnit | ||
| run: | | ||
| if [[ ${{ matrix.db-type }} == 'sqlite' ]]; then export DB_URL='sqlite:///:memory:'; fi | ||
| if [[ ${{ matrix.db-type }} == 'mysql' ]]; then export DB_URL='mysql://root:root@127.0.0.1/cakephp'; fi | ||
| if [[ ${{ matrix.db-type }} == 'pgsql' ]]; then export DB_URL='postgres://postgres:postgres@127.0.0.1/postgres'; fi | ||
| if [[ ${{ matrix.php-version }} == '7.4' && ${{ matrix.db-type }} == 'mysql' ]]; then | ||
| vendor/bin/phpunit --coverage-clover=coverage.xml | ||
| else | ||
| vendor/bin/phpunit | ||
| fi | ||
| - name: Code Coverage Report | ||
| if: success() && matrix.php-version == '7.4' && matrix.db-type == 'mysql' | ||
| uses: codecov/codecov-action@v2 | ||
| uses: cakephp/.github/.github/workflows/testsuite-with-db.yml@5.x | ||
| secrets: inherit | ||
|
|
||
| cs-stan: | ||
| name: Coding Standard & Static Analysis | ||
| runs-on: ubuntu-18.04 | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
|
|
||
| - name: Setup PHP | ||
| uses: shivammathur/setup-php@v2 | ||
| with: | ||
| php-version: '7.4' | ||
| extensions: mbstring, intl | ||
| coverage: none | ||
| tools: cs2pr, phpstan:1.2 | ||
|
|
||
| - name: Composer Install | ||
| run: composer install | ||
|
|
||
| - name: Run phpcs | ||
| run: vendor/bin/phpcs --report=checkstyle --standard=vendor/cakephp/cakephp-codesniffer/CakePHP src/ tests/ | cs2pr | ||
|
|
||
| - name: Run phpstan | ||
| if: success() || failure() | ||
| run: phpstan analyse | ||
| uses: cakephp/.github/.github/workflows/cs-stan.yml@5.x | ||
| secrets: inherit |
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,5 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <phive xmlns="https://phar.io/phive"> | ||
| <phar name="phpstan" version="1.10.38" installed="1.10.38" location="./tools/phpstan" copy="false"/> | ||
| <phar name="psalm" version="5.15.0" installed="5.15.0" location="./tools/psalm" copy="false"/> | ||
| </phive> |
This file was deleted.
Oops, something went wrong.
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,8 @@ | ||
| <?xml version="1.0"?> | ||
| <ruleset name="CakePHP Core"> | ||
| <config name="installed_paths" value="../../cakephp/cakephp-codesniffer" /> | ||
|
|
||
| <rule ref="CakePHP" /> | ||
|
|
||
| <arg value="s"/> | ||
| </ruleset> |
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 |
|---|---|---|
| @@ -1,40 +1,23 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?><phpunit | ||
| colors="true" | ||
| processIsolation="false" | ||
| stopOnFailure="false" | ||
| bootstrap="./tests/bootstrap.php" | ||
| convertDeprecationsToExceptions="true" | ||
| > | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" processIsolation="false" stopOnFailure="false" bootstrap="tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd"> | ||
| <coverage/> | ||
| <php> | ||
| <ini name="memory_limit" value="-1"/> | ||
| <!-- E_ALL & ~E_USER_DEPRECATED (16383)--> | ||
| <!-- E_ALL (32767) --> | ||
| <ini name="error_reporting" value="32767"/> | ||
| <ini name="apc.enable_cli" value="1"/> | ||
| <env name="FIXTURE_SCHEMA_METADATA" value="./tests/schema.php"/> | ||
| </php> | ||
|
|
||
| <!-- Add any additional test suites you want to run here --> | ||
| <testsuites> | ||
| <testsuite name="Version Test Suite"> | ||
| <directory>./tests/TestCase</directory> | ||
| <testsuite name="cakephp-upload"> | ||
| <directory>tests/TestCase/</directory> | ||
| </testsuite> | ||
| </testsuites> | ||
|
|
||
| <filter> | ||
| <whitelist> | ||
| <directory suffix=".php">./src</directory> | ||
| </whitelist> | ||
| </filter> | ||
|
|
||
| <!-- Setup a listener for fixtures --> | ||
| <listeners> | ||
| <listener | ||
| class="\Cake\TestSuite\Fixture\FixtureInjector" | ||
| file="./vendor/cakephp/cakephp/src/TestSuite/Fixture/FixtureInjector.php"> | ||
| <arguments> | ||
| <object class="\Cake\TestSuite\Fixture\FixtureManager" /> | ||
| </arguments> | ||
| </listener> | ||
| </listeners> | ||
|
|
||
| <extensions> | ||
| <bootstrap class="Cake\TestSuite\Fixture\Extension\PHPUnitExtension"/> | ||
| </extensions> | ||
| <source> | ||
| <include> | ||
| <directory suffix=".php">src/</directory> | ||
| </include> | ||
| </source> | ||
| </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 |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <?xml version="1.0"?> | ||
| <psalm | ||
| reportMixedIssues="false" | ||
| autoloader="tests/bootstrap.php" | ||
| errorLevel="7" | ||
| resolveFromConfigFile="true" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xmlns="https://getpsalm.org/schema/config" | ||
| xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd" | ||
| findUnusedBaselineEntry="true" | ||
| findUnusedCode="false" | ||
| > | ||
| <projectFiles> | ||
| <directory name="src" /> | ||
| <ignoreFiles> | ||
| <directory name="vendor" /> | ||
| </ignoreFiles> | ||
| </projectFiles> | ||
| </psalm> |
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
Oops, something went wrong.