CS fixed

Spomky · Spomky · commit 622a7e0321b6 · 2019-01-21T12:37:37.000+01:00
diff --git a/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKSetSource.php b/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKSetSource.php
@@ -23,7 +23,7 @@
 class JWKSetSource implements Source
 {
     /**
-     * @var null|JWKSetSourceInterface[]
+     * @var JWKSetSourceInterface[]|null
      */
     private $jwkset_sources = null;
 
diff --git a/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKSource.php b/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKSource.php
@@ -23,7 +23,7 @@
 class JWKSource implements Source
 {
     /**
-     * @var null|JWKSourceInterface[]
+     * @var JWKSourceInterface[]|null
      */
     private $jwkSources = null;
 
diff --git a/src/Component/Checker/Tests/Stub/OtherToken.php b/src/Component/Checker/Tests/Stub/OtherToken.php
@@ -18,7 +18,7 @@
 class OtherToken implements JWT
 {
     /**
-     * @var null|string
+     * @var string|null
      */
     private $payload;
 
diff --git a/src/Component/Checker/Tests/Stub/Token.php b/src/Component/Checker/Tests/Stub/Token.php
@@ -18,7 +18,7 @@
 class Token implements JWT
 {
     /**
-     * @var null|string
+     * @var string|null
      */
     private $payload;
 
diff --git a/src/Component/Core/Tests/AlgorithmManagerFactoryTest.php b/src/Component/Core/Tests/AlgorithmManagerFactoryTest.php
@@ -67,7 +67,7 @@ public function iCannotGetAnAlgorithmThatDoesNotExist()
     }
 
     /**
-     * @var null|AlgorithmManagerFactory
+     * @var AlgorithmManagerFactory|null
      */
     private $algorithmManagerFactory;
 
diff --git a/src/Component/Encryption/JWEBuilder.php b/src/Component/Encryption/JWEBuilder.php
@@ -36,7 +36,7 @@ class JWEBuilder
     private $jsonConverter;
 
     /**
-     * @var null|string
+     * @var string|null
      */
     private $payload;
 
@@ -76,17 +76,17 @@ class JWEBuilder
     private $sharedHeader = [];
 
     /**
-     * @var null|CompressionMethod
+     * @var CompressionMethod|null
      */
     private $compressionMethod = null;
 
     /**
-     * @var null|ContentEncryptionAlgorithm
+     * @var ContentEncryptionAlgorithm|null
      */
     private $contentEncryptionAlgorithm = null;
 
     /**
-     * @var null|string
+     * @var string|null
      */
     private $keyManagementMode = null;
 
diff --git a/src/Component/Encryption/Recipient.php b/src/Component/Encryption/Recipient.php
@@ -24,7 +24,7 @@ class Recipient
     private $header = [];
 
     /**
-     * @var null|string
+     * @var string|null
      */
     private $encryptedKey = null;
 
diff --git a/src/Component/Encryption/Tests/EncryptionTest.php b/src/Component/Encryption/Tests/EncryptionTest.php
@@ -137,7 +137,7 @@ protected function getJWELoaderFactory(): JWELoaderFactory
     }
 
     /**
-     * @var null|Serializer\JWESerializerManagerFactory
+     * @var Serializer\JWESerializerManagerFactory|null
      */
     private $jwsSerializerManagerFactory = null;
 
@@ -154,7 +154,7 @@ protected function getJWESerializerManagerFactory(): Serializer\JWESerializerMan
     }
 
     /**
-     * @var null|Serializer\JWESerializerManager
+     * @var Serializer\JWESerializerManager|null
      */
     private $jwsSerializerManager = null;
 
diff --git a/src/Component/Encryption/Tests/RFC7520/NestingTokenBuilderTest.php b/src/Component/Encryption/Tests/RFC7520/NestingTokenBuilderTest.php
@@ -211,7 +211,7 @@ private function getCompressionMethodManagerFactory(): CompressionMethodManagerF
     }
 
     /**
-     * @var null|JweSerializer\JWESerializerManagerFactory
+     * @var JweSerializer\JWESerializerManagerFactory|null
      */
     private $jwsSerializerManagerFactory = null;
 
diff --git a/src/Component/Encryption/Tests/RFC7520/NestingTokenUsingNestedTokenLoaderTest.php b/src/Component/Encryption/Tests/RFC7520/NestingTokenUsingNestedTokenLoaderTest.php
@@ -256,7 +256,7 @@ private function getJWEDecrypterFactory(): JWEDecrypterFactory
     }
 
     /**
-     * @var null|JweSerializer\JWESerializerManagerFactory
+     * @var JweSerializer\JWESerializerManagerFactory|null
      */
     private $jwsSerializerManagerFactory = null;
 
diff --git a/src/Component/Signature/JWSBuilder.php b/src/Component/Signature/JWSBuilder.php
@@ -28,7 +28,7 @@ class JWSBuilder
     private $jsonConverter;
 
     /**
-     * @var null|string
+     * @var string|null
      */
     private $payload;
 
@@ -48,7 +48,7 @@ class JWSBuilder
     private $signatureAlgorithmManager;
 
     /**
-     * @var null|bool
+     * @var bool|null
      */
     private $isPayloadEncoded = null;
 
diff --git a/src/Component/Signature/JWSVerifier.php b/src/Component/Signature/JWSVerifier.php
@@ -62,7 +62,7 @@ public function verifyWithKey(JWS $jws, JWK $jwk, int $signature, ?string $detac
      *
      * @param JWS         $jws             A JWS object
      * @param JWKSet      $jwkset          The signature will be verified using keys in the key set
-     * @param null|string $detachedPayload If not null, the value must be the detached payload encoded in Base64 URL safe. If the input contains a payload, throws an exception.
+     * @param string|null $detachedPayload If not null, the value must be the detached payload encoded in Base64 URL safe. If the input contains a payload, throws an exception.
      *
      * @return bool true if the verification of the signature succeeded, else false
      */
diff --git a/src/Component/Signature/Signature.php b/src/Component/Signature/Signature.php
@@ -16,7 +16,7 @@
 class Signature
 {
     /**
-     * @var null|string
+     * @var string|null
      */
     private $encodedProtectedHeader;
 
diff --git a/src/Component/Signature/Tests/SignatureTest.php b/src/Component/Signature/Tests/SignatureTest.php
@@ -87,7 +87,7 @@ protected function getJWSVerifierFactory(): JWSVerifierFactory
     }
 
     /**
-     * @var null|Serializer\JWSSerializerManagerFactory
+     * @var Serializer\JWSSerializerManagerFactory|null
      */
     private $jwsSerializerManagerFactory = null;
 
@@ -104,7 +104,7 @@ protected function getJWSSerializerManagerFactory(): Serializer\JWSSerializerMan
     }
 
     /**
-     * @var null|Serializer\JWSSerializerManager
+     * @var Serializer\JWSSerializerManager|null
      */
     private $jwsSerializerManager = null;
 

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`class JWKSetSource implements Source`
`24`	`24`	`{`
`25`	`25`	`/**`
`26`		`- * @var null\|JWKSetSourceInterface[]`
	`26`	`+ * @var JWKSetSourceInterface[]\|null`
`27`	`27`	`*/`
`28`	`28`	`private $jwkset_sources = null;`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`class OtherToken implements JWT`
`19`	`19`	`{`
`20`	`20`	`/**`
`21`		`- * @var null\|string`
	`21`	`+ * @var string\|null`
`22`	`22`	`*/`
`23`	`23`	`private $payload;`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public function iCannotGetAnAlgorithmThatDoesNotExist()`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`/**`
`70`		`- * @var null\|AlgorithmManagerFactory`
	`70`	`+ * @var AlgorithmManagerFactory\|null`
`71`	`71`	`*/`
`72`	`72`	`private $algorithmManagerFactory;`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ protected function getJWELoaderFactory(): JWELoaderFactory`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`/**`
`140`		`- * @var null\|Serializer\JWESerializerManagerFactory`
	`140`	`+ * @var Serializer\JWESerializerManagerFactory\|null`
`141`	`141`	`*/`
`142`	`142`	`private $jwsSerializerManagerFactory = null;`
`143`	`143`
`@@ -154,7 +154,7 @@ protected function getJWESerializerManagerFactory(): Serializer\JWESerializerMan`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`/**`
`157`		`- * @var null\|Serializer\JWESerializerManager`
	`157`	`+ * @var Serializer\JWESerializerManager\|null`
`158`	`158`	`*/`
`159`	`159`	`private $jwsSerializerManager = null;`
`160`	`160`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ private function getCompressionMethodManagerFactory(): CompressionMethodManagerF`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`/**`
`214`		`- * @var null\|JweSerializer\JWESerializerManagerFactory`
	`214`	`+ * @var JweSerializer\JWESerializerManagerFactory\|null`
`215`	`215`	`*/`
`216`	`216`	`private $jwsSerializerManagerFactory = null;`
`217`	`217`
Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ private function getJWEDecrypterFactory(): JWEDecrypterFactory`
`256`	`256`	`}`
`257`	`257`
`258`	`258`	`/**`
`259`		`- * @var null\|JweSerializer\JWESerializerManagerFactory`
	`259`	`+ * @var JweSerializer\JWESerializerManagerFactory\|null`
`260`	`260`	`*/`
`261`	`261`	`private $jwsSerializerManagerFactory = null;`
`262`	`262`