Skip to content

Commit a46b677

Browse files
authored
Merge pull request #130 from FriendsOfCake/cake-4.x
Cake 4.x
2 parents 3b105f4 + 63bdf30 commit a46b677

19 files changed

Lines changed: 559 additions & 449 deletions

File tree

.gitattributes

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Define the line ending behavior of the different file extensions
2+
# Set default behavior, in case users don't have core.autocrlf set.
3+
* text=auto eol=lf
4+
5+
# Explicitly declare text files we want to always be normalized and converted
6+
# to native line endings on checkout.
7+
*.php text
8+
9+
# Remove files for archives generated using `git archive`
10+
.github export-ignore
11+
tests export-ignore
12+
.editorconfig export-ignore
13+
.gitattributes export-ignore
14+
.gitignore export-ignore
15+
.stickler.yml export-ignore
16+
.travis.yml export-ignore
17+
phpcs.xml.dist export-ignore
18+
phpstan.neon export-ignore
19+
phpstan-baseline.neon export-ignore
20+
phpunit.xml.dist export-ignore
21+
psalm.xml export-ignore
22+
psalm-baseline.xml export-ignore

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/composer.lock
22
/phpunit.xml
33
/vendor
4+
.phpunit.result.cache
45

56
## IntelliJ project files
67
.idea
7-
*.iml
8+
*.iml

.stickler.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
linters:
33
phpcs:
4-
standard: CakePHP
5-
extensions: 'php,ctp'
4+
standard: CakePHP4
5+
extensions: 'php'
66
fixer: true
77

88
fixers:

.travis.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: php
22

33
php:
4-
- 5.6
4+
- 7.2
55
- 7.4
66

77
env:
@@ -12,17 +12,17 @@ matrix:
1212
fast_finish: true
1313

1414
include:
15-
- php: 5.6
15+
- php: 7.2
1616
env: PREFER_LOWEST=1
1717

18-
- php: 7.3
19-
env: PHPCS=1 DEFAULT=0
18+
- php: 7.2
19+
env: CHECKS=1 DEFAULT=0
2020

2121
- php: 7.3
2222
env: CODECOVERAGE=1 DEFAULT=0
2323

2424
before_install:
25-
- if [[ ${TRAVIS_PHP_VERSION} != "7.4" && $CODECOVERAGE != 1 ]]; then phpenv config-rm xdebug.ini ; fi
25+
- if [[ $CODECOVERAGE != 1 ]]; then phpenv config-rm xdebug.ini ; fi
2626

2727
before_script:
2828
- if [[ $PREFER_LOWEST != 1 ]]; then composer install --prefer-source --no-interaction ; fi
@@ -31,13 +31,16 @@ before_script:
3131
script:
3232
- if [[ $DEFAULT == 1 ]]; then vendor/bin/phpunit ; fi
3333

34-
- if [[ $PHPSTAN == 1 ]]; then composer require --dev phpstan/phpstan && vendor/bin/phpstan analyse -c tests/phpstan.neon -l 3 src/ ; fi
35-
36-
- if [[ $PHPCS = 1 ]]; then composer cs-check; fi
34+
- if [[ $CHECKS == 1 ]]; then composer stan-setup && composer stan ; fi
35+
- if [[ $CHECKS == 1 ]]; then composer cs-check ; fi
3736

3837
- if [[ $CODECOVERAGE == 1 ]]; then vendor/bin/phpunit --coverage-clover=clover.xml ; fi
3938
- if [[ $CODECOVERAGE == 1 ]]; then wget -O codecov.sh https://codecov.io/bash ; fi
4039
- if [[ $CODECOVERAGE == 1 ]]; then bash codecov.sh ; fi
4140

4241
notifications:
4342
email: false
43+
44+
cache:
45+
directories:
46+
- $HOME/.composer/cache

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ chance of keeping on top of things.
4747
## Testcases and codesniffer
4848

4949
CsvView tests requires [PHPUnit](http://www.phpunit.de/manual/current/en/installation.html)
50-
3.5 or higher. To run the testcases locally use the following command:
50+
8.5 or higher. To run the testcases locally use the following command:
5151

52-
./lib/Cake/Console/cake test CsvView AllCsvView
52+
composer test
5353

5454
To run the sniffs for CakePHP coding standards
5555

56-
phpcs -p --extensions=php --standard=CakePHP ./app/Plugin/CsvView
56+
composer cs-check
5757

5858
Check the [cakephp-codesniffer](https://github.com/cakephp/cakephp-codesniffer)
5959
repository to setup the CakePHP standard. The README contains installation info
@@ -62,7 +62,7 @@ for the sniff and phpcs.
6262

6363
# Additional Resources
6464

65-
* [CakePHP coding standards](http://book.cakephp.org/2.0/en/contributing/cakephp-coding-conventions.html)
65+
* [CakePHP coding standards](http://book.cakephp.org/4/en/contributing/cakephp-coding-conventions.html)
6666
* [Bug tracker](https://github.com/friendsofcake/cakephp-csvview/issues)
6767
* [General GitHub documentation](https://help.github.com/)
6868
* [GitHub pull request documentation](https://help.github.com/send-pull-requests/)

0 commit comments

Comments
 (0)