Merge branch '2.x' into 3.x

# Conflicts: # .github/workflows/ci.yml
relayphp · Oct 22, 2024 · 6334b3a · 6334b3a
2 parents 4d511be + 50de3fc
commit 6334b3a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,8 +16,6 @@ jobs:
           php-version: '7.2'
       - name: Install Composer Dependencies
         uses: ramsey/composer-install@v1
-      - name: Run PHP-CS-Fixer
-        run: php vendor/bin/php-cs-fixer fix --verbose --dry-run --using-cache=no
       - name: Run PHP_CodeSniffer
         run: php vendor/bin/phpcs --no-cache --no-colors
 

diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
diff --git a/composer.json b/composer.json
@@ -23,13 +23,12 @@
     },
     "require-dev": {
         "doctrine/coding-standard": "^9.0",
-        "friendsofphp/php-cs-fixer": "^3.0",
         "nyholm/psr7": "^1.6",
         "nyholm/psr7-server": "^1.1",
-        "phpstan/phpstan": "^0.12.14",
+        "phpstan/phpstan": "^1.4",
         "phpunit/phpunit": "~7.0 || ~9.5",
         "roave/security-advisories": "dev-master",
-        "vimeo/psalm": "^4.7"
+        "vimeo/psalm": "^4.30"
     },
     "autoload": {
         "psr-4": {
@@ -52,14 +51,12 @@
     },
     "scripts": {
         "test": [
-            "php-cs-fixer fix --verbose --dry-run",
             "phpcs",
             "phpstan analyse",
             "psalm",
             "phpunit"
         ],
         "fix": [
-            "php-cs-fixer fix --verbose",
             "phpcbf"
         ]
     }

diff --git a/phpcs.xml b/phpcs.xml
@@ -20,4 +20,24 @@
         <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint"/>
         <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint"/>
     </rule>
+
+    <rule ref="Generic.PHP.ForbiddenFunctions">
+        <properties>
+            <property name="forbiddenFunctions" type="array">
+                <element key="str_split" value="mb_str_split"/>
+                <element key="strlen" value="mb_strlen"/>
+                <element key="strpos" value="mb_strpos"/>
+                <element key="strrpos" value="mb_strrpos"/>
+                <element key="substr" value="mb_substr"/>
+                <element key="strtolower" value="mb_strtolower"/>
+                <element key="strtoupper" value="mb_strtoupper"/>
+                <element key="stripos" value="mb_stripos"/>
+                <element key="strripos" value="mb_strripos"/>
+                <element key="strstr" value="mb_strstr"/>
+                <element key="stristr" value="mb_stristr"/>
+                <element key="strrchr" value="mb_strrchr"/>
+                <element key="substr_count" value="mb_substr_count"/>
+            </property>
+        </properties>
+    </rule>
 </ruleset>