Skip to content

Commit acc6ed0

Browse files
JanSlabonJanSlabon
committed
Changed all used class names to new namespaced variation of SetaPDF.
1 parent 8341451 commit acc6ed0

9 files changed

Lines changed: 115 additions & 103 deletions

File tree

‎examples/appearance-demo.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
use setasign\SetaPDF\Signer\Module\CSC\Client;
66
use setasign\SetaPDF\Signer\Module\CSC\ClientException;
77
use setasign\SetaPDF\Signer\Module\CSC\Module;
8-
9-
ini_set('display_errors', '1');
10-
ini_set('display_startup_errors', '1');
11-
error_reporting(E_ALL);
8+
use setasign\SetaPDF2\Core\Document;
9+
use setasign\SetaPDF2\Core\Writer\FileWriter;
10+
use setasign\SetaPDF2\Signer\Signature\Appearance\Dynamic as DynamicAppearance;
11+
use setasign\SetaPDF2\Signer\SignatureField;
12+
use setasign\SetaPDF2\Signer\Signer;
1213

1314
require_once(__DIR__ . '/../vendor/autoload.php');
1415

@@ -38,7 +39,6 @@
3839
$accessToken = $_SESSION['accessToken']['access_token'];
3940

4041
$httpClient = new GuzzleHttp\Client();
41-
$httpClient = new Mjelamanov\GuzzlePsr18\Client($httpClient);
4242
$requestFactory = new Http\Factory\Guzzle\RequestFactory();
4343
$streamFactory = new Http\Factory\Guzzle\StreamFactory();
4444
$client = new Client($apiUri, $httpClient, $requestFactory, $streamFactory);
@@ -88,25 +88,25 @@
8888
}
8989

9090
// create a writer instance
91-
$writer = new SetaPDF_Core_Writer_File($resultPath);
91+
$writer = new FileWriter($resultPath);
9292
// create the document instance
93-
$document = SetaPDF_Core_Document::loadByFilename($fileToSign, $writer);
93+
$document = Document::loadByFilename($fileToSign, $writer);
9494

9595
// create the signer instance
96-
$signer = new SetaPDF_Signer($document);
96+
$signer = new Signer($document);
9797

9898
$field = $signer->addSignatureField(
9999
'Signature',
100100
1,
101-
SetaPDF_Signer_SignatureField::POSITION_RIGHT_TOP,
101+
SignatureField::POSITION_RIGHT_TOP,
102102
['x' => -160, 'y' => -100],
103103
180,
104104
60
105105
);
106106

107107
$signer->setSignatureFieldName($field->getQualifiedName());
108108

109-
$appearance = new SetaPDF_Signer_Signature_Appearance_Dynamic($module);
109+
$appearance = new DynamicAppearance($module);
110110
$signer->setAppearance($appearance);
111111

112112
try {

‎examples/async-demo.php‎

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,21 @@
55
use League\OAuth2\Client\OptionProvider\OptionProviderInterface;
66
use League\OAuth2\Client\Provider\AbstractProvider;
77
use League\OAuth2\Client\Provider\GenericProvider;
8-
use SetaPDF_Signer_Digest as Digest;
8+
use setasign\SetaPDF2\Signer\Digest;
99
use setasign\SetaPDF\Signer\Module\CSC\Client;
1010
use setasign\SetaPDF\Signer\Module\CSC\Module;
11-
12-
ini_set('display_errors', '1');
13-
ini_set('display_startup_errors', '1');
14-
error_reporting(E_ALL);
11+
use setasign\SetaPDF2\Core\Document;
12+
use setasign\SetaPDF2\Core\Reader\FileReader;
13+
use setasign\SetaPDF2\Core\Writer\FileWriter;
14+
use setasign\SetaPDF2\Core\Writer\StringWriter;
15+
use setasign\SetaPDF2\Core\Writer\TempFileWriter;
16+
use setasign\SetaPDF2\Signer\DocumentSecurityStore;
17+
use setasign\SetaPDF2\Signer\Signature\Module\Pades;
18+
use setasign\SetaPDF2\Signer\Signer;
19+
use setasign\SetaPDF2\Signer\TmpDocument;
20+
use setasign\SetaPDF2\Signer\ValidationRelatedInfo\Collector;
21+
use setasign\SetaPDF2\Signer\X509\Certificate;
22+
use setasign\SetaPDF2\Signer\X509\Collection;
1523

1624
require_once(__DIR__ . '/../vendor/autoload.php');
1725

@@ -45,7 +53,6 @@
4553
$accessToken = $_SESSION['accessToken']['access_token'];
4654

4755
$httpClient = new GuzzleHttp\Client();
48-
$httpClient = new Mjelamanov\GuzzlePsr18\Client($httpClient);
4956
$requestFactory = new Http\Factory\Guzzle\RequestFactory();
5057
$streamFactory = new Http\Factory\Guzzle\StreamFactory();
5158
$client = new Client($apiUri, $httpClient, $requestFactory, $streamFactory);
@@ -115,8 +122,8 @@ public function getAccessTokenOptions($method, array $params)
115122
}
116123

117124
$certificates = $credentialInfo['cert']['certificates'];
118-
$certificates = array_map(function (string $certificate) {
119-
return new SetaPDF_Signer_X509_Certificate($certificate);
125+
$certificates = array_map(static function (string $certificate) {
126+
return new Certificate($certificate);
120127
}, $certificates);
121128
// to cache the certificate files
122129
//foreach ($certificates as $k => $certificate) {
@@ -129,22 +136,22 @@ public function getAccessTokenOptions($method, array $params)
129136
$signatureAlgorithmOid = $credentialInfo['key']['algo'][0];
130137

131138
// create a writer instance
132-
$writer = new SetaPDF_Core_Writer_File($resultPath);
139+
$writer = new FileWriter($resultPath);
133140
// create the document instance
134-
$document = SetaPDF_Core_Document::loadByFilename($fileToSign, $writer);
141+
$document = Document::loadByFilename($fileToSign, $writer);
135142

136143
// create the signer instance
137-
$signer = new SetaPDF_Signer($document);
144+
$signer = new Signer($document);
138145

139-
$module = new SetaPDF_Signer_Signature_Module_Pades();
146+
$module = new Pades();
140147
$module->setCertificate($certificate);
141148
$module->setExtraCertificates($certificates);
142149

143150
['hashAlgorithm' => $hashAlgorithm, 'signAlgorithm' => $signAlgorithm] = Module::findHashAndSignAlgorithm($signatureAlgorithmOid);
144151
$module->setDigest($hashAlgorithm);
145152

146153
// create a collector instance
147-
$collector = new SetaPDF_Signer_ValidationRelatedInfo_Collector(new SetaPDF_Signer_X509_Collection($certificates));
154+
$collector = new Collector(new Collection($certificates));
148155
// collect revocation information for this certificate
149156
$vriData = $collector->getByCertificate($certificate);
150157

@@ -157,7 +164,7 @@ public function getAccessTokenOptions($method, array $params)
157164

158165
$signer->setSignatureContentLength(20000);
159166
$tmpDocument = $signer->preSign(
160-
new SetaPDF_Core_Writer_File(SetaPDF_Core_Writer_TempFile::createTempPath()),
167+
new FileWriter(TempFileWriter::createTempPath()),
161168
$module
162169
);
163170
if ($signAlgorithm === Digest::RSA_PSS_ALGORITHM) {
@@ -201,12 +208,12 @@ public function getAccessTokenOptions($method, array $params)
201208
$hashData = $_SESSION[__FILE__]['hashData'];
202209

203210
/**
204-
* @var SetaPDF_Signer_Signature_Module_Pades $module
211+
* @var Pades $module
205212
*/
206213
$module = $_SESSION[__FILE__]['module'];
207214

208215
/**
209-
* @var SetaPDF_Signer_TmpDocument $tmpDocument
216+
* @var TmpDocument $tmpDocument
210217
*/
211218
$tmpDocument = $_SESSION[__FILE__]['tmpDocument'];
212219

@@ -234,11 +241,11 @@ public function getAccessTokenOptions($method, array $params)
234241
// get the CMS structur from the signature module
235242
$cms = (string) $module->getCms();
236243

237-
$reader = new SetaPDF_Core_Reader_File($fileToSign);
238-
$tmpWriter = new SetaPDF_Core_Writer_TempFile();
244+
$reader = new FileReader($fileToSign);
245+
$tmpWriter = new TempFileWriter();
239246

240-
$document = SetaPDF_Core_Document::load($reader, $tmpWriter);
241-
$signer = new SetaPDF_Signer($document);
247+
$document = Document::load($reader, $tmpWriter);
248+
$signer = new Signer($document);
242249

243250
$field = $signer->getSignatureField();
244251
$fieldName = $field->getQualifiedName();
@@ -247,21 +254,21 @@ public function getAccessTokenOptions($method, array $params)
247254
$signer->saveSignature($tmpDocument, $cms);
248255
$document->finish();
249256

250-
$writer = new SetaPDF_Core_Writer_String();
251-
$document = \SetaPDF_Core_Document::loadByFilename($tmpWriter->getPath(), $writer);
257+
$writer = new StringWriter();
258+
$document = Document::loadByFilename($tmpWriter->getPath(), $writer);
252259

253260
// create a VRI collector instance
254-
$collector = new SetaPDF_Signer_ValidationRelatedInfo_Collector(new SetaPDF_Signer_X509_Collection($_SESSION[__FILE__]['certificates']));
261+
$collector = new Collector(new Collection($_SESSION[__FILE__]['certificates']));
255262
$vriData = $collector->getByFieldName(
256263
$document,
257264
$fieldName,
258-
SetaPDF_Signer_ValidationRelatedInfo_Collector::SOURCE_OCSP_OR_CRL,
265+
Collector::SOURCE_OCSP_OR_CRL,
259266
null,
260267
null,
261268
$_SESSION[__FILE__]['vriData'] // pass the previously gathered VRI data
262269
);
263270
// and add it to the document.
264-
$dss = new SetaPDF_Signer_DocumentSecurityStore($document);
271+
$dss = new DocumentSecurityStore($document);
265272
$dss->addValidationRelatedInfoByFieldName(
266273
$fieldName,
267274
$vriData->getCrls(),

‎examples/demo.php‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
use setasign\SetaPDF\Signer\Module\CSC\Client;
66
use setasign\SetaPDF\Signer\Module\CSC\ClientException;
77
use setasign\SetaPDF\Signer\Module\CSC\Module;
8-
9-
ini_set('display_errors', '1');
10-
ini_set('display_startup_errors', '1');
11-
error_reporting(E_ALL);
8+
use setasign\SetaPDF2\Core\Document;
9+
use setasign\SetaPDF2\Core\Writer\FileWriter;
10+
use setasign\SetaPDF2\Signer\Signer;
1211

1312
require_once(__DIR__ . '/../vendor/autoload.php');
1413

@@ -38,7 +37,6 @@
3837
$accessToken = $_SESSION['accessToken']['access_token'];
3938

4039
$httpClient = new GuzzleHttp\Client();
41-
$httpClient = new Mjelamanov\GuzzlePsr18\Client($httpClient);
4240
$requestFactory = new Http\Factory\Guzzle\RequestFactory();
4341
$streamFactory = new Http\Factory\Guzzle\StreamFactory();
4442
$client = new Client($apiUri, $httpClient, $requestFactory, $streamFactory);
@@ -88,12 +86,12 @@
8886
}
8987

9088
// create a writer instance
91-
$writer = new SetaPDF_Core_Writer_File($resultPath);
89+
$writer = new FileWriter($resultPath);
9290
// create the document instance
93-
$document = SetaPDF_Core_Document::loadByFilename($fileToSign, $writer);
91+
$document = Document::loadByFilename($fileToSign, $writer);
9492

9593
// create the signer instance
96-
$signer = new SetaPDF_Signer($document);
94+
$signer = new Signer($document);
9795
try {
9896
$signer->sign($module);
9997
} catch (ClientException $e) {

‎examples/generate-token.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
use League\OAuth2\Client\Token\AccessToken;
77
use setasign\SetaPDF\Signer\Module\CSC\Client;
88

9-
ini_set('display_errors', 1);
10-
ini_set('display_startup_errors', 1);
11-
error_reporting(E_ALL);
12-
139
require_once(__DIR__ . '/../vendor/autoload.php');
1410

1511
/**
@@ -20,7 +16,6 @@
2016
$apiUri = $settings['apiUri'];
2117

2218
$httpClient = new GuzzleHttp\Client();
23-
$httpClient = new Mjelamanov\GuzzlePsr18\Client($httpClient);
2419
$requestFactory = new Http\Factory\Guzzle\RequestFactory();
2520
$streamFactory = new Http\Factory\Guzzle\StreamFactory();
2621

‎examples/info.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
$apiUri = $settings['apiUri'];
1616

1717
$httpClient = new GuzzleHttp\Client();
18-
$httpClient = new Mjelamanov\GuzzlePsr18\Client($httpClient);
1918
$requestFactory = new Http\Factory\Guzzle\RequestFactory();
2019
$streamFactory = new Http\Factory\Guzzle\StreamFactory();
2120
$client = new Client($apiUri, $httpClient, $requestFactory, $streamFactory);

‎examples/ltv-demo.php‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,16 @@
55
use setasign\SetaPDF\Signer\Module\CSC\Client;
66
use setasign\SetaPDF\Signer\Module\CSC\ClientException;
77
use setasign\SetaPDF\Signer\Module\CSC\Module;
8-
9-
ini_set('display_errors', '1');
10-
ini_set('display_startup_errors', '1');
11-
error_reporting(E_ALL);
8+
use setasign\SetaPDF2\Core\Document;
9+
use setasign\SetaPDF2\Core\Writer\FileWriter;
10+
use setasign\SetaPDF2\Core\Writer\TempFileWriter;
11+
use setasign\SetaPDF2\Signer\DocumentSecurityStore;
12+
use setasign\SetaPDF2\Signer\PemHelper;
13+
use setasign\SetaPDF2\Signer\Signer;
14+
use setasign\SetaPDF2\Signer\Timestamp\Module\Rfc3161\Curl;
15+
use setasign\SetaPDF2\Signer\ValidationRelatedInfo\Collector;
16+
use setasign\SetaPDF2\Signer\X509\Certificate;
17+
use setasign\SetaPDF2\Signer\X509\Collection;
1218

1319
require_once(__DIR__ . '/../vendor/autoload.php');
1420

@@ -42,7 +48,6 @@
4248
$accessToken = $_SESSION['accessToken']['access_token'];
4349

4450
$httpClient = new GuzzleHttp\Client();
45-
$httpClient = new Mjelamanov\GuzzlePsr18\Client($httpClient);
4651
$requestFactory = new Http\Factory\Guzzle\RequestFactory();
4752
$streamFactory = new Http\Factory\Guzzle\StreamFactory();
4853
$client = new Client($apiUri, $httpClient, $requestFactory, $streamFactory);
@@ -66,8 +71,8 @@
6671
}
6772

6873
$certificates = $credentialInfo['cert']['certificates'];
69-
$certificates = array_map(function (string $certificate) {
70-
return new SetaPDF_Signer_X509_Certificate($certificate);
74+
$certificates = array_map(static function (string $certificate) {
75+
return new Certificate($certificate);
7176
}, $certificates);
7277

7378
$certificate = array_shift($certificates);
@@ -82,16 +87,16 @@
8287
$module->setExtraCertificates($certificates);
8388

8489
// create a collection of trusted certificats:
85-
$trustedCertificates = new SetaPDF_Signer_X509_Collection($certificates[count($certificates) - 1]);
86-
$trustedCertificates->add(SetaPDF_Signer_Pem::extractFromFile($trustedCertificatesPath));
90+
$trustedCertificates = new Collection($certificates[count($certificates) - 1]);
91+
$trustedCertificates->add(PemHelper::extractFromFile($trustedCertificatesPath));
8792
// sadly not all CSC API implementations return the full chain (in our tests e.g. SSL.com), so we have to
8893
// add a trusted root on our own:
8994
foreach ($otherTrustedCertificatePaths as $otherTrustedCertificatePath) {
9095
$trustedCertificates->addFromFile($otherTrustedCertificatePath);
9196
}
9297

9398
// create a collector instance
94-
$collector = new SetaPDF_Signer_ValidationRelatedInfo_Collector($trustedCertificates);
99+
$collector = new Collector($trustedCertificates);
95100
$vriData = $collector->getByCertificate($certificate);
96101
foreach ($vriData->getOcspResponses() as $ocspResponse) {
97102
$module->addOcspResponse($ocspResponse);
@@ -116,18 +121,18 @@
116121
}
117122

118123
// create a writer instance
119-
$writer = new SetaPDF_Core_Writer_File($resultPath);
120-
$tmpWriter = new SetaPDF_Core_Writer_TempFile();
124+
$writer = new FileWriter($resultPath);
125+
$tmpWriter = new TempFileWriter();
121126
// create the document instance
122-
$document = SetaPDF_Core_Document::loadByFilename($fileToSign, $tmpWriter);
127+
$document = Document::loadByFilename($fileToSign, $tmpWriter);
123128

124129
// create the signer instance
125-
$signer = new SetaPDF_Signer($document);
130+
$signer = new Signer($document);
126131
// because of the timestamp and VRI data we need more space for the signature container
127132
$signer->setSignatureContentLength(40000);
128133

129134
// setup a timestamp module
130-
$tsModule = new SetaPDF_Signer_Timestamp_Module_Rfc3161_Curl($timestampingUrl);
135+
$tsModule = new Curl($timestampingUrl);
131136
$signer->setTimestampModule($tsModule);
132137

133138
// add a signature field manually to get access to its name
@@ -150,10 +155,10 @@
150155
}
151156

152157
// create a new instance
153-
$document = SetaPDF_Core_Document::loadByFilename($tmpWriter->getPath(), $writer);
158+
$document = Document::loadByFilename($tmpWriter->getPath(), $writer);
154159

155160
// create a VRI collector instance
156-
$collector = new SetaPDF_Signer_ValidationRelatedInfo_Collector($trustedCertificates);
161+
$collector = new Collector($trustedCertificates);
157162
// Use IPv4 to bypass an issue at http://ocsp.ensuredca.com
158163
//$collector->getOcspClient()->setCurlOption([
159164
// CURLOPT_IPRESOLVE => CURL_IPRESOLVE_V4
@@ -163,7 +168,7 @@
163168
$vriData = $collector->getByFieldName(
164169
$document,
165170
$signatureField->getQualifiedName(),
166-
SetaPDF_Signer_ValidationRelatedInfo_Collector::SOURCE_OCSP_OR_CRL,
171+
Collector::SOURCE_OCSP_OR_CRL,
167172
null,
168173
null,
169174
$vriData // pass the previously gathered VRI data
@@ -175,7 +180,7 @@
175180
//}
176181

177182
// and add it to the document.
178-
$dss = new SetaPDF_Signer_DocumentSecurityStore($document);
183+
$dss = new DocumentSecurityStore($document);
179184
$dss->addValidationRelatedInfoByFieldName(
180185
$signatureField->getQualifiedName(),
181186
$vriData->getCrls(),

0 commit comments

Comments
 (0)