Skip to content

Commit

Permalink
Change requirements to PHP 7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
sop committed May 8, 2019
1 parent 8f52d72 commit e7da66e
Show file tree
Hide file tree
Showing 14 changed files with 262 additions and 207 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
tab_width = 4
end_of_line = lf

[*.{php}]
[*.{php,json,xml.dist}]
indent_style = space
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# export
.git* export-ignore
.*.yml export-ignore
.php_cs* export-ignore
test/ export-ignore
phpunit.* export-ignore
.editorconfig export-ignore
14 changes: 11 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
# eclipse project files
# Eclipse project files
/.settings/
/.buildpath
/.project
/.pydevproject

# build
# VS Code
/.vscode

# build files
/build/
/.*.cache

# composer
# Composer
/vendor/
/composer.lock

# non-dist files
/phpunit.xml
/.php_cs

# sandbox
/demo/
33 changes: 33 additions & 0 deletions .php_cs.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?php

declare(strict_types = 1);

$finder = PhpCsFixer\Finder::create()
->in(__DIR__);

return PhpCsFixer\Config::create()
->setRules([
'@PSR2' => true,
'@PhpCsFixer' => true,
'multiline_whitespace_before_semicolons' => [
'strategy' => 'no_multi_line',
],
'declare_equal_normalize' => [
'space' => 'single',
],
'method_argument_space' => [
'on_multiline' => 'ignore',
],
'blank_line_before_statement' => [
'statements' => [],
],
'concat_space' => [
'spacing' => 'one',
],
'list_syntax' => [
'syntax' => 'short',
],
'php_unit_test_class_requires_covers' => false,
'phpdoc_types' => false,
])
->setFinder($finder);
30 changes: 20 additions & 10 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,27 @@
build:
nodes:
analysis:
tests:
override:
- php-scrutinizer-run
tests-and-coverage:
requires:
- node: analysis
tests:
override:
- command: vendor/bin/phpunit
coverage:
format: clover
file: build/logs/clover.xml
environment:
php:
version: 7.0.20
tests:
override:
- command: vendor/bin/phpunit
coverage:
format: php-clover
file: build/logs/clover.xml
version: 7.2
filter:
excluded_paths:
- test/
dependency_paths:
- vendor/
checks:
php:
code_rating: true
duplication: false
filter:
excluded_paths:
- test/
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
language: php
php:
- "7.0"
- "7.1"
- "7.2"
- "nightly"
- "7.3"
before_script:
- "composer install"
- "composer require satooshi/php-coveralls"
- "composer require php-coveralls/php-coveralls"
after_success:
- "travis_retry php vendor/bin/coveralls -v"
- "travis_retry php vendor/bin/php-coveralls -v"
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2016-2017 Joni Eskelinen
Copyright (c) 2016-2019 Joni Eskelinen

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ encrypted private-key.

## Requirements

- PHP >=7.0
- PHP >=7.2
- [sop/asn1](https://github.com/sop/asn1)
- [sop/crypto-encoding](https://github.com/sop/crypto-encoding)
- [sop/crypto-types](https://github.com/sop/crypto-types)
Expand Down
70 changes: 36 additions & 34 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,37 @@
{
"name": "sop/pkcs8",
"description": "A PHP implementation of PKCS #8 encrypted private-key.",
"homepage": "https://github.com/sop/pkcs8",
"license": "MIT",
"type": "library",
"keywords": [
"pkcs8",
"encrypt",
"private-key"
],
"authors": [
{
"name": "Joni Eskelinen",
"email": "jonieske@gmail.com",
"role": "Developer"
}
],
"require": {
"php": ">=7.0",
"sop/asn1": "^3.2.0",
"sop/crypto-encoding": "^0.2.0",
"sop/crypto-types": "^0.2.1",
"sop/crypto-bridge": "^0.2.0",
"sop/pkcs5": "^0.2.0"
},
"require-dev": {
"phpunit/phpunit": "^6.4"
},
"autoload": {
"psr-4": {
"Sop\\PKCS8\\": "lib/PKCS8"
}
}
}
"name": "sop/pkcs8",
"description": "A PHP implementation of PKCS #8 encrypted private-key.",
"homepage": "https://github.com/sop/pkcs8",
"license": "MIT",
"type": "library",
"keywords": [
"pkcs8",
"encrypt",
"private-key"
],
"authors": [
{
"name": "Joni Eskelinen",
"email": "jonieske@gmail.com",
"role": "Developer"
}
],
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"php": ">=7.2",
"sop/asn1": "dev-php72 as 3.4.0",
"sop/crypto-encoding": "dev-php72 as 0.2.0",
"sop/crypto-types": "dev-php72 as 0.2.1",
"sop/crypto-bridge": "dev-php72 as 0.2.0",
"sop/pkcs5": "dev-php72 as 0.2.0"
},
"require-dev": {
"phpunit/phpunit": "^8.1"
},
"autoload": {
"psr-4": {
"Sop\\PKCS8\\": "lib/PKCS8/"
}
}
}

0 comments on commit e7da66e

Please sign in to comment.