Implemented rectangular data matrix barcode #678

w512work · 2024-01-19T15:20:55Z

Implemented support for rectangular data matrix code. Corrected values in code definition table and corrected modulo 254 operation in function get253StateCodeword.

…#620) Tested and confirmed working in PHP 7.4 and PHP 8.2

* README: tone down the warning about tc-lib-pdf Signed-off-by: Ruben Barkow-Kuder <github@r.z11.de> * Update README.md Co-authored-by: William Desportes <williamdes@wdes.fr> --------- Signed-off-by: Ruben Barkow-Kuder <github@r.z11.de> Co-authored-by: William Desportes <williamdes@wdes.fr>

* Fix of Deprecation warning with php 8.1 tecnickcom#614 * Update include/barcodes/qrcode.php Co-authored-by: William Desportes <williamdes@wdes.fr> --------- Co-authored-by: Robert Johnson Nallori <rnallori@evoketechnologies.com> Co-authored-by: johnson361 <johnson361@users.noreply.github.com> Co-authored-by: William Desportes <williamdes@wdes.fr>

…om#633) * Update tcpdf_fonts.php Fixes "use of "self" in callables is deprecated" warning is arising from tcpdf_fonts.php when using PHP >= 8.2 * Update tcpdf_fonts.php for PHP 5.3-8.2 compatibility PHP 8.2 "use of "self" in callables is deprecated" yet some ways of fixing this breaks for PHP 5.3. This approach works, tested PHP 5.3.29 - 8.2.0 * Update tcpdf_fonts.php Spaces added back in before arguments * Update tcpdf_fonts.php using get_called_class() Maneuvers compatibility of callables inside array_map() between PHP 5.3 and 8.2 - tested. --------- Co-authored-by: Nicola Asuni <nicolaasuni@users.noreply.github.com>

Co-authored-by: Nicola Asuni <nicolaasuni@users.noreply.github.com>

* Fix composite glyph output * Pad zeros before checksum calulation --------- Co-authored-by: Nicola Asuni <nicolaasuni@users.noreply.github.com>

* fix for tecnickcom#583 * fix fix --------- Co-authored-by: Nicola Asuni <nicolaasuni@users.noreply.github.com>

* Fix non-numeric value warning Fixes this warning on generating PDF: Warning: A non-numeric value encountered in /tcpdf/tcpdf.php on line 5473 * Better fix for non-numeric value warning Fixes this warning on generating PDF after calling `Text` with a non-numeric value for `$fstroke`: Warning: A non-numeric value encountered in /tcpdf/tcpdf.php on line 5470 * Update tcpdf.php Co-authored-by: William Desportes <williamdes@wdes.fr> --------- Co-authored-by: William Desportes <williamdes@wdes.fr> Co-authored-by: Nicola Asuni <nicolaasuni@users.noreply.github.com>

This was already fixed in tc-lib-barcode.

* Fix return type annotation * BC with tools that do not support PHPStan annotations Co-authored-by: William Desportes <williamdes@wdes.fr> --------- Co-authored-by: William Desportes <williamdes@wdes.fr> Co-authored-by: Nicola Asuni <nicolaasuni@users.noreply.github.com>

tecnickcom#598) * Typehints for get/setHeaderMargin are inconstent * Add typehints for header/footer margin properties --------- Co-authored-by: Nicola Asuni <nicolaasuni@users.noreply.github.com>

* Bump actions/checkout and add PHP 8.3 * Update the composer json tests * Remove PHP 5.3 and 5.4 from the matrix * add permission entry Restrict GitHub actions access --------- Co-authored-by: Nicola Asuni <nicolaasuni@users.noreply.github.com>

CLAassistant · 2024-01-19T15:21:05Z

All committers have signed the CLA.

williamdes · 2024-01-19T21:06:46Z

Do you have an ouput to show here and some example code ?
It would be great to have a new example in the examples/ folder

williamdes · 2024-01-23T09:56:05Z

include/barcodes/datamatrix.php

@@ -121,6 +122,12 @@ class Datamatrix {
 	 */
 	protected $last_enc = ENC_ASCII;

+	/**
+	 * Store whether the code is rectangular or not (square).
+	 * @protected


Suggested change

* @protected

* @protected

* @var bool

williamdes · 2024-01-23T09:56:35Z

include/barcodes/datamatrix.php

@@ -230,38 +237,62 @@ class Datamatrix {
 	 * This is the class constructor.
 	 * Creates a datamatrix object
 	 * @param string $code Code to represent using Datamatrix.
+	 * @param string $shape Shape of datamatrix code (R = rectangular, S = square)


Suggested change

* @param string $shape Shape of datamatrix code (R = rectangular, S = square)

* @param string $shape Shape of datamatrix code (R = rectangular, S = square)

* @phpstan-param 'R'|'S' $shape

@williamdes Just saw your comment recommendations. Unfortunately only after I added the latest change -> Update will follow...
I've never used phpstan. Is the last line there to specify the parameters for automated testing?

You should check out phpstan, it is for static analysis

Here is an example of what my proposal would do https://phpstan.org/r/f04d0c5e-0a40-4959-b03a-fdee4430a29a

If I understand correctly, this does not generate an automatic verification script.
As you may have seen, I have extended the parameter so that you can specify the desired dimensions (e.g. 48x48). Can this also be specified in a kind of wildcard form, or would each valid combination have to be specified separately?

If I understand correctly, this does not generate an automatic verification script.

This is used by automatic tools, in this repo:

TCPDF/.github/workflows/tests.yml

Line 121 in 5fce932

run: ./vendor/bin/phpstan --memory-limit=6G

But for people that will integrate TCPDF, it will also throw warnings if they use phpstan and pass something else than the values you did set

williamdes

The code looks good

nicolaasuni · 2024-01-24T15:12:10Z

This feature is already present in https://github.com/tecnickcom/tc-lib-barcode that is already integrated with tc-lib-pdf.
The current datamatrix implementation in TCPDF is not maintained and contains other bugs.
If you want to use datamatrix with TCPDF it is easier to import the tc-lib-barcode and integrate it like in tc-lib-pdf.

williamdes · 2024-01-25T10:52:23Z

@w512work it is probably best that you migrate to the new library for data matrix and close this PR

w512work · 2024-01-26T07:57:36Z

Thank you @nicolaasuni for the hint.

I do not only need barcodes. If I have understood correctly, tc-lib-pdf is the top level for generating comprehensive PDFs. In its readme it says at the top that the library is not yet ready.
I would have liked to take a look at the examples of this version to get an idea of the current status. I installed the current version of the lib via composer and tried for about an hour without success to get the example script in the examples folder displayed im my browser. I failed because the autoloader could not be loaded.
I'm not sure if it's a good idea to change everything at this point without causing various other problems that will significantly increase the development and maintenance effort of my project...

Can I view the examples anywhere on the net without spending 2 hours coding, like on https://tcpdf.org/examples/ ?

w512work · 2024-01-26T09:04:52Z

Can I view the examples anywhere on the net without spending 2 hours coding, like on https://tcpdf.org/examples/ ?

Just tried the command make server mentioned in the readme. Unfortunately it gives me the error:

Directory example does not exist.
make: *** [Makefile:250: server] Error 1

The manual approach php -t examples -S 10.0.0.251:8888 throws another error when I try to access from the browser:

[Fri Jan 26 09:55:16 2024] PHP Fatal error: Uncaught Com\Tecnick\Pdf\Font\Exception: unable to read file: helvetica.json in /var/www/html/test-uw/tc-lib-pdf/vendor/tecnickcom/tc-lib-pdf-font/src/Stack.php:183
Stack trace:
#0 /var/www/html/test-uw/tc-lib-pdf/vendor/tecnickcom/tc-lib-pdf/examples/index.php(46): Com\Tecnick\Pdf\Font\Stack->insert()
#1 {main}
thrown in /var/www/html/test-uw/tc-lib-pdf/vendor/tecnickcom/tc-lib-pdf-font/src/Stack.php on line 183
[Fri Jan 26 09:55:16 2024] 10.0.2.121:49293 [500]: GET / - Uncaught Com\Tecnick\Pdf\Font\Exception: unable to read file: helvetica.json in /var/www/html/test-uw/tc-lib-pdf/vendor/tecnickcom/tc-lib-pdf-font/src/Stack.php:183
Stack trace:
#0 /var/www/html/test-uw/tc-lib-pdf/vendor/tecnickcom/tc-lib-pdf/examples/index.php(46): Com\Tecnick\Pdf\Font\Stack->insert()
#1 {main}
thrown in /var/www/html/test-uw/tc-lib-pdf/vendor/tecnickcom/tc-lib-pdf-font/src/Stack.php on line 183

nicolaasuni · 2024-04-20T17:23:08Z

Please try to resolve the conflicts.

remicollet and others added 23 commits September 6, 2023 08:51

Fix SPDX license ID (tecnickcom#591)

f7b000d

Applied fix found by BrainforgeUK in Issue tecnickcom#564 (tecnickcom…

70b63fa

…#620) Tested and confirmed working in PHP 7.4 and PHP 8.2

php 8+ edge cases fixes (tecnickcom#630)

de332db

Co-authored-by: Nicola Asuni <nicolaasuni@users.noreply.github.com>

Fix composite glyph output (tecnickcom#581)

7e3fb6f

* Fix composite glyph output * Pad zeros before checksum calulation --------- Co-authored-by: Nicola Asuni <nicolaasuni@users.noreply.github.com>

fix for tecnickcom#583 (tecnickcom#584)

9c7982d

* fix for tecnickcom#583 * fix fix --------- Co-authored-by: Nicola Asuni <nicolaasuni@users.noreply.github.com>

Fixed problems with S25 barcode (tecnickcom#611)

26d2eed

This was already fixed in tc-lib-barcode.

Check fonts files with phpstan too (tecnickcom#575)

548c0f2

Typehints for getHeaderMargin() and setHeaderMargin() are inconsistent (

18d1b2b

tecnickcom#598) * Typehints for get/setHeaderMargin are inconstent * Add typehints for header/footer margin properties --------- Co-authored-by: Nicola Asuni <nicolaasuni@users.noreply.github.com>

Bump version

f209e39

Update copyright year

96985b9

Update the CHANGELOG for 6.6.3 (tecnickcom#643)

e3a8409

Bump version

31b9389

Fix corrupted file

3ca051c

Simplify test matrix

037283c

Remove duplicate settings

7689851

Adjust automation test settings

5fce932

Implemented rectangular data matrix barcode

1eca731

Fix DataMatrix encoding errors, update example

aa86f92

williamdes reviewed Jan 23, 2024

View reviewed changes

williamdes approved these changes Jan 23, 2024

View reviewed changes

Added desired dimensions for DataMatrix code

864c1e0

williamdes mentioned this pull request Jan 23, 2024

Datamatrix code encoding error #674

Open

nicolaasuni force-pushed the main branch from f9fd218 to 82fc97b Compare March 25, 2024 23:53

w512work added 2 commits April 22, 2024 09:34

documentation

923dfdd

Merge branch 'main' of https://github.com/tecnickcom/TCPDF

2a0a211

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implemented rectangular data matrix barcode #678

Implemented rectangular data matrix barcode #678

w512work commented Jan 19, 2024

CLAassistant commented Jan 19, 2024 •

edited

williamdes commented Jan 19, 2024

williamdes Jan 23, 2024

williamdes Jan 23, 2024

w512work Jan 23, 2024

williamdes Jan 24, 2024

w512work Jan 24, 2024

williamdes Jan 25, 2024

williamdes left a comment

nicolaasuni commented Jan 24, 2024

williamdes commented Jan 25, 2024

w512work commented Jan 26, 2024

w512work commented Jan 26, 2024

nicolaasuni commented Apr 20, 2024

	* @param string $shape Shape of datamatrix code (R = rectangular, S = square)
	* @param string $shape Shape of datamatrix code (R = rectangular, S = square)
	* @phpstan-param 'R'\|'S' $shape

Implemented rectangular data matrix barcode #678

Are you sure you want to change the base?

Implemented rectangular data matrix barcode #678

Conversation

w512work commented Jan 19, 2024

CLAassistant commented Jan 19, 2024 • edited

williamdes commented Jan 19, 2024

williamdes Jan 23, 2024

Choose a reason for hiding this comment

williamdes Jan 23, 2024

Choose a reason for hiding this comment

w512work Jan 23, 2024

Choose a reason for hiding this comment

williamdes Jan 24, 2024

Choose a reason for hiding this comment

w512work Jan 24, 2024

Choose a reason for hiding this comment

williamdes Jan 25, 2024

Choose a reason for hiding this comment

williamdes left a comment

Choose a reason for hiding this comment

nicolaasuni commented Jan 24, 2024

williamdes commented Jan 25, 2024

w512work commented Jan 26, 2024

w512work commented Jan 26, 2024

nicolaasuni commented Apr 20, 2024

CLAassistant commented Jan 19, 2024 •

edited