Apply fixes from StyleCI (#15)

[ci skip] [skip ci]

Author: Spomky

AlgorithmManager.php

@@ -40,7 +40,7 @@ private function __construct(array $algorithms)
  *
  * @return AlgorithmManager
  */
- public static function create(array $algorithms): AlgorithmManager
+ public static function create(array $algorithms): self
  {
  return new self($algorithms);
  }
@@ -82,7 +82,7 @@ public function get(string $algorithm): AlgorithmInterface
  *
  * @return AlgorithmManager
  */
- private function add(AlgorithmInterface $algorithm): AlgorithmManager
+ private function add(AlgorithmInterface $algorithm): self
  {
  $name = $algorithm->name();
  if ($this->has($name)) {

AlgorithmManagerFactory.php

@@ -29,7 +29,7 @@ final class AlgorithmManagerFactory
  *
  * @return AlgorithmManagerFactory
  */
- public function add(string $alias, AlgorithmInterface $algorithm): AlgorithmManagerFactory
+ public function add(string $alias, AlgorithmInterface $algorithm): self
  {
  if (array_key_exists($alias, $this->algorithms)) {
  throw new \InvalidArgumentException(sprintf('The alias "%s" already exists.', $alias));

JWK.php

@@ -40,7 +40,7 @@ private function __construct(array $values)
  *
  * @return JWK
  */
- public static function create(array $values): JWK
+ public static function create(array $values): self
  {
  if (!array_key_exists('kty', $values)) {
  throw new \InvalidArgumentException('The parameter "kty" is mandatory.');
@@ -124,7 +124,7 @@ public function thumbprint(string $hash_algorithm): string
  /**
  * @return JWK
  */
- public function toPublic(): JWK
+ public function toPublic(): self
  {
  $values = array_diff_key($this->values, array_flip(['p', 'd', 'q', 'dp', 'dq', 'qi']));
 

JWKSet.php

@@ -38,7 +38,7 @@ private function __construct(array $keys)
  *
  * @return JWKSet
  */
- public static function createFromKeyData(array $data): JWKSet
+ public static function createFromKeyData(array $data): self
  {
  if (!array_key_exists('keys', $data) || !is_array($data['keys'])) {
  throw new \InvalidArgumentException('Invalid data.');
@@ -63,7 +63,7 @@ public static function createFromKeyData(array $data): JWKSet
  *
  * @return JWKSet
  */
- public static function createFromKeys(array $keys): JWKSet
+ public static function createFromKeys(array $keys): self
  {
  $keys = array_filter($keys, function () {
  return true;
@@ -95,7 +95,7 @@ public function all(): array
  *
  * @return JWKSet
  */
- public function with(JWK $jwk): JWKSet
+ public function with(JWK $jwk): self
  {
  $clone = clone $this;
 
@@ -115,7 +115,7 @@ public function with(JWK $jwk): JWKSet
  *
  * @return JWKSet
  */
- public function without($key): JWKSet
+ public function without($key): self
  {
  if (!$this->has($key)) {
  return $this;

Util/BigInteger.php

@@ -38,7 +38,7 @@ private function __construct(\GMP $value)
  *
  * @return BigInteger
  */
- public static function createFromGMPResource(\GMP $value): BigInteger
+ public static function createFromGMPResource(\GMP $value): self
  {
  return new self($value);
  }
@@ -48,7 +48,7 @@ public static function createFromGMPResource(\GMP $value): BigInteger
  *
  * @return BigInteger
  */
- public static function createFromBinaryString(string $value): BigInteger
+ public static function createFromBinaryString(string $value): self
  {
  $value = '0x'.unpack('H*', $value)[1];
  $value = gmp_init($value, 16);
@@ -61,7 +61,7 @@ public static function createFromBinaryString(string $value): BigInteger
  *
  * @return BigInteger
  */
- public static function createFromDecimal(int $value): BigInteger
+ public static function createFromDecimal(int $value): self
  {
  $value = gmp_init($value, 10);
 
@@ -93,7 +93,7 @@ public function toBytes(): string
  *
  * @return BigInteger
  */
- public function add(BigInteger $y): BigInteger
+ public function add(self $y): self
  {
  $value = gmp_add($this->value, $y->value);
 
@@ -107,7 +107,7 @@ public function add(BigInteger $y): BigInteger
  *
  * @return BigInteger
  */
- public function subtract(BigInteger $y): BigInteger
+ public function subtract(self $y): self
  {
  $value = gmp_sub($this->value, $y->value);
 
@@ -121,7 +121,7 @@ public function subtract(BigInteger $y): BigInteger
  *
  * @return BigInteger
  */
- public function multiply(BigInteger $x): BigInteger
+ public function multiply(self $x): self
  {
  $value = gmp_mul($this->value, $x->value);
 
@@ -135,7 +135,7 @@ public function multiply(BigInteger $x): BigInteger
  *
  * @return BigInteger
  */
- public function divide(BigInteger $x): BigInteger
+ public function divide(self $x): self
  {
  $value = gmp_div($this->value, $x->value);
 
@@ -150,7 +150,7 @@ public function divide(BigInteger $x): BigInteger
  *
  * @return BigInteger
  */
- public function modPow(BigInteger $e, BigInteger $n): BigInteger
+ public function modPow(self $e, self $n): self
  {
  $value = gmp_powm($this->value, $e->value, $n->value);
 
@@ -164,7 +164,7 @@ public function modPow(BigInteger $e, BigInteger $n): BigInteger
  *
  * @return BigInteger
  */
- public function mod(BigInteger $d): BigInteger
+ public function mod(self $d): self
  {
  $value = gmp_mod($this->value, $d->value);
 
@@ -178,7 +178,7 @@ public function mod(BigInteger $d): BigInteger
  *
  * @return BigInteger
  */
- public function modInverse(BigInteger $n): BigInteger
+ public function modInverse(self $n): self
  {
  $value = gmp_invert($this->value, $n->value);
 
@@ -192,7 +192,7 @@ public function modInverse(BigInteger $n): BigInteger
  *
  * @return int < 0 if $this is less than $y; > 0 if $this is greater than $y, and 0 if they are equal
  */
- public function compare(BigInteger $y): int
+ public function compare(self $y): int
  {
  return gmp_cmp($this->value, $y->value);
  }
@@ -202,7 +202,7 @@ public function compare(BigInteger $y): int
  *
  * @return bool
  */
- public function equals(BigInteger $y): bool
+ public function equals(self $y): bool
  {
  return 0 === $this->compare($y);
  }
@@ -212,7 +212,7 @@ public function equals(BigInteger $y): bool
  *
  * @return BigInteger
  */
- public static function random(BigInteger $y): BigInteger
+ public static function random(self $y): self
  {
  $zero = self::createFromDecimal(0);
 
@@ -224,7 +224,7 @@ public static function random(BigInteger $y): BigInteger
  *
  * @return BigInteger
  */
- public function gcd(BigInteger $y): BigInteger
+ public function gcd(self $y): self
  {
  return self::createFromGMPResource(gmp_gcd($this->value, $y->value));
  }
@@ -234,7 +234,7 @@ public function gcd(BigInteger $y): BigInteger
  *
  * @return bool
  */
- public function lowerThan(BigInteger $y): bool
+ public function lowerThan(self $y): bool
  {
  return 0 > $this->compare($y);
  }

Util/Ecc/Curve.php

@@ -259,7 +259,7 @@ public function mul(Point $one, \GMP $n): Point
  *
  * @return int
  */
- public function cmp(Curve $other): int
+ public function cmp(self $other): int
  {
  $equal = Math::equals($this->getA(), $other->getA());
  $equal &= Math::equals($this->getB(), $other->getB());
@@ -273,7 +273,7 @@ public function cmp(Curve $other): int
  *
  * @return bool
  */
- public function equals(Curve $other): bool
+ public function equals(self $other): bool
  {
  return 0 === $this->cmp($other);
  }

Util/Ecc/Point.php

@@ -92,15 +92,15 @@ private function __construct(\GMP $x, \GMP $y, \GMP $order, bool $infinity = fal
  *
  * @return Point
  */
- public static function create(\GMP $x, \GMP $y, ?\GMP $order = null): Point
+ public static function create(\GMP $x, \GMP $y, ?\GMP $order = null): self
  {
  return new self($x, $y, null === $order ? gmp_init(0, 10) : $order);
  }
 
  /**
  * @return Point
  */
- public static function infinity(): Point
+ public static function infinity(): self
  {
  $zero = gmp_init(0, 10);
 
@@ -144,7 +144,7 @@ public function getY(): \GMP
  * @param Point $b
  * @param int $cond
  */
- public static function cswap(Point $a, Point $b, int $cond)
+ public static function cswap(self $a, self $b, int $cond)
  {
  self::cswapGMP($a->x, $b->x, $cond);
  self::cswapGMP($a->y, $b->y, $cond);

Util/Ecc/PrivateKey.php

@@ -60,7 +60,7 @@ private function __construct(\GMP $secret)
  *
  * @return PrivateKey
  */
- public static function create(\GMP $secret): PrivateKey
+ public static function create(\GMP $secret): self
  {
  return new self($secret);
  }

Util/Ecc/PublicKey.php

@@ -62,7 +62,7 @@ private function __construct(Point $point)
  *
  * @return PublicKey
  */
- public static function create(Point $point): PublicKey
+ public static function create(Point $point): self
  {
  return new self($point);
  }

Util/Hash.php

@@ -35,31 +35,31 @@ final class Hash
  /**
  * @return Hash
  */
- public static function sha1(): Hash
+ public static function sha1(): self
  {
  return new self('sha1', 20);
  }
 
  /**
  * @return Hash
  */
- public static function sha256(): Hash
+ public static function sha256(): self
  {
  return new self('sha256', 32);
  }
 
  /**
  * @return Hash
  */
- public static function sha384(): Hash
+ public static function sha384(): self
  {
  return new self('sha384', 48);
  }
 
  /**
  * @return Hash
  */
- public static function sha512(): Hash
+ public static function sha512(): self
  {
  return new self('sha512', 64);
  }