Update dependencies.

composer install now works without having to ignore platform dependencies.

Author: ADmad

.github/workflows/ci.yml

@@ -34,7 +34,6 @@ jobs:
       uses: ramsey/composer-install@v3
       with:
         dependency-versions: ${{ matrix.dependencies }}
-        composer-options: --ignore-platform-reqs
 
     - name: Run PHPUnit
       run: composer phpunit
@@ -55,8 +54,6 @@ jobs:
 
     - name: Composer install
       uses: ramsey/composer-install@v3
-      with:
-        composer-options: --ignore-platform-reqs
 
     - name: Run PHP CodeSniffer
       run: vendor/bin/phpcs --report=checkstyle | cs2pr

CakePHP/Sniffs/Classes/ReturnTypeHintSniff.php

@@ -58,7 +58,7 @@ public function process(File $phpcsFile, $stackPtr)
 
         // We skip for interface methods
         if (empty($tokens[$stackPtr]['scope_opener']) || empty($tokens[$stackPtr]['scope_closer'])) {
-            return [];
+            return;
         }
 
         $returnTokenCode = $tokens[$startIndex]['code'];

…/Classes/ReturnTypeHintUnitTestinc.fixed …Classes/ReturnTypeHintUnitTest.inc.fixedCakePHP/Tests/Classes/ReturnTypeHintUnitTestinc.fixed renamed to CakePHP/Tests/Classes/ReturnTypeHintUnitTest.inc.fixed CakePHP/Tests/Classes/ReturnTypeHintUnitTestinc.fixed renamed to CakePHP/Tests/Classes/ReturnTypeHintUnitTest.inc.fixed

@@ -1,9 +1,6 @@
 <?php
 namespace Beakman;
 
-use Other\Crap;
-use Other\Error as OtherError;
-
 class Foo
 {
     /**

composer.json

@@ -20,11 +20,11 @@
     "require": {
         "php": ">=8.1.0",
         "phpstan/phpdoc-parser": "^1.4.5",
-        "slevomat/coding-standard": "^8.4",
-        "squizlabs/php_codesniffer": "^3.7.1"
+        "slevomat/coding-standard": "^8.15",
+        "squizlabs/php_codesniffer": "^3.9"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.1"
+        "phpunit/phpunit": "^9.3.4"
     },
     "autoload": {
         "psr-4": {

docs/README.md

@@ -54,7 +54,7 @@ Generic (25 sniffs)
 - Generic.WhiteSpace.ScopeIndent
 
 PEAR (1 sniff)
----------------
+--------------
 - PEAR.Functions.ValidDefaultValue
 
 PSR1 (3 sniffs)
@@ -63,6 +63,18 @@ PSR1 (3 sniffs)
 - PSR1.Files.SideEffects
 - PSR1.Methods.CamelCapsMethodName
 
+PSR2 (9 sniffs)
+---------------
+- PSR2.Classes.ClassDeclaration
+- PSR2.Classes.PropertyDeclaration
+- PSR2.ControlStructures.ElseIfDeclaration
+- PSR2.ControlStructures.SwitchDeclaration
+- PSR2.Files.ClosingTag
+- PSR2.Files.EndFileNewline
+- PSR2.Methods.FunctionCallSignature
+- PSR2.Methods.FunctionClosingBrace
+- PSR2.Methods.MethodDeclaration
+
 PSR12 (17 sniffs)
 -----------------
 - PSR12.Classes.AnonClassDeclaration
@@ -83,18 +95,6 @@ PSR12 (17 sniffs)
 - PSR12.Properties.ConstantVisibility
 - PSR12.Traits.UseDeclaration
 
-PSR2 (9 sniffs)
----------------
-- PSR2.Classes.ClassDeclaration
-- PSR2.Classes.PropertyDeclaration
-- PSR2.ControlStructures.ElseIfDeclaration
-- PSR2.ControlStructures.SwitchDeclaration
-- PSR2.Files.ClosingTag
-- PSR2.Files.EndFileNewline
-- PSR2.Methods.FunctionCallSignature
-- PSR2.Methods.FunctionClosingBrace
-- PSR2.Methods.MethodDeclaration
-
 SlevomatCodingStandard (40 sniffs)
 ----------------------------------
 - SlevomatCodingStandard.Arrays.TrailingArrayComma
@@ -170,5 +170,5 @@ Squiz (28 sniffs)
 - Squiz.WhiteSpace.SuperfluousWhitespace
 
 Zend (1 sniff)
----------------
+--------------
 - Zend.NamingConventions.ValidVariableName