Cleaned up composer.json, updated dependencies, added PHP 8.3 and 8.2…

… support to CI
erusev · Sep 29, 2024 · d9ea0b4 · d9ea0b4
1 parent f936778
commit d9ea0b4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        php: [8.1, 8.0, 7.4, 7.3, 7.2, 7.1]
+        php: [8.3, 8.2, 8.1, 8.0, 7.4, 7.3, 7.2, 7.1]
 
     runs-on: ${{ matrix.os }}
     steps:
@@ -29,7 +29,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        php: [8.1]
+        php: [8.3]
 
     runs-on: ${{ matrix.os }}
     steps:
@@ -50,7 +50,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        php: [8.1]
+        php: [8.3]
 
     runs-on: ${{ matrix.os }}
     steps:
@@ -74,7 +74,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        php: [8.1]
+        php: [8.3]
 
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -10,9 +10,7 @@
     'array_syntax' => [
         'syntax' => 'short',
     ],
-    'braces' => [
-        'allow_single_line_closure' => true,
-    ],
+    'blank_lines_before_namespace' => true,
     'logical_operators' => true,
     'native_constant_invocation' => [
         'fix_built_in' => true,
@@ -24,7 +22,6 @@
     'ordered_imports' => [
         'sort_algorithm' => 'alpha',
     ],
-    'single_blank_line_before_namespace' => true,
     'strict_comparison' => true,
     'strict_param' => true,
     'whitespace_after_comma_in_array' => true,

diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
         {
             "name": "Emanuil Rusev",
             "email": "[email protected]",
-            "homepage": "http://erusev.com"
+            "homepage": "https://erusev.com"
         }
     ],
     "require": {
@@ -18,14 +18,16 @@
         "ext-mbstring": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.3.11||^8.5.21||^7.5.20",
-        "vimeo/psalm": "^4.10.0",
-        "friendsofphp/php-cs-fixer": "^3.0.0",
-        "infection/infection": "^0.25.0",
-        "roave/infection-static-analysis-plugin": "^1.10.0"
+        "phpunit/phpunit": "^10.1||^9.3.11||^8.5.21||^7.5.20",
+        "vimeo/psalm": "^5.26",
+        "friendsofphp/php-cs-fixer": "^3.0",
+        "infection/infection": "^0.27",
+        "roave/infection-static-analysis-plugin": "^1.35"
     },
     "autoload": {
-        "psr-4": {"Erusev\\ParsedownExtra\\": "src/"}
+        "psr-4": {
+            "Erusev\\ParsedownExtra\\": "src/"
+        }
     },
     "autoload-dev": {
         "psr-4": {
@@ -43,10 +45,14 @@
         "test-static": "vendor/bin/psalm",
         "test-dead-code": "vendor/bin/psalm --find-dead-code",
         "test-units": "vendor/bin/phpunit",
-        "test-commonmark": "vendor/bin/phpunit tests/CommonMarkTestStrict.php",
-        "test-commonmark-weak": "vendor/bin/phpunit tests/CommonMarkTestWeak.php",
+        "test-commonmark": "vendor/bin/phpunit vendor/erusev/parsedown/tests/CommonMarkTestStrict.php",
+        "test-commonmark-weak": "vendor/bin/phpunit vendor/erusev/parsedown/tests/CommonMarkTestWeak.php",
         "test-formatting": "@composer fix -- --dry-run",
-
         "fix": "vendor/bin/php-cs-fixer fix --verbose --show-progress=dots --diff"
+    },
+    "config": {
+        "allow-plugins": {
+            "infection/extension-installer": true
+        }
     }
 }