Merge branch 'master' into in-portal

* master:
  Drop support for PHP 5.4 and PHP 5.5 (#109)

Author: aik099

.github/workflows/tests.yml

@@ -16,23 +16,25 @@ defaults:
 jobs:
 
   tests:
-    name: Tests (PHP ${{ matrix.php }}, PHP_CodeSniffer ${{ matrix.phpcs_version }})
-    runs-on: Ubuntu-20.04
+    name: "PHP ${{ matrix.php }}${{ matrix.with_coverage == true && ' with coverage' || ''}}, PHPCS ${{ matrix.phpcs_version }}"
+    runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
-        phpcs_version: ['^3.3']
+        php: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
+        with_coverage: [ false ]
+        phpcs_version: ['^3.9']
         include:
-          - php: 5.4
-            phpcs_version: ^3.3@dev
+          - php: 7.4
+            phpcs_version: ^3.9@dev
           - php: 7.2
-            phpcs_version: ^3.3@dev
+            phpcs_version: ^3.9
+            with_coverage: true
       fail-fast: false
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 2
 
@@ -48,16 +50,25 @@ jobs:
           composer require squizlabs/php_codesniffer:${{ matrix.phpcs_version }} --dev --no-update
 
       - name: Install dependencies
-        uses: "ramsey/composer-install@v1"
+        uses: "ramsey/composer-install@v3"
         with:
           dependency-versions: "highest"
 
-      - name: Run tests
+      - name: Run tests with Coverage
+        if: "${{ matrix.with_coverage == true }}"
         run: |
           vendor/bin/phpunit -v --coverage-clover=coverage.clover
 
+      - name: Run tests without Coverage
+        if: "${{ matrix.with_coverage == false }}"
+        run: |
+          vendor/bin/phpunit -v
+
       - name: Upload Coverage to CodeCov
-        uses: codecov/codecov-action@v2
+        if: "${{ matrix.with_coverage == true }}"
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
 
       - name: Upload Coverage to Scrutinizer CI (PHP < 8.0)
         if: "${{ matrix.php < '8.0' }}"

.phpunit.result.cache

@@ -0,0 +1 @@
+{"version":1,"defects":[],"times":{"CodingStandard\\Tests\\Arrays\\ArrayUnitTest::testSniff":0.014,"CodingStandard\\Tests\\Classes\\ClassCreateInstanceUnitTest::testSniff":0.003,"CodingStandard\\Tests\\Classes\\ClassDeclarationUnitTest::testSniff":0.026,"CodingStandard\\Tests\\Classes\\ClassNamespaceUnitTest::testSniff":0,"CodingStandard\\Tests\\Classes\\PropertyDeclarationUnitTest::testSniff":0.001,"CodingStandard\\Tests\\CodeAnalysis\\WrongParentCallUnitTest::testSniff":0.001,"CodingStandard\\Tests\\Commenting\\DocCommentUnitTest::testSniff":0.024,"CodingStandard\\Tests\\Commenting\\FunctionCommentUnitTest::testSniff":0.102,"CodingStandard\\Tests\\Commenting\\InlineCommentUnitTest::testSniff":0.02,"CodingStandard\\Tests\\Commenting\\TypeCommentUnitTest::testSniff":0.018,"CodingStandard\\Tests\\ControlStructures\\AssignmentInConditionUnitTest::testSniff":0.001,"CodingStandard\\Tests\\ControlStructures\\ControlSignatureUnitTest::testSniff":0.005,"CodingStandard\\Tests\\Files\\OneTraitPerFileUnitTest::testSniff":0,"CodingStandard\\Tests\\Formatting\\BlankLineBeforeReturnUnitTest::testSniff":0.003,"CodingStandard\\Tests\\Formatting\\ItemAssignmentUnitTest::testSniff":0.004,"CodingStandard\\Tests\\Formatting\\NamespaceDeclarationUnitTest::testSniff":0.005,"CodingStandard\\Tests\\Formatting\\NoSpaceAfterBooleanNotUnitTest::testSniff":0.002,"CodingStandard\\Tests\\Formatting\\SpaceOperatorUnitTest::testSniff":0.007,"CodingStandard\\Tests\\Formatting\\SpaceUnaryOperatorUnitTest::testSniff":0.002,"CodingStandard\\Tests\\NamingConventions\\ValidClassNameUnitTest::testSniff":0,"CodingStandard\\Tests\\NamingConventions\\ValidFunctionNameUnitTest::testSniff":0.012,"CodingStandard\\Tests\\NamingConventions\\ValidInterfaceNameUnitTest::testSniff":0,"CodingStandard\\Tests\\NamingConventions\\ValidTraitNameUnitTest::testSniff":0,"CodingStandard\\Tests\\NamingConventions\\ValidVariableNameUnitTest::testSniff":0.005,"CodingStandard\\Tests\\PHP\\NoSilencedErrorsUnitTest::testSniff":0.001,"CodingStandard\\Tests\\Strings\\ConcatenationSpacingUnitTest::testSniff":0.004,"CodingStandard\\Tests\\WhiteSpace\\CommaSpacingUnitTest::testSniff":0.003,"CodingStandard\\Tests\\WhiteSpace\\ControlStructureSpacingUnitTest::testSniff":0.142,"CodingStandard\\Tests\\WhiteSpace\\ObjectOperatorSpacingUnitTest::testSniff":0.002}}

CodingStandard/Tests/Commenting/FunctionCommentUnitTest.php

@@ -68,8 +68,7 @@ public function getErrorList($testFile)
                         138 => 4,
                         139 => 4,
                         143 => 2,
-                        152 => 1,
-                        155 => 2,
+                        155 => 1,
                         159 => 1,
                         166 => 1,
                         173 => 1,
@@ -123,7 +122,6 @@ public function getErrorList($testFile)
                         792 => 1,
                         794 => 1,
                         797 => 1,
-                        801 => 1,
                         828 => 1,
                         840 => 1,
                         852 => 1,