Improve (#8)

yoanm · web-flow · commit 102cc0ceb1fb · 2018-11-04T12:47:46.000+01:00
diff --git a/Makefile b/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
diff --git a/behat.yml b/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
diff --git a/features/bootstrap/DemoAppContext.php b/features/bootstrap/DemoAppContext.php
@@ -1,7 +1,6 @@
 <?php
 namespace Tests\Functional\BehatContext;
 
-use Behat\Behat\Context\Context;
 use Behat\Gherkin\Node\PyStringNode;
 use DemoApp\AbstractKernel;
 use DemoApp\DefaultKernel;
diff --git a/features/demo_app/src/Listener/ServerDocCreatedListener.php b/features/demo_app/src/Listener/ServerDocCreatedListener.php
@@ -1,8 +1,6 @@
 <?php
 namespace DemoApp\Listener;
 
-use DemoApp\Method\MethodB;
-use Yoanm\JsonRpcServerDoc\Domain\Model\Type\ArrayDoc;
 use Yoanm\SymfonyJsonRpcHttpServerDoc\Event\ServerDocCreatedEvent;
 
 /**
diff --git a/features/demo_app/src/Method/MethodA.php b/features/demo_app/src/Method/MethodA.php
@@ -5,14 +5,6 @@
 
 class MethodA implements JsonRpcMethodInterface
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function validateParams(array $paramList) : array
-    {
-        return [];
-    }
-
     /**
      * {@inheritdoc}
      */
diff --git a/features/demo_app/src/Method/MethodB.php b/features/demo_app/src/Method/MethodB.php
@@ -5,14 +5,6 @@
 
 class MethodB implements JsonRpcMethodInterface
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function validateParams(array $paramList) : array
-    {
-        return [];
-    }
-
     /**
      * {@inheritdoc}
      */
diff --git a/features/demo_app/src/Method/MethodC.php b/features/demo_app/src/Method/MethodC.php
@@ -5,14 +5,6 @@
 
 class MethodC implements JsonRpcMethodInterface
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function validateParams(array $paramList) : array
-    {
-        return [];
-    }
-
     /**
      * {@inheritdoc}
      */
diff --git a/features/demo_app/src/Method/MethodD.php b/features/demo_app/src/Method/MethodD.php
@@ -5,14 +5,6 @@
 
 class MethodD implements JsonRpcMethodInterface
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function validateParams(array $paramList) : array
-    {
-        return [];
-    }
-
     /**
      * {@inheritdoc}
      */
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,7 +8,6 @@
          processIsolation="false"
 
          stopOnRisky="true"
-
          stopOnError="true"
          stopOnFailure="true"
 
diff --git a/src/Endpoint/DocumentationEndpoint.php b/src/Endpoint/DocumentationEndpoint.php
@@ -49,6 +49,8 @@ public function httpOptions() : Response
      * @param Request $request
      *
      * @return Response
+     *
+     * @throws \Exception
      */
     public function httpGet(Request $request) : Response
     {
diff --git a/src/Provider/DocProviderInterface.php b/src/Provider/DocProviderInterface.php
@@ -14,7 +14,7 @@ interface DocProviderInterface
     public function getDoc($host = null) : array;
 
     /**
-     * $param string      $filename
+     * @param string      $filename
      * @param string|null $host
      *
      * @return bool
diff --git a/tests/Functional/DependencyInjection/ConfigFilesTest.php b/tests/Functional/DependencyInjection/ConfigFilesTest.php
@@ -10,7 +10,6 @@
 use Yoanm\JsonRpcServerDoc\Infra\Normalizer\TypeDocNormalizer;
 use Yoanm\SymfonyJsonRpcHttpServer\DependencyInjection\JsonRpcHttpServerExtension;
 use Yoanm\SymfonyJsonRpcHttpServerDoc\Creator\HttpServerDocCreator;
-use Yoanm\SymfonyJsonRpcHttpServerDoc\DependencyInjection\JsonRpcHttpServerDocExtension;
 use Yoanm\SymfonyJsonRpcHttpServerDoc\Endpoint\DocumentationEndpoint;
 use Yoanm\SymfonyJsonRpcHttpServerDoc\Finder\NormalizedDocFinder;
 use Yoanm\SymfonyJsonRpcHttpServerDoc\Provider\RawDocProvider;
diff --git a/tests/Functional/Endpoint/DocumentationEndpointTest.php b/tests/Functional/Endpoint/DocumentationEndpointTest.php
@@ -90,10 +90,8 @@ public function testHttPostShouldHaveUseRawDocIfNoFilenameProvided()
     public function testHttOptionsShouldReturnAllowedMethodsAndContentType()
     {
         $expectedAllowedMethodList = [Request::METHOD_GET, Request::METHOD_OPTIONS];
-        /** @var Request|ObjectProphecy $request */
-        $request = $this->prophesize(Request::class);
 
-        $response = $this->endpoint->httpOptions($request->reveal());
+        $response = $this->endpoint->httpOptions();
 
         $this->assertSame(Response::HTTP_OK, $response->getStatusCode());
         $this->assertSame('application/json', $response->headers->get('Content-Type'));

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,8 @@ public function httpOptions() : Response`
`49`	`49`	`* @param Request $request`
`50`	`50`	`*`
`51`	`51`	`* @return Response`
	`52`	`+ *`
	`53`	`+ * @throws \Exception`
`52`	`54`	`*/`
`53`	`55`	`public function httpGet(Request $request) : Response`
`54`	`56`	`{`