Merge pull request #162 from twirphp/updates

Update dependencies
twirphp · May 16, 2024 · ee14973 · ee14973
2 parents d89e456 + 1436a78
commit ee14973
Show file tree

Hide file tree

Showing 8 changed files with 322 additions and 103 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ["7.4", "8.0", "8.1", "8.2"]
+        php: ["7.4", "8.0", "8.1", "8.2", "8.3"]
 
     steps:
       - name: Checkout repository

diff --git a/.github/workflows/static.yaml b/.github/workflows/static.yaml
@@ -27,13 +27,13 @@ jobs:
         uses: DeterminateSystems/magic-nix-cache-action@87e8236f46702ab0ce5a058b605a173ec88d618e # v6
 
       - name: Prepare Nix shell
-        run: nix develop --impure .#ci
+        run: nix develop --impure .#ci_lowest
 
       - name: Download dependencies
-        run: nix develop --impure .#ci -c composer update --no-interaction --no-progress
+        run: nix develop --impure .#ci_lowest -c composer update --no-interaction --no-progress
 
       - name: Run PHPStan
-        run: nix develop --impure .#ci -c phpstan analyze --no-progress
+        run: nix develop --impure .#ci_lowest -c phpstan analyze --no-progress
 
   php-cs-fixer:
     name: PHP-CS-Fixer
@@ -53,36 +53,36 @@ jobs:
         uses: DeterminateSystems/magic-nix-cache-action@87e8236f46702ab0ce5a058b605a173ec88d618e # v6
 
       - name: Prepare Nix shell
-        run: nix develop --impure .#ci
+        run: nix develop --impure .#ci_lowest
 
       - name: Download dependencies
-        run: nix develop --impure .#ci -c composer update --no-interaction --no-progress
+        run: nix develop --impure .#ci_lowest -c composer update --no-interaction --no-progress
 
       - name: Run PHP CS Fixer
-        run: nix develop --impure .#ci -c php-cs-fixer fix --diff --dry-run
-
-  psalm:
-    name: Psalm
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-
-      - name: Set up Nix
-        uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27
-        with:
-          extra_nix_config: |
-            access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up magic Nix cache
-        uses: DeterminateSystems/magic-nix-cache-action@87e8236f46702ab0ce5a058b605a173ec88d618e # v6
-
-      - name: Prepare Nix shell
-        run: nix develop --impure .#ci
-
-      - name: Download dependencies
-        run: nix develop --impure .#ci -c composer update --no-interaction --no-progress
-
-      - name: Run Psalm
-        run: nix develop --impure .#ci -c psalm --no-progress --output-format=github
+        run: nix develop --impure .#ci_lowest -c php-cs-fixer fix --diff --dry-run
+
+  # psalm:
+  #   name: Psalm
+  #   runs-on: ubuntu-latest
+  #
+  #   steps:
+  #     - name: Checkout repository
+  #       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+  #
+  #     - name: Set up Nix
+  #       uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27
+  #       with:
+  #         extra_nix_config: |
+  #           access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
+  #
+  #     - name: Set up magic Nix cache
+  #       uses: DeterminateSystems/magic-nix-cache-action@87e8236f46702ab0ce5a058b605a173ec88d618e # v6
+  #
+  #     - name: Prepare Nix shell
+  #       run: nix develop --impure .#ci_lowest
+  #
+  #     - name: Download dependencies
+  #       run: nix develop --impure .#ci_lowest -c composer update --no-interaction --no-progress
+  #
+  #     - name: Run Psalm
+  #       run: nix develop --impure .#ci_lowest -c psalm --no-progress --root $PWD --output-format=github
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -4,7 +4,7 @@
     ->setRiskyAllowed(true)
     ->setRules([
         '@PSR2' => true,
-        '@PHP73Migration' => true,
+        '@PHP74Migration' => true,
         '@PHPUnit84Migration:risky' => true,
         '@Symfony' => true,
         '@Symfony:risky' => true,