Improve (#33)

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/demo_app/src/DefaultKernel.php

@@ -9,6 +9,7 @@ class DefaultKernel extends AbstractKernel
 {
     public function registerBundles()
     {
+        /** @noinspection PhpIncludeInspection */
         $contents = require $this->getProjectDir().'/'.$this->getConfigDirectory().'/bundles.php';
         foreach ($contents as $class => $envs) {
             if (isset($envs['all']) || isset($envs[$this->environment])) {

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}
      */

features/demo_app/src/Method/MethodC.php

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

features/demo_app/src/Method/MethodD.php

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

phpunit.xml.dist

@@ -8,7 +8,6 @@
          processIsolation="false"
 
          stopOnRisky="true"
-
          stopOnError="true"
          stopOnFailure="true"
 

src/DependencyInjection/JsonRpcHttpServerExtension.php

@@ -108,8 +108,6 @@ private function compileAndProcessConfigurations(array $configs, ContainerBuilde
 
     /**
      * @param ContainerBuilder $container
-     *
-     * @return Reference|null Null in case no dispatcher found
      */
     private function bindJsonRpcServerDispatcher(ContainerBuilder $container) : void
     {
@@ -170,7 +168,7 @@ private function binJsonRpcMethods(ContainerBuilder $container) : void
 
     /**
      * @param string       $methodName
-     * @param Definition   $jsonRpcMethodDefinition
+     * @param string       $jsonRpcMethodServiceId
      * @param Definition[] $mappingAwareServiceDefinitionList
      */
     private function bindJsonRpcMethod(
@@ -190,7 +188,6 @@ private function bindJsonRpcMethod(
      * @param ContainerBuilder $container
      *
      * @return array
-     * @throws \ReflectionException
      */
     private function findAndValidateMappingAwareDefinitionList(ContainerBuilder $container): array
     {

src/DependencyInjection/JsonRpcMethodDefinitionHelper.php

@@ -15,7 +15,6 @@ class JsonRpcMethodDefinitionHelper
      * @param ContainerBuilder $container
      *
      * @return array
-     * @throws \ReflectionException
      */
     public function findAndValidateJsonRpcMethodDefinition(ContainerBuilder $container) : array
     {
@@ -56,7 +55,6 @@ private function validateJsonRpcMethodTagAttributes(string $serviceId, array $ta
      * @param string     $serviceId
      * @param Definition $definition
      *
-     * @throws \ReflectionException
      * @throws \LogicException      In case definition is not valid
      */
     private function validateJsonRpcMethodDefinition(string $serviceId, Definition $definition) : void