-
Notifications
You must be signed in to change notification settings - Fork 20
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 #48 from CakeDC/2.next
2.next - Upgraded to CakePHP 4
- Loading branch information
Showing
26 changed files
with
665 additions
and
188 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| --- | ||
| :major: 1 | ||
| :minor: 2 | ||
| :minor: 5 | ||
| :patch: 0 | ||
| :special: '' | ||
| :metadata: '' |
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,16 +1,25 @@ | ||
| language: php | ||
|
|
||
| dist: xenial | ||
|
|
||
| php: | ||
| - 5.5 | ||
| - 5.6 | ||
| - 7.0 | ||
| - 7.1 | ||
| - 7.2 | ||
| - 7.3 | ||
|
|
||
| sudo: false | ||
|
|
||
| services: | ||
| - postgresql | ||
| - mysql | ||
|
|
||
| cache: | ||
| directories: | ||
| - vendor | ||
| - $HOME/.composer/cache | ||
|
|
||
| env: | ||
| matrix: | ||
| - DB=mysql db_dsn='mysql://[email protected]/cakephp_test' | ||
| - DB=mysql db_dsn='mysql://[email protected]/cakephp_test?init[]=SET sql_mode = "STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"' | ||
| - DB=pgsql db_dsn='postgres://[email protected]/cakephp_test' | ||
| - DB=sqlite db_dsn='sqlite:///:memory:' | ||
|
|
||
|
|
@@ -21,25 +30,30 @@ matrix: | |
| fast_finish: true | ||
|
|
||
| include: | ||
| - php: 5.6 | ||
| - php: 7.3 | ||
| env: COVERAGE=1 DEFAULT=0 | ||
|
|
||
| - php: 7.3 | ||
| env: PHPCS=1 DEFAULT=0 | ||
|
|
||
| before_script: | ||
| - if [[ $TRAVIS_PHP_VERSION != 7.0 ]]; then phpenv config-rm xdebug.ini; fi | ||
| - php: 7.3 | ||
| env: PHPSTAN=1 DEFAULT=0 | ||
|
|
||
| before_script: | ||
| - if [[ $TRAVIS_PHP_VERSION != 7.3 ]]; then phpenv config-rm xdebug.ini; fi | ||
| - composer install --prefer-dist --no-interaction | ||
|
|
||
| - if [ $DB = 'mysql' ]; then mysql -e 'CREATE DATABASE cakephp_test;'; fi | ||
| - if [ $DB = 'pgsql' ]; then psql -c 'CREATE DATABASE cakephp_test;' -U postgres; fi | ||
| - if [[ $DB == 'mysql' ]]; then mysql -u root -e 'CREATE DATABASE cakephp_test;'; fi | ||
| - if [[ $DB == 'pgsql' ]]; then psql -c 'CREATE DATABASE cakephp_test;' -U postgres; fi | ||
| - if [[ $PHPSTAN = 1 ]]; then composer stan-setup; fi | ||
|
|
||
| script: | ||
| - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION != 7.0 ]]; then vendor/bin/phpunit; fi | ||
| - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.0 ]]; then vendor/bin/phpunit --coverage-clover=clover.xml; fi | ||
|
|
||
| - if [ '$PHPCS' = '1' ]; then ./vendor/bin/phpcs -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi | ||
| - if [[ $DEFAULT = 1 ]]; then composer test; fi | ||
| - if [[ $COVERAGE = 1 ]]; then composer coverage-test; fi | ||
| - if [[ $PHPCS = 1 ]]; then composer cs-check; fi | ||
| - if [[ $PHPSTAN = 1 ]]; then composer stan; fi | ||
|
|
||
| after_success: | ||
| - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.0 ]]; then bash <(curl -s https://codecov.io/bash); fi | ||
| - if [[ $COVERAGE = 1 ]]; then bash <(curl -s https://codecov.io/bash); fi | ||
|
|
||
| notifications: | ||
| email: false | ||
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
Large diffs are not rendered by default.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| parameters: | ||
| level: 4 | ||
| autoload_files: | ||
| - tests/bootstrap.php |
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,126 @@ | ||
| <?xml version="1.0"?> | ||
| <psalm | ||
| totallyTyped="false" | ||
| allowCoercionFromStringToClassConst="true" | ||
| allowStringToStandInForClass="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" | ||
| > | ||
| <projectFiles> | ||
| <directory name="src" /> | ||
| <ignoreFiles> | ||
| </ignoreFiles> | ||
| </projectFiles> | ||
|
|
||
| <issueHandlers> | ||
| <LessSpecificReturnType errorLevel="info" /> | ||
|
|
||
| <!-- level 3 issues - slightly lazy code writing, but provably low false-negatives --> | ||
|
|
||
| <MissingClosureReturnType errorLevel="info" /> | ||
| <MissingPropertyType errorLevel="info" /> | ||
|
|
||
| <PropertyNotSetInConstructor errorLevel="info" /> | ||
| <MissingConstructor> | ||
| </MissingConstructor> | ||
| <MissingClosureParamType errorLevel="info" /> | ||
| <MissingParamType errorLevel="info" /> | ||
|
|
||
| <RedundantCondition> | ||
| <errorLevel type="suppress"> | ||
| </errorLevel> | ||
| </RedundantCondition> | ||
|
|
||
| <DocblockTypeContradiction errorLevel="info" /> | ||
| <RedundantConditionGivenDocblockType errorLevel="info" /> | ||
|
|
||
| <UnresolvableInclude errorLevel="info" /> | ||
|
|
||
| <!-- level 4 issues - points to possible deficiencies in logic, higher false-positives --> | ||
|
|
||
| <MoreSpecificReturnType errorLevel="info" /> | ||
| <LessSpecificReturnStatement errorLevel="info" /> | ||
| <TypeCoercion errorLevel="info" /> | ||
|
|
||
| <PossiblyInvalidArrayAccess errorLevel="info" /> | ||
| <PossiblyInvalidArrayOffset errorLevel="info" /> | ||
| <PossiblyInvalidFunctionCall errorLevel="info" /> | ||
| <PossiblyInvalidIterator errorLevel="info" /> | ||
| <PossiblyInvalidMethodCall errorLevel="info" /> | ||
| <PossiblyInvalidOperand errorLevel="info" /> | ||
| <PossiblyInvalidPropertyAssignment errorLevel="info" /> | ||
| <PossiblyNullArgument errorLevel="info" /> | ||
| <PossiblyNullArrayAccess errorLevel="info" /> | ||
| <PossiblyNullArrayAssignment errorLevel="info" /> | ||
| <PossiblyNullArrayOffset errorLevel="info" /> | ||
| <PossiblyNullOperand errorLevel="info" /> | ||
| <PossiblyNullPropertyAssignment errorLevel="info" /> | ||
| <PossiblyNullPropertyAssignmentValue errorLevel="info" /> | ||
| <PossiblyNullPropertyFetch errorLevel="info" /> | ||
| <PossiblyNullReference errorLevel="info" /> | ||
|
|
||
| <!-- level 5 issues - should be avoided at mosts costs... --> | ||
|
|
||
| <InvalidScalarArgument errorLevel="info" /> | ||
| <InvalidOperand errorLevel="info" /> | ||
| <NoInterfaceProperties errorLevel="info" /> | ||
| <TypeDoesNotContainType errorLevel="info" /> | ||
| <TypeDoesNotContainNull errorLevel="info" /> | ||
| <ImplementedReturnTypeMismatch errorLevel="info" /> | ||
|
|
||
| <!-- level 6 issues - really bad things --> | ||
|
|
||
| <NullableReturnStatement> | ||
| <errorLevel type="suppress"> | ||
| </errorLevel> | ||
| </NullableReturnStatement> | ||
|
|
||
| <MoreSpecificImplementedParamType errorLevel="info" /> | ||
| <LessSpecificImplementedReturnType errorLevel="info" /> | ||
|
|
||
| <!-- level 7 issues - even worse --> | ||
| <InvalidArgument errorLevel="info" /> | ||
|
|
||
| <InvalidPropertyAssignmentValue> | ||
| <errorLevel type="suppress"> | ||
| </errorLevel> | ||
| </InvalidPropertyAssignmentValue> | ||
|
|
||
| <!-- CakePHP Specific --> | ||
| <DeprecatedClass> | ||
| <errorLevel type="suppress"> | ||
| </errorLevel> | ||
| </DeprecatedClass> | ||
|
|
||
| <PossiblyUndefinedArrayOffset> | ||
| </PossiblyUndefinedArrayOffset> | ||
|
|
||
| <UndefinedConstant errorLevel="suppress" /> | ||
|
|
||
| <UndefinedPropertyAssignment> | ||
| </UndefinedPropertyAssignment> | ||
|
|
||
| <UndefinedPropertyFetch> | ||
| </UndefinedPropertyFetch> | ||
|
|
||
| <EmptyArrayAccess> | ||
| </EmptyArrayAccess> | ||
|
|
||
| <LoopInvalidation> | ||
| </LoopInvalidation> | ||
|
|
||
| <UndefinedClass> | ||
| </UndefinedClass> | ||
|
|
||
| <UndefinedMethod> | ||
| </UndefinedMethod> | ||
|
|
||
| <NullReference> | ||
| </NullReference> | ||
|
|
||
| <PossiblyUndefinedMethod> | ||
| </PossiblyUndefinedMethod> | ||
|
|
||
| </issueHandlers> | ||
| </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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| # rector.yaml | ||
| services: | ||
| Rector\Php\Rector\FunctionLike\ParamTypeDeclarationRector: ~ | ||
| Rector\Php\Rector\FunctionLike\ReturnTypeDeclarationRector: ~ |
Oops, something went wrong.