Add PHP8.1 & Symfony 6 support

Signed-off-by: Jelle Deneweth <jelle.deneweth@gmail.com>

Author: pottink

.github/workflows/grumphp.yaml

@@ -7,7 +7,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['7.3', '7.4', '8.0']
+                php-versions: ['8.0', '8.1']
                 composer-options: ['', '--prefer-lowest']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }} with ${{ matrix.composer-options }}
@@ -34,14 +34,7 @@ jobs:
                   path: ${{ steps.composercache.outputs.dir }}
                   key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
                   restore-keys: ${{ runner.os }}-composer-
-            - name: Install dependencies <PHP8
-              if: matrix.php-versions != '8.0'
-              run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }}
-            #
-            # Currently php-cs-fixer is nog PHP 8 compatible yet!
-            #
-            - name: Install dependencies PHP8
-              if: matrix.php-versions == '8.0'
+            - name: Install dependencies PHP
               run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }} --ignore-platform-reqs
             - name: Set git variables
               run: |
@@ -50,4 +43,4 @@ jobs:
             - name: Run the tests
               run: php vendor/bin/grumphp run --no-interaction
               env:
-                  PHP_CS_FIXER_IGNORE_ENV: ${{ matrix.php-versions == '8.0'}}
+                  PHP_CS_FIXER_IGNORE_ENV: 1

.php-cs-fixer.cache

@@ -0,0 +1 @@
+{"php":"8.0.13","version":"3.3.2:v3.3.2#06bdbdfcd619183dd7a1a6948360f8af73b9ecec","indent":"    ","lineEnding":"\n","rules":{"array_syntax":{"syntax":"short"},"backtick_to_shell_exec":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["return"]},"braces":{"allow_single_line_anonymous_class_with_empty_body":true,"allow_single_line_closure":true},"cast_spaces":true,"class_attributes_separation":{"elements":{"method":"one"}},"class_definition":{"single_line":true},"clean_namespace":true,"concat_space":true,"echo_tag_syntax":{"format":"long"},"empty_loop_body":{"style":"braces"},"empty_loop_condition":true,"fully_qualified_strict_types":true,"function_typehint_space":true,"general_phpdoc_tag_rename":{"replacements":{"inheritDocs":"inheritDoc"}},"include":true,"increment_style":true,"integer_literal_case":true,"lambda_not_used_import":true,"linebreak_after_opening_tag":true,"magic_constant_casing":true,"magic_method_casing":true,"method_argument_space":{"on_multiline":"ignore"},"native_function_casing":true,"native_function_type_declaration_casing":true,"no_alias_language_construct_call":true,"no_alternative_syntax":true,"no_binary_string":true,"no_blank_lines_after_phpdoc":true,"no_empty_comment":true,"no_empty_phpdoc":true,"no_empty_statement":true,"no_extra_blank_lines":{"tokens":["case","continue","curly_brace_block","default","extra","parenthesis_brace_block","square_brace_block","switch","throw","use"]},"no_leading_namespace_whitespace":true,"no_mixed_echo_print":true,"no_multiline_whitespace_around_double_arrow":true,"no_short_bool_cast":true,"no_singleline_whitespace_before_semicolons":true,"no_spaces_around_offset":true,"no_superfluous_phpdoc_tags":{"allow_mixed":true,"allow_unused_params":true},"no_trailing_comma_in_list_call":true,"no_trailing_comma_in_singleline_array":true,"no_unneeded_control_parentheses":{"statements":["break","clone","continue","echo_print","return","switch_case","yield","yield_from"]},"no_unneeded_curly_braces":{"namespaces":true},"no_unset_cast":true,"no_unused_imports":true,"no_whitespace_before_comma_in_array":true,"normalize_index_brace":true,"object_operator_without_whitespace":true,"ordered_imports":true,"php_unit_fqcn_annotation":true,"php_unit_method_casing":{"case":"snake_case"},"phpdoc_align":{"align":"left"},"phpdoc_annotation_without_dot":true,"phpdoc_indent":true,"phpdoc_inline_tag_normalizer":true,"phpdoc_no_access":true,"phpdoc_no_alias_tag":true,"phpdoc_no_package":true,"phpdoc_no_useless_inheritdoc":true,"phpdoc_return_self_reference":true,"phpdoc_scalar":true,"phpdoc_separation":true,"phpdoc_single_line_var_spacing":true,"phpdoc_summary":true,"phpdoc_tag_type":{"tags":{"inheritDoc":"inline"}},"phpdoc_trim":true,"phpdoc_trim_consecutive_blank_line_separation":true,"phpdoc_types":true,"phpdoc_types_order":{"null_adjustment":"always_last"},"phpdoc_var_without_name":true,"protected_to_private":true,"semicolon_after_instruction":true,"single_class_element_per_statement":true,"single_line_comment_style":{"comment_types":["hash"]},"single_quote":true,"single_space_after_construct":true,"space_after_semicolon":{"remove_in_empty_for_expressions":true},"standardize_increment":true,"standardize_not_equals":true,"switch_continue_to_break":true,"trailing_comma_in_multiline":true,"trim_array_spaces":true,"types_spaces":true,"unary_operator_spaces":true,"whitespace_after_comma_in_array":true,"yoda_style":true,"blank_line_after_opening_tag":true,"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"align_multiline_comment":true,"array_indentation":true,"combine_consecutive_issets":true,"combine_consecutive_unsets":true,"comment_to_phpdoc":true,"date_time_immutable":true,"declare_strict_types":true,"doctrine_annotation_array_assignment":true,"doctrine_annotation_braces":true,"doctrine_annotation_indentation":true,"doctrine_annotation_spaces":true,"escape_implicit_backslashes":true,"explicit_indirect_variable":true,"explicit_string_variable":true,"final_internal_class":true,"list_syntax":{"syntax":"short"},"mb_str_functions":true,"method_chaining_indentation":true,"multiline_comment_opening_closing":true,"multiline_whitespace_before_semicolons":true,"no_null_property_initialization":true,"no_php4_constructor":true,"no_superfluous_elseif":true,"no_unreachable_default_argument_value":true,"no_useless_else":true,"no_useless_return":true,"phpdoc_order_by_value":{"annotations":["covers"]},"php_unit_set_up_tear_down_visibility":true,"phpdoc_add_missing_param_annotation":true,"phpdoc_order":true,"pow_to_exponentiation":true,"psr_autoloading":{"dir":"src"},"simplified_null_return":true,"strict_comparison":true,"strict_param":true,"string_line_ending":true,"ternary_to_null_coalescing":true,"void_return":true,"global_namespace_import":{"import_classes":true,"import_constants":true,"import_functions":true}},"hashes":{"src\/EventListener\/JsonApiProblemExceptionListener.php":3370518202,"src\/Transformer\/HttpExceptionTransformer.php":326027393,"src\/Transformer\/ExceptionTransformerInterface.php":2751164189,"src\/Transformer\/SecurityExceptionTransformer.php":2004785248,"src\/Transformer\/ApiProblemExceptionTransformer.php":4217022154,"src\/Transformer\/Chain.php":673462146,"src\/Exception\/ApiProblemHttpException.php":2140000361,"src\/DependencyInjection\/ApiProblemExtension.php":1581141798,"src\/ApiProblemBundle.php":1382394439,"test\/EventListener\/JsonApiProblemExceptionListenerTest.php":3707063159,"test\/ApiProblemBundleTest.php":2971244330,"test\/Transformer\/ApiProblemExceptionTransformerTest.php":3963316912,"test\/Transformer\/HttpExceptionTransformerTest.php":2380537184,"test\/Transformer\/ChainTest.php":4071150179,"test\/Transformer\/SecurityExceptionTransformerTest.php":219608745,"test\/Exception\/ApiProblemHttpExceptionTest.php":856727078,"test\/DependencyInjection\/ApiProblemExtensionTest.php":2706743894}}

.php-cs-fixer.dist.php

@@ -0,0 +1,92 @@
+<?php
+
+return (new PhpCsFixer\Config())
+    ->setFinder(
+        \Symfony\Component\Finder\Finder::create()
+        ->in([
+                 __DIR__ . '/src',
+                 __DIR__ . '/test',
+         ])
+    )
+    ->setRiskyAllowed(true)
+    ->setRules([
+           '@Symfony' => true,
+           'align_multiline_comment' => true,
+           'array_indentation' => true,
+           'array_syntax' => ['syntax' => 'short'],
+           'backtick_to_shell_exec' => true,
+           'blank_line_before_statement' => ['statements' => ['return']],
+           'class_keyword_remove' => false,
+           'combine_consecutive_issets' => true,
+           'combine_consecutive_unsets' => true,
+           'comment_to_phpdoc' => true,
+           'compact_nullable_typehint' => true,
+           'date_time_immutable' => true,
+           'declare_strict_types' => true,
+           'doctrine_annotation_array_assignment' => true,
+           'doctrine_annotation_braces' => true,
+           'doctrine_annotation_indentation' => true,
+           'doctrine_annotation_spaces' => true,
+           'escape_implicit_backslashes' => true,
+           'explicit_indirect_variable' => true,
+           'explicit_string_variable' => true,
+           'final_internal_class' => true,
+           'fully_qualified_strict_types' => true,
+           'general_phpdoc_annotation_remove' => false,
+           'header_comment' => false,
+           'heredoc_to_nowdoc' => false,
+           'linebreak_after_opening_tag' => true,
+           'list_syntax' => ['syntax' => 'short'],
+           'mb_str_functions' => true,
+           'method_chaining_indentation' => true,
+           'multiline_comment_opening_closing' => true,
+           'multiline_whitespace_before_semicolons' => true,
+           'native_function_invocation' => false,
+           'no_alternative_syntax' => true,
+           'no_blank_lines_before_namespace' => false,
+           'no_null_property_initialization' => true,
+           'no_php4_constructor' => true,
+           'echo_tag_syntax' => ['format'=> 'long'],
+           'no_superfluous_elseif' => true,
+           'no_unreachable_default_argument_value' => true,
+           'no_useless_else' => true,
+           'no_useless_return' => true,
+           'not_operator_with_space' => false,
+           'not_operator_with_successor_space' => false,
+           'ordered_class_elements' => false,
+           'ordered_imports' => true,
+           'php_unit_dedicate_assert' => false,
+           'php_unit_expectation' => false,
+           'php_unit_mock' => false,
+           'php_unit_namespaced' => false,
+           'php_unit_no_expectation_annotation' => false,
+           'phpdoc_order_by_value' => ['annotations' => ['covers']],
+           'php_unit_set_up_tear_down_visibility' => true,
+           'php_unit_strict' => false,
+           'php_unit_test_annotation' => false,
+           'php_unit_test_class_requires_covers' => false,
+           'php_unit_method_casing' => ['case' => 'snake_case'],
+           'phpdoc_add_missing_param_annotation' => true,
+           'phpdoc_order' => true,
+           'phpdoc_types_order' => ['null_adjustment' => 'always_last'],
+           'pow_to_exponentiation' => true,
+           'psr_autoloading' => ['dir' => 'src'],
+           'random_api_migration' => false,
+           'simplified_null_return' => true,
+           'static_lambda' => false,
+           'strict_comparison' => true,
+           'strict_param' => true,
+           'string_line_ending' => true,
+           'ternary_to_null_coalescing' => true,
+           'void_return' => true,
+           'yoda_style' => true,
+           'single_line_throw' => false,
+           'phpdoc_align' => ['align' => 'left'],
+           'phpdoc_to_comment' => false,
+           'global_namespace_import' => [
+               'import_classes' => true,
+               'import_constants' => true,
+               'import_functions' => true,
+           ],
+   ])
+;

.php_cs.dist

@@ -10,19 +10,19 @@
         }
     ],
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^8.0",
         "phpro/api-problem": "^1.0",
-        "symfony/dependency-injection": "^4.4|^5.0",
-        "symfony/event-dispatcher": "^4.4|^5.0",
-        "symfony/http-kernel": "^4.4|^5.0"
+        "symfony/dependency-injection": "^5.3 || ^6.0",
+        "symfony/event-dispatcher": "^5.3 || ^6.0",
+        "symfony/http-kernel": "^5.3 || ^6.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.16.7",
+        "friendsofphp/php-cs-fixer": "^3.3",
         "matthiasnoback/symfony-dependency-injection-test": "^4.2",
-        "phpro/grumphp-shim": "^1.2.0",
+        "phpro/grumphp-shim": "^1.6.0",
         "phpspec/prophecy-phpunit": "^2.0",
         "phpunit/phpunit": "^9.4",
-        "symfony/security-core": "^4.4|^5.0"
+        "symfony/security-core": "^5.3 || ^6.0"
     },
     "config": {
         "sort-packages": true

composer.json

@@ -1,7 +1,7 @@
 grumphp:
     tasks:
       phpcsfixer2:
-        config: ".php_cs.dist"
+        config: ".php-cs-fixer.dist.php"
         config_contains_finder: true
       phpunit: ~
       clover_coverage:

grumphp.yml.dist

@@ -11,6 +11,7 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
+use Throwable;
 
 class JsonApiProblemExceptionListener
 {
@@ -45,7 +46,7 @@ public function onKernelException(ExceptionEvent $event): void
         $event->setResponse($this->generateResponse($apiProblem));
     }
 
-    private function convertExceptionToProblem(\Throwable $exception): ApiProblemInterface
+    private function convertExceptionToProblem(Throwable $exception): ApiProblemInterface
     {
         if (!$this->exceptionTransformer->accepts($exception)) {
             return new ExceptionApiProblem($exception);

src/EventListener/JsonApiProblemExceptionListener.php

@@ -7,18 +7,19 @@
 use Phpro\ApiProblem\ApiProblemInterface;
 use Phpro\ApiProblem\Exception\ApiProblemException;
 use Phpro\ApiProblemBundle\Exception\ApiProblemHttpException;
+use Throwable;
 
 class ApiProblemExceptionTransformer implements ExceptionTransformerInterface
 {
     /**
      * @param ApiProblemException|ApiProblemHttpException $exception
      */
-    public function transform(\Throwable $exception): ApiProblemInterface
+    public function transform(Throwable $exception): ApiProblemInterface
     {
         return $exception->getApiProblem();
     }
 
-    public function accepts(\Throwable $exception): bool
+    public function accepts(Throwable $exception): bool
     {
         return $exception instanceof ApiProblemException || $exception instanceof ApiProblemHttpException;
     }

src/Transformer/ApiProblemExceptionTransformer.php

@@ -6,6 +6,7 @@
 
 use Phpro\ApiProblem\ApiProblemInterface;
 use Phpro\ApiProblem\Http\ExceptionApiProblem;
+use Throwable;
 
 class Chain implements ExceptionTransformerInterface
 {
@@ -21,7 +22,7 @@ public function __construct(iterable $transformers)
         }
     }
 
-    public function transform(\Throwable $exception): ApiProblemInterface
+    public function transform(Throwable $exception): ApiProblemInterface
     {
         foreach ($this->transformers as $transformer) {
             if ($transformer->accepts($exception)) {
@@ -32,7 +33,7 @@ public function transform(\Throwable $exception): ApiProblemInterface
         return new ExceptionApiProblem($exception);
     }
 
-    public function accepts(\Throwable $exception): bool
+    public function accepts(Throwable $exception): bool
     {
         return true;
     }

src/Transformer/Chain.php

@@ -5,10 +5,11 @@
 namespace Phpro\ApiProblemBundle\Transformer;
 
 use Phpro\ApiProblem\ApiProblemInterface;
+use Throwable;
 
 interface ExceptionTransformerInterface
 {
-    public function transform(\Throwable $exception): ApiProblemInterface;
+    public function transform(Throwable $exception): ApiProblemInterface;
 
-    public function accepts(\Throwable $exception): bool;
+    public function accepts(Throwable $exception): bool;
 }