Skip to content

Commit 016ea5f

Browse files
yoanmyoanm
authored
Improve (#21)
1 parent 244a270 commit 016ea5f

19 files changed

+45
-21
lines changed

‎Makefile‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ COVERAGE_OUTPUT_STYLE ?= html
66
BUILD_DIRECTORY ?= build
77
REPORTS_DIRECTORY ?= ${BUILD_DIRECTORY}/reports
88
COVERAGE_DIRECTORY ?= ${BUILD_DIRECTORY}/coverage
9+
BEHAT_COVERAGE_DIRECTORY ?= ${BUILD_DIRECTORY}/behat-coverage
910
COVERAGE_CLOVER_FILE_PATH ?= ${COVERAGE_DIRECTORY}/clover.xml
1011

1112
## Commands options
@@ -88,15 +89,21 @@ codestyle: create-reports-directory
8889
coverage: create-coverage-directory
8990
./vendor/bin/phpunit ${PHPUNIT_COLOR_OPTION} ${PHPUNIT_OUTPUT_STYLE_OPTION} ${PHPUNIT_COVERAGE_OPTION}
9091

92+
behat-coverage: create-behat-coverage-directory
93+
composer required leanphp/behat-code-coverage
94+
./vendor/bin/behat ${BEHAT_COLOR_OPTION} ${BEHAT_OUTPUT_STYLE_OPTION} --no-snippets --profile coverage
9195

9296

9397
# Internal commands
9498
create-coverage-directory:
9599
mkdir -p ${COVERAGE_DIRECTORY}
96100

101+
create-behat-coverage-directory:
102+
mkdir -p ${BEHAT_COVERAGE_DIRECTORY}
103+
97104
create-reports-directory:
98105
mkdir -p ${REPORTS_DIRECTORY}
99106

100107

101-
.PHONY: build install configure test test-technical test-functional codestyle coverage create-coverage-directory create-reports-directory
108+
.PHONY: build install configure test test-technical test-functional codestyle coverage behat-coverage create-coverage-directory create-behat-coverage-directory create-reports-directory
102109
.DEFAULT: build

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
[![Scrutinizer Build Status](https://img.shields.io/scrutinizer/build/g/yoanm/php-jsonrpc-http-server-swagger-doc-sdk.svg?label=Scrutinizer&logo=scrutinizer)](https://scrutinizer-ci.com/g/yoanm/php-jsonrpc-http-server-swagger-doc-sdk/build-status/master) [![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/yoanm/php-jsonrpc-http-server-swagger-doc-sdk/master.svg?logo=scrutinizer)](https://scrutinizer-ci.com/g/yoanm/php-jsonrpc-http-server-swagger-doc-sdk/?branch=master) [![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/yoanm/php-jsonrpc-http-server-swagger-doc-sdk/master.svg?logo=scrutinizer)](https://scrutinizer-ci.com/g/yoanm/php-jsonrpc-http-server-swagger-doc-sdk/?branch=master)
55

6-
[![Travis Build Status](https://img.shields.io/travis/com/yoanm/php-jsonrpc-http-server-swagger-doc-sdk/master.svg?label=Travis&logo=travis)](https://travis-ci.com/yoanm/php-jsonrpc-http-server-swagger-doc-sdk) [![Travis PHP versions](https://img.shields.io/travis/php-v/yoanm/php-jsonrpc-http-server-swagger-doc-sdk.svg?logo=travis)](https://php.net/)
6+
[![Travis Build Status](https://img.shields.io/travis/com/yoanm/php-jsonrpc-http-server-swagger-doc-sdk/master.svg?label=Travis&logo=travis)](https://travis-ci.com/yoanm/php-jsonrpc-http-server-swagger-doc-sdk) [![Travis PHP versions](https://img.shields.io/travis/php-v/yoanm/php-jsonrpc-http-server-swagger-doc-sdk.svg?logo=travis)](https://php.net/) [![Travis Symfony Versions](https://img.shields.io/badge/Symfony-v3%20%2F%20v4-8892BF.svg?logo=travis)](https://symfony.com/)
77

88
[![Latest Stable Version](https://img.shields.io/packagist/v/yoanm/jsonrpc-http-server-swagger-doc-sdk.svg)](https://packagist.org/packages/yoanm/jsonrpc-http-server-swagger-doc-sdk) [![Packagist PHP version](https://img.shields.io/packagist/php-v/yoanm/jsonrpc-http-server-swagger-doc-sdk.svg)](https://packagist.org/packages/yoanm/jsonrpc-http-server-swagger-doc-sdk)
99

‎features/bootstrap/AbstractContext.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ protected function jsonDecode($encodedData)
2222
/**
2323
* @param object $object
2424
* @param array $decodedMethodCalls
25-
*
26-
* @return mixed
2725
*/
2826
protected function callMethods($object, array $decodedMethodCalls)
2927
{

‎src/App/Normalizer/Component/ErrorDocNormalizer.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ public function __construct(
2626
}
2727

2828
/**
29-
* {@inheritdoc}
29+
* @param ErrorDoc $errorDoc
30+
*
31+
* @return array
32+
*
33+
* @throws \ReflectionException
3034
*/
3135
public function normalize(ErrorDoc $errorDoc)
3236
{

‎src/App/Normalizer/Component/ExternalSchemaListDocNormalizer.php‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ public function __construct(
4141

4242
/**
4343
* @param ServerDoc $doc
44+
*
4445
* @return array
46+
*
47+
* @throws \ReflectionException
4548
*/
4649
public function normalize(ServerDoc $doc)
4750
{
@@ -57,6 +60,8 @@ public function normalize(ServerDoc $doc)
5760
* @param ServerDoc $doc
5861
*
5962
* @return array
63+
*
64+
* @throws \ReflectionException
6065
*/
6166
protected function getMethodsExternalSchemaList(ServerDoc $doc)
6267
{
@@ -73,6 +78,8 @@ protected function getMethodsExternalSchemaList(ServerDoc $doc)
7378
* @param ServerDoc $doc
7479
*
7580
* @return array
81+
*
82+
* @throws \ReflectionException
7683
*/
7784
protected function getMethodErrorsExternalSchemaList(ServerDoc $doc)
7885
{
@@ -95,6 +102,8 @@ protected function getMethodErrorsExternalSchemaList(ServerDoc $doc)
95102
* @param ServerDoc $doc
96103
*
97104
* @return array
105+
*
106+
* @throws \ReflectionException
98107
*/
99108
protected function getServerErrorsExtraSchemaList(ServerDoc $doc)
100109
{
@@ -114,6 +123,8 @@ protected function getServerErrorsExtraSchemaList(ServerDoc $doc)
114123
* @param MethodDoc $method
115124
*
116125
* @return array[]
126+
*
127+
* @throws \ReflectionException
117128
*/
118129
protected function getMethodExternalSchemaList(MethodDoc $method) : array
119130
{
@@ -195,10 +206,12 @@ function (ErrorDoc $errorDoc) {
195206
}
196207

197208
/**
198-
* @param array $errorDocList
199-
* @param string $definitionType
209+
* @param array $errorDocList
210+
* @param $definitionType
200211
*
201212
* @return array
213+
*
214+
* @throws \ReflectionException
202215
*/
203216
private function normalizeErrorList(array $errorDocList, $definitionType)
204217
{
@@ -218,6 +231,8 @@ private function normalizeErrorList(array $errorDocList, $definitionType)
218231
* @param array $list
219232
*
220233
* @return array
234+
*
235+
* @throws \ReflectionException
221236
*/
222237
protected function appendAndNormalizeIfNotNull(string $key, $value, array $list = [])
223238
{

‎src/App/Normalizer/Component/SchemaTypeNormalizer.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ class SchemaTypeNormalizer
3434
* @param TypeDoc $doc
3535
*
3636
* @return mixed|string
37+
*
38+
* @throws \ReflectionException
3739
*/
3840
public function normalize(TypeDoc $doc)
3941
{

‎src/App/Normalizer/Component/TypeDocNormalizer.php‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,13 @@ public function __construct(SchemaTypeNormalizer $schemaTypeNormalizer)
2626
{
2727
$this->schemaTypeNormalizer = $schemaTypeNormalizer;
2828
}
29+
2930
/**
3031
* @param TypeDoc $doc
3132
*
32-
* @return array
33+
* @return array|mixed
34+
*
35+
* @throws \ReflectionException
3336
*/
3437
public function normalize(TypeDoc $doc)
3538
{
@@ -58,8 +61,8 @@ public function normalize(TypeDoc $doc)
5861

5962
/**
6063
* @param TypeDoc $doc
61-
* @param $paramDocMinMax
62-
* @return mixed
64+
*
65+
* @return array
6366
*/
6467
protected function getMinMaxDoc(TypeDoc $doc)
6568
{
@@ -87,6 +90,8 @@ protected function getMinMaxDoc(TypeDoc $doc)
8790
* @param array $siblingsDoc
8891
*
8992
* @return array
93+
*
94+
* @throws \ReflectionException
9095
*/
9196
protected function appendArrayDoc(TypeDoc $doc, array $siblingsDoc)
9297
{

‎src/Infra/Normalizer/DocNormalizer.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ public function __construct(
3535
* @param HttpServerDoc $doc
3636
*
3737
* @return array
38+
*
39+
* @throws \ReflectionException
3840
*/
3941
public function normalize(HttpServerDoc $doc)
4042
{
@@ -120,6 +122,8 @@ protected function pathsArray(HttpServerDoc $doc)
120122
* @param HttpServerDoc $doc
121123
*
122124
* @return array
125+
*
126+
* @throws \ReflectionException
123127
*/
124128
protected function externalSchemaListArray(HttpServerDoc $doc)
125129
{

‎tests/Common/Helper/ConcreteArrayAppendHelper.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?php
22
namespace Tests\Common\Helper;
33

4-
use Prophecy\Argument;
54
use Yoanm\JsonRpcHttpServerSwaggerDoc\App\Helper\ArrayAppendHelperTrait;
65

76
class ConcreteArrayAppendHelper

‎tests/Functional/App/Helper/ArrayAppendHelperTraitTest.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
namespace Tests\Functional\App\Helper;
33

44
use PHPUnit\Framework\TestCase;
5-
use Prophecy\Argument;
65
use Tests\Common\Helper\ConcreteArrayAppendHelper;
76
use Yoanm\JsonRpcHttpServerSwaggerDoc\App\Helper\ArrayAppendHelperTrait;
87
use Yoanm\JsonRpcServerDoc\Domain\Model\ErrorDoc;

0 commit comments

Comments
 (0)