Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Normalize indentation and apply basic PSR2 CS ruleset #358

Closed
wants to merge 5 commits into from

Conversation

mvorisek
Copy link
Contributor

@mvorisek mvorisek commented Apr 3, 2021

there should be no code change, thus fully compatible with PHP 5

@codecov-io
Copy link

codecov-io commented Apr 3, 2021

Codecov Report

Merging #358 (af37dbe) into main (c979d00) will decrease coverage by 0.01%.
The diff coverage is 76.58%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #358      +/-   ##
==========================================
- Coverage   72.80%   72.78%   -0.02%     
==========================================
  Files         125      125              
  Lines       22964    22951      -13     
==========================================
- Hits        16718    16705      -13     
  Misses       6246     6246              
Flag Coverage Δ
php-5.3-ubuntu-latest 72.26% <76.42%> (-0.02%) ⬇️
php-5.4-ubuntu-latest ?
php-5.5-ubuntu-latest ?
php-5.6-ubuntu-latest 45.11% <68.59%> (-0.03%) ⬇️
php-7.1-ubuntu-latest 45.69% <68.32%> (+<0.01%) ⬆️
php-7.2-ubuntu-latest 45.64% <68.32%> (ø)
php-7.3-ubuntu-latest 45.63% <68.26%> (+<0.01%) ⬆️
php-7.4-ubuntu-latest 45.63% <68.26%> (ø)
php-8.0-ubuntu-latest 65.19% <73.63%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
fonts/cid0jp.php 100.00% <ø> (ø)
fonts/dejavusans.php 100.00% <ø> (ø)
fonts/dejavusansb.php 100.00% <ø> (ø)
fonts/dejavusansi.php 100.00% <ø> (ø)
fonts/dejavuserif.php 100.00% <ø> (ø)
fonts/freeserif.php 100.00% <ø> (ø)
fonts/uni2cid_aj16.php 100.00% <ø> (ø)
include/barcodes/pdf417.php 60.58% <ø> (-0.15%) ⬇️
include/barcodes/qrcode.php 64.18% <ø> (-0.04%) ⬇️
include/tcpdf_font_data.php 100.00% <ø> (ø)
... and 123 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c979d00...af37dbe. Read the comment docs.

nicolaasuni
nicolaasuni previously approved these changes Jul 10, 2021
@nicolaasuni
Copy link
Member

Can you please resolve the conflicts?

@codecov-commenter
Copy link

codecov-commenter commented Jul 10, 2021

Codecov Report

Merging #358 (634a56e) into main (150e756) will decrease coverage by 27.26%.
The diff coverage is 68.32%.

❗ Current head 634a56e differs from pull request most recent head 523848e. Consider uploading reports for the commit 523848e to get more accurate results
Impacted file tree graph

@@             Coverage Diff             @@
##             main     #358       +/-   ##
===========================================
- Coverage   72.93%   45.67%   -27.27%     
===========================================
  Files         127       90       -37     
  Lines       23024    20291     -2733     
===========================================
- Hits        16792     9267     -7525     
- Misses       6232    11024     +4792     
Flag Coverage Δ
php-5.3-ubuntu-latest ?
php-5.4-ubuntu-latest ?
php-5.5-ubuntu-latest ?
php-5.6-ubuntu-latest ?
php-7.1-ubuntu-latest 45.67% <68.32%> (+<0.01%) ⬆️
php-7.2-ubuntu-latest 45.62% <68.32%> (ø)
php-7.3-ubuntu-latest 45.61% <68.26%> (ø)
php-7.4-ubuntu-latest ?
php-8.0-ubuntu-latest ?

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
fonts/cid0jp.php 100.00% <ø> (ø)
fonts/dejavusans.php 100.00% <ø> (ø)
fonts/freeserif.php 100.00% <ø> (ø)
fonts/uni2cid_aj16.php 100.00% <ø> (ø)
include/barcodes/pdf417.php 62.12% <ø> (+1.39%) ⬆️
include/barcodes/qrcode.php 63.88% <ø> (-0.34%) ⬇️
include/tcpdf_font_data.php 100.00% <ø> (ø)
include/tcpdf_fonts.php 35.84% <ø> (-8.93%) ⬇️
include/tcpdf_static.php 35.46% <ø> (-18.08%) ⬇️
tcpdf.php 39.35% <ø> (-31.53%) ⬇️
... and 102 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 150e756...523848e. Read the comment docs.

@mvorisek
Copy link
Contributor Author

Can you please resolve the conflicts?

@nicolaasuni done, please merge asap to prevent further conflicts, thanks!

@williamdes
Copy link
Contributor

Can you rebase @mvorisek ?

@nicolaasuni
Copy link
Member

Thank you for this contribution.
Unfortunately I will not be able to merge as we always get into a long conflict resolution issue.
I may push an automatic formatting on my side or ignore this issue in favour of using the new tc-lib-pdf library that is already a valid replacement of this lib, except for HTML/CSS/SVG/Javascript that are under development.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants