Skip to content

Commit

Permalink
Merge pull request #1 from jamesryanbell/master
Browse files Browse the repository at this point in the history
Update forked master branch
  • Loading branch information
Tigran M authored Aug 4, 2017
2 parents f5d6df5 + 6975ca6 commit d0d1050
Show file tree
Hide file tree
Showing 61 changed files with 4,848 additions and 975 deletions.
11 changes: 11 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Path-based git attributes
# https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html

# Ignore everything.
/* export-ignore

# Export white-listed production code only.
/src -export-ignore
/composer.json -export-ignore
/composer.lock -export-ignore

7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/.idea
/.ds_store

/vendor
composer.lock
.ds_store
/output
/build
10 changes: 10 additions & 0 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
filter:
excluded_paths:
- 'tests/*'
checks:
php: true
coding_style:
php:
spaces:
before_left_brace:
function: false
8 changes: 8 additions & 0 deletions .styleci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
preset: recommended

risky: false

linting: true

disabled:
- phpdoc_summary
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
language: php

php:
- 5.3
- 5.4
- 5.5
- 5.6
- hhvm
- 7

before_script:
- composer self-update
- composer install --prefer-source --no-interaction --dev
- composer install --prefer-dist --no-interaction --no-progress --dev

script:
- mkdir -p build/logs
- phpunit --coverage-clover build/logs/clover.xml

after_script:
  - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then php vendor/bin/coveralls -v; fi;'
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then php vendor/bin/coveralls -v; fi;'
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jamesryanbell/cloudflare",
"description": "Cloudflare API V4 PHP wrapper",
"description": "CloudFlare API - PHP",
"license": "MIT",
"keywords": ["cloudflare", "api"],
"authors": [
Expand All @@ -11,7 +11,7 @@
],
"require": {},
"require-dev": {
"phpunit/phpunit": "*",
"phpunit/phpunit": "< 6",
"satooshi/php-coveralls": "dev-master"
},
"autoload": {
Expand Down
Loading

0 comments on commit d0d1050

Please sign in to comment.