Improve (#6)

Author: yoanm

Makefile

@@ -6,13 +6,15 @@ COVERAGE_OUTPUT_STYLE ?= html
 BUILD_DIRECTORY ?= build
 REPORTS_DIRECTORY ?= ${BUILD_DIRECTORY}/reports
 COVERAGE_DIRECTORY ?= ${BUILD_DIRECTORY}/coverage
+BEHAT_COVERAGE_DIRECTORY ?= ${BUILD_DIRECTORY}/behat-coverage
 COVERAGE_CLOVER_FILE_PATH ?= ${COVERAGE_DIRECTORY}/clover.xml
 
 ## Commands options
 ### Composer
 #COMPOSER_OPTIONS=
 ### Phpcs
 PHPCS_REPORT_STYLE ?= full
+PHPCS_DISABLE_WARNING ?= "false"
 #PHPCS_REPORT_FILE=
 #PHPCS_REPORT_FILE_OPTION=
 
@@ -51,6 +53,12 @@ ifneq ("${PHPCS_REPORT_FILE}","")
 	PHPCS_REPORT_FILE_OPTION ?= --report-file=${PHPCS_REPORT_FILE}
 endif
 
+ifneq ("${PHPCS_DISABLE_WARNING}","true")
+	PHPCS_DISABLE_WARNING_OPTION=
+else
+	PHPCS_DISABLE_WARNING_OPTION=-n
+endif
+
 
 ## Project build (install and configure)
 build: install configure
@@ -76,20 +84,26 @@ test-functional:
 	./vendor/bin/behat ${BEHAT_COLOR_OPTION} ${BEHAT_OUTPUT_STYLE_OPTION} --no-snippets
 
 codestyle: create-reports-directory
-	./vendor/bin/phpcs --standard=phpcs.xml.dist ${PHPCS_COLOR_OPTION} ${PHPCS_REPORT_FILE_OPTION} --report=${PHPCS_REPORT_STYLE}
+	./vendor/bin/phpcs ${PHPCS_DISABLE_WARNING_OPTION} --standard=phpcs.xml.dist ${PHPCS_COLOR_OPTION} ${PHPCS_REPORT_FILE_OPTION} --report=${PHPCS_REPORT_STYLE}
 
 coverage: create-coverage-directory
 	./vendor/bin/phpunit ${PHPUNIT_COLOR_OPTION} ${PHPUNIT_OUTPUT_STYLE_OPTION} ${PHPUNIT_COVERAGE_OPTION}
 
+behat-coverage: create-behat-coverage-directory
+	composer required leanphp/behat-code-coverage
+	./vendor/bin/behat ${BEHAT_COLOR_OPTION} ${BEHAT_OUTPUT_STYLE_OPTION} --no-snippets --profile coverage
 
 
 # Internal commands
 create-coverage-directory:
 	mkdir -p ${COVERAGE_DIRECTORY}
 
+create-behat-coverage-directory:
+	mkdir -p ${BEHAT_COVERAGE_DIRECTORY}
+
 create-reports-directory:
 	mkdir -p ${REPORTS_DIRECTORY}
 
 
-.PHONY: build install configure test test-technical test-functional codestyle coverage create-coverage-directory create-reports-directory
+.PHONY: build install configure test test-technical test-functional codestyle coverage behat-coverage create-coverage-directory create-behat-coverage-directory create-reports-directory
 .DEFAULT: build

behat.yml

@@ -3,3 +3,17 @@ default:
     default:
       contexts:
         - Tests\Functional\BehatContext\DemoAppContext: ~
+coverage:
+  extensions:
+    LeanPHP\Behat\CodeCoverage\Extension:
+      drivers:
+      - local
+      filter:
+        whitelist:
+          include:
+            directories:
+              'src': ~
+      report:
+        format:   html
+        options:
+          target: build/behat-coverage

features/bootstrap/DemoAppContext.php

@@ -20,14 +20,6 @@ class DemoAppContext extends AbstractContext
     /** @var bool */
     private $useKernelWithDocCreatedListener = false;
 
-    /**
-     * @Given I will use kernel with MethodDocCreated listener
-     */
-    public function givenIWillUseMethodDocCreatedListener()
-    {
-        $this->useKernelWithMethodDocCreatedListener = true;
-    }
-
     /**
      * @Given I will use kernel with DocCreated listener
      */

features/demo_app/config_with_doc_created_listener/services.yaml

@@ -9,7 +9,7 @@ services:
   # Alias resolver mock to bundle resolver
   json_rpc_http_server.alias.method_resolver: '@resolver'
 
-  # MethodDocCreated Listener
+  # DocCreated Listener
   method_doc_created.listener:
     class: DemoApp\Listener\DocCreatedListener
     tags:

features/demo_app/src/Method/MethodA.php

@@ -5,14 +5,6 @@
 
 class MethodA implements JsonRpcMethodInterface
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function validateParams(array $paramList) : array
-    {
-        return [];
-    }
-
     /**
      * {@inheritdoc}
      */

features/demo_app/src/Method/MethodB.php

@@ -5,14 +5,6 @@
 
 class MethodB implements JsonRpcMethodInterface
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function validateParams(array $paramList) : array
-    {
-        return [];
-    }
-
     /**
      * {@inheritdoc}
      */

src/Provider/DocProvider.php

@@ -35,9 +35,11 @@ public function __construct(
     }
 
     /**
-     * @param string|null $host
+     * @param null $host
      *
      * @return array
+     *
+     * @throws \ReflectionException
      */
     public function getDoc($host = null) : array
     {

tests/Functional/DependencyInjection/ConfigFilesTest.php

@@ -7,7 +7,6 @@
 use Yoanm\JsonRpcHttpServerSwaggerDoc\App\Normalizer\Component\OperationDocNormalizer;
 use Yoanm\JsonRpcHttpServerSwaggerDoc\App\Normalizer\Component\RequestDocNormalizer;
 use Yoanm\JsonRpcHttpServerSwaggerDoc\App\Normalizer\Component\ResponseDocNormalizer;
-use Yoanm\JsonRpcHttpServerSwaggerDoc\App\Normalizer\Component\SchemaTypeNormalizer;
 use Yoanm\JsonRpcHttpServerSwaggerDoc\App\Normalizer\Component\ShapeNormalizer;
 use Yoanm\JsonRpcHttpServerSwaggerDoc\App\Resolver\DefinitionRefResolver;
 use Yoanm\JsonRpcHttpServerSwaggerDoc\Infra\Normalizer\DocNormalizer;