Skip to content

Commit 33bf6de

Browse files
committed
Merge remote-tracking branch 'origin/master' into feat-swift-generics
# Conflicts: # src/SDK/Language.php # src/SDK/Language/Apple.php # src/SDK/Language/Web.php
2 parents cff2822 + 058c94d commit 33bf6de

35 files changed

+747
-1097
lines changed

.travis.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ language: php
1414
php:
1515
- 8.1
1616

17+
stages:
18+
- lint
19+
- test
20+
1721
env:
1822
- SDK=Android11Java8
1923
- SDK=Android11Java11
@@ -51,16 +55,22 @@ notifications:
5155
email:
5256
5357

58+
jobs:
59+
include:
60+
- stage: lint
61+
name: Lint
62+
install:
63+
- composer install
64+
script:
65+
- composer lint
66+
5467
before_install:
5568
- >
5669
if [ ! -z "${DOCKERHUB_PULL_USERNAME:-}" ]; then
5770
echo "${DOCKERHUB_PULL_PASSWORD}" | docker login --username "${DOCKERHUB_PULL_USERNAME}" --password-stdin
5871
fi
59-
60-
6172
install:
6273
- docker --version
6374
- composer install
64-
6575
script:
66-
- vendor/bin/phpunit tests/${SDK}Test.php
76+
- composer test tests/${SDK}Test.php

composer.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
"email": "[email protected]"
1010
}
1111
],
12+
"scripts": {
13+
"test": "vendor/bin/phpunit",
14+
"lint": "vendor/bin/phpcs",
15+
"format": "vendor/bin/phpcbf"
16+
},
1217
"autoload": {
1318
"psr-4": {
1419
"Appwrite\\SDK\\": "src/SDK",
@@ -19,7 +24,7 @@
1924
"psr-4": {"Tests\\": "tests"}
2025
},
2126
"require": {
22-
"php": ">=7.0.0",
27+
"php": ">=8.0",
2328
"ext-curl": "*",
2429
"ext-mbstring": "*",
2530
"ext-json": "*",
@@ -28,7 +33,8 @@
2833
},
2934
"require-dev": {
3035
"phpunit/phpunit": "^9.5.21",
31-
"brianium/paratest": "^6.4"
36+
"brianium/paratest": "^6.4",
37+
"squizlabs/php_codesniffer": "^3.6"
3238
},
3339
"minimum-stability": "dev",
3440
"prefer-stable": true

0 commit comments

Comments
 (0)