Removed signingMethod property

Minor code styling fixes

Author: MaximilianKresse

src/Module.php

@@ -33,24 +33,21 @@ class Module implements ModuleInterface, DictionaryInterface, DocumentInterface
     protected $certificateId;
 
     /**
-     * A Time based One Time Pin (TOTP) generated by a compatible app such as Google Authenticator, Microsoft Authenticator etc'.
+     * A Time based One Time Pin (TOTP) generated by a compatible app such as Google Authenticator, Microsoft
+     * Authenticator etc.
+     *
      * @var null|string
      */
     protected $otp;
 
     /**
      * The Signing Activation Data (SAD) token obtained in an earlier authorise request.
+     *
+     * @see Client::authorize()
      * @var null|string
      */
     protected $sad;
 
-    /**
-     * Signing method to be used, either 'otp' or 'sad'
-     * Default: otp
-     * @var string
-     */
-    protected $signingMethod = 'otp';
-
     /**
      * @var string
      */
@@ -89,29 +86,28 @@ public function setSigningAlgorithm(string $algorithm)
         $this->_getPadesModule()->setDigest($hashingAlgorithm);
     }
 
+    /**
+     * Set a Time based One Time Pin (TOTP) generated by a compatible app such as Google Authenticator, Microsoft
+     * Authenticator etc.
+     *
+     * @param string $otp
+     * @return void
+     */
     public function setOtp(string $otp): void
     {
         $this->otp = $otp;
     }
 
-    public function setSad(string $sad): void
-    {
-        $this->sad = $sad;
-    }
-
     /**
-     * Sets the desired signing method to use on createSignature method
+     * Set a Signing Activation Data (SAD) token obtained in an earlier authorise request.
+     *
+     * @see Client::authorize()
+     * @param string $sad
+     * @return void
      */
-    public function setSigningMethod($method)
+    public function setSad(string $sad): void
     {
-        $possible = ['otp','sad'];
-
-        if ( ! in_array($method, $possible ) )
-        {
-            throw new InvalidArgumentException('Invalid signing method! you can only choose beteen: ' . implode(',', $possible));
-        }
-
-        $this->signingMethod = $method;
+        $this->sad = $sad;
     }
 
     public function getCertificate()
@@ -138,34 +134,30 @@ public function createSignature(SetaPDF_Core_Reader_FilePath $tmpPath)
 
         $hashData = hash($padesDigest, $padesModule->getDataToSign($tmpPath), true);
 
-        if ( $this->signingMethod == 'sad' ) {
-            // Sign using SAD
-            if ($this->sad === null) {
-                throw new \BadMethodCallException('Missing SAD! Did you perform /authorize request before?');
-            }
+        if ($this->sad !== null && $this->otp !== null) {
+            throw new \BadMethodCallException('SAD and OTP given! You must only use one.');
+        }
 
+        if ($this->sad !== null) {
+            // Sign using SAD
             $signatureValue = $this->client->signWithSad(
                 $this->certificateId,
                 $this->signingAlgorithm,
                 $hashData,
                 $this->sad
             );
-        }
-        else {
+        } elseif ($this->otp !== null) {
             // Sign using OTP
-            if ($this->otp === null) {
-                throw new \BadMethodCallException('Missing OTP!');
-            }
-
             $signatureValue = $this->client->signWithOtp(
                 $this->certificateId,
                 $this->signingAlgorithm,
                 $hashData,
                 $this->otp
             );
+        } else {
+            throw new \BadMethodCallException('Missing SAD/OTP! Please use setOtp() OR setSad() before.');
         }
 
-
         if (\in_array($this->signingAlgorithm, ['ES256', 'ES384', 'ES512'], true)) {
             // THIS NEEDS TO BE USED TO FIX EC SIGNATURES
             $len = strlen($signatureValue);