Merge pull request #1 from shapintv/sf5

Allow sf5 + clean

.github/workflows/static.yml

@@ -0,0 +1,21 @@
+on: [push, pull_request]
+name: Static analysis
+jobs:
+  php-cs-fixer:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: PHP-CS-Fixer
+        uses: docker://jakzal/phpqa:php7.3-alpine
+        with:
+            args: php-cs-fixer fix --dry-run --diff-format udiff -vvv
+
+  phpstan:
+    name: PHPStan
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: PHPStan
+        uses: docker://oskarstark/phpstan-ga
+        with:
+          args: analyze --no-progress

Makefile

@@ -1,6 +1,9 @@
 .PHONY: ${TARGETS}
 .DEFAULT_GOAL := help
 
+DIR := ${CURDIR}
+QA_IMAGE := jakzal/phpqa:php7.3-alpine
+
 define say_red =
     echo "\033[31m$1\033[0m"
 endef
@@ -25,11 +28,16 @@ install: ## Install all applications
 	@$(call say_green,"Installing PHP dependencies")
 	@composer install
 
-test: ## Launch tests
-	@vendor/bin/phpunit
-
 cs-lint: ## Verify check styles
-	-vendor/bin/php-cs-fixer fix --dry-run --using-cache=no --verbose --diff
+	@docker run --rm -v $(DIR):/project -w /project $(QA_IMAGE) php-cs-fixer fix --diff-format udiff --dry-run -vvv
 
 cs-fix: ## Apply Check styles
-	-vendor/bin/php-cs-fixer fix --using-cache=no --verbose --diff
+	@docker run --rm -v $(DIR):/project -w /project $(QA_IMAGE) php-cs-fixer fix --diff-format udiff -vvv
+
+phpstan: ## Run PHPStan
+	@docker run --rm -v $(DIR):/project -w /project $(QA_IMAGE) phpstan analyse
+
+test: cs-lint phpstan ## Launch tests
+	@rm -rf ./tests/app/var ./tests/app/cache
+	@$(call say_green,"==\> Launch unit tests")
+	@vendor/bin/phpunit

composer.json

@@ -11,15 +11,13 @@
     ],
     "require": {
         "php": "^7.3",
-        "symfony/config": "^4.2",
-        "symfony/http-client": "^4.3"
+        "symfony/config": "^4.3|^5.0",
+        "symfony/http-client": "^4.3|^5.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.0",
-        "friendsofphp/php-cs-fixer": "^2.13",
-        "phpstan/phpstan": "^0.11.1",
-        "symfony/phpunit-bridge": "^4.2",
-        "symfony/var-dumper": "^4.2"
+        "phpunit/phpunit": "^8.5",
+        "symfony/phpunit-bridge": "^4.4|^5.0",
+        "symfony/var-dumper": "^4.3|^5.0"
     },
     "autoload": {
         "psr-4": {

phpstan.neon.dist

@@ -1,5 +1,6 @@
 parameters:
     level: 5
+    inferPrivatePropertyTypeFromConstructor: true
     paths:
         - %currentWorkingDirectory%/src
         - %currentWorkingDirectory%/tests

src/Api/HttpApi.php

@@ -18,14 +18,7 @@
 
 abstract class HttpApi
 {
-    /**
-     * @var HttpClient
-     */
     protected $httpClient;
-
-    /**
-     * @var Hydrator
-     */
     protected $hydrator;
 
     public function __construct(HttpClientInterface $httpClient, Hydrator $hydrator)

src/Exception/Domain/BadRequestException.php

@@ -9,8 +9,8 @@
 
 namespace Shapin\TalkJS\Exception\Domain;
 
-use Symfony\Contracts\HttpClient\ResponseInterface;
 use Shapin\TalkJS\Exception\DomainException;
+use Symfony\Contracts\HttpClient\ResponseInterface;
 
 class BadRequestException extends \Exception implements DomainException
 {

src/Exception/Domain/UnknownErrorException.php

@@ -9,8 +9,8 @@
 
 namespace Shapin\TalkJS\Exception\Domain;
 
-use Symfony\Contracts\HttpClient\ResponseInterface;
 use Shapin\TalkJS\Exception\DomainException;
+use Symfony\Contracts\HttpClient\ResponseInterface;
 
 final class UnknownErrorException extends \Exception implements DomainException
 {

src/Hydrator/ModelHydrator.php

@@ -19,15 +19,12 @@
 final class ModelHydrator implements Hydrator
 {
     /**
-     * @param ResponseInterface $response
-     * @param string            $class
-     *
      * @return mixed
      */
     public function hydrate(ResponseInterface $response, string $class)
     {
         if (!isset($response->getHeaders()['content-type'])) {
-            throw new HydrationException("The ModelHydrator cannot hydrate response with Content-Type: $contentType");
+            throw new HydrationException('The ModelHydrator cannot hydrate response without Content-Type header.');
         }
 
         $contentType = reset($response->getHeaders()['content-type']);

src/Model/Conversation/Conversation.php

@@ -29,7 +29,7 @@ class Conversation implements CreatableFromArray
     private $photoUrl;
 
     /**
-     * @var ?string
+     * @var array
      */
     private $welcomeMessages;
 

src/TalkJSClient.php

@@ -9,20 +9,13 @@
 
 namespace Shapin\TalkJS;
 
-use Shapin\TalkJS\Hydrator\ModelHydrator;
 use Shapin\TalkJS\Hydrator\Hydrator;
+use Shapin\TalkJS\Hydrator\ModelHydrator;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 final class TalkJSClient
 {
-    /**
-     * @var HttpClient
-     */
     private $httpClient;
-
-    /**
-     * @var Hydrator
-     */
     private $hydrator;
 
     public function __construct(HttpClientInterface $talkjsClient, Hydrator $hydrator = null)

tests/FunctionalTests/ConversationTest.php

@@ -10,10 +10,10 @@
 namespace Shapin\TalkJS\Tests\FunctionalTests;
 
 use Shapin\TalkJS\Model\Conversation\Conversation;
-use Shapin\TalkJS\Model\Conversation\ConversationJoined;
-use Shapin\TalkJS\Model\Conversation\ConversationLeft;
 use Shapin\TalkJS\Model\Conversation\ConversationCollection;
 use Shapin\TalkJS\Model\Conversation\ConversationCreatedOrUpdated;
+use Shapin\TalkJS\Model\Conversation\ConversationJoined;
+use Shapin\TalkJS\Model\Conversation\ConversationLeft;
 use Shapin\TalkJS\Model\Conversation\ParticipationUpdated;
 
 final class ConversationTest extends TestCase