diff --git a/.editorconfig b/.editorconfig index 0a4d7c6..a59b091 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,5 +2,5 @@ tab_width = 4 end_of_line = lf -[*.{php}] +[*.{php,json,xml.dist}] indent_style = space diff --git a/.gitignore b/.gitignore index a8aa02b..58dbe73 100644 --- a/.gitignore +++ b/.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/ \ No newline at end of file diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 37fad01..71e53d5 100644 --- a/.scrutinizer.yml +++ b/.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/ \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 782c6cd..76c05c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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" diff --git a/LICENSE b/LICENSE index 5cd24d0..146b5cf 100644 --- a/LICENSE +++ b/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 diff --git a/README.md b/README.md index e8f6823..58725ee 100644 --- a/README.md +++ b/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 diff --git a/composer.json b/composer.json index 438b7a8..0da11d8 100644 --- a/composer.json +++ b/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" + } + } +} \ No newline at end of file diff --git a/phpunit.xml.dist b/phpunit.xml.dist index d515369..6a06dd6 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,33 +1,29 @@ - - - - test/unit - - - test/integration - - - - - lib - - - - - - + + + + test/unit + + + test/integration + + + + + lib + + + + + + \ No newline at end of file