Skip to content

Commit 3bf244b

Browse files
authored
chore: merge develop into master
2 parents deae3f5 + 5b52e60 commit 3bf244b

Some content is hidden

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

42 files changed

+6981
-321
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
composer.lock
21
phpunit.xml
32
vendor
43
clover.xml

.php-cs-fixer.cache

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

.php-cs-fixer.php

Lines changed: 194 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,194 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
use PhpCsFixer\Config;
6+
use PhpCsFixer\Finder;
7+
8+
$rules = [
9+
'array_syntax' => ['syntax' => 'short'],
10+
'binary_operator_spaces' => [
11+
'default' => 'single_space',
12+
'operators' => [
13+
'=' => 'align',
14+
'=>' => 'align',
15+
],
16+
],
17+
'blank_line_after_namespace' => true,
18+
'blank_line_after_opening_tag' => true,
19+
'blank_line_before_statement' => [
20+
'statements' => [
21+
'break',
22+
'continue',
23+
'declare',
24+
'return',
25+
'throw',
26+
'try',
27+
],
28+
],
29+
'braces' => true,
30+
'cast_spaces' => true,
31+
'class_attributes_separation' => [
32+
'elements' => [
33+
'const' => 'one',
34+
'method' => 'one',
35+
'property' => 'one',
36+
],
37+
],
38+
'class_definition' => true,
39+
'concat_space' => ['spacing' => 'none'],
40+
'constant_case' => ['case' => 'lower'],
41+
'declare_equal_normalize' => true,
42+
'declare_strict_types' => true,
43+
'echo_tag_syntax' => ['format' => 'long'],
44+
'elseif' => true,
45+
'encoding' => true,
46+
'final_internal_class' => true,
47+
'full_opening_tag' => true,
48+
'fully_qualified_strict_types' => true,
49+
'function_declaration' => true,
50+
'function_typehint_space' => true,
51+
'heredoc_to_nowdoc' => true,
52+
'include' => true,
53+
'increment_style' => ['style' => 'post'],
54+
'indentation_type' => true,
55+
'linebreak_after_opening_tag' => true,
56+
'line_ending' => true,
57+
'lowercase_cast' => true,
58+
'lowercase_keywords' => true,
59+
'lowercase_static_reference' => true,
60+
'magic_method_casing' => true,
61+
'magic_constant_casing' => true,
62+
'method_argument_space' => true,
63+
'multiline_whitespace_before_semicolons' => ['strategy' => 'no_multi_line'],
64+
'native_function_casing' => true,
65+
'new_with_braces' => true,
66+
'no_alias_functions' => true,
67+
'no_blank_lines_after_class_opening' => true,
68+
'no_blank_lines_after_phpdoc' => true,
69+
'no_closing_tag' => true,
70+
'no_empty_phpdoc' => true,
71+
'no_empty_statement' => true,
72+
'no_extra_blank_lines' => [
73+
'tokens' => [
74+
'extra',
75+
'throw',
76+
'use',
77+
'use_trait',
78+
],
79+
],
80+
'no_leading_import_slash' => true,
81+
'no_leading_namespace_whitespace' => true,
82+
'no_mixed_echo_print' => ['use' => 'echo'],
83+
'no_multiline_whitespace_around_double_arrow' => true,
84+
'no_short_bool_cast' => true,
85+
'no_singleline_whitespace_before_semicolons' => true,
86+
'no_spaces_after_function_name' => true,
87+
'no_spaces_around_offset' => [
88+
'positions' => ['inside'],
89+
],
90+
'no_spaces_inside_parenthesis' => true,
91+
'no_trailing_comma_in_list_call' => true,
92+
'no_trailing_comma_in_singleline_array' => true,
93+
'no_trailing_whitespace' => true,
94+
'no_trailing_whitespace_in_comment' => true,
95+
'no_unneeded_control_parentheses' => [
96+
'statements' => [
97+
'break',
98+
'clone',
99+
'continue',
100+
'echo_print',
101+
'return',
102+
'switch_case',
103+
'yield',
104+
],
105+
],
106+
'no_unreachable_default_argument_value' => true,
107+
'no_unused_imports' => true,
108+
'no_useless_else' => true,
109+
'no_useless_return' => true,
110+
'no_whitespace_before_comma_in_array' => true,
111+
'no_whitespace_in_blank_line' => true,
112+
'normalize_index_brace' => true,
113+
'not_operator_with_successor_space' => true,
114+
'object_operator_without_whitespace' => true,
115+
'ordered_class_elements' => true,
116+
'ordered_imports' => ['sort_algorithm' => 'alpha'],
117+
'php_unit_strict' => true,
118+
'php_unit_test_class_requires_covers' => true,
119+
'phpdoc_add_missing_param_annotation' => true,
120+
'phpdoc_align' => false,
121+
'phpdoc_indent' => true,
122+
'phpdoc_inline_tag_normalizer' => true,
123+
'phpdoc_no_access' => true,
124+
'phpdoc_no_package' => true,
125+
'phpdoc_no_useless_inheritdoc' => true,
126+
'phpdoc_order' => true,
127+
'phpdoc_scalar' => true,
128+
'phpdoc_single_line_var_spacing' => true,
129+
'phpdoc_summary' => true,
130+
'phpdoc_to_comment' => ['ignored_tags' => ['var']],
131+
'phpdoc_trim' => true,
132+
'phpdoc_types' => true,
133+
'phpdoc_var_without_name' => true,
134+
'psr_autoloading' => true,
135+
'self_accessor' => true,
136+
'semicolon_after_instruction' => true,
137+
'short_scalar_cast' => true,
138+
'simplified_null_return' => true,
139+
'single_blank_line_at_eof' => true,
140+
'single_blank_line_before_namespace' => true,
141+
'single_class_element_per_statement' => [
142+
'elements' => [
143+
'const',
144+
'property',
145+
],
146+
],
147+
'single_import_per_statement' => true,
148+
'single_line_after_imports' => true,
149+
'single_line_comment_style' => [
150+
'comment_types' => ['hash'],
151+
],
152+
'single_quote' => true,
153+
'single_trait_insert_per_statement' => true,
154+
'space_after_semicolon' => true,
155+
'standardize_not_equals' => true,
156+
'strict_comparison' => true,
157+
'strict_param' => true,
158+
'switch_case_semicolon_to_colon' => true,
159+
'switch_case_space' => true,
160+
'ternary_operator_spaces' => true,
161+
'trailing_comma_in_multiline' => [
162+
'elements' => ['arrays'],
163+
],
164+
'trim_array_spaces' => true,
165+
'unary_operator_spaces' => true,
166+
'visibility_required' => [
167+
'elements' => [
168+
'property',
169+
'method',
170+
'const',
171+
],
172+
],
173+
'whitespace_after_comma_in_array' => true,
174+
];
175+
176+
$finder = Finder::create()
177+
->notPath('bootstrap')
178+
->notPath('storage')
179+
->notPath('vendor')
180+
->in(getcwd())
181+
->name('*.php')
182+
->notName('*.blade.php')
183+
->notName('index.php')
184+
->notName('server.php')
185+
->notName('_ide_helper.php')
186+
->ignoreDotFiles(true)
187+
->ignoreVCS(true);
188+
189+
return (new Config())
190+
->setFinder($finder)
191+
->setRules($rules)
192+
->setRiskyAllowed(true)
193+
->setCacheFile(__DIR__.'/.php-cs-fixer.cache')
194+
->setUsingCache(true);

.php_cs

Lines changed: 0 additions & 145 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
1616
## Documentation
1717

18-
You can find installation instructions and detailed instructions on how to use this package at the [dedicated documentation site](https://docs.ark.io/sdk/cryptography/php.html).
18+
You can find installation instructions and detailed instructions on how to use this package at the [dedicated documentation site](https://ark.dev/docs/sdk/php/crypto/intro).
1919

2020
## Security
2121

composer.json

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,16 @@
1717
}
1818
],
1919
"require": {
20-
"php": "^8.0",
21-
"bitwasp/bitcoin": "^1.0",
20+
"php": "^8.2",
21+
"protonlabs/bitcoin": "^1.0",
2222
"simplito/elliptic-php": "^1.0"
2323
},
2424
"require-dev": {
25-
"graham-campbell/analyzer": "^3.0",
26-
"illuminate/support": "^8.62",
27-
"pestphp/pest": "^1.11",
28-
"pestphp/pest-plugin-parallel": "^0.3.1"
25+
"friendsofphp/php-cs-fixer": "^3.59",
26+
"graham-campbell/analyzer": "^3.1",
27+
"illuminate/support": "^8.8",
28+
"pestphp/pest": "^1.23",
29+
"pestphp/pest-plugin-parallel": "^1.2"
2930
},
3031
"autoload": {
3132
"psr-4": {
@@ -39,7 +40,10 @@
3940
},
4041
"config": {
4142
"preferred-install": "dist",
42-
"sort-packages": true
43+
"sort-packages": true,
44+
"allow-plugins": {
45+
"pestphp/pest-plugin": true
46+
}
4347
},
4448
"extra": {
4549
"branch-alias": {

0 commit comments

Comments
 (0)