Skip to content

Commit 549548a

Browse files
authored
Merge pull request #45 from cakephp/next
Change package type to "composer-plugin".
2 parents 9014a73 + 74b1508 commit 549548a

10 files changed

Lines changed: 677 additions & 864 deletions

File tree

.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ indent_size = 4
99
end_of_line = lf
1010
insert_final_newline = true
1111
trim_trailing_whitespace = true
12+
13+
[*.yml]
14+
indent_size = 2

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/vendor
2-
/composer.lock
2+
/composer.lock
3+
.phpunit.result.cache

.travis.yml

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

3-
sudo: false
4-
53
php:
6-
- 5.6
7-
- 7.0
84
- 7.2
9-
- 7.3
10-
11-
5+
- 7.4
6+
- 'nightly'
127

138
matrix:
149
include:
15-
- php: 7.3
10+
- php: 7.2
1611
env: PHPCS=1
1712

18-
before_script: composer install --prefer-dist --dev
13+
install:
14+
- composer install --no-interaction
1915

2016
script:
21-
- sh -c "if [ '$PHPCS' != '1' ]; then vendor/bin/phpunit; fi"
22-
- sh -c "if [ '$PHPCS' = '1' ]; then vendor/bin/phpcs -p -n --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi"
17+
- if [[ $PHPCS != 1 ]]; then vendor/bin/phpunit; fi
18+
- if [[ $PHPCS == 1 ]]; then vendor/bin/phpcs -p -n --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi
2319

2420
notifications:
2521
email: false

composer.json

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
{
22
"name": "cakephp/plugin-installer",
33
"description": "A composer installer for CakePHP 3.0+ plugins.",
4-
"type": "composer-installer",
4+
"type": "composer-plugin",
55
"license": "MIT",
66
"authors": [
77
{
88
"name": "CakePHP Community",
99
"homepage": "https://cakephp.org"
1010
}
1111
],
12+
"require": {
13+
"php": ">=7.2.0",
14+
"composer-plugin-api": "^1.0 || ^2.0"
15+
},
1216
"require-dev": {
13-
"composer/composer": "^1.0",
14-
"phpunit/phpunit": "^4.8|^5.7|^6.0",
15-
"cakephp/cakephp-codesniffer": "^3.0"
17+
"cakephp/cakephp-codesniffer": "^4.1",
18+
"composer/composer": "^2.0@RC",
19+
"phpunit/phpunit": "^8.5 || ^9.3"
1620
},
1721
"autoload": {
1822
"psr-4": {
@@ -21,10 +25,14 @@
2125
},
2226
"autoload-dev": {
2327
"psr-4": {
24-
"Cake\\Test\\Composer\\": "tests/"
28+
"Cake\\Test\\TestCase\\Composer\\": "tests/"
2529
}
2630
},
2731
"extra": {
28-
"class": "Cake\\Composer\\Installer\\PluginInstaller"
29-
}
32+
"class": "Cake\\Composer\\Plugin"
33+
},
34+
"config": {
35+
"sort-packages": true
36+
},
37+
"prefer-stable": true
3038
}

phpunit.xml.dist

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
convertWarningsToExceptions="true"
99
processIsolation="false"
1010
stopOnFailure="false"
11-
syntaxCheck="false"
1211
bootstrap="vendor/autoload.php"
1312
>
1413
<testsuites>

0 commit comments

Comments
 (0)