FriendsOfSymfony · Jan 8, 2020 · Jan 8, 2020 · Jan 8, 2020 · Jan 8, 2020 · Apr 27, 2020
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -0,0 +1,68 @@
+name: CI
+
+on: ['push', 'pull_request']
+
+jobs:
+  cs:
+    runs-on: ubuntu-latest
+    name: Coding style
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+          extensions: json, mbstring
+          tools: composer, php-cs-fixer:2.19
+
+      - name: Display tools versions
+        run: |
+          composer --version
+          php-cs-fixer --version
+      - name: Check PHP code
+        run: php-cs-fixer fix --dry-run --diff --ansi
+
+  phpunit:
+    name: PHPUnit (PHP ${{ matrix.php }} + ${{ matrix.symfony-version}})
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    env:
+      SYMFONY_REQUIRE: "${{ matrix.symfony_require }}"
+    strategy:
+      matrix:
+        include:
+          - php: '7.4'
+            dependencies: 'lowest'
+            symfony_require: '3.4.*'
+          - php: '7.4'
+            dependencies: 'highest'
+            symfony_require: '4.4.*'
+          - php: '8.0'
+            dependencies: 'highest'
+            symfony_require: '4.4.*'
+      fail-fast: false
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: "${{ matrix.php }}"
+          tools: pecl, composer
+          extensions: curl, json, mbstring, openssl
+
+      - name: Globally install symfony/flex
+        run: composer global require --no-progress --no-scripts --no-plugins symfony/flex
+
+      - name: Install Composer dependencies (${{ matrix.dependencies }})
+        uses: ramsey/composer-install@v1
+        with:
+            dependency-versions: "${{ matrix.dependencies }}"
+            composer-options: "--prefer-dist --prefer-stable"
+
+      - name: Run unit tests
+        run: |
+          vendor/bin/phpunit
diff --git a/.travis.yml b/.travis.yml
diff --git a/Resources/meta/LICENSE → LICENSE b/Resources/meta/LICENSE → LICENSE
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ FOSCommentBundle
 
 The FOSCommentBundle adds support for a comment system in Symfony. Features include:
 
-- Supports Symfony 3.4, 4.3
+- Supports Symfony 3.4, 4.4
 - Manages trees of comments
 - Can include comment threads in any page
 - Compatible with any persistence backend. Doctrine2 mongodb-odm and ORM are implemented.
@@ -23,16 +23,16 @@ Documentation
 The bulk of the documentation is stored in the `Resources/doc/index.md`
 file in this bundle:
 
-[Read the Documentation](https://github.com/FriendsOfSymfony/FOSCommentBundle/blob/master/Resources/doc/index.md)
+[Read the Documentation](https://github.com/FriendsOfSymfony/FOSCommentBundle/blob/master/docs/index.md)
 
 Installation
 ------------
 
-All the installation instructions are located in [documentation](https://github.com/FriendsOfSymfony/FOSCommentBundle/blob/master/Resources/doc/index.md).
+All the installation instructions are located in [documentation](https://github.com/FriendsOfSymfony/FOSCommentBundle/blob/master/docs/index.md).
 
 License
 -------
 
 This bundle is under the MIT license. See the complete license in the bundle:
 
-    Resources/meta/LICENSE
+    LICENSE
diff --git a/composer.json b/composer.json
@@ -20,12 +20,11 @@
         }
     ],
     "support": {
-        "irc": "irc://irc.freenode.org/symfony-dev",
         "issues": "https://github.com/FriendsOfSymfony/FOSCommentBundle/issues"
     },
     "require": {
-        "php": "^7.2",
-        "friendsofsymfony/rest-bundle": "~2.6",
+        "php": "^7.4 || ^8.0",
+        "friendsofsymfony/rest-bundle": "~2.8",
         "jms/serializer-bundle": "~2.0|~3.0",
         "symfony/framework-bundle": "~3.4|^4.3",
         "symfony/asset": "~3.4|^4.3",
@@ -52,7 +51,7 @@
         "symfony/dom-crawler": "~3.4|^4.3",
         "symfony/css-selector": "~3.4|^4.3",
         "doctrine/orm": "~2.3",
-        "doctrine/doctrine-bundle": "~1.6",
+        "doctrine/doctrine-bundle": "^1.6|^2.0",
         "friendsofsymfony/user-bundle": "~2.0",
         "ornicar/akismet-bundle": "dev-master",
         "symfony/expression-language": "~3.4|^4.3",
@@ -62,12 +61,18 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.0.x-dev"
+            "dev-master": "4.0.x-dev"
         }
     },
     "autoload": {
-        "psr-4": { "FOS\\CommentBundle\\": "" },
-        "exclude-from-classmap": [ "/Tests/" ]
+        "psr-4": {
+            "FOS\\CommentBundle\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "FOS\\CommentBundle\\Tests\\": "tests/"
+        }
     },
     "prefer-stable": true
 }
diff --git a/Resources/doc/1-setting_up_the_bundle.md → docs/1-setting_up_the_bundle.md b/Resources/doc/1-setting_up_the_bundle.md → docs/1-setting_up_the_bundle.md
@@ -27,11 +27,9 @@ public function registerBundles()
 }
 ```
 
-### C) Enable Http Method Override
+### C) Enable HTTP Method Override
 
-[Enable HTTP Method override as described here](http://symfony.com/doc/master/cookbook/routing/method_parameters.html#faking-the-method-with-method)
-
-As of symfony 2.3, you just have to modify your config.yml :
+[Enable HTTP Method override as described here](https://symfony.com/doc/current/reference/configuration/framework.html#http-method-override)
 
 ``` yaml
 # app/config/config.yml
@@ -40,6 +38,18 @@ framework:
     http_method_override: true
 ```
 
+Or
+
+
+``` php
+// public/index.php
+
+$kernel = new CacheKernel($kernel);
+
+Request::enableHttpMethodParameterOverride(); // <-- add this line
+$request = Request::createFromGlobals();
+```
+
 ### D) Enable translations
 
 If you wish to use default texts provided in this bundle, you have to make

diff --git a/...ther_ways_of_adding_comments_to_a_page.md → ...ther_ways_of_adding_comments_to_a_page.md b/...ther_ways_of_adding_comments_to_a_page.md → ...ther_ways_of_adding_comments_to_a_page.md
diff --git a/Resources/doc/11-running_the_test_suite.md → docs/11-running_the_test_suite.md b/Resources/doc/11-running_the_test_suite.md → docs/11-running_the_test_suite.md
diff --git a/Resources/doc/12-enable_voting.md → docs/12-enable_voting.md b/Resources/doc/12-enable_voting.md → docs/12-enable_voting.md
diff --git a/Resources/doc/12a-mapping_orm.md → docs/12a-mapping_orm.md b/Resources/doc/12a-mapping_orm.md → docs/12a-mapping_orm.md
diff --git a/Resources/doc/12b-mapping_mongodb.md → docs/12b-mapping_mongodb.md b/Resources/doc/12b-mapping_mongodb.md → docs/12b-mapping_mongodb.md
diff --git a/...doc/12c-integration_with_fosuserbundle.md → docs/12c-integration_with_fosuserbundle.md b/...doc/12c-integration_with_fosuserbundle.md → docs/12c-integration_with_fosuserbundle.md
diff --git a/Resources/doc/13-hooking_into_the_js_code.md → docs/13-hooking_into_the_js_code.md b/Resources/doc/13-hooking_into_the_js_code.md → docs/13-hooking_into_the_js_code.md
diff --git a/Resources/doc/14-customizing_tree_sorting.md → docs/14-customizing_tree_sorting.md b/Resources/doc/14-customizing_tree_sorting.md → docs/14-customizing_tree_sorting.md
diff --git a/Resources/doc/15-events.md → docs/15-events.md b/Resources/doc/15-events.md → docs/15-events.md
diff --git a/...create_your_comment_and_thread_classes.md → ...create_your_comment_and_thread_classes.md b/...create_your_comment_and_thread_classes.md → ...create_your_comment_and_thread_classes.md
diff --git a/Resources/doc/2a-mapping_orm.md → docs/2a-mapping_orm.md b/Resources/doc/2a-mapping_orm.md → docs/2a-mapping_orm.md
diff --git a/Resources/doc/2b-mapping_mongodb.md → docs/2b-mapping_mongodb.md b/Resources/doc/2b-mapping_mongodb.md → docs/2b-mapping_mongodb.md
diff --git a/...c/3-importing_foscommentbundle_routing.md → docs/3-importing_foscommentbundle_routing.md b/...c/3-importing_foscommentbundle_routing.md → docs/3-importing_foscommentbundle_routing.md
diff --git a/Resources/doc/4-enable_comments_on_a_page.md → docs/4-enable_comments_on_a_page.md b/Resources/doc/4-enable_comments_on_a_page.md → docs/4-enable_comments_on_a_page.md
@@ -14,7 +14,7 @@ the page load.
 
 And the following code at a desired place in the template to load the comments:
 
-```
+```twig
 {% include '@FOSComment/Thread/async.html.twig' with {'id': 'foo'} %}
 ```
 

diff --git a/Resources/doc/5-style_it.md → docs/5-style_it.md b/Resources/doc/5-style_it.md → docs/5-style_it.md
diff --git a/...s/doc/6-integration_with_fosuserbundle.md → docs/6-integration_with_fosuserbundle.md b/...s/doc/6-integration_with_fosuserbundle.md → docs/6-integration_with_fosuserbundle.md
diff --git a/...s/doc/7-adding_role_based_acl_security.md → docs/7-adding_role_based_acl_security.md b/...s/doc/7-adding_role_based_acl_security.md → docs/7-adding_role_based_acl_security.md
diff --git a/...-adding_symfony2s_builtin_acl_security.md → ...-adding_symfony2s_builtin_acl_security.md b/...-adding_symfony2s_builtin_acl_security.md → ...-adding_symfony2s_builtin_acl_security.md
diff --git a/Resources/doc/9-using_a_markup_parser.md → docs/9-using_a_markup_parser.md b/Resources/doc/9-using_a_markup_parser.md → docs/9-using_a_markup_parser.md
diff --git a/Resources/doc/99-faq.md → docs/99-faq.md b/Resources/doc/99-faq.md → docs/99-faq.md
diff --git a/Resources/doc/9a-markup_htmlpurifier.md → docs/9a-markup_htmlpurifier.md b/Resources/doc/9a-markup_htmlpurifier.md → docs/9a-markup_htmlpurifier.md
diff --git a/Resources/doc/9b-sundown_markdown_parser.md → docs/9b-sundown_markdown_parser.md b/Resources/doc/9b-sundown_markdown_parser.md → docs/9b-sundown_markdown_parser.md
diff --git a/Resources/doc/9c-using_a_bbcode_parser.md → docs/9c-using_a_bbcode_parser.md b/Resources/doc/9c-using_a_bbcode_parser.md → docs/9c-using_a_bbcode_parser.md
diff --git a/...urces/doc/9d-php_markdown_extra_parser.md → docs/9d-php_markdown_extra_parser.md b/...urces/doc/9d-php_markdown_extra_parser.md → docs/9d-php_markdown_extra_parser.md
diff --git a/...ces/doc/9e-integrating_several_parsers.md → docs/9e-integrating_several_parsers.md b/...ces/doc/9e-integrating_several_parsers.md → docs/9e-integrating_several_parsers.md
diff --git a/Resources/doc/index.md → docs/index.md b/Resources/doc/index.md → docs/index.md
@@ -3,7 +3,7 @@ Getting Started With FOSCommentBundle
 
 ## Installation
 
-Installation is a quick (I promise!) 4 step process:
+Installation is a quick 4-step process:
 
 1. [Setting up the bundle](1-setting_up_the_bundle.md)
 2. [Create your Comment and Thread classes](2-create_your_comment_and_thread_classes.md)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,25 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="./Tests/bootstrap.php" colors="true">
+<phpunit bootstrap="./tests/bootstrap.php" colors="true">
     <php>
         <ini name="xdebug.max_nesting_level" value="200" />
     </php>
     <testsuites>
-        <testsuite name="FOSCommentBundle">
-            <directory suffix="Test.php">./Tests</directory>
+        <testsuite name="FOSCommentBundle test suitei">
+            <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-                <directory>./sahi</directory>
-                <directory>./Features</directory>
-            </exclude>
-        </whitelist>
-    </filter>
 </phpunit>
diff --git a/Acl/AclCommentManager.php → src/Acl/AclCommentManager.php b/Acl/AclCommentManager.php → src/Acl/AclCommentManager.php
diff --git a/Acl/AclThreadManager.php → src/Acl/AclThreadManager.php b/Acl/AclThreadManager.php → src/Acl/AclThreadManager.php
diff --git a/Acl/AclVoteManager.php → src/Acl/AclVoteManager.php b/Acl/AclVoteManager.php → src/Acl/AclVoteManager.php
diff --git a/Acl/CommentAclInterface.php → src/Acl/CommentAclInterface.php b/Acl/CommentAclInterface.php → src/Acl/CommentAclInterface.php
diff --git a/Acl/RoleCommentAcl.php → src/Acl/RoleCommentAcl.php b/Acl/RoleCommentAcl.php → src/Acl/RoleCommentAcl.php
diff --git a/Acl/RoleThreadAcl.php → src/Acl/RoleThreadAcl.php b/Acl/RoleThreadAcl.php → src/Acl/RoleThreadAcl.php
diff --git a/Acl/RoleVoteAcl.php → src/Acl/RoleVoteAcl.php b/Acl/RoleVoteAcl.php → src/Acl/RoleVoteAcl.php
diff --git a/Acl/SecurityCommentAcl.php → src/Acl/SecurityCommentAcl.php b/Acl/SecurityCommentAcl.php → src/Acl/SecurityCommentAcl.php
diff --git a/Acl/SecurityThreadAcl.php → src/Acl/SecurityThreadAcl.php b/Acl/SecurityThreadAcl.php → src/Acl/SecurityThreadAcl.php
diff --git a/Acl/SecurityVoteAcl.php → src/Acl/SecurityVoteAcl.php b/Acl/SecurityVoteAcl.php → src/Acl/SecurityVoteAcl.php
diff --git a/Acl/ThreadAclInterface.php → src/Acl/ThreadAclInterface.php b/Acl/ThreadAclInterface.php → src/Acl/ThreadAclInterface.php
diff --git a/Acl/VoteAclInterface.php → src/Acl/VoteAclInterface.php b/Acl/VoteAclInterface.php → src/Acl/VoteAclInterface.php
diff --git a/Command/FixAcesCommand.php → src/Command/FixAcesCommand.php b/Command/FixAcesCommand.php → src/Command/FixAcesCommand.php
diff --git a/Command/InstallAcesCommand.php → src/Command/InstallAcesCommand.php b/Command/InstallAcesCommand.php → src/Command/InstallAcesCommand.php
-Original file line number
+Diff line change
@@ @@ -14,7 +14,7 @@ the page load. @@
     And the following code at a desired place in the template to load the comments:
-    ```
+    ```twig
     {% include '@FOSComment/Thread/async.html.twig' with {'id': 'foo'} %}
     ```