fix: update dependencies for PHP 8.2-8.5 compatibility

cryptiklemur · cryptiklemur · commit 1c2db3d4607d · 2026-01-15T20:14:19.000-06:00
- Update PHPUnit from ^9.0 to ^10.5 || ^11.0
- Update Mockery from ^1.4 to ^1.6
- Remove #[\Override] attributes (PHP 8.3+ only, we support 8.2)
- Suppress MissingOverrideAttribute in Psalm config
- Use PHPUnit 11 attributes instead of doc-comment annotations
- Release workflow now requires CI to pass first
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,12 +1,15 @@
 name: Release
 
 on:
-    push:
+    workflow_run:
+        workflows: [CI]
+        types: [completed]
         branches: [master]
 
 jobs:
     release:
         runs-on: ubuntu-latest
+        if: ${{ github.event.workflow_run.conclusion == 'success' }}
 
         steps:
             - name: 'Checkout'
diff --git a/.phpunit.cache/test-results b/.phpunit.cache/test-results
@@ -1 +1 @@
-{"version":2,"defects":[],"times":{"Secretary\\Tests\\ManagerTest::testConstruct":0.002,"Secretary\\Tests\\ManagerTest::testGetSecret":0.002,"Secretary\\Tests\\ManagerTest::testGetBadSecret":0.001,"Secretary\\Tests\\ManagerTest::testPutSecret":0,"Secretary\\Tests\\ManagerTest::testDeleteSecretByKey":0,"Secretary\\Tests\\ManagerTest::testDeleteSecret":0,"Secretary\\Tests\\ManagerTest::testGetAdapter":0}}
+{"version":2,"defects":[],"times":{"Secretary\\Tests\\ManagerTest::testConstruct":0.017,"Secretary\\Tests\\ManagerTest::testGetSecret":0.003,"Secretary\\Tests\\ManagerTest::testGetBadSecret":0.007,"Secretary\\Tests\\ManagerTest::testPutSecret":0,"Secretary\\Tests\\ManagerTest::testDeleteSecretByKey":0.001,"Secretary\\Tests\\ManagerTest::testDeleteSecret":0,"Secretary\\Tests\\ManagerTest::testGetAdapter":0}}
diff --git a/composer.json b/composer.json
@@ -8,8 +8,8 @@
 		"aws/aws-sdk-php": "^3.91",
 		"google/cloud-secret-manager": "^2.2",
 		"guzzlehttp/guzzle": "^7.0",
-		"mockery/mockery": "^1.4",
-		"phpunit/phpunit": "^9.0 || ^10.0",
+		"mockery/mockery": "^1.6",
+		"phpunit/phpunit": "^10.5 || ^11.0",
 		"psr/simple-cache": "^1.0 || ^2.0 || ^3.0",
 		"symfony/config": "^5.3 || ^6.0 || ^7.0 || ^8.0",
 		"symfony/dependency-injection": "^5.0 || ^6.0 || ^7.0 || ^8.0",
diff --git a/psalm.xml b/psalm.xml
@@ -15,4 +15,9 @@
             <file name="src/Bundle/SecretaryBundle/Test.php" />
         </ignoreFiles>
     </projectFiles>
+
+    <issueHandlers>
+        <!-- PHP 8.2 doesn't support #[\Override], only 8.3+ -->
+        <MissingOverrideAttribute errorLevel="suppress" />
+    </issueHandlers>
 </psalm>
diff --git a/src/Adapter/AWS/SecretsManager/AWSSecretsManagerAdapter.php b/src/Adapter/AWS/SecretsManager/AWSSecretsManagerAdapter.php
@@ -44,7 +44,6 @@ public function __construct(array $config)
     /**
      * {@inheritdoc}
      */
-    #[\Override]
     public function getSecret(string $key, ?array $options = []): Secret
     {
         $options['SecretId'] = $key;
@@ -73,7 +72,6 @@ public function getSecret(string $key, ?array $options = []): Secret
     /**
      * {@inheritdoc}
      */
-    #[\Override]
     public function putSecret(Secret $secret, ?array $options = []): Secret
     {
         $options['SecretString'] = is_array($secret->getValue())
@@ -106,13 +104,11 @@ public function deleteSecretByKey(string $key, ?array $options = []): void
     /**
      * {@inheritdoc}
      */
-    #[\Override]
     public function deleteSecret(Secret $secret, ?array $options = []): void
     {
         $this->deleteSecretByKey($secret->getKey(), $options);
     }
 
-    #[\Override]
     public function configureGetSecretOptions(OptionsResolver $resolver): void
     {
         parent::configureSharedOptions($resolver);
@@ -121,7 +117,6 @@ public function configureGetSecretOptions(OptionsResolver $resolver): void
             ->setAllowedTypes('VersionStage', 'string');
     }
 
-    #[\Override]
     public function configurePutSecretOptions(OptionsResolver $resolver): void
     {
         parent::configureSharedOptions($resolver);
@@ -130,7 +125,6 @@ public function configurePutSecretOptions(OptionsResolver $resolver): void
             ->setAllowedTypes('Description', 'string');
     }
 
-    #[\Override]
     public function configureDeleteSecretOptions(OptionsResolver $resolver): void
     {
         parent::configureDeleteSecretOptions($resolver);
diff --git a/src/Adapter/AWS/SecretsManager/composer.json b/src/Adapter/AWS/SecretsManager/composer.json
@@ -23,8 +23,8 @@
         "secretary/core":  "self.version"
     },
     "require-dev":       {
-        "phpunit/phpunit": "^9.0 || ^10.0",
-        "mockery/mockery": "^1.4"
+        "phpunit/phpunit": "^10.5 || ^11.0",
+        "mockery/mockery": "^1.6"
     },
     "autoload":          {
         "psr-4": {
diff --git a/src/Adapter/Cache/PSR16Cache/PSR16CacheAdapter.php b/src/Adapter/Cache/PSR16Cache/PSR16CacheAdapter.php
@@ -34,7 +34,6 @@ public function __construct(AdapterInterface $adapter, CacheInterface $cache)
     /**
      * {@inheritdoc}
      */
-    #[\Override]
     public function getSecret(string $key, ?array $options = []): Secret
     {
         ['ttl' => $ttl] = ArrayHelper::remove($options, 'ttl');
@@ -54,7 +53,6 @@ public function getSecret(string $key, ?array $options = []): Secret
     /**
      * {@inheritdoc}
      */
-    #[\Override]
     public function putSecret(Secret $secret, ?array $options = []): Secret
     {
         ['ttl' => $ttl] = ArrayHelper::remove($options, 'ttl');
@@ -75,7 +73,6 @@ public function putSecret(Secret $secret, ?array $options = []): Secret
     /**
      * {@inheritdoc}
      */
-    #[\Override]
     public function deleteSecret(Secret $secret, ?array $options = []): void
     {
         $this->deleteSecretByKey($secret->getKey(), $options);
diff --git a/src/Adapter/Cache/PSR16Cache/composer.json b/src/Adapter/Cache/PSR16Cache/composer.json
@@ -22,8 +22,8 @@
         "secretary/core":   "self.version"
     },
     "require-dev":       {
-        "phpunit/phpunit": "^9.0 || ^10.0",
-        "mockery/mockery": "^1.4"
+        "phpunit/phpunit": "^10.5 || ^11.0",
+        "mockery/mockery": "^1.6"
     },
     "autoload":          {
         "psr-4": {
diff --git a/src/Adapter/Cache/PSR6Cache/PSR6CacheAdapter.php b/src/Adapter/Cache/PSR6Cache/PSR6CacheAdapter.php
@@ -36,7 +36,6 @@ public function __construct(AdapterInterface $adapter, CacheItemPoolInterface $c
     /**
      * {@inheritdoc}
      */
-    #[\Override]
     public function getSecret(string $key, ?array $options = []): Secret
     {
         ['ttl' => $ttl] = ArrayHelper::remove($options, 'ttl');
@@ -63,7 +62,6 @@ public function getSecret(string $key, ?array $options = []): Secret
     /**
      * {@inheritdoc}
      */
-    #[\Override]
     public function putSecret(Secret $secret, ?array $options = []): Secret
     {
         ['ttl' => $ttl] = ArrayHelper::remove($options, 'ttl');
@@ -90,7 +88,6 @@ public function putSecret(Secret $secret, ?array $options = []): Secret
     /**
      * {@inheritdoc}
      */
-    #[\Override]
     public function deleteSecret(Secret $secret, ?array $options = []): void
     {
         $this->deleteSecretByKey($secret->getKey(), $options);
diff --git a/src/Adapter/Cache/PSR6Cache/composer.json b/src/Adapter/Cache/PSR6Cache/composer.json
@@ -22,8 +22,8 @@
         "secretary/core": "self.version"
     },
     "require-dev":       {
-        "phpunit/phpunit": "^9.0 || ^10.0",
-        "mockery/mockery": "^1.4"
+        "phpunit/phpunit": "^10.5 || ^11.0",
+        "mockery/mockery": "^1.6"
     },
     "autoload":          {
         "psr-4": {
diff --git a/src/Adapter/Chain/ChainAdapter.php b/src/Adapter/Chain/ChainAdapter.php
@@ -39,7 +39,6 @@ public function __construct(array $adapters)
      * Note: $options is a 0-indexed array of options. Each index corresponds to the index of the adapters
      * {@inheritdoc}
      */
-    #[\Override]
     public function getSecret(string $key, ?array $options = []): Secret
     {
         foreach ($this->adapters as $index => $adapter) {
@@ -55,7 +54,6 @@ public function getSecret(string $key, ?array $options = []): Secret
     /**
      * {@inheritdoc}
      */
-    #[\Override]
     public function putSecret(Secret $secret, ?array $options = []): Secret
     {
         foreach ($this->adapters as $index => $adapter) {
@@ -68,7 +66,6 @@ public function putSecret(Secret $secret, ?array $options = []): Secret
     /**
      * {@inheritdoc}
      */
-    #[\Override]
     public function deleteSecret(Secret $secret, ?array $options = []): void
     {
         foreach ($this->adapters as $index => $adapter) {
diff --git a/src/Adapter/Chain/composer.json b/src/Adapter/Chain/composer.json
@@ -20,8 +20,8 @@
         "secretary/core": "self.version"
     },
     "require-dev":       {
-        "phpunit/phpunit": "^9.0 || ^10.0",
-        "mockery/mockery": "^1.4"
+        "phpunit/phpunit": "^10.5 || ^11.0",
+        "mockery/mockery": "^1.6"
     },
     "autoload":          {
         "psr-4": {
diff --git a/src/Adapter/GCP/SecretsManager/GCPSecretsManagerAdapter.php b/src/Adapter/GCP/SecretsManager/GCPSecretsManagerAdapter.php
@@ -57,7 +57,6 @@ public function __construct(array $config)
     /**
      * {@inheritdoc}
      */
-    #[\Override]
     public function getSecret(string $key, ?array $options = []): Secret
     {
         $version = $options['version'] ?? 'latest';
@@ -91,7 +90,6 @@ public function getSecret(string $key, ?array $options = []): Secret
     /**
      * {@inheritdoc}
      */
-    #[\Override]
     public function putSecret(Secret $secret, ?array $options = []): Secret
     {
         $secretValue = is_array($secret->getValue())
@@ -156,13 +154,11 @@ public function deleteSecretByKey(string $key, ?array $options = []): void
     /**
      * {@inheritdoc}
      */
-    #[\Override]
     public function deleteSecret(Secret $secret, ?array $options = []): void
     {
         $this->deleteSecretByKey($secret->getKey(), $options);
     }
 
-    #[\Override]
     public function configureGetSecretOptions(OptionsResolver $resolver): void
     {
         parent::configureSharedOptions($resolver);
@@ -171,13 +167,11 @@ public function configureGetSecretOptions(OptionsResolver $resolver): void
             ->setDefault('version', 'latest');
     }
 
-    #[\Override]
     public function configurePutSecretOptions(OptionsResolver $resolver): void
     {
         parent::configureSharedOptions($resolver);
     }
 
-    #[\Override]
     public function configureDeleteSecretOptions(OptionsResolver $resolver): void
     {
         parent::configureDeleteSecretOptions($resolver);
diff --git a/src/Adapter/GCP/SecretsManager/composer.json b/src/Adapter/GCP/SecretsManager/composer.json
@@ -24,8 +24,8 @@
         "secretary/core":               "^3.0"
     },
     "require-dev":       {
-        "phpunit/phpunit": "^9.0 || ^10.0",
-        "mockery/mockery": "^1.4"
+        "phpunit/phpunit": "^10.5 || ^11.0",
+        "mockery/mockery": "^1.6"
     },
     "autoload":          {
         "psr-4": {
diff --git a/src/Adapter/Hashicorp/Vault/HashicorpVaultAdapter.php b/src/Adapter/Hashicorp/Vault/HashicorpVaultAdapter.php
@@ -39,7 +39,6 @@ public function __construct(array $config = [])
     /**
      * {@inheritdoc}
      */
-    #[\Override]
     public function getSecret(string $key, ?array $options = []): Secret
     {
         $response = $this->client->getClient()->get('/v1/secret/'.$key);
@@ -51,7 +50,6 @@ public function getSecret(string $key, ?array $options = []): Secret
     /**
      * {@inheritdoc}
      */
-    #[\Override]
     public function putSecret(Secret $secret, ?array $options = []): Secret
     {
         if (!is_array($secret->getValue())) {
@@ -66,7 +64,6 @@ public function putSecret(Secret $secret, ?array $options = []): Secret
     /**
      * {@inheritdoc}
      */
-    #[\Override]
     public function deleteSecret(Secret $secret, ?array $options = []): void
     {
         $this->deleteSecretByKey($secret->getKey(), $options);
diff --git a/src/Adapter/Hashicorp/Vault/composer.json b/src/Adapter/Hashicorp/Vault/composer.json
@@ -22,8 +22,8 @@
         "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0 || ^8.0"
     },
     "require-dev":       {
-        "phpunit/phpunit": "^9.0 || ^10.0",
-        "mockery/mockery": "^1.4"
+        "phpunit/phpunit": "^10.5 || ^11.0",
+        "mockery/mockery": "^1.6"
     },
     "autoload":          {
         "psr-4": {
diff --git a/src/Adapter/Local/JSONFile/LocalJSONFileAdapter.php b/src/Adapter/Local/JSONFile/LocalJSONFileAdapter.php
@@ -51,7 +51,6 @@ public function __construct(array $config)
      *
      * @throws SecretNotFoundException
      */
-    #[\Override]
     public function getSecret(string $key, ?array $options = []): Secret
     {
         $secrets = $this->loadSecrets();
@@ -72,7 +71,6 @@ public function getSecret(string $key, ?array $options = []): Secret
     /**
      * {@inheritdoc}
      */
-    #[\Override]
     public function putSecret(Secret $secret, ?array $options = []): Secret
     {
         $secrets = self::updateValue($secret, $this->loadSecrets());
@@ -103,7 +101,6 @@ public function deleteSecretByKey(string $key, ?array $options = []): void
      *
      * @throws SecretNotFoundException
      */
-    #[\Override]
     public function deleteSecret(Secret $secret, ?array $options = []): void
     {
         $this->deleteSecretByKey($secret->getKey(), $options);
diff --git a/src/Adapter/Local/JSONFile/composer.json b/src/Adapter/Local/JSONFile/composer.json
@@ -21,8 +21,8 @@
         "secretary/core":  "self.version"
     },
     "require-dev":       {
-        "mockery/mockery": "^1.4",
-        "phpunit/phpunit": "^9.0 || ^10.0"
+        "mockery/mockery": "^1.6",
+        "phpunit/phpunit": "^10.5 || ^11.0"
     },
     "autoload":          {
         "psr-4": {
diff --git a/src/Bundle/SecretaryBundle/DependencyInjection/Configuration.php b/src/Bundle/SecretaryBundle/DependencyInjection/Configuration.php
@@ -19,7 +19,6 @@
  */
 class Configuration implements ConfigurationInterface
 {
-    #[\Override]
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('secretary', 'array');
diff --git a/src/Bundle/SecretaryBundle/DependencyInjection/SecretaryExtension.php b/src/Bundle/SecretaryBundle/DependencyInjection/SecretaryExtension.php
@@ -22,7 +22,6 @@
 
 class SecretaryExtension extends Extension
 {
-    #[\Override]
     public function load(array $configs, ContainerBuilder $container): void
     {
         $config = $this->processConfiguration(new Configuration(), $configs);
diff --git a/src/Bundle/SecretaryBundle/EnvVar/EnvVarProcessor.php b/src/Bundle/SecretaryBundle/EnvVar/EnvVarProcessor.php
@@ -28,7 +28,6 @@ public function __construct(\Traversable $managers)
     /**
      * @psalm-suppress InvalidArrayOffset
      */
-    #[\Override]
     public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed
     {
         $parts = explode(':', $name);
@@ -55,7 +54,6 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed
         return $value;
     }
 
-    #[\Override]
     public static function getProvidedTypes(): array
     {
         return [
diff --git a/src/Core/Adapter/AbstractAdapter.php b/src/Core/Adapter/AbstractAdapter.php
@@ -19,22 +19,18 @@
  */
 abstract class AbstractAdapter implements AdapterInterface
 {
-    #[\Override]
     public function configureSharedOptions(OptionsResolver $resolver): void
     {
     }
 
-    #[\Override]
     public function configureGetSecretOptions(OptionsResolver $resolver): void
     {
     }
 
-    #[\Override]
     public function configurePutSecretOptions(OptionsResolver $resolver): void
     {
     }
 
-    #[\Override]
     public function configureDeleteSecretOptions(OptionsResolver $resolver): void
     {
     }
diff --git a/src/Core/Secret.php b/src/Core/Secret.php
diff --git a/src/Core/Tests/ManagerTest.php b/src/Core/Tests/ManagerTest.php
diff --git a/src/Core/composer.json b/src/Core/composer.json

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{"version":2,"defects":[],"times":{"Secretary\\Tests\\ManagerTest::testConstruct":0.002,"Secretary\\Tests\\ManagerTest::testGetSecret":0.002,"Secretary\\Tests\\ManagerTest::testGetBadSecret":0.001,"Secretary\\Tests\\ManagerTest::testPutSecret":0,"Secretary\\Tests\\ManagerTest::testDeleteSecretByKey":0,"Secretary\\Tests\\ManagerTest::testDeleteSecret":0,"Secretary\\Tests\\ManagerTest::testGetAdapter":0}}`
	`1`	`+{"version":2,"defects":[],"times":{"Secretary\\Tests\\ManagerTest::testConstruct":0.017,"Secretary\\Tests\\ManagerTest::testGetSecret":0.003,"Secretary\\Tests\\ManagerTest::testGetBadSecret":0.007,"Secretary\\Tests\\ManagerTest::testPutSecret":0,"Secretary\\Tests\\ManagerTest::testDeleteSecretByKey":0.001,"Secretary\\Tests\\ManagerTest::testDeleteSecret":0,"Secretary\\Tests\\ManagerTest::testGetAdapter":0}}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@ public function __construct(array $config)`
`44`	`44`	`/**`
`45`	`45`	`* {@inheritdoc}`
`46`	`46`	`*/`
`47`		`- #[\Override]`
`48`	`47`	`public function getSecret(string $key, ?array $options = []): Secret`
`49`	`48`	`{`
`50`	`49`	`$options['SecretId'] = $key;`
`@@ -73,7 +72,6 @@ public function getSecret(string $key, ?array $options = []): Secret`
`73`	`72`	`/**`
`74`	`73`	`* {@inheritdoc}`
`75`	`74`	`*/`
`76`		`- #[\Override]`
`77`	`75`	`public function putSecret(Secret $secret, ?array $options = []): Secret`
`78`	`76`	`{`
`79`	`77`	`$options['SecretString'] = is_array($secret->getValue())`
`@@ -106,13 +104,11 @@ public function deleteSecretByKey(string $key, ?array $options = []): void`
`106`	`104`	`/**`
`107`	`105`	`* {@inheritdoc}`
`108`	`106`	`*/`
`109`		`- #[\Override]`
`110`	`107`	`public function deleteSecret(Secret $secret, ?array $options = []): void`
`111`	`108`	`{`
`112`	`109`	`$this->deleteSecretByKey($secret->getKey(), $options);`
`113`	`110`	`}`
`114`	`111`
`115`		`- #[\Override]`
`116`	`112`	`public function configureGetSecretOptions(OptionsResolver $resolver): void`
`117`	`113`	`{`
`118`	`114`	`parent::configureSharedOptions($resolver);`
`@@ -121,7 +117,6 @@ public function configureGetSecretOptions(OptionsResolver $resolver): void`
`121`	`117`	`->setAllowedTypes('VersionStage', 'string');`
`122`	`118`	`}`
`123`	`119`
`124`		`- #[\Override]`
`125`	`120`	`public function configurePutSecretOptions(OptionsResolver $resolver): void`
`126`	`121`	`{`
`127`	`122`	`parent::configureSharedOptions($resolver);`
`@@ -130,7 +125,6 @@ public function configurePutSecretOptions(OptionsResolver $resolver): void`
`130`	`125`	`->setAllowedTypes('Description', 'string');`
`131`	`126`	`}`
`132`	`127`
`133`		`- #[\Override]`
`134`	`128`	`public function configureDeleteSecretOptions(OptionsResolver $resolver): void`
`135`	`129`	`{`
`136`	`130`	`parent::configureDeleteSecretOptions($resolver);`