Skip to content

Preparation 3.0 #323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 0 additions & 2 deletions .gitsplit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ splits:
target: "https://${GH_TOKEN}@github.com/web-token/encryption-pack.git"
- prefix: "packs/signature"
target: "https://${GH_TOKEN}@github.com/web-token/signature-pack.git"
- prefix: "src/Easy"
target: "https://${GH_TOKEN}@github.com/web-token/jwt-easy.git"

origins:
- ^master$
Expand Down
80 changes: 0 additions & 80 deletions .php_cs.dist

This file was deleted.

53 changes: 53 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
.PHONY: it
it: coding-standards tests static-analyse performance-tests mutation-tests

.PHONY: code-coverage
code-coverage: vendor ## Show test coverage rates
vendor/bin/phpunit --coverage-text

.PHONY: fix-coding-standards
fix-coding-standards: vendor ## Fix all files using defined PHP-CS-FIXER rules
vendor/bin/ecs --fix

.PHONY: coding-standards
coding-standards: vendor ## Check all files using defined PHP-CS-FIXER rules
vendor/bin/ecs

.PHONY: mutation-tests
mutation-tests: vendor ## Run mutation tests with minimum MSI and covered MSI enabled
vendor/bin/infection --logger-github -s --threads=$(nproc) --min-msi=80 --min-covered-msi=85

.PHONY: tests
tests: vendor ## Run all tests
vendor/bin/phpunit --color

vendor: composer.json composer.lock
composer validate
composer install
composer normalize

.PHONY: tu
tu: vendor ## Run all unit tests
vendor/bin/phpunit --color --group Unit

.PHONY: tf
tf: vendor ## Run all functional tests
vendor/bin/phpunit --color --group Functional

.PHONY: static-analyse
static-analyse: vendor ## Run static analyse
vendor/bin/phpstan analyse

.PHONY: performance-tests
performance-tests: vendor ## Run performance test suite
vendor/bin/phpbench run -l dots --report aggregate

.PHONY: rector
rector: vendor ## Check all files using Rector
vendor/bin/rector process --ansi --dry-run --xdebug


.DEFAULT_GOAL := help
help:
@grep -E '(^[a-zA-Z_-]+:.*?##.*$$)|(^##)' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[32m%-30s\033[0m %s\n", $$1, $$2}' | sed -e 's/\[32m##/[33m/'
.PHONY: help
37 changes: 19 additions & 18 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,32 +58,31 @@
}
},
"require": {
"php": ">=7.2",
"php": ">=8.0",
"ext-json": "*",
"ext-mbstring": "*",
"ext-openssl": "*",
"ext-sodium": "*",
"brick/math": "^0.8.17|^0.9",
"brick/math": "^0.9",
"fgrosse/phpasn1": "^2.0",
"paragonie/constant_time_encoding": "^2.4",
"psr/event-dispatcher": "^1.0",
"psr/http-client": "^1.0",
"psr/http-factory": "^1.0",
"spomky-labs/aes-key-wrap": "^5.0|^6.0",
"symfony/config": "^4.2|^5.0",
"symfony/console": "^4.2|^5.0",
"symfony/dependency-injection": "^4.2|^5.0",
"symfony/event-dispatcher": "^4.2|^5.0",
"symfony/http-kernel": "^4.2|^5.0",
"spomky-labs/aes-key-wrap": "^7.0",
"symfony/config": "^5.4|^6.0",
"symfony/console": "^5.4|^6.0",
"symfony/dependency-injection": "^5.4|^6.0",
"symfony/event-dispatcher": "^5.4|^6.0",
"symfony/http-kernel": "^5.4|^6.0",
"symfony/polyfill-mbstring": "^1.12"
},
"require-dev": {
"ext-curl": "*",
"ext-gmp": "*",
"bjeavons/zxcvbn-php": "^1.0",
"blackfire/php-sdk": "^1.14",
"friendsofphp/php-cs-fixer": "^2.16",
"infection/infection": "^0.15|^0.16|^0.17|^0.18|^0.19|^0.20",
"infection/infection": "^0.25",
"matthiasnoback/symfony-config-test": "^3.1|^4.0",
"nyholm/psr7": "^1.3",
"php-http/mock-client": "^1.0",
Expand All @@ -93,15 +92,17 @@
"phpstan/phpstan-phpunit": "^1.0",
"phpstan/phpstan-strict-rules": "^1.0",
"phpunit/phpunit": "^8.0|^9.0",
"rector/rector": "^0.12.5",
"roave/security-advisories": "dev-latest",
"symfony/browser-kit": "^4.2|^5.0",
"symfony/finder": "^4.2|^5.0",
"symfony/framework-bundle": "^4.2|^5.0",
"symfony/http-client": "^5.2",
"symfony/phpunit-bridge": "^4.2|^5.0",
"symfony/serializer": "^4.2|^5.0",
"symfony/var-dumper": "^4.2|^5.0",
"symfony/yaml": "^4.2|^5.0"
"symfony/browser-kit": "^5.4|^6.0",
"symfony/finder": "^5.4|^6.0",
"symfony/framework-bundle": "^5.4|^6.0",
"symfony/http-client": "^5.4|^6.0",
"symfony/phpunit-bridge": "^5.4|^6.0",
"symfony/serializer": "^5.4|^6.0",
"symfony/var-dumper": "^5.4|^6.0",
"symfony/yaml": "^5.4|^6.0",
"symplify/easy-coding-standard": "^10.0"
},
"replace": {
"web-token/jwt-easy": "self.version",
Expand Down
124 changes: 124 additions & 0 deletions ecs.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
<?php

declare(strict_types=1);

use PhpCsFixer\Fixer\Alias\MbStrFunctionsFixer;
use PhpCsFixer\Fixer\ArrayNotation\ArraySyntaxFixer;
use PhpCsFixer\Fixer\ClassNotation\ProtectedToPrivateFixer;
use PhpCsFixer\Fixer\Comment\HeaderCommentFixer;
use PhpCsFixer\Fixer\ConstantNotation\NativeConstantInvocationFixer;
use PhpCsFixer\Fixer\ControlStructure\NoSuperfluousElseifFixer;
use PhpCsFixer\Fixer\FunctionNotation\NativeFunctionInvocationFixer;
use PhpCsFixer\Fixer\Import\GlobalNamespaceImportFixer;
use PhpCsFixer\Fixer\Import\OrderedImportsFixer;
use PhpCsFixer\Fixer\LanguageConstruct\CombineConsecutiveIssetsFixer;
use PhpCsFixer\Fixer\LanguageConstruct\CombineConsecutiveUnsetsFixer;
use PhpCsFixer\Fixer\Phpdoc\AlignMultilineCommentFixer;
use PhpCsFixer\Fixer\Phpdoc\NoSuperfluousPhpdocTagsFixer;
use PhpCsFixer\Fixer\Phpdoc\PhpdocOrderFixer;
use PhpCsFixer\Fixer\Phpdoc\PhpdocTrimConsecutiveBlankLineSeparationFixer;
use PhpCsFixer\Fixer\PhpTag\LinebreakAfterOpeningTagFixer;
use PhpCsFixer\Fixer\PhpUnit\PhpUnitTestAnnotationFixer;
use PhpCsFixer\Fixer\PhpUnit\PhpUnitTestCaseStaticMethodCallsFixer;
use PhpCsFixer\Fixer\PhpUnit\PhpUnitTestClassRequiresCoversFixer;
use PhpCsFixer\Fixer\ReturnNotation\SimplifiedNullReturnFixer;
use PhpCsFixer\Fixer\Strict\DeclareStrictTypesFixer;
use PhpCsFixer\Fixer\Strict\StrictComparisonFixer;
use PhpCsFixer\Fixer\Strict\StrictParamFixer;
use PhpCsFixer\Fixer\Whitespace\ArrayIndentationFixer;
use PhpCsFixer\Fixer\Whitespace\CompactNullableTypehintFixer;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
use Symplify\EasyCodingStandard\ValueObject\Option;
use Symplify\EasyCodingStandard\ValueObject\Set\SetList;

$header = '';

return static function (ContainerConfigurator $containerConfigurator) use ($header): void {
$containerConfigurator->import(SetList::PSR_12);
$containerConfigurator->import(SetList::PHP_CS_FIXER);
$containerConfigurator->import(SetList::PHP_CS_FIXER_RISKY);
$containerConfigurator->import(SetList::CLEAN_CODE);
$containerConfigurator->import(SetList::SYMFONY);
$containerConfigurator->import(SetList::DOCTRINE_ANNOTATIONS);
$containerConfigurator->import(SetList::SPACES);
$containerConfigurator->import(SetList::PHPUNIT);
$containerConfigurator->import(SetList::SYMPLIFY);
$containerConfigurator->import(SetList::ARRAY);
$containerConfigurator->import(SetList::COMMON);
$containerConfigurator->import(SetList::COMMENTS);
$containerConfigurator->import(SetList::CONTROL_STRUCTURES);
$containerConfigurator->import(SetList::DOCBLOCK);
$containerConfigurator->import(SetList::NAMESPACES);
$containerConfigurator->import(SetList::STRICT);

$services = $containerConfigurator->services();
$services->set(StrictParamFixer::class);
$services->set(StrictComparisonFixer::class);
$services->set(ArraySyntaxFixer::class)
->call('configure', [[
'syntax' => 'short',
]])
;
$services->set(ArrayIndentationFixer::class);
$services->set(OrderedImportsFixer::class);
$services->set(ProtectedToPrivateFixer::class);
$services->set(DeclareStrictTypesFixer::class);
$services->set(NativeConstantInvocationFixer::class);
$services->set(NativeFunctionInvocationFixer::class)
->call('configure', [[
'include' => ['@compiler_optimized'],
'scope' => 'namespaced',
'strict' => true,
]])
;
$services->set(MbStrFunctionsFixer::class);
$services->set(LinebreakAfterOpeningTagFixer::class);
$services->set(CombineConsecutiveIssetsFixer::class);
$services->set(CombineConsecutiveUnsetsFixer::class);
$services->set(CompactNullableTypehintFixer::class);
$services->set(NoSuperfluousElseifFixer::class);
$services->set(NoSuperfluousPhpdocTagsFixer::class);
$services->set(PhpdocTrimConsecutiveBlankLineSeparationFixer::class);
$services->set(PhpdocOrderFixer::class);
$services->set(SimplifiedNullReturnFixer::class);
$services->set(HeaderCommentFixer::class)
->call('configure', [[
'header' => $header,
]])
;
$services->set(AlignMultilineCommentFixer::class)
->call('configure', [[
'comment_type' => 'all_multiline',
]])
;
$services->set(PhpUnitTestAnnotationFixer::class)
->call('configure', [[
'style' => 'annotation',
]])
;
$services->set(PhpUnitTestCaseStaticMethodCallsFixer::class);
$services->set(GlobalNamespaceImportFixer::class)
->call('configure', [[
'import_classes' => true,
'import_constants' => true,
'import_functions' => true,
]])
;

$services->remove(PhpUnitTestClassRequiresCoversFixer::class);

$parameters = $containerConfigurator->parameters();
$parameters
->set(Option::PARALLEL, true)
->set(Option::PATHS, [__DIR__])
->set(Option::SKIP, [
__DIR__ . '/src/Kernel.php',
__DIR__ . '/assets',
__DIR__ . '/bin',
__DIR__ . '/config',
__DIR__ . '/heroku',
__DIR__ . '/public',
__DIR__ . '/var',
])
;
};
24 changes: 24 additions & 0 deletions infection.json.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"source": {
"directories": [
"src"
]
},
"logs": {
"text": "infection.log"
},
"mutators": {
"@default": true,
"global-ignoreSourceCodeByRegex": [
"\\$this->logger.*",
"\\$this->cache->save.*",
"parent::build(\\$container);"
],
"MBString": {
"settings": {
"mb_substr": false,
"mb_strlen": false
}
}
}
}
Loading