Skip to content

Commit 6bfa43d

Browse files
committed
Update dependencies and code style
1 parent 5b112cb commit 6bfa43d

24 files changed

Lines changed: 3877 additions & 1822 deletions

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
/info/
44
/vendor/
55
/config.test.yml
6-
/.php_cs.cache
6+
/.php_cs.cache
7+
/.phpunit.result.cache

.php_cs.dist

Lines changed: 8 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,10 @@
11
<?php
22

3-
return PhpCsFixer\Config::create()
4-
->setRiskyAllowed(true)
5-
->setRules([
6-
"@PSR1" => true,
7-
"@PSR2" => true,
8-
"braces" => [
9-
"allow_single_line_closure" => true,
10-
"position_after_functions_and_oop_constructs" => "same",
11-
],
12-
"array_syntax" => ["syntax" => "short"],
13-
"cast_spaces" => true,
14-
"combine_consecutive_unsets" => true,
15-
"function_to_constant" => true,
16-
"native_function_invocation" => true,
17-
"no_multiline_whitespace_before_semicolons" => true,
18-
"no_unused_imports" => true,
19-
"no_useless_else" => true,
20-
"no_useless_return" => true,
21-
"no_whitespace_before_comma_in_array" => true,
22-
"no_whitespace_in_blank_line" => true,
23-
"non_printable_character" => true,
24-
"normalize_index_brace" => true,
25-
"ordered_imports" => true,
26-
"php_unit_construct" => true,
27-
"php_unit_dedicate_assert" => true,
28-
"php_unit_fqcn_annotation" => true,
29-
"phpdoc_summary" => true,
30-
"phpdoc_types" => true,
31-
"psr4" => true,
32-
"return_type_declaration" => ["space_before" => "none"],
33-
"short_scalar_cast" => true,
34-
"single_blank_line_before_namespace" => true,
35-
])
36-
->setFinder(
37-
PhpCsFixer\Finder::create()
38-
->in(__DIR__ . "/src")
39-
->in(__DIR__ . "/test")
40-
);
3+
$config = new Amp\CodeStyle\Config;
4+
$config->getFinder()
5+
->in(__DIR__ . '/src')
6+
->in(__DIR__ . '/test');
7+
8+
$config->setCacheFile(__DIR__ . '/.php_cs.cache');
9+
10+
return $config;

.travis.yml

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

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2015-2018 Niklas Keller
3+
Copyright (c) 2015-2021 Niklas Keller
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

composer.json

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,22 @@
1111
"tls"
1212
],
1313
"require": {
14-
"php": ">=7",
14+
"php": ">=7.2",
1515
"ext-openssl": "*",
16-
"amphp/process": "^0.3.3",
17-
"amphp/parallel": "^0.2.5",
18-
"kelunik/acme": "^0.5",
16+
"amphp/process": "^1.1",
17+
"amphp/parallel": "^v1.4",
18+
"kelunik/acme": "^1-dev",
1919
"kelunik/certificate": "^1",
20-
"league/climate": "^3.2",
21-
"rdlowrey/auryn": "^1.4.2",
22-
"webmozart/assert": "^1.2",
23-
"symfony/yaml": "^3.0",
24-
"amphp/log": "^1.0"
20+
"league/climate": "^3.4",
21+
"rdlowrey/auryn": "^1.4.4",
22+
"webmozart/assert": "^1.3",
23+
"symfony/yaml": "^5.3.2",
24+
"amphp/log": "^1.0",
25+
"ext-posix": "*"
2526
},
2627
"require-dev": {
27-
"phpunit/phpunit": "^6",
28-
"friendsofphp/php-cs-fixer": "^2.9",
28+
"phpunit/phpunit": "^8 || ^9",
29+
"amphp/php-cs-fixer-config": "dev-master",
2930
"macfja/phar-builder": "^0.2.6"
3031
},
3132
"license": "MIT",
@@ -45,15 +46,19 @@
4546
},
4647
"config": {
4748
"platform": {
48-
"php": "7.0.0"
49+
"php": "7.2.5"
4950
}
5051
},
5152
"extra": {
5253
"phar-builder": {
5354
"compression": "GZip",
5455
"name": "acme-client.phar",
5556
"output-dir": "build",
56-
"include": ["info", "src", "vendor/kelunik/acme/res"],
57+
"include": [
58+
"info",
59+
"src",
60+
"vendor/kelunik/acme/res"
61+
],
5762
"include-dev": false,
5863
"skip-shebang": false,
5964
"entry-point": "bin/acme",

0 commit comments

Comments
 (0)