Merge pull request #48 from 10n/patch-1

Revert BC break - allow `array` structures for private keys, rather than just `string`
mezzio · Apr 7, 2022 · ab1a1a0 · ab1a1a0
2 parents 05d2c0e + 63af12f
commit ab1a1a0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/ConfigTrait.php b/src/ConfigTrait.php
@@ -11,7 +11,8 @@
 
 trait ConfigTrait
 {
-    protected function getPrivateKey(ContainerInterface $container): string
+    /** @return non-empty-string|non-empty-array */
+    protected function getPrivateKey(ContainerInterface $container)
     {
         $config = $container->get('config')['authentication'] ?? [];
 

diff --git a/test/ConfigTraitTest.php b/test/ConfigTraitTest.php
@@ -59,6 +59,26 @@ public function testGetPrivateKey()
         $this->assertEquals($this->config['authentication']['private_key'], $result);
     }
 
+    public function testGetPrivateKeyArray()
+    {
+        $config = [
+            'authentication' => [
+                'private_key' => [
+                    'key_or_path'           => 'xxx',
+                    'pass_phrase'           => 'test',
+                    'key_permissions_check' => false,
+                ],
+            ],
+        ];
+
+        $this->container
+            ->get('config')
+            ->willReturn($config);
+
+        $result = $this->trait->proxy('getPrivateKey', $this->container->reveal());
+        $this->assertEquals($config['authentication']['private_key'], $result);
+    }
+
     public function testGetEncryptionKeyNoConfig()
     {
         $this->container