Test on PHP 8.5 (#591)

GrahamCampbell · web-flow · commit cd59ef093516 · 2025-12-27T19:31:52.000Z
diff --git a/.gitattributes b/.gitattributes
@@ -10,8 +10,6 @@
 /phpstan-baseline.neon export-ignore
 /phpstan.neon.dist export-ignore
 /phpunit.xml.dist export-ignore
-/psalm-baseline.xml export-ignore
-/psalm.xml export-ignore
 /README.md export-ignore
 /UPGRADING.md export-ignore
 /vendor-bin export-ignore
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -11,12 +11,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.4'
+          php-version: '8.5'
           tools: composer:v2
           coverage: none
         env:
@@ -38,37 +38,3 @@ jobs:
 
       - name: Execute PHPStan
         run: vendor/bin/phpstan analyze --no-progress
-
-  psalm:
-    name: Psalm
-    runs-on: ubuntu-24.04
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.4'
-          tools: composer:v2
-          coverage: none
-        env:
-          update: true
-
-      - name: Install Dependencies
-        uses: nick-invision/retry@v3
-        with:
-          timeout_minutes: 5
-          max_attempts: 5
-          command: composer update --no-interaction --no-progress
-
-      - name: Install Psalm
-        uses: nick-invision/retry@v3
-        with:
-          timeout_minutes: 5
-          max_attempts: 5
-          command: composer bin psalm update --no-interaction --no-progress
-
-      - name: Execute Psalm
-        run: vendor/bin/psalm.phar --no-progress --output-format=github
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -11,11 +11,11 @@ jobs:
 
     strategy:
       matrix:
-        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -43,11 +43,11 @@ jobs:
 
     strategy:
       matrix:
-        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/Makefile b/Makefile
@@ -1,26 +1,17 @@
 install:
-	@docker run -it -w /data -v ${PWD}:/data:delegated -v ~/.composer:/root/.composer:delegated --entrypoint composer --rm registry.gitlab.com/grahamcampbell/php:8.4-base update
-	@docker run -it -w /data -v ${PWD}:/data:delegated -v ~/.composer:/root/.composer:delegated --entrypoint composer --rm registry.gitlab.com/grahamcampbell/php:8.4-base bin all update
+	@docker run -it -w /data -v ${PWD}:/data:delegated -v ~/.composer:/root/.composer:delegated --entrypoint composer --rm registry.gitlab.com/grahamcampbell/php:8.5-base update
+	@docker run -it -w /data -v ${PWD}:/data:delegated -v ~/.composer:/root/.composer:delegated --entrypoint composer --rm registry.gitlab.com/grahamcampbell/php:8.5-base bin all update
 
 phpunit:
-	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit --rm registry.gitlab.com/grahamcampbell/php:8.4-cli
+	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit --rm registry.gitlab.com/grahamcampbell/php:8.5-cli
 
 phpstan-analyze:
-	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpstan --rm registry.gitlab.com/grahamcampbell/php:8.4-cli analyze
+	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpstan --rm registry.gitlab.com/grahamcampbell/php:8.5-cli analyze
 
 phpstan-baseline:
-	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpstan --rm registry.gitlab.com/grahamcampbell/php:8.4-cli analyze --generate-baseline
+	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpstan --rm registry.gitlab.com/grahamcampbell/php:8.5-cli analyze --generate-baseline
 
-psalm-analyze:
-	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:8.4-cli
-
-psalm-baseline:
-	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:8.4-cli --set-baseline=psalm-baseline.xml
-
-psalm-show-info:
-	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:8.4-cli --show-info=true
-
-test: phpunit phpstan-analyze psalm-analyze
+test: phpunit phpstan-analyze
 
 clean:
 	@rm -rf .phpunit.result.cache composer.lock vendor vendor-bin/*/composer.lock vendor-bin/*/vendor
diff --git a/README.md b/README.md
@@ -12,20 +12,7 @@ Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` au
 </p>
 
 <div align="center">
- 
 **Special thanks to [our sponsors](https://github.com/sponsors/GrahamCampbell)**
- 
-<br>
-<a href="https://www.dotenvx.com/?utm_source=github&utm_medium=referral&utm_campaign=phpdotenv">
-  <div>
-    <img src="https://dotenvx.com/logo.png" width="120" alt="Dotenvx">
-  </div>
-  <b>Need to sync .env files across teams and environments?</b>
-  <div>
-    <sup>Dotenvx builds on the simplicity of phpdotenv with support for encryption, multiple environments, and team workflows. Use it alongside phpdotenv to modernize your secrets management.</sup>
-  </div>
-</a>
- 
 <hr>
 </div>
 
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -138,12 +138,6 @@ parameters:
 			count: 1
 			path: src/Util/Regex.php
 
-		-
-			message: '#^Call to function is_string\(\) with string will always evaluate to true\.$#'
-			identifier: function.alreadyNarrowedType
-			count: 1
-			path: src/Util/Str.php
-
 		-
 			message: '#^Loose comparison via "\=\=" is not allowed\.$#'
 			identifier: equal.notAllowed
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
diff --git a/psalm.xml b/psalm.xml
diff --git a/src/Parser/EntryParser.php b/src/Parser/EntryParser.php
@@ -168,7 +168,6 @@ private static function parseValue(string $value)
                 });
             });
         }, Success::create([Value::blank(), self::INITIAL_STATE]))->flatMap(static function (array $result) {
-            /** @psalm-suppress DocblockTypeContradiction */
             if (in_array($result[1], self::REJECT_STATES, true)) {
                 /** @var \GrahamCampbell\ResultType\Result<\Dotenv\Parser\Value, string> */
                 return Error::create('a missing closing quote');
diff --git a/src/Repository/Adapter/EnvConstAdapter.php b/src/Repository/Adapter/EnvConstAdapter.php
@@ -53,7 +53,6 @@ public function read(string $name)
                     return 'true';
                 }
 
-                /** @psalm-suppress PossiblyInvalidCast */
                 return (string) $value;
             });
     }
diff --git a/src/Repository/Adapter/ServerConstAdapter.php b/src/Repository/Adapter/ServerConstAdapter.php
@@ -53,7 +53,6 @@ public function read(string $name)
                     return 'true';
                 }
 
-                /** @psalm-suppress PossiblyInvalidCast */
                 return (string) $value;
             });
     }
diff --git a/vendor-bin/phpstan/composer.json b/vendor-bin/phpstan/composer.json
@@ -1,10 +1,10 @@
 {
     "require": {
-        "php": "^8.4",
-        "phpstan/phpstan": "2.1.11",
+        "php": "^8.5",
+        "phpstan/phpstan": "2.1.33",
         "phpstan/extension-installer": "1.4.3",
-        "phpstan/phpstan-deprecation-rules": "2.0.1",
-        "phpstan/phpstan-strict-rules": "2.0.4"
+        "phpstan/phpstan-deprecation-rules": "2.0.3",
+        "phpstan/phpstan-strict-rules": "2.0.7"
     },
     "config": {
         "preferred-install": "dist",
diff --git a/vendor-bin/psalm/composer.json b/vendor-bin/psalm/composer.json

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,6 @@ public function read(string $name)`
`53`	`53`	`return 'true';`
`54`	`54`	`}`
`55`	`55`
`56`		`- /** @psalm-suppress PossiblyInvalidCast */`
`57`	`56`	`return (string) $value;`
`58`	`57`	`});`
`59`	`58`	`}`