diff --git a/lib/Bridge/DataMatrixExtendedParametersDTO.php b/lib/Bridge/DataMatrixExtendedParametersDTO.php index cd2445f8..06ce11d9 100644 --- a/lib/Bridge/DataMatrixExtendedParametersDTO.php +++ b/lib/Bridge/DataMatrixExtendedParametersDTO.php @@ -42,6 +42,11 @@ class DataMatrixExtendedParametersDTO 'type' => TType::BOOL, ), 5 => array( + 'var' => 'empty', + 'isRequired' => false, + 'type' => TType::BOOL, + ), + 6 => array( 'var' => 'toString', 'isRequired' => false, 'type' => TType::STRING, @@ -64,6 +69,10 @@ class DataMatrixExtendedParametersDTO * @var bool */ public $readerProgramming = null; + /** + * @var bool + */ + public $empty = null; /** * @var string */ @@ -84,6 +93,9 @@ public function __construct($vals = null) if (isset($vals['readerProgramming'])) { $this->readerProgramming = $vals['readerProgramming']; } + if (isset($vals['empty'])) { + $this->empty = $vals['empty']; + } if (isset($vals['toString'])) { $this->toString = $vals['toString']; } @@ -138,6 +150,13 @@ public function read($input) } break; case 5: + if ($ftype == TType::BOOL) { + $xfer += $input->readBool($this->empty); + } else { + $xfer += $input->skip($ftype); + } + break; + case 6: if ($ftype == TType::STRING) { $xfer += $input->readString($this->toString); } else { @@ -178,8 +197,13 @@ public function write($output) $xfer += $output->writeBool($this->readerProgramming); $xfer += $output->writeFieldEnd(); } + if ($this->empty !== null) { + $xfer += $output->writeFieldBegin('empty', TType::BOOL, 5); + $xfer += $output->writeBool($this->empty); + $xfer += $output->writeFieldEnd(); + } if ($this->toString !== null) { - $xfer += $output->writeFieldBegin('toString', TType::STRING, 5); + $xfer += $output->writeFieldBegin('toString', TType::STRING, 6); $xfer += $output->writeString($this->toString); $xfer += $output->writeFieldEnd(); } diff --git a/lib/Bridge/ThriftAsposeBarcodeServiceClient.php b/lib/Bridge/ThriftAsposeBarcodeServiceClient.php index b91af292..5f222a57 100644 --- a/lib/Bridge/ThriftAsposeBarcodeServiceClient.php +++ b/lib/Bridge/ThriftAsposeBarcodeServiceClient.php @@ -1038,6 +1038,68 @@ public function recv_BarcodeGenerator_ctor() throw new \Exception("BarcodeGenerator_ctor failed: unknown result"); } + public function BarcodeGenerator_getCodeTextWithEncoding($codeText, $encoding, $insertBoM, $encodeType) + { + $this->send_BarcodeGenerator_getCodeTextWithEncoding($codeText, $encoding, $insertBoM, $encodeType); + return $this->recv_BarcodeGenerator_getCodeTextWithEncoding(); + } + + public function send_BarcodeGenerator_getCodeTextWithEncoding($codeText, $encoding, $insertBoM, $encodeType) + { + $args = new \Aspose\Barcode\Bridge\ThriftAsposeBarcodeService_BarcodeGenerator_getCodeTextWithEncoding_args(); + $args->codeText = $codeText; + $args->encoding = $encoding; + $args->insertBoM = $insertBoM; + $args->encodeType = $encodeType; + $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary'); + if ($bin_accel) { + thrift_protocol_write_binary( + $this->output_, + 'BarcodeGenerator_getCodeTextWithEncoding', + TMessageType::CALL, + $args, + $this->seqid_, + $this->output_->isStrictWrite() + ); + } else { + $this->output_->writeMessageBegin('BarcodeGenerator_getCodeTextWithEncoding', TMessageType::CALL, $this->seqid_); + $args->write($this->output_); + $this->output_->writeMessageEnd(); + $this->output_->getTransport()->flush(); + } + } + + public function recv_BarcodeGenerator_getCodeTextWithEncoding() + { + $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary'); + if ($bin_accel) { + $result = thrift_protocol_read_binary( + $this->input_, + '\Aspose\Barcode\Bridge\ThriftAsposeBarcodeService_BarcodeGenerator_getCodeTextWithEncoding_result', + $this->input_->isStrictRead() + ); + } else { + $rseqid = 0; + $fname = null; + $mtype = 0; + + $this->input_->readMessageBegin($fname, $mtype, $rseqid); + if ($mtype == TMessageType::EXCEPTION) { + $x = new TApplicationException(); + $x->read($this->input_); + $this->input_->readMessageEnd(); + throw $x; + } + $result = new \Aspose\Barcode\Bridge\ThriftAsposeBarcodeService_BarcodeGenerator_getCodeTextWithEncoding_result(); + $result->read($this->input_); + $this->input_->readMessageEnd(); + } + if ($result->success !== null) { + return $result->success; + } + throw new \Exception("BarcodeGenerator_getCodeTextWithEncoding failed: unknown result"); + } + public function BarcodeGenerator_generateBarCodeImage(\Aspose\Barcode\Bridge\BarcodeGeneratorDTO $barcodeGeneratorDTO, $imageFormat, $base64LicenseContent) { $this->send_BarcodeGenerator_generateBarCodeImage($barcodeGeneratorDTO, $imageFormat, $base64LicenseContent); diff --git a/lib/Bridge/ThriftAsposeBarcodeServiceIf.php b/lib/Bridge/ThriftAsposeBarcodeServiceIf.php index 5fb3eadb..0dee4dbc 100644 --- a/lib/Bridge/ThriftAsposeBarcodeServiceIf.php +++ b/lib/Bridge/ThriftAsposeBarcodeServiceIf.php @@ -106,6 +106,14 @@ public function Code128DataPortion_toString(\Aspose\Barcode\Bridge\Code128DataPo * @return \Aspose\Barcode\Bridge\BarcodeGeneratorDTO */ public function BarcodeGenerator_ctor($encodeType); + /** + * @param string $codeText + * @param string $encoding + * @param bool $insertBoM + * @param int $encodeType + * @return string + */ + public function BarcodeGenerator_getCodeTextWithEncoding($codeText, $encoding, $insertBoM, $encodeType); /** * @param \Aspose\Barcode\Bridge\BarcodeGeneratorDTO $barcodeGeneratorDTO * @param int $imageFormat diff --git a/lib/Bridge/ThriftAsposeBarcodeService_BarcodeGenerator_getCodeTextWithEncoding_args.php b/lib/Bridge/ThriftAsposeBarcodeService_BarcodeGenerator_getCodeTextWithEncoding_args.php new file mode 100644 index 00000000..e9cf3892 --- /dev/null +++ b/lib/Bridge/ThriftAsposeBarcodeService_BarcodeGenerator_getCodeTextWithEncoding_args.php @@ -0,0 +1,166 @@ + array( + 'var' => 'codeText', + 'isRequired' => false, + 'type' => TType::STRING, + ), + 2 => array( + 'var' => 'encoding', + 'isRequired' => false, + 'type' => TType::STRING, + ), + 3 => array( + 'var' => 'insertBoM', + 'isRequired' => false, + 'type' => TType::BOOL, + ), + 4 => array( + 'var' => 'encodeType', + 'isRequired' => false, + 'type' => TType::I32, + ), + ); + + /** + * @var string + */ + public $codeText = null; + /** + * @var string + */ + public $encoding = null; + /** + * @var bool + */ + public $insertBoM = null; + /** + * @var int + */ + public $encodeType = null; + + public function __construct($vals = null) + { + if (is_array($vals)) { + if (isset($vals['codeText'])) { + $this->codeText = $vals['codeText']; + } + if (isset($vals['encoding'])) { + $this->encoding = $vals['encoding']; + } + if (isset($vals['insertBoM'])) { + $this->insertBoM = $vals['insertBoM']; + } + if (isset($vals['encodeType'])) { + $this->encodeType = $vals['encodeType']; + } + } + } + + public function getName() + { + return 'ThriftAsposeBarcodeService_BarcodeGenerator_getCodeTextWithEncoding_args'; + } + + + public function read($input) + { + $xfer = 0; + $fname = null; + $ftype = 0; + $fid = 0; + $xfer += $input->readStructBegin($fname); + while (true) { + $xfer += $input->readFieldBegin($fname, $ftype, $fid); + if ($ftype == TType::STOP) { + break; + } + switch ($fid) { + case 1: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->codeText); + } else { + $xfer += $input->skip($ftype); + } + break; + case 2: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->encoding); + } else { + $xfer += $input->skip($ftype); + } + break; + case 3: + if ($ftype == TType::BOOL) { + $xfer += $input->readBool($this->insertBoM); + } else { + $xfer += $input->skip($ftype); + } + break; + case 4: + if ($ftype == TType::I32) { + $xfer += $input->readI32($this->encodeType); + } else { + $xfer += $input->skip($ftype); + } + break; + default: + $xfer += $input->skip($ftype); + break; + } + $xfer += $input->readFieldEnd(); + } + $xfer += $input->readStructEnd(); + return $xfer; + } + + public function write($output) + { + $xfer = 0; + $xfer += $output->writeStructBegin('ThriftAsposeBarcodeService_BarcodeGenerator_getCodeTextWithEncoding_args'); + if ($this->codeText !== null) { + $xfer += $output->writeFieldBegin('codeText', TType::STRING, 1); + $xfer += $output->writeString($this->codeText); + $xfer += $output->writeFieldEnd(); + } + if ($this->encoding !== null) { + $xfer += $output->writeFieldBegin('encoding', TType::STRING, 2); + $xfer += $output->writeString($this->encoding); + $xfer += $output->writeFieldEnd(); + } + if ($this->insertBoM !== null) { + $xfer += $output->writeFieldBegin('insertBoM', TType::BOOL, 3); + $xfer += $output->writeBool($this->insertBoM); + $xfer += $output->writeFieldEnd(); + } + if ($this->encodeType !== null) { + $xfer += $output->writeFieldBegin('encodeType', TType::I32, 4); + $xfer += $output->writeI32($this->encodeType); + $xfer += $output->writeFieldEnd(); + } + $xfer += $output->writeFieldStop(); + $xfer += $output->writeStructEnd(); + return $xfer; + } +} diff --git a/lib/Bridge/ThriftAsposeBarcodeService_BarcodeGenerator_getCodeTextWithEncoding_result.php b/lib/Bridge/ThriftAsposeBarcodeService_BarcodeGenerator_getCodeTextWithEncoding_result.php new file mode 100644 index 00000000..3d9d57e2 --- /dev/null +++ b/lib/Bridge/ThriftAsposeBarcodeService_BarcodeGenerator_getCodeTextWithEncoding_result.php @@ -0,0 +1,94 @@ + array( + 'var' => 'success', + 'isRequired' => false, + 'type' => TType::STRING, + ), + ); + + /** + * @var string + */ + public $success = null; + + public function __construct($vals = null) + { + if (is_array($vals)) { + if (isset($vals['success'])) { + $this->success = $vals['success']; + } + } + } + + public function getName() + { + return 'ThriftAsposeBarcodeService_BarcodeGenerator_getCodeTextWithEncoding_result'; + } + + + public function read($input) + { + $xfer = 0; + $fname = null; + $ftype = 0; + $fid = 0; + $xfer += $input->readStructBegin($fname); + while (true) { + $xfer += $input->readFieldBegin($fname, $ftype, $fid); + if ($ftype == TType::STOP) { + break; + } + switch ($fid) { + case 0: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->success); + } else { + $xfer += $input->skip($ftype); + } + break; + default: + $xfer += $input->skip($ftype); + break; + } + $xfer += $input->readFieldEnd(); + } + $xfer += $input->readStructEnd(); + return $xfer; + } + + public function write($output) + { + $xfer = 0; + $xfer += $output->writeStructBegin('ThriftAsposeBarcodeService_BarcodeGenerator_getCodeTextWithEncoding_result'); + if ($this->success !== null) { + $xfer += $output->writeFieldBegin('success', TType::STRING, 0); + $xfer += $output->writeString($this->success); + $xfer += $output->writeFieldEnd(); + } + $xfer += $output->writeFieldStop(); + $xfer += $output->writeStructEnd(); + return $xfer; + } +} diff --git a/lib/ComplexBarcode/ComplexBarcodeGenerator.php b/lib/ComplexBarcode/ComplexBarcodeGenerator.php index 15985cfb..4e7ad224 100644 --- a/lib/ComplexBarcode/ComplexBarcodeGenerator.php +++ b/lib/ComplexBarcode/ComplexBarcodeGenerator.php @@ -4,7 +4,6 @@ use Aspose\Barcode\Exception; use Aspose\Barcode\Generation\BaseGenerationParameters; -use Aspose\Barcode\ComplexBarcode\IComplexCodetext; use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\Communicator; use Aspose\Barcode\Internal\License; diff --git a/lib/ComplexBarcode/ComplexCodetextReader.php b/lib/ComplexBarcode/ComplexCodetextReader.php index e1120b21..3ac599ea 100644 --- a/lib/ComplexBarcode/ComplexCodetextReader.php +++ b/lib/ComplexBarcode/ComplexCodetextReader.php @@ -2,22 +2,8 @@ namespace Aspose\Barcode\ComplexBarcode; -use Aspose\Barcode\ComplexBarcode\ComplexCodetextType; -use Aspose\Barcode\Exception; -use Aspose\Barcode\ComplexBarcode\HIBCLICCombinedCodetext; -use Aspose\Barcode\ComplexBarcode\HIBCLICComplexCodetext; -use Aspose\Barcode\ComplexBarcode\HIBCLICPrimaryDataCodetext; -use Aspose\Barcode\ComplexBarcode\HIBCLICSecondaryAndAdditionalDataCodetext; -use Aspose\Barcode\ComplexBarcode\HIBCPASCodetext; use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\ThriftConnection; -use Aspose\Barcode\ComplexBarcode\Mailmark2DCodetext; -use Aspose\Barcode\ComplexBarcode\MailmarkCodetext; -use Aspose\Barcode\ComplexBarcode\MaxiCodeCodetext; -use Aspose\Barcode\ComplexBarcode\MaxiCodeCodetextMode2; -use Aspose\Barcode\ComplexBarcode\MaxiCodeCodetextMode3; -use Aspose\Barcode\ComplexBarcode\MaxiCodeStandardCodetext; -use Aspose\Barcode\ComplexBarcode\SwissQRCodetext; /** * ComplexCodetextReader decodes codetext to specified complex barcode type. @@ -37,7 +23,7 @@ final class ComplexCodetextReader * @param string encodedCodetext encoded codetext * @return SwissQRCodetext decoded SwissQRCodetext or null. */ - public static function tryDecodeSwissQR(string $encodedCodetext): SwissQRCodetext + public static function tryDecodeSwissQR(string $encodedCodetext): ?SwissQRCodetext { try { @@ -47,9 +33,9 @@ public static function tryDecodeSwissQR(string $encodedCodetext): SwissQRCodetex $thriftConnection->closeConnection(); return SwissQRCodetext::construct($swissQRCodetextDTO); } - catch (Exception $ex) + catch (\Throwable $ex) { - throw new BarcodeException($ex->getMessage(), __FILE__, __LINE__); + return null; } } @@ -58,7 +44,7 @@ public static function tryDecodeSwissQR(string $encodedCodetext): SwissQRCodetex * @param string $encodedCodetext encoded codetext * @return Mailmark2DCodetext decoded Royal Mail Mailmark 2D or null. */ - public static function tryDecodeMailmark2D(string $encodedCodetext): Mailmark2DCodetext + public static function tryDecodeMailmark2D(string $encodedCodetext): ?Mailmark2DCodetext { try { @@ -69,9 +55,9 @@ public static function tryDecodeMailmark2D(string $encodedCodetext): Mailmark2DC $mailmark2DCodetext = Mailmark2DCodetext::construct($mailmark2DCodetextDTO); return $mailmark2DCodetext; } - catch (Exception $ex) + catch (\Throwable $ex) { - throw new BarcodeException($ex->getMessage(), __FILE__, __LINE__); + return null; } } @@ -87,7 +73,7 @@ public static function tryDecodeMailmark(string $encodedCodetext): ?MailmarkCode { $res->initFromString($encodedCodetext); } - catch (Exception $e) + catch (\Throwable $e) { return null; } @@ -100,13 +86,16 @@ public static function tryDecodeMailmark(string $encodedCodetext): ?MailmarkCode * @param string encodedCodetext encoded codetext * @return MaxiCodeCodetext Decoded MaxiCode codetext. */ - public static function tryDecodeMaxiCode(int $maxiCodeMode, string $encodedCodetext): MaxiCodeCodetext + public static function tryDecodeMaxiCode(int $maxiCodeMode, string $encodedCodetext): ?MaxiCodeCodetext { $thriftConnection = new ThriftConnection(); $client = $thriftConnection->openConnection(); $maxiCodeCodetextDTO = $client->ComplexCodetextReader_tryDecodeMaxiCode($maxiCodeMode, $encodedCodetext); $thriftConnection->closeConnection(); + if($maxiCodeCodetextDTO->isNull === true) + return null; + if ($maxiCodeCodetextDTO->complexCodetextType == ComplexCodetextType::MaxiCodeCodetextMode2) { return MaxiCodeCodetextMode2::construct($maxiCodeCodetextDTO); diff --git a/lib/ComplexBarcode/HIBCLICCombinedCodetext.php b/lib/ComplexBarcode/HIBCLICCombinedCodetext.php index 2f75e7a8..d51f1ac8 100644 --- a/lib/ComplexBarcode/HIBCLICCombinedCodetext.php +++ b/lib/ComplexBarcode/HIBCLICCombinedCodetext.php @@ -2,12 +2,7 @@ namespace Aspose\Barcode\ComplexBarcode; -use Aspose\Barcode\ComplexBarcode\ComplexCodetextType; -use Aspose\Barcode\ComplexBarcode\HIBCLICComplexCodetext; use Aspose\Barcode\Internal\ThriftConnection; -use Aspose\Barcode\obj; -use Aspose\Barcode\ComplexBarcode\PrimaryData; -use Aspose\Barcode\ComplexBarcode\SecondaryAndAdditionalData; /** *

diff --git a/lib/ComplexBarcode/HIBCLICComplexCodetext.php b/lib/ComplexBarcode/HIBCLICComplexCodetext.php index 38167e6e..008ed98e 100644 --- a/lib/ComplexBarcode/HIBCLICComplexCodetext.php +++ b/lib/ComplexBarcode/HIBCLICComplexCodetext.php @@ -2,8 +2,6 @@ namespace Aspose\Barcode\ComplexBarcode; -use Aspose\Barcode\ComplexBarcode\IComplexCodetext; - /** *

* Base class for encoding and decoding the text embedded in the HIBC LIC code. diff --git a/lib/ComplexBarcode/HIBCLICPrimaryDataCodetext.php b/lib/ComplexBarcode/HIBCLICPrimaryDataCodetext.php index b55cde7a..4cd9e39f 100644 --- a/lib/ComplexBarcode/HIBCLICPrimaryDataCodetext.php +++ b/lib/ComplexBarcode/HIBCLICPrimaryDataCodetext.php @@ -2,10 +2,7 @@ namespace Aspose\Barcode\ComplexBarcode; -use Aspose\Barcode\ComplexBarcode\ComplexCodetextType; -use Aspose\Barcode\ComplexBarcode\HIBCLICComplexCodetext; use Aspose\Barcode\Internal\ThriftConnection; -use Aspose\Barcode\ComplexBarcode\PrimaryData; /** *

diff --git a/lib/ComplexBarcode/HIBCLICSecondaryAndAdditionalDataCodetext.php b/lib/ComplexBarcode/HIBCLICSecondaryAndAdditionalDataCodetext.php index 5e290f87..31c0c868 100644 --- a/lib/ComplexBarcode/HIBCLICSecondaryAndAdditionalDataCodetext.php +++ b/lib/ComplexBarcode/HIBCLICSecondaryAndAdditionalDataCodetext.php @@ -2,11 +2,8 @@ namespace Aspose\Barcode\ComplexBarcode; -use Aspose\Barcode\ComplexBarcode\ComplexCodetextType; -use Aspose\Barcode\ComplexBarcode\HIBCLICComplexCodetext; -use Aspose\Barcode\ComplexBarcode\SecondaryAndAdditionalData; use Aspose\Barcode\Internal\ThriftConnection; -use Aspose\Barcode\obj; + /** * Class for encoding and decoding the text embedded in the HIBC LIC code which stores seconday data. diff --git a/lib/ComplexBarcode/HIBCPASCodetext.php b/lib/ComplexBarcode/HIBCPASCodetext.php index c14618c0..b7167ab5 100644 --- a/lib/ComplexBarcode/HIBCPASCodetext.php +++ b/lib/ComplexBarcode/HIBCPASCodetext.php @@ -2,11 +2,8 @@ namespace Aspose\Barcode\ComplexBarcode; -use Aspose\Barcode\ComplexBarcode\ComplexCodetextType; -use Aspose\Barcode\ComplexBarcode\IComplexCodetext; -use Aspose\Barcode\ComplexBarcode\HIBCPASRecord; use Aspose\Barcode\Internal\ThriftConnection; -use Aspose\Barcode\List; + /** *

diff --git a/lib/ComplexBarcode/Mailmark2DCodetext.php b/lib/ComplexBarcode/Mailmark2DCodetext.php index 100c3bc4..89ac3f5a 100644 --- a/lib/ComplexBarcode/Mailmark2DCodetext.php +++ b/lib/ComplexBarcode/Mailmark2DCodetext.php @@ -2,8 +2,6 @@ namespace Aspose\Barcode\ComplexBarcode; -use Aspose\Barcode\ComplexBarcode\ComplexCodetextType; -use Aspose\Barcode\ComplexBarcode\IComplexCodetext; use Aspose\Barcode\Exception; use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\ThriftConnection; @@ -157,7 +155,7 @@ public function setVersionID(string $value): void { try { - $this->getIComplexCodetextDTO()->versionID = (int)$value; + $this->getIComplexCodetextDTO()->versionID = $value; } catch (Exception $ex) { diff --git a/lib/ComplexBarcode/MailmarkCodetext.php b/lib/ComplexBarcode/MailmarkCodetext.php index 8f5490e5..d67648a9 100644 --- a/lib/ComplexBarcode/MailmarkCodetext.php +++ b/lib/ComplexBarcode/MailmarkCodetext.php @@ -3,8 +3,6 @@ namespace Aspose\Barcode\ComplexBarcode; use Aspose\Barcode\Bridge\IComplexCodetextDTO; -use Aspose\Barcode\ComplexBarcode\ComplexCodetextType; -use Aspose\Barcode\ComplexBarcode\IComplexCodetext; use Aspose\Barcode\Internal\ThriftConnection; /** diff --git a/lib/ComplexBarcode/MaxiCodeCodetext.php b/lib/ComplexBarcode/MaxiCodeCodetext.php index 5e75fd23..e9d60d8f 100644 --- a/lib/ComplexBarcode/MaxiCodeCodetext.php +++ b/lib/ComplexBarcode/MaxiCodeCodetext.php @@ -2,8 +2,6 @@ namespace Aspose\Barcode\ComplexBarcode; -use Aspose\Barcode\ComplexBarcode\IComplexCodetext; - /** * Base class for encoding and decoding the text embedded in the MaxiCode code. * diff --git a/lib/ComplexBarcode/MaxiCodeCodetextMode2.php b/lib/ComplexBarcode/MaxiCodeCodetextMode2.php index 8ee76244..fb404826 100644 --- a/lib/ComplexBarcode/MaxiCodeCodetextMode2.php +++ b/lib/ComplexBarcode/MaxiCodeCodetextMode2.php @@ -2,7 +2,6 @@ namespace Aspose\Barcode\ComplexBarcode; -use Aspose\Barcode\ComplexBarcode\MaxiCodeStructuredCodetext; use Aspose\Barcode\Exception; use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\ThriftConnection; diff --git a/lib/ComplexBarcode/MaxiCodeCodetextMode3.php b/lib/ComplexBarcode/MaxiCodeCodetextMode3.php index c2d5f44c..7cd20689 100644 --- a/lib/ComplexBarcode/MaxiCodeCodetextMode3.php +++ b/lib/ComplexBarcode/MaxiCodeCodetextMode3.php @@ -2,7 +2,6 @@ namespace Aspose\Barcode\ComplexBarcode; -use Aspose\Barcode\ComplexBarcode\MaxiCodeStructuredCodetext; use Aspose\Barcode\Exception; use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\ThriftConnection; diff --git a/lib/ComplexBarcode/MaxiCodeStandardCodetext.php b/lib/ComplexBarcode/MaxiCodeStandardCodetext.php index ca112330..962db841 100644 --- a/lib/ComplexBarcode/MaxiCodeStandardCodetext.php +++ b/lib/ComplexBarcode/MaxiCodeStandardCodetext.php @@ -3,8 +3,8 @@ namespace Aspose\Barcode\ComplexBarcode; use Aspose\Barcode\Bridge\IComplexCodetextDTO; -use Aspose\Barcode\ComplexBarcode\MaxiCodeCodetext; use Aspose\Barcode\Exception; +use Aspose\Barcode\Generation\MaxiCodeMode; use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\ThriftConnection; @@ -43,7 +43,7 @@ function __construct() $this->setIComplexCodetextDTO($this->obtainDto()); $this->initFieldsFromDto(); } - catch (Exception $ex) + catch (\Throwable $ex) { throw new BarcodeException($ex->getMessage(), __FILE__, __LINE__); } @@ -92,6 +92,9 @@ public function setMessage(string $value): void */ public function setMode(int $mode): void { + if ($mode != MaxiCodeMode::MODE_4 && $mode != MaxiCodeMode::MODE_5 && $mode != MaxiCodeMode::MODE_6) { + throw new BarCodeException("Incorrect MaxiCode mode. Standart codetext can be used only for modes 4, 5 or 6."); + } $this->getIComplexCodetextDTO()->mode = $mode; } diff --git a/lib/ComplexBarcode/MaxiCodeStandartSecondMessage.php b/lib/ComplexBarcode/MaxiCodeStandartSecondMessage.php index b116b13a..07d5a878 100644 --- a/lib/ComplexBarcode/MaxiCodeStandartSecondMessage.php +++ b/lib/ComplexBarcode/MaxiCodeStandartSecondMessage.php @@ -2,7 +2,6 @@ namespace Aspose\Barcode\ComplexBarcode; -use Aspose\Barcode\ComplexBarcode\MaxiCodeSecondMessage; use Aspose\Barcode\Exception; use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\ThriftConnection; @@ -83,7 +82,7 @@ public function equals($obj): bool { $thriftConnection = new ThriftConnection(); $client = $thriftConnection->openConnection(); - $isEqual = $client->MaxiCodeStandardCodetext_equals($this->getMaxiCodeSecondMessageDto(), $obj->getMaxiCodeSecondMessageDto()); + $isEqual = $client->MaxiCodeStandartSecondMessage_equals($this->getMaxiCodeSecondMessageDto(), $obj->getMaxiCodeSecondMessageDto()); $thriftConnection->closeConnection(); return $isEqual; } diff --git a/lib/ComplexBarcode/MaxiCodeStructuredCodetext.php b/lib/ComplexBarcode/MaxiCodeStructuredCodetext.php index e24f089f..1b5d7e80 100644 --- a/lib/ComplexBarcode/MaxiCodeStructuredCodetext.php +++ b/lib/ComplexBarcode/MaxiCodeStructuredCodetext.php @@ -2,12 +2,7 @@ namespace Aspose\Barcode\ComplexBarcode; -use Aspose\Barcode\ComplexBarcode\MaxiCodeCodetext; -use Aspose\Barcode\ComplexBarcode\MaxiCodeSecondMessageType; use Aspose\Barcode\Exception; -use Aspose\Barcode\ComplexBarcode\MaxiCodeSecondMessage; -use Aspose\Barcode\ComplexBarcode\MaxiCodeStandartSecondMessage; -use Aspose\Barcode\ComplexBarcode\MaxiCodeStructuredSecondMessage; /** * Base class for encoding and decoding the text embedded in the MaxiCode code for modes 2 and 3. diff --git a/lib/ComplexBarcode/MaxiCodeStructuredSecondMessage.php b/lib/ComplexBarcode/MaxiCodeStructuredSecondMessage.php index 004db170..41bdc0b4 100644 --- a/lib/ComplexBarcode/MaxiCodeStructuredSecondMessage.php +++ b/lib/ComplexBarcode/MaxiCodeStructuredSecondMessage.php @@ -2,7 +2,6 @@ namespace Aspose\Barcode\ComplexBarcode; -use Aspose\Barcode\ComplexBarcode\MaxiCodeSecondMessage; use Aspose\Barcode\Exception; use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\ThriftConnection; diff --git a/lib/ComplexBarcode/PrimaryData.php b/lib/ComplexBarcode/PrimaryData.php index 7f4d4f5f..0470cce6 100644 --- a/lib/ComplexBarcode/PrimaryData.php +++ b/lib/ComplexBarcode/PrimaryData.php @@ -4,8 +4,6 @@ use Aspose\Barcode\Internal\Communicator; use Aspose\Barcode\Internal\ThriftConnection; -use Aspose\Barcode\obj; -use Aspose\Barcode\primaryDataCodetext; /** *

diff --git a/lib/ComplexBarcode/QrBillStandardVersion.php b/lib/ComplexBarcode/QrBillStandardVersion.php index 8483c249..0388656a 100644 --- a/lib/ComplexBarcode/QrBillStandardVersion.php +++ b/lib/ComplexBarcode/QrBillStandardVersion.php @@ -1,16 +1,6 @@ size(); $i++) + for ($i = 0; $i < sizeof($javaAlternativeSchemes); $i++) { - $alternativeSchemes[$i] = AlternativeScheme::construct($javaAlternativeSchemes->get($i)); + $alternativeSchemes[$i] = AlternativeScheme::construct($javaAlternativeSchemes[$i]); } return $alternativeSchemes; } diff --git a/lib/ComplexBarcode/SwissQRCodetext.php b/lib/ComplexBarcode/SwissQRCodetext.php index 78e2921f..a3d2449b 100644 --- a/lib/ComplexBarcode/SwissQRCodetext.php +++ b/lib/ComplexBarcode/SwissQRCodetext.php @@ -2,9 +2,6 @@ namespace Aspose\Barcode\ComplexBarcode; -use Aspose\Barcode\ComplexBarcode\ComplexCodetextType; -use Aspose\Barcode\ComplexBarcode\IComplexCodetext; -use Aspose\Barcode\ComplexBarcode\SwissQRBill; use Aspose\Barcode\Exception; use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\ThriftConnection; @@ -100,7 +97,7 @@ public function getConstructedCodetext(): string $thriftConnection->closeConnection(); return $constructedCodetext; } - catch (Exception $ex) + catch (\Throwable $ex) { throw new BarcodeException($ex->getMessage(), __FILE__, __LINE__); } diff --git a/lib/Generation/AustralianPostParameters.php b/lib/Generation/AustralianPostParameters.php index beac4261..2a115ee3 100644 --- a/lib/Generation/AustralianPostParameters.php +++ b/lib/Generation/AustralianPostParameters.php @@ -7,7 +7,6 @@ use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\Communicator; use Aspose\Barcode\Internal\ThriftConnection; -use Aspose\Barcode\Generation\Unit; /** * AustralianPost barcode parameters. diff --git a/lib/Generation/AutoSizeMode.php b/lib/Generation/AutoSizeMode.php index 4dab10d3..c5eebf5f 100644 --- a/lib/Generation/AutoSizeMode.php +++ b/lib/Generation/AutoSizeMode.php @@ -20,13 +20,13 @@ class AutoSizeMode /** * Automatic resizing is disabled. Default value. */ - const NONE = '0'; //or CUSTOM, or DEFAULT + const NONE = 0; //or CUSTOM, or DEFAULT /** * Barcode resizes to nearest lowest possible size * which are specified by BarCodeWidth and BarCodeHeight properties. */ - const NEAREST = '1'; + const NEAREST = 1; /** * Resizes barcode to specified size with little scaling diff --git a/lib/Generation/AztecExtCodetextBuilder.php b/lib/Generation/AztecExtCodetextBuilder.php index a3c4641a..f77197d4 100644 --- a/lib/Generation/AztecExtCodetextBuilder.php +++ b/lib/Generation/AztecExtCodetextBuilder.php @@ -3,8 +3,6 @@ namespace Aspose\Barcode\Generation; use Exception; -use Aspose\Barcode\Generation\ExtCodetextBuilderType; -use Aspose\Barcode\Generation\ExtCodetextBuilder; use Aspose\Barcode\Internal\BarcodeException; /** diff --git a/lib/Generation/BarcodeGenerator.php b/lib/Generation/BarcodeGenerator.php index a8652f28..43ae53bd 100644 --- a/lib/Generation/BarcodeGenerator.php +++ b/lib/Generation/BarcodeGenerator.php @@ -8,9 +8,6 @@ use Aspose\Barcode\Generation\BaseGenerationParameters; use Aspose\Barcode\Bridge\BarcodeExceptionDTO; use Aspose\Barcode\Bridge\BarcodeGeneratorDTO; -use Aspose\Barcode\codeText; -use Aspose\Barcode\encoding; -use Aspose\Barcode\insertBOM; use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\CommonUtility; use Aspose\Barcode\Internal\Communicator; @@ -164,7 +161,7 @@ public function generateBarCodeGDImage() * This sample shows how to create and save a barcode image. * * @param int $format value of BarCodeImageFormat (PNG, BMP, JPEG, GIF, EMF) - * @return string base64 representation of image. + * @return base64 representation of image. * * @code * $generator = new BarCodeGenerator(EncodeTypes::CODE_128); @@ -233,7 +230,11 @@ public function getCodeText(): string { try { - return $this->getBarcodeGeneratorDto()->base64CodeText; + $thriftConnection = new ThriftConnection(); + $client = $thriftConnection->openConnection(); + $codeText = $client->BarcodeGenerator_getCodeTextWithEncoding($this->getBarcodeGeneratorDto()->base64CodeText, $this->getBarcodeGeneratorDto()->encoding, $this->getBarcodeGeneratorDto()->insertBOM, $this->getBarcodeGeneratorDto()->barcodeType); + $thriftConnection->closeConnection(); + return $codeText; } catch (Exception $ex) { @@ -292,7 +293,7 @@ public function getCodeText(): string * If set to {@code true}, the BOM is added; if {@code false}, the BOM is omitted even if the encoding normally uses one. * */ - public function setCodeText($codeText, ?string $encoding = null, ?bool $insertBOM = false): void + public function setCodeText($codeText, ?string $encoding = null, ?bool $insertBOM = true): void { try { diff --git a/lib/Generation/BarcodeParameters.php b/lib/Generation/BarcodeParameters.php index 0b302f75..22b131ea 100644 --- a/lib/Generation/BarcodeParameters.php +++ b/lib/Generation/BarcodeParameters.php @@ -2,32 +2,10 @@ namespace Aspose\Barcode\Generation; -use Aspose\Barcode\Generation\AustralianPostParameters; -use Aspose\Barcode\Generation\AztecParameters; use Aspose\Barcode\Bridge\BarcodeParametersDTO; -use Aspose\Barcode\Generation\CodabarParameters; -use Aspose\Barcode\Generation\CodablockParameters; -use Aspose\Barcode\Generation\Code128Parameters; -use Aspose\Barcode\Generation\Code16KParameters; -use Aspose\Barcode\Generation\CodetextParameters; -use Aspose\Barcode\Generation\CouponParameters; -use Aspose\Barcode\Generation\DataBarParameters; -use Aspose\Barcode\Generation\DataMatrixParameters; -use Aspose\Barcode\Generation\DotCodeParameters; use Aspose\Barcode\Exception; -use Aspose\Barcode\Generation\GS1CompositeBarParameters; -use Aspose\Barcode\Generation\HanXinParameters; use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\Communicator; -use Aspose\Barcode\Generation\ITFParameters; -use Aspose\Barcode\Generation\MaxiCodeParameters; -use Aspose\Barcode\Generation\Padding; -use Aspose\Barcode\Generation\PatchCodeParameters; -use Aspose\Barcode\Generation\Pdf417Parameters; -use Aspose\Barcode\Generation\PostalParameters; -use Aspose\Barcode\Generation\QrParameters; -use Aspose\Barcode\Generation\SupplementParameters; -use Aspose\Barcode\Generation\Unit; /** * Barcode generation parameters. @@ -182,7 +160,7 @@ public function setXDimension(Unit $value): void * Get bars reduction value that is used to compensate ink spread while printing. * @return Unit value of BarWidthReduction */ - public function getBarWidthReduction(): Unit + public function getBarWidthReduction(): ?Unit { try { @@ -197,14 +175,17 @@ public function getBarWidthReduction(): Unit /** * Sets bars reduction value that is used to compensate ink spread while printing. */ - public function setBarWidthReduction(Unit $value): void + public function setBarWidthReduction(?Unit $value): void { try { - $this->getBarcodeParametersDto()->barWidthReduction = $value->getUnitDto(); + if($value === null) + $this->getBarcodeParametersDto()->barWidthReduction = $value; + else + $this->getBarcodeParametersDto()->barWidthReduction = $value->getUnitDto(); $this->barWidthReduction = $value; } - catch (Exception $ex) + catch (\Throwable $ex) { throw new BarcodeException($ex->getMessage(), __FILE__, __LINE__); } diff --git a/lib/Generation/BaseGenerationParameters.php b/lib/Generation/BaseGenerationParameters.php index 929fc348..f0318cc8 100644 --- a/lib/Generation/BaseGenerationParameters.php +++ b/lib/Generation/BaseGenerationParameters.php @@ -2,16 +2,11 @@ namespace Aspose\Barcode\Generation; -use Aspose\Barcode\Generation\BarcodeParameters; -use Aspose\Barcode\Generation\BorderParameters; use Aspose\Barcode\Bridge\BaseGenerationParametersDTO; -use Aspose\Barcode\Generation\CaptionParameters; use Aspose\Barcode\Exception; -use Aspose\Barcode\Generation\ImageParameters; use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\Communicator; use Aspose\Barcode\Internal\ThriftConnection; -use Aspose\Barcode\Generation\Unit; /** * Barcode image generation parameters. diff --git a/lib/Generation/BorderParameters.php b/lib/Generation/BorderParameters.php index 20887911..8d475ea9 100644 --- a/lib/Generation/BorderParameters.php +++ b/lib/Generation/BorderParameters.php @@ -4,7 +4,6 @@ use Aspose\Barcode\Bridge\BorderParametersDTO; use Aspose\Barcode\Exception; -use Aspose\Barcode\Generation\Unit; use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\Communicator; use Aspose\Barcode\Internal\ThriftConnection; diff --git a/lib/Generation/CMYKColor.php b/lib/Generation/CMYKColor.php index cbe0533f..f6be3b7d 100644 --- a/lib/Generation/CMYKColor.php +++ b/lib/Generation/CMYKColor.php @@ -2,7 +2,7 @@ namespace Aspose\Barcode\Generation; -use Aspose\Barcode\InvalidArgumentException; +use InvalidArgumentException; /** * Class for CMYK color. A null instance means CMYK is not used, diff --git a/lib/Generation/CaptionParameters.php b/lib/Generation/CaptionParameters.php index 384e5657..b1d70a6e 100644 --- a/lib/Generation/CaptionParameters.php +++ b/lib/Generation/CaptionParameters.php @@ -4,10 +4,8 @@ use Aspose\Barcode\Bridge\CaptionParametersDTO; use Aspose\Barcode\Exception; -use Aspose\Barcode\Generation\FontUnit; use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\Communicator; -use Aspose\Barcode\Generation\Padding; /** * Caption parameters. diff --git a/lib/Generation/CodetextParameters.php b/lib/Generation/CodetextParameters.php index f3b86e08..bf02cd70 100644 --- a/lib/Generation/CodetextParameters.php +++ b/lib/Generation/CodetextParameters.php @@ -4,11 +4,9 @@ use Aspose\Barcode\Bridge\CodetextParametersDTO; use Aspose\Barcode\Exception; -use Aspose\Barcode\Generation\FontUnit; use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\Communicator; use Aspose\Barcode\Internal\ThriftConnection; -use Aspose\Barcode\Generation\Unit; /** * Codetext parameters. diff --git a/lib/Generation/CouponParameters.php b/lib/Generation/CouponParameters.php index 9c154b59..de87a952 100644 --- a/lib/Generation/CouponParameters.php +++ b/lib/Generation/CouponParameters.php @@ -7,7 +7,6 @@ use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\Communicator; use Aspose\Barcode\Internal\ThriftConnection; -use Aspose\Barcode\Generation\Unit; /** * Coupon parameters. Used for UpcaGs1DatabarCoupon, UpcaGs1Code128Coupon. diff --git a/lib/Generation/DataMatrixExtCodetextBuilder.php b/lib/Generation/DataMatrixExtCodetextBuilder.php index d798b974..57c20e47 100644 --- a/lib/Generation/DataMatrixExtCodetextBuilder.php +++ b/lib/Generation/DataMatrixExtCodetextBuilder.php @@ -2,8 +2,6 @@ namespace Aspose\Barcode\Generation; -use Aspose\Barcode\Generation\ExtCodeItemType; -use Aspose\Barcode\Generation\ExtCodetextBuilderType; use Aspose\Barcode\Internal\BarcodeException; use Exception; diff --git a/lib/Generation/DotCodeExtCodetextBuilder.php b/lib/Generation/DotCodeExtCodetextBuilder.php index 40584bc4..1ada480e 100644 --- a/lib/Generation/DotCodeExtCodetextBuilder.php +++ b/lib/Generation/DotCodeExtCodetextBuilder.php @@ -3,9 +3,6 @@ namespace Aspose\Barcode\Generation; use Aspose\Barcode\Exception; -use Aspose\Barcode\Generation\ExtCodeItemType; -use Aspose\Barcode\Generation\ExtCodetextBuilderType; -use Aspose\Barcode\Generation\ExtCodetextBuilder; use Aspose\Barcode\Internal\BarcodeException; /** diff --git a/lib/Generation/ExtCodetextBuilder.php b/lib/Generation/ExtCodetextBuilder.php index b460b871..689c85c0 100644 --- a/lib/Generation/ExtCodetextBuilder.php +++ b/lib/Generation/ExtCodetextBuilder.php @@ -3,7 +3,6 @@ namespace Aspose\Barcode\Generation; use Aspose\Barcode\Exception; -use Aspose\Barcode\Generation\ExtCodeItemType; use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\ThriftConnection; diff --git a/lib/Generation/FontUnit.php b/lib/Generation/FontUnit.php index 07836f75..19319a9b 100644 --- a/lib/Generation/FontUnit.php +++ b/lib/Generation/FontUnit.php @@ -4,10 +4,9 @@ use Aspose\Barcode\Bridge\FontUnitDTO; use Aspose\Barcode\Exception; -use Aspose\Barcode\Generation\Unit; use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\Communicator; -use Aspose\Barcode\InvalidArgumentException; +use InvalidArgumentException; /** * diff --git a/lib/Generation/HanXinErrorLevel.php b/lib/Generation/HanXinErrorLevel.php index 72467aee..cadd4455 100644 --- a/lib/Generation/HanXinErrorLevel.php +++ b/lib/Generation/HanXinErrorLevel.php @@ -1,52 +1,6 @@ * Level of Reed-Solomon error correction. From low to high: L1, L2, L3, L4. diff --git a/lib/Generation/HanXinExtCodetextBuilder.php b/lib/Generation/HanXinExtCodetextBuilder.php index 32f4464d..3b9b6050 100644 --- a/lib/Generation/HanXinExtCodetextBuilder.php +++ b/lib/Generation/HanXinExtCodetextBuilder.php @@ -4,10 +4,8 @@ use Aspose\Barcode\Bridge\ExtCodeItemDTO; use Aspose\Barcode\Exception; -use Aspose\Barcode\Generation\HanXinExtCodetextBuilderType; use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\ThriftConnection; -use Aspose\Barcode\text; /** *

diff --git a/lib/Generation/HslaColor.php b/lib/Generation/HslaColor.php index 04c679ae..dce12330 100644 --- a/lib/Generation/HslaColor.php +++ b/lib/Generation/HslaColor.php @@ -2,11 +2,7 @@ namespace Aspose\Barcode\Generation; -use Aspose\Barcode\Alpha; use Aspose\Barcode\Exception; -use Aspose\Barcode\Hue; -use Aspose\Barcode\Lightness; -use Aspose\Barcode\Saturation; /** *

diff --git a/lib/Generation/ITFParameters.php b/lib/Generation/ITFParameters.php index a44f4b00..a0e3fa77 100644 --- a/lib/Generation/ITFParameters.php +++ b/lib/Generation/ITFParameters.php @@ -7,7 +7,6 @@ use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\Communicator; use Aspose\Barcode\Internal\ThriftConnection; -use Aspose\Barcode\Generation\Unit; /** * ITF parameters. diff --git a/lib/Generation/ImageParameters.php b/lib/Generation/ImageParameters.php index de432d64..b22bf347 100644 --- a/lib/Generation/ImageParameters.php +++ b/lib/Generation/ImageParameters.php @@ -4,8 +4,6 @@ use Aspose\Barcode\Bridge\ImageParametersDTO; use Aspose\Barcode\Internal\Communicator; -use Aspose\Barcode\Generation\PdfParameters; -use Aspose\Barcode\Generation\SvgParameters; /** * Image parameters. diff --git a/lib/Generation/MaxiCodeExtCodetextBuilder.php b/lib/Generation/MaxiCodeExtCodetextBuilder.php index 2c9ae7bd..e469d7ca 100644 --- a/lib/Generation/MaxiCodeExtCodetextBuilder.php +++ b/lib/Generation/MaxiCodeExtCodetextBuilder.php @@ -3,8 +3,6 @@ namespace Aspose\Barcode\Generation; use Aspose\Barcode\Exception; -use Aspose\Barcode\Generation\ExtCodetextBuilderType; -use Aspose\Barcode\Generation\ExtCodetextBuilder; use Aspose\Barcode\Internal\BarcodeException; /** diff --git a/lib/Generation/Padding.php b/lib/Generation/Padding.php index 61e832dc..e77aea72 100644 --- a/lib/Generation/Padding.php +++ b/lib/Generation/Padding.php @@ -4,7 +4,6 @@ use Aspose\Barcode\Bridge\PaddingDTO; use Aspose\Barcode\Exception; -use Aspose\Barcode\Generation\Unit; use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\Communicator; use Aspose\Barcode\Internal\ThriftConnection; diff --git a/lib/Generation/PostalParameters.php b/lib/Generation/PostalParameters.php index abfe30fa..b28edb8f 100644 --- a/lib/Generation/PostalParameters.php +++ b/lib/Generation/PostalParameters.php @@ -7,7 +7,6 @@ use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\Communicator; use Aspose\Barcode\Internal\ThriftConnection; -use Aspose\Barcode\Generation\Unit; /** * diff --git a/lib/Generation/QrExtCodetextBuilder.php b/lib/Generation/QrExtCodetextBuilder.php index 317464ca..2841fe37 100644 --- a/lib/Generation/QrExtCodetextBuilder.php +++ b/lib/Generation/QrExtCodetextBuilder.php @@ -3,9 +3,6 @@ namespace Aspose\Barcode\Generation; use Exception; -use Aspose\Barcode\Generation\ExtCodeItemType; -use Aspose\Barcode\Generation\ExtCodetextBuilderType; -use Aspose\Barcode\Generation\ExtCodetextBuilder; use Aspose\Barcode\Internal\BarcodeException; /** diff --git a/lib/Generation/QrParameters.php b/lib/Generation/QrParameters.php index e84758f4..be25699c 100644 --- a/lib/Generation/QrParameters.php +++ b/lib/Generation/QrParameters.php @@ -7,7 +7,6 @@ use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\Communicator; use Aspose\Barcode\Internal\ThriftConnection; -use Aspose\Barcode\Generation\QrStructuredAppendParameters; /** * QR parameters. diff --git a/lib/Generation/SupplementParameters.php b/lib/Generation/SupplementParameters.php index cec485a1..c1744d79 100644 --- a/lib/Generation/SupplementParameters.php +++ b/lib/Generation/SupplementParameters.php @@ -7,7 +7,6 @@ use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\Communicator; use Aspose\Barcode\Internal\ThriftConnection; -use Aspose\Barcode\Generation\Unit; /** * Supplement parameters. Used for Interleaved2of5, Standard2of5, EAN13, EAN8, UPCA, UPCE, ISBN, ISSN, ISMN. diff --git a/lib/Generation/Unit.php b/lib/Generation/Unit.php index c63fa329..c103e73c 100644 --- a/lib/Generation/Unit.php +++ b/lib/Generation/Unit.php @@ -4,11 +4,10 @@ use Aspose\Barcode\Bridge\UnitDTO; use Aspose\Barcode\Exception; -use Aspose\Barcode\Generation\GraphicsUnit; use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\Communicator; use Aspose\Barcode\Internal\ThriftConnection; -use Aspose\Barcode\InvalidArgumentException; +use InvalidArgumentException; /** * Specifies the size value in different units (Pixel, Inches, etc.). diff --git a/lib/Recognition/BarCodeExtendedParameters.php b/lib/Recognition/BarCodeExtendedParameters.php index 74faf6d8..4d6e70c6 100644 --- a/lib/Recognition/BarCodeExtendedParameters.php +++ b/lib/Recognition/BarCodeExtendedParameters.php @@ -2,22 +2,11 @@ namespace Aspose\Barcode\Recognition; -use Aspose\Barcode\Recognition\AztecExtendedParameters; use Aspose\Barcode\Bridge\BarCodeExtendedParametersDTO; -use Aspose\Barcode\Recognition\CodabarExtendedParameters; -use Aspose\Barcode\Recognition\Code128ExtendedParameters; -use Aspose\Barcode\Recognition\DataBarExtendedParameters; -use Aspose\Barcode\Recognition\DataMatrixExtendedParameters; -use Aspose\Barcode\Recognition\DotCodeExtendedParameters; use Aspose\Barcode\Exception; -use Aspose\Barcode\Recognition\GS1CompositeBarExtendedParameters; use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\Communicator; use Aspose\Barcode\Internal\ThriftConnection; -use Aspose\Barcode\Recognition\MaxiCodeExtendedParameters; -use Aspose\Barcode\Recognition\OneDExtendedParameters; -use Aspose\Barcode\Recognition\Pdf417ExtendedParameters; -use Aspose\Barcode\Recognition\QRExtendedParameters; /** *

diff --git a/lib/Recognition/BarCodeReader.php b/lib/Recognition/BarCodeReader.php index 48817369..7ce74a50 100644 --- a/lib/Recognition/BarCodeReader.php +++ b/lib/Recognition/BarCodeReader.php @@ -2,10 +2,7 @@ namespace Aspose\Barcode\Recognition; -use Aspose\Barcode\Recognition\BarCodeResult; -use Aspose\Barcode\Recognition\BarcodeSettings; use Aspose\Barcode\Bridge\BarcodeReaderDTO; -use Aspose\Barcode\Recognition\DecodeType; use Aspose\Barcode\Exception; use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\CommonUtility; @@ -13,9 +10,9 @@ use Aspose\Barcode\Internal\License; use Aspose\Barcode\Internal\Rectangle; use Aspose\Barcode\Internal\ThriftConnection; -use Aspose\Barcode\InvalidArgumentException; -use Aspose\Barcode\Recognition\QualitySettings; -use Aspose\Barcode\TypeError; +use InvalidArgumentException; +use RuntimeException; +use TypeError; /** * BarCodeReader encapsulates an image which may contain one or several barcodes, it then can perform ReadBarCodes operation to detect barcodes. @@ -434,13 +431,13 @@ public function exportToXml(string $xmlFile): bool $xmlData = $client->BarcodeReader_exportToXml($this->barCodeReaderDto); $thriftConnection->closeConnection(); $isContentExported = $xmlData != null; - if ($isContentExported) + if (!$isContentExported + (file_put_contents($xmlFile, $xmlData) === false) ) { - file_put_contents($xmlFile, $xmlData); + throw new RuntimeException("Failed to write file: " . $xmlFile); } return $isContentExported; } - catch (Exception $ex) + catch (\RuntimeException $ex) { throw new BarcodeException($ex->getMessage(), __FILE__, __LINE__); } @@ -461,8 +458,6 @@ public static function importFromXml(string $resource): BarCodeReader $resource = fopen($resource, "r"); } $xmlData = (stream_get_contents($resource)); - $offset = 6; - $xmlData = substr($xmlData, $offset, strlen($xmlData) - $offset); $thriftConnection = new ThriftConnection(); $client = $thriftConnection->openConnection(); @@ -471,7 +466,7 @@ public static function importFromXml(string $resource): BarCodeReader return BarCodeReader::construct($barCodeReaderDto); } - catch (Exception $ex) + catch (\Throwable $ex) { throw new BarcodeException($ex->getMessage(), __FILE__, __LINE__); } diff --git a/lib/Recognition/BarCodeRegionParameters.php b/lib/Recognition/BarCodeRegionParameters.php index 4c095b64..787e8b53 100644 --- a/lib/Recognition/BarCodeRegionParameters.php +++ b/lib/Recognition/BarCodeRegionParameters.php @@ -9,7 +9,6 @@ use Aspose\Barcode\Internal\Point; use Aspose\Barcode\Internal\Rectangle; use Aspose\Barcode\Internal\ThriftConnection; -use Aspose\Barcode\Recognition\Quadrangle; /** * Represents the recognized barcode's region and barcode angle diff --git a/lib/Recognition/BarCodeResult.php b/lib/Recognition/BarCodeResult.php index 95199922..ebc035c9 100644 --- a/lib/Recognition/BarCodeResult.php +++ b/lib/Recognition/BarCodeResult.php @@ -2,15 +2,12 @@ namespace Aspose\Barcode\Recognition; -use Aspose\Barcode\A; -use Aspose\Barcode\Recognition\BarCodeExtendedParameters; -use Aspose\Barcode\Recognition\BarCodeRegionParameters; use Aspose\Barcode\Bridge\BarCodeResultDTO; -use Aspose\Barcode\encoding; -use Aspose\Barcode\Exception; + use Aspose\Barcode\Internal\BarcodeException; use Aspose\Barcode\Internal\Communicator; use Aspose\Barcode\Internal\ThriftConnection; +use Exception; /** * Stores recognized barcode data like SingleDecodeType type, {string} codetext, @@ -107,26 +104,27 @@ public function getReadingQuality(): float * *

* @param encoding The encoding for codetext. - * @return A string containing recognized code text. + * @return codeText string containing recognized code text. */ - function getCodeText(?string $encoding): string + function getCodeText(?string $encoding = null): string { - if ($encoding == null || $encoding == "") - { + if ($encoding == null || $encoding == "") { return $this->getBarCodeResultDTO()->codeText; - } else - { - try - { - $thriftConnection = new ThriftConnection(); - $client = $thriftConnection->openConnection(); - $codeText = $client->BarcodeResult_getCodeTextWithEncoding($this->getBarCodeResultDTO()->codeBytes, $encoding); + } + + try { + $thriftConnection = new ThriftConnection(); + $client = $thriftConnection->openConnection(); + $codeText = $client->BarcodeResult_getCodeTextWithEncoding($this->getBarCodeResultDTO()->codeBytes, $encoding); + $thriftConnection->closeConnection(); + return $codeText; + } + catch (Exception $ex) { + throw new BarcodeException($ex->getMessage(), __FILE__, __LINE__); + } + finally { + if (isset($thriftConnection)) { $thriftConnection->closeConnection(); - return $codeText; - } - catch (Exception $ex) - { - throw new BarcodeException($ex->getMessage(), __FILE__, __LINE__); } } } diff --git a/lib/Recognition/BarcodeSettings.php b/lib/Recognition/BarcodeSettings.php index 6b57d4d1..f5b8f66d 100644 --- a/lib/Recognition/BarcodeSettings.php +++ b/lib/Recognition/BarcodeSettings.php @@ -2,7 +2,6 @@ namespace Aspose\Barcode\Recognition; -use Aspose\Barcode\Recognition\AustraliaPostSettings; use Aspose\Barcode\Bridge\BarcodeSettingsDTO; use Aspose\Barcode\Internal\Communicator; diff --git a/lib/Recognition/ChecksumValidation.php b/lib/Recognition/ChecksumValidation.php index eb372fb9..a8347a0f 100644 --- a/lib/Recognition/ChecksumValidation.php +++ b/lib/Recognition/ChecksumValidation.php @@ -1,40 +1,6 @@