PHP 7.4 compatibility + small improvements

Setasign · Aug 11, 2020 · b920787 · b920787
1 parent 9b73999
commit b920787
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,8 @@
 /vendor
 /composer.lock
 /examples/mycertandkey.crt
-/examples/SwisscomAISDemoClient-Certificate.*
+/examples/*.crt
+/examples/*.pfx
 /examples/credentials*
 /examples/output/*.pdf
 /examples/_tmp/.ht*
diff --git a/examples/demo.php b/examples/demo.php
@@ -44,7 +44,7 @@
 // now let's create a signer instance
 $signer = new SetaPDF_Signer($document);
 $signer->setAllowSignatureContentLengthChange(false);
-$signer->setSignatureContentLength(32000);
+$signer->setSignatureContentLength(36000);
 
 // set some signature properties
 $signer->setLocation($_SERVER['SERVER_NAME']);

diff --git a/src/SetaPDF/Signer/SwisscomAIS/AbstractModule.php b/src/SetaPDF/Signer/SwisscomAIS/AbstractModule.php
@@ -77,7 +77,7 @@ public function __construct($customerId, array $clientOptions = array(), $wsdl =
     {
         $this->_customerId = $customerId;
         $this->_clientOptions = $clientOptions;
-        $this->_wsdl = $wsdl === null ? dirname(__FILE__) . '/aisService.wsdl' : $wsdl;
+        $this->_wsdl = $wsdl === null ? __DIR__ . '/aisService.wsdl' : $wsdl;
     }
 
     /**
@@ -196,7 +196,7 @@ public function updateDss(SetaPDF_Core_Document $document, $fieldName)
         }
 
         $dss = new SetaPDF_Signer_DocumentSecurityStore($document);
-        $dss->addValidationRelatedInfoByField($fieldName, $crls, $ocsps, $certificates);
+        $dss->addValidationRelatedInfoByFieldName($fieldName, $crls, $ocsps, $certificates);
     }
 
     /**
@@ -209,9 +209,9 @@ protected function _getHash($data)
     {
         if ($data instanceof SetaPDF_Core_Reader_FilePath) {
             return hash_file($this->getDigest(), $data->getPath(), true);
-        } else {
-            return hash($this->getDigest(), $data, true);
         }
+
+        return hash($this->getDigest(), $data, true);
     }
 
     /**
@@ -247,7 +247,7 @@ protected function _generateTransactionId()
         $maxLen = strlen($pattern) - 1;
         $id = '';
         for ($i = 1; $i <= 6; $i++) {
-            $id .= $pattern{mt_rand(0, $maxLen)};
+            $id .= $pattern[mt_rand(0, $maxLen)];
         }
 
         return $id;

diff --git a/src/SetaPDF/Signer/SwisscomAIS/Batch.php b/src/SetaPDF/Signer/SwisscomAIS/Batch.php
@@ -24,7 +24,7 @@ class SetaPDF_Signer_SwisscomAIS_Batch extends SetaPDF_Signer_SwisscomAIS_Abstra
      *
      * @var int
      */
-    protected $_signatureConentLength = 32000;
+    protected $_signatureConentLength = 36000;
 
     /**
      * The signature field name