Skip to content

fix some IDE complaints #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
miken32 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix some IDE complaints #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90b7726
use less specific argument type
miken32 Sep 17, 2025
1d71ef5
use less specific type
miken32 Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/CryptoTypes/AlgorithmIdentifier/Signature/SignatureAlgorithmIdentifierFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

use Sop\CryptoTypes\AlgorithmIdentifier\AlgorithmIdentifier;
use Sop\CryptoTypes\AlgorithmIdentifier\AlgorithmIdentifierFactory;
use Sop\CryptoTypes\AlgorithmIdentifier\Feature\AsymmetricCryptoAlgorithmIdentifier;
use Sop\CryptoTypes\AlgorithmIdentifier\Feature\AlgorithmIdentifierType;
use Sop\CryptoTypes\AlgorithmIdentifier\Feature\HashAlgorithmIdentifier;
use Sop\CryptoTypes\AlgorithmIdentifier\Feature\SignatureAlgorithmIdentifier;

Expand Down Expand Up @@ -50,13 +50,13 @@ abstract class SignatureAlgorithmIdentifierFactory
* Get signature algorithm identifier of given asymmetric cryptographic type
* utilizing given hash algorithm.
*
* @param AsymmetricCryptoAlgorithmIdentifier $crypto_algo Cryptographic algorithm identifier, eg. RSA or EC
* @param AlgorithmIdentifierType $crypto_algo Cryptographic algorithm identifier, eg. RSA or EC
* @param HashAlgorithmIdentifier $hash_algo Hash algorithm identifier
*
* @throws \UnexpectedValueException
*/
public static function algoForAsymmetricCrypto(
AsymmetricCryptoAlgorithmIdentifier $crypto_algo,
AlgorithmIdentifierType $crypto_algo,
HashAlgorithmIdentifier $hash_algo): SignatureAlgorithmIdentifier
{
switch ($crypto_algo->oid()) {
Expand Down
8 changes: 4 additions & 4 deletions lib/CryptoTypes/Asymmetric/PrivateKey.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ public function privateKeyData(): string
}

/**
* Get the private key as a PrivateKeyInfo type.
* Get the private key as a OneAsymmetricKey type.
*/
public function privateKeyInfo(): PrivateKeyInfo
public function privateKeyInfo(): OneAsymmetricKey
{
return PrivateKeyInfo::fromPrivateKey($this);
return OneAsymmetricKey::fromPrivateKey($this);
}

/**
Expand All @@ -66,7 +66,7 @@ public static function fromPEM(PEM $pem)
case PEM::TYPE_EC_PRIVATE_KEY:
return EC\ECPrivateKey::fromDER($pem->data());
case PEM::TYPE_PRIVATE_KEY:
return PrivateKeyInfo::fromDER($pem->data())->privateKey();
return OneAsymmetricKey::fromDER($pem->data())->privateKey();
}
throw new \UnexpectedValueException(
'PEM type ' . $pem->type() . ' is not a valid private key.');
Expand Down