Skip to content

Commit

Permalink
Update docs
Browse files Browse the repository at this point in the history
  • Loading branch information
sop committed May 20, 2019
1 parent 8f52d72 commit f081d22
Show file tree
Hide file tree
Showing 8 changed files with 109 additions and 95 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Expand Up @@ -2,5 +2,5 @@
tab_width = 4
end_of_line = lf

[*.{php}]
[*.{php,json,xml.dist}]
indent_style = space
16 changes: 12 additions & 4 deletions .gitignore
@@ -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/
/demo/
30 changes: 20 additions & 10 deletions .scrutinizer.yml
@@ -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.0
filter:
excluded_paths:
- test/
dependency_paths:
- vendor/
checks:
php:
code_rating: true
duplication: false
filter:
excluded_paths:
- test/
6 changes: 3 additions & 3 deletions .travis.yml
Expand Up @@ -3,9 +3,9 @@ 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
@@ -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
22 changes: 11 additions & 11 deletions README.md
@@ -1,21 +1,21 @@
[![Build Status](https://travis-ci.org/sop/pkcs8.svg?branch=master)](https://travis-ci.org/sop/pkcs8)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/sop/pkcs8/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/sop/pkcs8/?branch=master)
[![Coverage Status](https://coveralls.io/repos/github/sop/pkcs8/badge.svg?branch=master)](https://coveralls.io/github/sop/pkcs8?branch=master)
[![License](https://poser.pugx.org/sop/pkcs8/license)](https://github.com/sop/pkcs8/blob/master/LICENSE)

# PKCS #8

[![Build Status](https://travis-ci.org/sop/pkcs8.svg?branch=php70)](https://travis-ci.org/sop/pkcs8)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/sop/pkcs8/badges/quality-score.png?b=php70)](https://scrutinizer-ci.com/g/sop/pkcs8/?branch=php70)
[![Coverage Status](https://coveralls.io/repos/github/sop/pkcs8/badge.svg?branch=php70)](https://coveralls.io/github/sop/pkcs8?branch=php70)
[![License](https://poser.pugx.org/sop/pkcs8/license)](https://github.com/sop/pkcs8/blob/php70/LICENSE)

A PHP implementation of [PKCS #8](https://tools.ietf.org/html/rfc5208)
encrypted private-key.

## Requirements

- PHP >=7.0
- [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)
- [sop/crypto-bridge](https://github.com/sop/crypto-bridge)
- [sop/pkcs5](https://github.com/sop/pkcs5)
- PHP >=7.0
- [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)
- [sop/crypto-bridge](https://github.com/sop/crypto-bridge)
- [sop/pkcs5](https://github.com/sop/pkcs5)

## Installation

Expand Down
68 changes: 34 additions & 34 deletions composer.json
@@ -1,35 +1,35 @@
{
"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"
}
],
"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.5"
},
"autoload": {
"psr-4": {
"Sop\\PKCS8\\": "lib/PKCS8"
}
}
}
58 changes: 27 additions & 31 deletions phpunit.xml.dist
@@ -1,33 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.5/phpunit.xsd"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
bootstrap="test/bootstrap.php">
<testsuites>
<testsuite name="Unit">
<directory>test/unit</directory>
</testsuite>
<testsuite name="Integration">
<directory>test/integration</directory>
</testsuite>
</testsuites>
<filter>
<whitelist
addUncoveredFilesFromWhitelist="true"
processUncoveredFilesFromWhitelist="true">
<directory suffix=".php">lib</directory>
</whitelist>
</filter>
<logging>
<log
type="coverage-clover"
target="build/logs/clover.xml" />
<log
type="coverage-html"
target="build/coverage" />
</logging>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.5/phpunit.xsd"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
bootstrap="test/bootstrap.php">
<testsuites>
<testsuite name="Unit">
<directory>test/unit</directory>
</testsuite>
<testsuite name="Integration">
<directory>test/integration</directory>
</testsuite>
</testsuites>
<filter>
<whitelist addUncoveredFilesFromWhitelist="true"
processUncoveredFilesFromWhitelist="true">
<directory suffix=".php">lib</directory>
</whitelist>
</filter>
<logging>
<log type="coverage-clover"
target="build/logs/clover.xml" />
<log type="coverage-html"
target="build/coverage" />
</logging>
</phpunit>

0 comments on commit f081d22

Please sign in to comment.