Skip to content

Commit 99b6b0f

Browse files
committed
Merge branch 'feature/streamline-tools'
Streamlines QA tools.
2 parents 9ab7777 + 78b47f4 commit 99b6b0f

File tree

8 files changed

+4
-36
lines changed

8 files changed

+4
-36
lines changed

.php_cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ return Symfony\CS\Config\Config::create()
2929
'indentation',
3030
'linefeed',
3131
'php_closing_tag',
32-
'psr0',
3332
'short_tag',
3433
'trailing_spaces',
3534
'unused_use',

.travis.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,9 @@ before_script:
1010
- composer install --dev --prefer-source
1111

1212
script:
13-
- ./vendor/bin/phpunit --coverage-clover ./build/logs/clover.xml
14-
- ./bin/check-cs.sh
13+
- ./vendor/bin/phpunit
14+
- ./vendor/bin/php-cs-fixer -v fix . --dry-run --config-file ./.php_cs
1515

16-
after_script:
17-
- php ./vendor/bin/coveralls -v
18-
1916
notifications:
2017
irc: "irc.freenode.org#apigility-dev"
2118
email: false

bin/check-cs.sh

Lines changed: 0 additions & 24 deletions
This file was deleted.

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
"require-dev": {
3737
"fabpot/php-cs-fixer": "*@dev",
3838
"phpunit/PHPUnit": "3.7.*",
39-
"satooshi/php-coveralls": ">=0.6.0",
4039
"zendframework/zend-console": "~2.3",
4140
"zendframework/zend-loader": "~2.3"
4241
},

src/ApiProblemResponse.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ class ApiProblemResponse extends Response
1919
protected $apiProblem;
2020

2121
/**
22-
* Flags to use with json_encode
23-
*
22+
* Flags to use with json_encode
23+
*
2424
* @var int
2525
*/
2626
protected $jsonFlags = 0;

src/Listener/RenderErrorListener.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
use Zend\EventManager\EventManagerInterface;
1010
use Zend\EventManager\AbstractListenerAggregate;
11-
use Zend\Http\Request as HttpRequest;
1211
use Zend\Mvc\MvcEvent;
1312
use Zend\View\Exception\ExceptionInterface as ViewExceptionInterface;
1413

test/Listener/ApiProblemListenerTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
use PHPUnit_Framework_TestCase as TestCase;
1010
use Zend\Console\Request as ConsoleRequest;
11-
use Zend\Console\Response as ConsoleResponse;
1211
use Zend\Http\Request;
1312
use Zend\Mvc\Application;
1413
use Zend\Mvc\MvcEvent;

test/View/ApiProblemStrategyTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
use Zend\Http\Response;
1111
use Zend\View\Model\JsonModel;
1212
use Zend\View\Model\ViewModel;
13-
use Zend\View\Renderer\JsonRenderer;
1413
use Zend\View\ViewEvent;
1514
use ZF\ApiProblem\ApiProblem;
1615
use ZF\ApiProblem\View\ApiProblemModel;

0 commit comments

Comments
 (0)