From 2914a8ab58a88a427c150ca2a5a8f2fa0b5ee1ec Mon Sep 17 00:00:00 2001 From: Mattias Lyckne Date: Sun, 4 Sep 2016 13:17:37 +0200 Subject: [PATCH 1/3] Fix typos --- README.md | 2 +- src/Pug.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f672c47..ed1293b 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Route::get('/', function () { ```php // boostrap/app.php // uncomment $app->withFacades(); -// register the service provider ddsand facade +// register the service provider and facade $app->register('Olyckne\Pug\PugServiceProvider'); class_alias('Olyckne\Pug\PugFacade', 'Pug'); ``` diff --git a/src/Pug.php b/src/Pug.php index 66a0496..0f5b535 100644 --- a/src/Pug.php +++ b/src/Pug.php @@ -32,7 +32,7 @@ public function __construct(ClientInterface $client) /** * send a request to pugme api * - * @param sring $url + * @param string $url * @return mixed * @throws PugNotFoundException */ From 6514a0493a99adaa99d59431a96fdb0728d32289 Mon Sep 17 00:00:00 2001 From: Mattias Lyckne Date: Sun, 4 Sep 2016 13:29:56 +0200 Subject: [PATCH 2/3] Remove HHVM support --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2baf2a1..0db72fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ language: php php: - 5.6 - 7.0 - - hhvm env: global: From 5cb5a7c13a6acfd46ee61c6f06a2fcd87f44baa0 Mon Sep 17 00:00:00 2001 From: Mattias Lyckne Date: Sun, 4 Sep 2016 13:21:57 +0200 Subject: [PATCH 3/3] Always run code coverage --- .travis.yml | 7 +------ composer.json | 3 +-- composer.lock | 2 +- phpspec-with-coverage.yml | 16 ---------------- phpspec.yml | 11 +++++++++++ 5 files changed, 14 insertions(+), 25 deletions(-) delete mode 100644 phpspec-with-coverage.yml diff --git a/.travis.yml b/.travis.yml index 0db72fd..27b9ded 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,6 @@ php: - 5.6 - 7.0 -env: - global: - - test=test-coverage - cache: directories: - vendor @@ -16,10 +12,9 @@ cache: before_script: - travis_retry composer self-update - travis_retry composer install --prefer-source --no-interaction - - if [[ "$TRAVIS_PHP_VERSION" == "7.0" ]] || [[ "$TRAVIS_PHP_VERSION" == "hhvm" ]]; then test=test; fi script: - - composer $test + - composer test after_success: - wget https://scrutinizer-ci.com/ocular.phar diff --git a/composer.json b/composer.json index 1757957..9640c18 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,6 @@ } }, "scripts": { - "test": "phpspec run", - "test-coverage": "phpspec run -c phpspec-with-coverage.yml" + "test": "phpspec run" } } diff --git a/composer.lock b/composer.lock index 958a97d..577d904 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "283bc6f8d55c54b228c6bbd668d2fc8d", + "hash": "08e96a97ea9daf2c014b3150b5c3ae33", "content-hash": "089ea34a013c4e7ba9e6902902210885", "packages": [ { diff --git a/phpspec-with-coverage.yml b/phpspec-with-coverage.yml deleted file mode 100644 index d9d1c2f..0000000 --- a/phpspec-with-coverage.yml +++ /dev/null @@ -1,16 +0,0 @@ -suites: - main_suite: - namespace: Olyckne\Pug - psr4_prefix: Olyckne\Pug - -formatter.name: pretty -extensions: - - PhpSpec\Extension\CodeCoverageExtension - -code_coverage: - format: - - clover - - html - output: - clover: build/logs/clover.xml - html: build/logs/html diff --git a/phpspec.yml b/phpspec.yml index 50f4e75..0ec2e96 100644 --- a/phpspec.yml +++ b/phpspec.yml @@ -4,3 +4,14 @@ suites: psr4_prefix: Olyckne\Pug formatter.name: pretty + +extensions: + - PhpSpec\Extension\CodeCoverageExtension + +code_coverage: + format: + - clover + - html + output: + clover: build/logs/clover.xml + html: build/logs/html