Skip to content

Commit ba6173d

Browse files
mariuszkrzaczkowskimariuszkrzaczkowski
authored
Merge pull request #27 from YetiForceCompany/developer
dev
2 parents 32dd9a8 + ca04b8c commit ba6173d

File tree

139 files changed

+387
-222
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+387
-222
lines changed

‎.php_cs.dist

+162
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
1+
<?php
2+
3+
$config = \PhpCsFixer\Config::create()
4+
->setRiskyAllowed(true)
5+
->setIndent("\t")
6+
->setUsingCache(false)
7+
->setRules([
8+
'@PHP56Migration' => true,
9+
'@PHPUnit60Migration:risky' => true,
10+
'@PhpCsFixer' => true,
11+
'@PhpCsFixer:risky' => true,
12+
'list_syntax' => ['syntax' => 'short'],
13+
'@PSR2' => true,
14+
'align_multiline_comment' => true,
15+
'array_syntax' => ['syntax' => 'short'],
16+
'blank_line_after_namespace' => true,
17+
'blank_line_after_opening_tag' => true,
18+
'blank_line_before_statement' => false,
19+
'binary_operator_spaces' => true,
20+
'cast_spaces' => true,
21+
'class_keyword_remove' => false,
22+
'combine_consecutive_issets' => true,
23+
'combine_consecutive_unsets' => true,
24+
'compact_nullable_typehint' => true,
25+
'concat_space' => [
26+
'spacing' => 'one',
27+
],
28+
'explicit_string_variable' => false,
29+
'declare_equal_normalize' => true,
30+
'dir_constant' => false,
31+
'doctrine_annotation_braces' => true,
32+
'doctrine_annotation_indentation' => true,
33+
'doctrine_annotation_spaces' => true,
34+
'function_typehint_space' => true,
35+
'general_phpdoc_annotation_remove' => false,
36+
'hash_to_slash_comment' => true,
37+
'include' => true,
38+
'linebreak_after_opening_tag' => true,
39+
'lowercase_cast' => true,
40+
'magic_constant_casing' => true,
41+
'method_chaining_indentation' => true,
42+
'method_separation' => true,
43+
'method_argument_space' => true,
44+
'modernize_types_casting' => true,
45+
'multiline_comment_opening_closing' => true,
46+
'no_multiline_whitespace_before_semicolons' => true,
47+
'native_function_casing' => true,
48+
'native_function_invocation' => ['include' => ['@compiler_optimized'], 'scope' => 'all'],
49+
'new_with_braces' => true,
50+
'no_alias_functions' => true,
51+
'no_blank_lines_after_class_opening' => true,
52+
'no_blank_lines_after_phpdoc' => true,
53+
'no_blank_lines_before_namespace' => false,
54+
'no_closing_tag' => true,
55+
'no_empty_comment' => true,
56+
'no_empty_phpdoc' => true,
57+
'no_empty_statement' => true,
58+
'no_extra_blank_lines' => ['tokens' => ['break', 'continue', 'extra', 'return', 'throw', 'use', 'parenthesis_brace_block', 'square_brace_block', 'curly_brace_block']],
59+
'no_extra_consecutive_blank_lines' => [
60+
'break',
61+
'continue',
62+
'curly_brace_block',
63+
'extra',
64+
'parenthesis_brace_block',
65+
'return',
66+
'square_brace_block',
67+
'throw',
68+
'use',
69+
'useTrait',
70+
],
71+
'no_leading_import_slash' => true,
72+
'no_leading_namespace_whitespace' => true,
73+
'no_mixed_echo_print' => [
74+
'use' => 'echo',
75+
],
76+
'no_multiline_whitespace_around_double_arrow' => true,
77+
'no_multiline_whitespace_before_semicolons' => true,
78+
'no_null_property_initialization' => true,
79+
'no_php4_constructor' => false,
80+
'no_short_bool_cast' => true,
81+
'no_short_echo_tag' => true,
82+
'no_superfluous_phpdoc_tags' => false,
83+
'no_singleline_whitespace_before_semicolons' => true,
84+
'no_spaces_after_function_name' => true,
85+
'no_spaces_around_offset' => true,
86+
'no_spaces_inside_parenthesis' => true,
87+
'no_trailing_comma_in_list_call' => true,
88+
'no_trailing_comma_in_singleline_array' => true,
89+
'no_trailing_whitespace' => true,
90+
'no_trailing_whitespace_in_comment' => true,
91+
'no_unneeded_control_parentheses' => true,
92+
'no_unneeded_final_method' => true,
93+
'no_unused_imports' => true,
94+
'no_useless_return' => true,
95+
'no_whitespace_before_comma_in_array' => true,
96+
'no_whitespace_in_blank_line' => true,
97+
'normalize_index_brace' => true,
98+
'not_operator_with_space' => false,
99+
'not_operator_with_successor_space' => false,
100+
'object_operator_without_whitespace' => true,
101+
'ordered_class_elements' => false,
102+
'ordered_imports' => true,
103+
'php_unit_construct' => [],
104+
'php_unit_fqcn_annotation' => true,
105+
'php_unit_strict' => true,
106+
'phpdoc_add_missing_param_annotation' => [
107+
'only_untyped' => false,
108+
],
109+
'phpdoc_align' => true,
110+
'phpdoc_annotation_without_dot' => false,
111+
'phpdoc_indent' => true,
112+
'phpdoc_inline_tag' => true,
113+
'phpdoc_no_access' => true,
114+
'phpdoc_no_empty_return' => false,
115+
'phpdoc_no_package' => false,
116+
'phpdoc_no_useless_inheritdoc' => true,
117+
'phpdoc_order' => true,
118+
'phpdoc_return_self_reference' => true,
119+
'phpdoc_scalar' => true,
120+
'phpdoc_separation' => true,
121+
'phpdoc_single_line_var_spacing' => true,
122+
'phpdoc_summary' => true,
123+
'phpdoc_trim' => true,
124+
'phpdoc_types' => true,
125+
'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
126+
'phpdoc_var_without_name' => true,
127+
'psr_autoloading' => false,
128+
'return_type_declaration' => true,
129+
'self_accessor' => true,
130+
'semicolon_after_instruction' => true,
131+
'short_scalar_cast' => true,
132+
'silenced_deprecation_error' => false,
133+
'single_blank_line_at_eof' => true,
134+
'single_blank_line_before_namespace' => true,
135+
'single_class_element_per_statement' => true,
136+
'single_import_per_statement' => true,
137+
'single_line_comment_style' => true,
138+
'single_line_throw' => true,
139+
'single_quote' => true,
140+
'space_after_semicolon' => true,
141+
'standardize_not_equals' => true,
142+
'strict_comparison' => false,
143+
'strict_param' => false,
144+
'switch_case_semicolon_to_colon' => true,
145+
'switch_case_space' => true,
146+
'ternary_operator_spaces' => true,
147+
'ternary_to_null_coalescing' => true,
148+
'trailing_comma_in_multiline_array' => false,
149+
'trim_array_spaces' => true,
150+
'unary_operator_spaces' => true,
151+
'visibility_required' => [
152+
'property',
153+
'method',
154+
],
155+
'whitespace_after_comma_in_array' => true,
156+
])
157+
->setFinder(PhpCsFixer\Finder::create()
158+
->exclude('vendor')
159+
->in(__DIR__)
160+
);
161+
162+
return $config;

‎LICENSE

+18-12
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
1-
YetiForce Public License v3
2-
Open license based on MIT license
3-
Copyright (c) 2017 YetiForce Sp. z o.o. (Ltd.)
1+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
42

5-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
6-
including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
7-
and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
83

9-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
10-
The inclusion of abovementioned notices may be in a form of an active link to the license, as stated in Appendix A.
114

12-
The Software used for more than 14 days must be registered via the built-in form.
13-
If such registration is not possible, further use of the Software requires registration via email ([email protected]), as stated in Appendix B.
14-
The registration form is properly submitted if sent (data entry to electronic communication system) and if it contains complete and true data.
15-
Registration is mandatory for any company (registration does not apply to employees of these companies or private individuals) that uses, configures and/or modifies the Software, regardless of whether the entity does it for itself or for other subjects.
5+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
6+
7+
8+
9+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
10+
11+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
12+
13+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
14+
15+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
16+
17+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
19+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20+
21+
SOFTWARE.

‎README.MD

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
# YetiForcePDF
22
[![Latest Stable Version](https://poser.pugx.org/yetiforce/yetiforcepdf/v/stable)](https://packagist.org/packages/yetiforce/yetiforcepdf)
33
[![Build Status](https://travis-ci.org/YetiForceCompany/YetiForcePDF.svg?branch=developer)](https://travis-ci.org/YetiForceCompany/YetiForcePDF)
4-
[![Analytics](https://ga-beacon.appspot.com/UA-81376231-2/welcome-page)](https://github.com/igrigorik/ga-beacon)
54
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/YetiForceCompany/YetiForcePDF/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/YetiForceCompany/YetiForcePDF/?branch=master)
65
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/b2e8645f5091496089ed203d05a05d61)](https://app.codacy.com/app/mariuszkrzaczkowski/YetiForcePDF?utm_source=github.com&utm_medium=referral&utm_content=YetiForceCompany/YetiForcePDF&utm_campaign=Badge_Grade_Settings)
76
[![Maintainability](https://api.codeclimate.com/v1/badges/af478ddd07cf7278841a/maintainability)](https://codeclimate.com/github/YetiForceCompany/YetiForcePDF/maintainability)
8-
[![SymfonyInsight](https://insight.symfony.com/projects/d944b009-6a76-4957-8833-db95b010e5a5/big.png)](https://insight.symfony.com/projects/d944b009-6a76-4957-8833-db95b010e5a5)
97

108
## PDF generation library for PHP
119
The best library in the world to generate PDF from HTML
@@ -196,7 +194,7 @@ When you want to place page number (in header or footer for example) you can do
196194
- [ ] position (absolute, relative)
197195

198196
### License
199-
YetiForce Public License v3
197+
MIT
200198
=======
201199
file_put_contents('test.pdf', $pdfFile);
202200
```

‎composer.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "yetiforce/yetiforcepdf",
33
"description": "Library that generate pdf files from html.",
4+
"license": "MIT",
45
"type": "library",
56
"keywords": [
67
"pdf",
@@ -11,7 +12,7 @@
1112
"authors": [
1213
{
1314
"name": "YetiForceCompany",
14-
"email": "info@yetiforce.com",
15+
"email": "devs@yetiforce.com",
1516
"homepage": "https://yetiforce.com/"
1617
}
1718
],

‎examples/ColSpan.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
$loader = require '../vendor/autoload.php';
44
$files = ['ColSpan'];
55
foreach ($files as $file) {
6-
$document = (new YetiForcePDF\Document())->init();
7-
$document->loadHtml(file_get_contents($file . '.html'));
8-
$pdfFile = $document->render();
9-
file_put_contents($file . '.pdf', $pdfFile);
6+
$document = (new YetiForcePDF\Document())->init();
7+
$document->loadHtml(file_get_contents($file . '.html'));
8+
$pdfFile = $document->render();
9+
file_put_contents($file . '.pdf', $pdfFile);
1010
}

‎examples/CustomFonts.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
'family' => 'Pacifico',
88
'weight' => '400',
99
'style' => 'normal',
10-
'file' => 'd:\fonts\Pacifico\Pacifico-Regular.ttf'
10+
'file' => 'd:\fonts\Pacifico\Pacifico-Regular.ttf',
1111
],
1212
[
1313
'family' => 'Lobster Two',
1414
'weight' => '400',
1515
'style' => 'normal',
16-
'file' => 'd:\fonts\Lobster_Two\LobsterTwo-Regular.ttf'
16+
'file' => 'd:\fonts\Lobster_Two\LobsterTwo-Regular.ttf',
1717
],
1818
[
1919
'family' => 'Lobster Two',
2020
'weight' => 'bold',
2121
'style' => 'normal',
22-
'file' => 'd:\fonts\Lobster_Two\LobsterTwo-Bold.ttf'
22+
'file' => 'd:\fonts\Lobster_Two\LobsterTwo-Bold.ttf',
2323
],
2424
]);
2525

‎examples/DefaultStyles.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
$loader = require '../vendor/autoload.php';
44
$files = ['DefaultStyles'];
55
foreach ($files as $file) {
6-
$document = (new YetiForcePDF\Document())->init();
7-
$document->loadHtml(file_get_contents($file . '.html'));
8-
$pdfFile = $document->render();
9-
file_put_contents($file . '.pdf', $pdfFile);
6+
$document = (new YetiForcePDF\Document())->init();
7+
$document->loadHtml(file_get_contents($file . '.html'));
8+
$pdfFile = $document->render();
9+
file_put_contents($file . '.pdf', $pdfFile);
1010
}

‎examples/HeaderFooter.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
$loader = require '../vendor/autoload.php';
44
$files = ['HeaderFooter'];
55
foreach ($files as $file) {
6-
$document = (new YetiForcePDF\Document())->init();
7-
$document->loadHtml(file_get_contents($file . '.html'));
8-
$pdfFile = $document->render();
9-
file_put_contents($file . '.pdf', $pdfFile);
6+
$document = (new YetiForcePDF\Document())->init();
7+
$document->loadHtml(file_get_contents($file . '.html'));
8+
$pdfFile = $document->render();
9+
file_put_contents($file . '.pdf', $pdfFile);
1010
}

‎examples/Image.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
$loader = require '../vendor/autoload.php';
44
$files = ['Image'];
55
foreach ($files as $file) {
6-
$document = (new YetiForcePDF\Document())->init();
7-
$document->loadHtml(file_get_contents($file . '.html'));
8-
$pdfFile = $document->render();
9-
file_put_contents($file . '.pdf', $pdfFile);
6+
$document = (new YetiForcePDF\Document())->init();
7+
$document->loadHtml(file_get_contents($file . '.html'));
8+
$pdfFile = $document->render();
9+
file_put_contents($file . '.pdf', $pdfFile);
1010
}

‎examples/InvoiceTable.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
$document->loadHtml(file_get_contents('InvoiceTable.html'));
66
$time = microtime(true);
77
$pdfFile = $document->render();
8-
echo microtime(true)-$time;
8+
echo microtime(true) - $time;
99
file_put_contents('InvoiceTable.pdf', $pdfFile);

‎examples/LongTable.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
$document->loadHtml(file_get_contents($file . '.html'));
88
$time = microtime(true);
99
$pdfFile = $document->render();
10-
echo microtime(true) -$time;
10+
echo microtime(true) - $time;
1111
file_put_contents($file . '.pdf', $pdfFile);
1212
}

‎examples/LoremIpsum.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
$document->loadHtml(file_get_contents($file . '.html'));
88
$time = microtime(true);
99
$pdfFile = $document->render();
10-
echo microtime(true) -$time;
10+
echo microtime(true) - $time;
1111
file_put_contents($file . '.pdf', $pdfFile);
1212
}

‎examples/NotExported.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
$document->loadHtml(file_get_contents($file . '.html'));
88
$time = microtime(true);
99
$pdfFile = $document->render();
10-
echo microtime(true) -$time;
10+
echo microtime(true) - $time;
1111
file_put_contents($file . '.pdf', $pdfFile);
1212
}

‎examples/Pages.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
$loader = require '../vendor/autoload.php';
44
$files = ['Pages'];
55
foreach ($files as $file) {
6-
$document = (new YetiForcePDF\Document())->init();
7-
$document->loadHtml(file_get_contents($file . '.html'));
8-
$pdfFile = $document->render();
9-
file_put_contents($file . '.pdf', $pdfFile);
6+
$document = (new YetiForcePDF\Document())->init();
7+
$document->loadHtml(file_get_contents($file . '.html'));
8+
$pdfFile = $document->render();
9+
file_put_contents($file . '.pdf', $pdfFile);
1010
}

‎examples/PagesTables.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
$document->loadHtml(file_get_contents($file . '.html'));
88
$time = microtime(true);
99
$pdfFile = $document->render();
10-
echo microtime(true)-$time;
10+
echo microtime(true) - $time;
1111
file_put_contents($file . '.pdf', $pdfFile);
1212
}

‎examples/PagesTables2.html.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
$html = '<table style="border:1px solid #000;border-collapse:collapse;"><tbody>';
4-
for ($i = 0; $i < 100; $i++) {
4+
for ($i = 0; $i < 100; ++$i) {
55
$html .= '<tr><td style="border:1px solid red;">' . $i . '</td><td style="border:1px solid green;">item</td></tr>';
66
}
77
$html .= '</tbody></table>';

‎examples/PagesTables2.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<?php
22

33
$loader = require '../vendor/autoload.php';
4-
require('PagesTables2.html.php');
4+
require 'PagesTables2.html.php';
55
$document = (new YetiForcePDF\Document())->init();
66
$document->loadHtml($html);
77
$pdfFile = $document->render();
88
file_put_contents('PagesTables2.pdf', $pdfFile);
9-

‎examples/RowSpan.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
$loader = require '../vendor/autoload.php';
44
$files = ['RowSpan'];
55
foreach ($files as $file) {
6-
$document = (new YetiForcePDF\Document())->init();
7-
$document->loadHtml(file_get_contents($file . '.html'));
8-
$pdfFile = $document->render();
9-
file_put_contents($file . '.pdf', $pdfFile);
6+
$document = (new YetiForcePDF\Document())->init();
7+
$document->loadHtml(file_get_contents($file . '.html'));
8+
$pdfFile = $document->render();
9+
file_put_contents($file . '.pdf', $pdfFile);
1010
}

0 commit comments

Comments
 (0)