Skip to content

Commit

Permalink
Merge pull request #4 from polidog/api-update
Browse files Browse the repository at this point in the history
Api update
  • Loading branch information
polidog authored Oct 21, 2017
2 parents 6a7fa37 + 75787ca commit 3317e81
Show file tree
Hide file tree
Showing 11 changed files with 837 additions and 2,138 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
build
demo.php
vendor
.idea
.idea
.php_cs.cache
14 changes: 14 additions & 0 deletions .php_cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php
$finder = PhpCsFixer\Finder::create()
->in(__DIR__)
->in(__DIR__."/tests")
;
return \PhpCsFixer\Config::create()
->setRiskyAllowed(true)
->setRules([
'@Symfony' => true,
'array_syntax' => ['syntax' => 'short'],
])
->setFinder($finder)
->setLineEnding("\n")
;
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
language: php

php:
- 5.5
- 5.6
- 7.0
- 7.1
before_script:
- composer install --prefer-source

Expand All @@ -18,4 +19,4 @@ script:
after_script:
- php vendor/bin/coveralls -v
- wget https://scrutinizer-ci.com/ocular.phar
- php ocular.phar code-coverage:upload --format=php-clover coverage.clover
- php ocular.phar code-coverage:upload --format=php-clover coverage.clover
139 changes: 0 additions & 139 deletions ApiMethods.php

This file was deleted.

11 changes: 7 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,21 @@
}
],
"require": {
"php": ">=5.5.0",
"php": ">=5.6",
"guzzlehttp/guzzle": "~6.0"
},
"require-dev": {
"phpunit/phpunit": "4.6.7",
"phpunit/phpcov": "*",
"phake/phake": "2.0.*@dev",
"phake/phake": "2.*",
"satooshi/php-coveralls": "dev-master"
},
"autoload": {
"psr-4": {
"Polidog\\Esa\\": ""
"Polidog\\Esa\\": "src"
}
}
},
"scripts": {
"test": "./vendor/bin/phpunit"
}
}
Loading

0 comments on commit 3317e81

Please sign in to comment.