Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge daaf600 into 5035b0e
  • Loading branch information
Spomky committed Apr 21, 2019
2 parents 5035b0e + daaf600 commit 4a826f1
Show file tree
Hide file tree
Showing 475 changed files with 5,013 additions and 4,058 deletions.
16 changes: 0 additions & 16 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

35 changes: 35 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,35 @@
---
name: Bug report
about: Create a report to help us improve

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,17 @@
---
name: Feature request
about: Suggest an idea for this project

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
20 changes: 0 additions & 20 deletions .github/PULL_REQUEST_TEMPLATE.md

This file was deleted.

14 changes: 13 additions & 1 deletion .php_cs.dist
@@ -1,5 +1,16 @@
<?php

declare(strict_types=1);

/*
* The MIT License (MIT)
*
* Copyright (c) 2014-2019 Spomky-Labs
*
* This software may be modified and distributed under the terms
* of the MIT license. See the LICENSE file for details.
*/

$header = 'The MIT License (MIT)
Copyright (c) 2014-2019 Spomky-Labs
Expand All @@ -17,6 +28,7 @@ return PhpCsFixer\Config::create()
'@PSR1' => true,
'@PSR2' => true,
'@Symfony' => true,
'@PhpCsFixer' => true,
'@DoctrineAnnotation' => true,
'@PHP70Migration' => true,
'@PHP71Migration' => true,
Expand All @@ -30,14 +42,14 @@ return PhpCsFixer\Config::create()
'native_function_invocation' => [
'include' => ['@compiler_optimized'],
'scope' => 'namespaced',
'strict' => true,
],
'mb_str_functions' => true,
'method_chaining_indentation' => true,
'linebreak_after_opening_tag' => true,
'combine_consecutive_issets' => true,
'combine_consecutive_unsets' => true,
'compact_nullable_typehint' => true,
'no_superfluous_phpdoc_tags' => true,
'no_superfluous_elseif' => true,
'phpdoc_trim_consecutive_blank_line_separation' => true,
'phpdoc_order' => true,
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -50,4 +50,4 @@ jobs:
- wget -c https://get.sensiolabs.org/security-checker.phar
- chmod +x security-checker.phar
script:
- ./security-checker.phar
- ./security-checker.phar security:check
31 changes: 16 additions & 15 deletions composer.json
Expand Up @@ -47,26 +47,25 @@
},
"autoload-dev": {
"psr-4": {
"Jose\\Test\\": "tests/",
"Jose\\Performance\\": "performance/"
}
},
"require": {
"php": "^7.1",
"php": "^7.2",
"ext-gmp": "*",
"ext-mbstring": "*",
"ext-json": "*",
"ext-mbstring": "*",
"ext-openssl": "*",
"ext-sodium": "*",
"fgrosse/phpasn1": "^2.0",
"paragonie/sodium_compat": "^1.2",
"spomky-labs/aes-key-wrap": "^4.0.1|^5.0",
"spomky-labs/base64url": "^1.0|^2.0",
"symfony/config": "^4.1",
"symfony/console": "^4.1",
"symfony/dependency-injection": "^4.1",
"symfony/event-dispatcher": "^4.1",
"symfony/framework-bundle": "^4.1",
"symfony/http-kernel": "^4.1"
"symfony/config": "^4.2",
"symfony/console": "^4.2",
"symfony/dependency-injection": "^4.2",
"symfony/event-dispatcher": "^4.2",
"symfony/framework-bundle": "^4.2",
"symfony/http-kernel": "^4.2"
},
"require-dev": {
"ext-curl": "*",
Expand All @@ -79,14 +78,15 @@
"php-http/httplug-bundle": "^1.7",
"php-http/mock-client": "^1.0",
"phpstan/phpstan": "^0.11",
"phpstan/phpstan-beberlei-assert": "^0.11.0",
"phpstan/phpstan-deprecation-rules": "^0.11",
"phpstan/phpstan-phpunit": "^0.11",
"phpstan/phpstan-strict-rules": "^0.11",
"phpunit/phpunit": "^7.0",
"symfony/browser-kit": "^4.1",
"symfony/finder": "^4.1",
"symfony/phpunit-bridge": "^4.1",
"symfony/serializer": "^4.1",
"symfony/browser-kit": "^4.2",
"symfony/finder": "^4.2",
"symfony/phpunit-bridge": "^4.2",
"symfony/serializer": "^4.2",
"symfony/var-dumper": "^4.2"
},
"replace": {
Expand Down Expand Up @@ -120,14 +120,15 @@
"php-http/httplug": "To enable JKU/X5U support.",
"php-http/httplug-bundle": "To enable JKU/X5U support.",
"php-http/message-factory": "To enable JKU/X5U support.",
"symfony/serializer": "Use the Symfony serializer to serialize/unserialize JWS and JWE tokens.",
"symfony/serializer": "Use the Symfony serializer to serialize/unserialize JWS and JWE tokens",
"symfony/var-dumper": "Used to show data on the debug toolbar."
},
"extra": {
"branch-alias": {
"v1.0": "1.0.x-dev",
"v1.1": "1.1.x-dev",
"v1.2": "1.2.x-dev",
"v1.3": "1.3.x-dev",
"v2.0": "2.0.x-dev"
}
},
Expand Down
10 changes: 5 additions & 5 deletions performance/JWE/A128GCMKWBench.php
Expand Up @@ -55,11 +55,6 @@ public function dataHeadersAndAlgorithms(): array
];
}

protected function getAAD(): ?string
{
return 'A,B,C,D';
}

public function dataInputs(): array
{
return [
Expand Down Expand Up @@ -90,4 +85,9 @@ public function dataRecipientPublicKeys(): array
],
];
}

protected function getAAD(): ?string
{
return 'A,B,C,D';
}
}
10 changes: 5 additions & 5 deletions performance/JWE/A128KWBench.php
Expand Up @@ -55,11 +55,6 @@ public function dataHeadersAndAlgorithms(): array
];
}

protected function getAAD(): ?string
{
return 'A,B,C,D';
}

public function dataInputs(): array
{
return [
Expand Down Expand Up @@ -90,4 +85,9 @@ public function dataRecipientPublicKeys(): array
],
];
}

protected function getAAD(): ?string
{
return 'A,B,C,D';
}
}
10 changes: 5 additions & 5 deletions performance/JWE/A192GCMKWBench.php
Expand Up @@ -55,11 +55,6 @@ public function dataHeadersAndAlgorithms(): array
];
}

protected function getAAD(): ?string
{
return 'A,B,C,D';
}

public function dataInputs(): array
{
return [
Expand Down Expand Up @@ -90,4 +85,9 @@ public function dataRecipientPublicKeys(): array
],
];
}

protected function getAAD(): ?string
{
return 'A,B,C,D';
}
}
10 changes: 5 additions & 5 deletions performance/JWE/A192KWBench.php
Expand Up @@ -55,11 +55,6 @@ public function dataHeadersAndAlgorithms(): array
];
}

protected function getAAD(): ?string
{
return 'A,B,C,D';
}

public function dataInputs(): array
{
return [
Expand Down Expand Up @@ -90,4 +85,9 @@ public function dataRecipientPublicKeys(): array
],
];
}

protected function getAAD(): ?string
{
return 'A,B,C,D';
}
}
10 changes: 5 additions & 5 deletions performance/JWE/A256GCMKWBench.php
Expand Up @@ -55,11 +55,6 @@ public function dataHeadersAndAlgorithms(): array
];
}

protected function getAAD(): ?string
{
return 'A,B,C,D';
}

public function dataInputs(): array
{
return [
Expand Down Expand Up @@ -90,4 +85,9 @@ public function dataRecipientPublicKeys(): array
],
];
}

protected function getAAD(): ?string
{
return 'A,B,C,D';
}
}
10 changes: 5 additions & 5 deletions performance/JWE/A256KWBench.php
Expand Up @@ -55,11 +55,6 @@ public function dataHeadersAndAlgorithms(): array
];
}

protected function getAAD(): ?string
{
return 'A,B,C,D';
}

public function dataInputs(): array
{
return [
Expand Down Expand Up @@ -90,4 +85,9 @@ public function dataRecipientPublicKeys(): array
],
];
}

protected function getAAD(): ?string
{
return 'A,B,C,D';
}
}
10 changes: 5 additions & 5 deletions performance/JWE/ECDHESA128KWBench.php
Expand Up @@ -55,11 +55,6 @@ public function dataHeadersAndAlgorithms(): array
];
}

protected function getAAD(): ?string
{
return 'A,B,C,D';
}

public function dataInputs(): array
{
return [
Expand Down Expand Up @@ -159,4 +154,9 @@ public function dataRecipientPublicKeys(): array
],
];
}

protected function getAAD(): ?string
{
return 'A,B,C,D';
}
}
10 changes: 5 additions & 5 deletions performance/JWE/ECDHESA192KWBench.php
Expand Up @@ -55,11 +55,6 @@ public function dataHeadersAndAlgorithms(): array
];
}

protected function getAAD(): ?string
{
return 'A,B,C,D';
}

public function dataInputs(): array
{
return [
Expand Down Expand Up @@ -159,4 +154,9 @@ public function dataRecipientPublicKeys(): array
],
];
}

protected function getAAD(): ?string
{
return 'A,B,C,D';
}
}

0 comments on commit 4a826f1

Please sign in to comment.