Moved to SF 5.3 and PHP8 (#12)

* Support PHP 8.0 and Symfony 5
* Use github workflows
* Removed unused security check

.github/workflows/ci.yaml

@@ -0,0 +1,115 @@
+name: 'CI'
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+
+  lint:
+    name: 'Lint'
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@v2
+
+      - name: 'Setup PHP'
+        uses: shivammathur/setup-php@v2
+        with:
+          coverage: "none"
+          extensions: "json"
+          ini-values: "memory_limit=-1"
+          php-version: "8.0"
+
+      - name: 'Determine composer cache directory'
+        id: composer-cache
+        run: echo "::set-output name=directory::$(composer config cache-dir)"
+
+      - name: 'Cache composer dependencies'
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.directory }}
+          key: 7.4-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: 7.4-composer-
+
+      - name: 'Install dependencies'
+        id: deps
+        run: |
+          echo "::group::composer update"
+            composer update --no-progress --ansi
+          echo "::endgroup::"
+
+          echo "::group::install phpunit"
+            # Required for PhpStan
+            vendor/bin/simple-phpunit install
+          echo "::endgroup::"
+
+      - name: 'Composer validate'
+        if: always() && steps.deps.outcome == 'success'
+        run: composer validate --strict
+
+      - name: 'PHP CS Fixer'
+        if: always() && steps.deps.outcome == 'success'
+        run: vendor/bin/php-cs-fixer fix --dry-run --diff
+
+      - name: 'PhpStan'
+        if: always() && steps.deps.outcome == 'success'
+        run: vendor/bin/phpstan analyse
+
+  tests:
+    name: 'Tests'
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+
+    strategy:
+      fail-fast: false # don't cancel other matrix jobs on failure
+      matrix:
+        php: [ '7.4', '8.0' ]
+
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@v2
+
+      - name: 'Setup PHP'
+        uses: shivammathur/setup-php@v2
+        with:
+          coverage: "none"
+          extensions: "json"
+          ini-values: "memory_limit=-1"
+          php-version: "${{ matrix.php }}"
+
+      - name: 'Determine composer cache directory'
+        id: composer-cache
+        run: echo "::set-output name=directory::$(composer config cache-dir)"
+
+      - name: 'Cache composer dependencies'
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.directory }}
+          key: ${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ matrix.php }}-composer-
+
+      #- name: 'Fixup Composer'
+      #  if: matrix.php == 8.0
+      #  run: |
+      #    echo "::group::Fixup Composer platform config for third-parties deps not PHP 8 ready yet"
+      #      composer config platform.php 7.4.99
+      #    echo "::endgroup::"
+
+      - name: 'Install dependencies'
+        run: |
+          echo "::group::composer update"
+            composer update --no-progress --ansi
+          echo "::endgroup::"
+
+          echo "::group::install phpunit"
+            vendor/bin/simple-phpunit install
+          echo "::endgroup::"
+
+      - name: 'Run tests'
+        run: vendor/bin/simple-phpunit --testdox
+

.gitignore

@@ -1,2 +1,13 @@
-/vendor/*
+###> symfony/phpunit-bridge ###
+.phpunit
+.phpunit.result.cache
+/phpunit.xml
+###< symfony/phpunit-bridge ######
+
+###> friendsofphp/php-cs-fixer ###
+/.php-cs-fixer.php
+/.php-cs-fixer.cache
+###< friendsofphp/php-cs-fixer ###
+
+/vendor/
 composer.lock

.php-cs-fixer.dist.php

@@ -0,0 +1,29 @@
+<?php
+
+$finder = (new PhpCsFixer\Finder())->in([
+    __DIR__
+]);
+
+return (new PhpCsFixer\Config())
+    ->setFinder($finder)
+    ->setCacheFile('.php-cs-fixer.cache') // forward compatibility with 3.x line
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@PSR12' => true,
+        '@Symfony' => true,
+        'strict_param' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'concat_space' => ['spacing' => 'one'],
+        'declare_strict_types' => true,
+        'native_function_invocation' => ['include' => ['@compiler_optimized']],
+        'no_superfluous_phpdoc_tags' => true,
+        'ordered_imports' => true,
+        'phpdoc_annotation_without_dot' => false,
+        'phpdoc_order' => true,
+        'phpdoc_summary' => false,
+        'simplified_null_return' => false,
+        'single_line_throw' => false,
+        'void_return' => true,
+        'yoda_style' => false,
+    ])
+;

DependencyInjection/Compiler/OverrideRequestHandlerCompilerPass.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elao\Bundle\JsonHttpFormBundle\DependencyInjection\Compiler;
 
 use Elao\Bundle\JsonHttpFormBundle\Form\RequestHandler\JsonHttpFoundationRequestHandler;

ElaoJsonHttpFormBundle.php

@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elao\Bundle\JsonHttpFormBundle;
 
 use Elao\Bundle\JsonHttpFormBundle\DependencyInjection\Compiler\OverrideRequestHandlerCompilerPass;
-use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class ElaoJsonHttpFormBundle extends Bundle
 {

Form/RequestHandler/JsonHttpFoundationRequestHandler.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elao\Bundle\JsonHttpFormBundle\Form\RequestHandler;
 
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
@@ -17,15 +19,14 @@
  */
 class JsonHttpFoundationRequestHandler extends HttpFoundationRequestHandler
 {
-    /** @var ServerParams */
-    private $serverParams;
-
     /**
      * Methods that have a body
      *
-     * @var array
+     * @var array<string>
      */
-    private static $bodyMethods = ['POST', 'PUT', 'PATCH', 'DELETE'];
+    private static array $bodyMethods = ['POST', 'PUT', 'PATCH', 'DELETE'];
+
+    private ServerParams $serverParams;
 
     public function __construct(ServerParams $serverParams = null)
     {
@@ -34,6 +35,9 @@ public function __construct(ServerParams $serverParams = null)
         $this->serverParams = $serverParams ?: new ServerParams();
     }
 
+    /**
+     * @param mixed $request Support old versions of RequestHandlerInterface
+     */
     public function handleRequest(FormInterface $form, $request = null): void
     {
         if (!$request instanceof Request) {
@@ -42,7 +46,7 @@ public function handleRequest(FormInterface $form, $request = null): void
 
         if (
             'json' === $request->getContentType()
-            && in_array($request->getMethod(), static::$bodyMethods, false)
+            && \in_array($request->getMethod(), static::$bodyMethods, false)
         ) {
             $this->handleJsonRequest($form, $request);
 
@@ -54,9 +58,6 @@ public function handleRequest(FormInterface $form, $request = null): void
 
     /**
      * Handle Json Request
-     *
-     * @param FormInterface $form
-     * @param Request $request
      */
     protected function handleJsonRequest(FormInterface $form, Request $request): void
     {
@@ -98,10 +99,6 @@ protected function handleJsonRequest(FormInterface $form, Request $request): voi
      *
      * Code from {@link HttpFoundationRequestHandler} max size verification.
      *
-     * @param FormInterface $form
-     *
-     * @return boolean
-     *
      * @author Bernhard Schussek <[email protected]>
      */
     protected function isContentSizeValid(FormInterface $form): bool

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 élao
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Makefile

@@ -0,0 +1,29 @@
+###########
+# Install #
+###########
+
+install:
+	composer update
+
+########
+# Lint #
+########
+
+lint: lint.php-cs-fixer lint.phpstan lint.composer
+
+lint.php-cs-fixer:
+	vendor/bin/php-cs-fixer fix
+
+lint.phpstan:
+	vendor/bin/phpstan analyse .
+
+lint.composer:
+	composer validate --strict
+
+########
+# Test #
+########
+
+## Test
+test:
+	vendor/bin/simple-phpunit

README.md

@@ -1,5 +1,4 @@
-Elao JSON HTTP Form Bundle ![](https://img.shields.io/badge/Symfony-3.0-blue.svg)
-==========================
+# Elao JSON HTTP Form Bundle ![](https://img.shields.io/badge/Symfony-5.3-blue.svg)
 
 [![Build Status](https://travis-ci.org/Elao/ElaoJsonHttpFormBundle.svg)](https://travis-ci.org/Elao/ElaoJsonHttpFormBundle)
 
@@ -11,34 +10,15 @@ The `JsonHttpFoundationRequestHandler` handles the request: If the request conte
 
 Otherwise, it lets the default behaviour operate: the `HttpFoundationRequestHandler` will handle the request. So all your non-json form request will be treated just the way they've always been.
 
-Installation:
--------------
+## Installation
 
-Add _ElaoJsonHttpFormBundle_ to your composer.json:
+Require _ElaoJsonHttpFormBundle_:
 
-```bash
-$ php composer.phar require elao/json-http-form-bundle
+```shell
+composer require elao/json-http-form-bundle
 ```
 
-Register the bundle in the kernel:
-
-```php
-<?php
-// app/AppKernel.php
-
-public function registerBundles()
-{
-    $bundles = array(
-        // ...
-        new Elao\Bundle\JsonHttpFormBundle\ElaoJsonHttpFormBundle(),
-    );
-}
-```
-
-That's it. You're good. Get some well deserved rest.
-
-Usage:
----------
+## Usage
 
 Given a `Rocket` entity with two attributes: `name` (a string) and `colors` (an array of strings).
 
@@ -111,9 +91,9 @@ Content-Length: 43
 
 {"name":"Melies","colors":["pink","brown"]}
 ```
-\o/
+It works \o/
 
-License
+## License
 -------
 
 MIT