Skip to content
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

Maintenance #76

Merged
merged 4 commits into from
Dec 12, 2024
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# editorconfig.org

root = true

[*]
Expand All @@ -10,5 +8,14 @@ indent_style = space
indent_size = 4
trim_trailing_whitespace = true

[*.json]
[*.{yml, yaml, sh, conf, neon*}]
indent_size = 2

[*.http]
end_of_line = crlf

[*.md]
trim_trailing_whitespace = false

[Makefile]
indent_style = tab
17 changes: 7 additions & 10 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
/.github export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/phpunit.xml.dist export-ignore
/tests export-ignore
/.editorconfig export-ignore
/.php_cs.dist.php export-ignore
/psalm.xml export-ignore
/psalm.xml.dist export-ignore
/UPGRADING.md export-ignore
/.* export-ignore
/tests export-ignore
/*.xml export-ignore
/*.yml export-ignore
/*.lock export-ignore
/*.dist export-ignore
Makefile export-ignore
16 changes: 16 additions & 0 deletions .github/workflows/cs-fix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---

on: # yamllint disable-line rule:truthy
push:
branches:
- '*'

name: Fix Code Style

jobs:
cs-fix:
permissions:
contents: write
uses: spiral/gh-actions/.github/workflows/cs-fix.yml@master

...
15 changes: 15 additions & 0 deletions .github/workflows/psalm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
on:
pull_request: null
push:
branches:
- master
- '*.*'

name: static analysis

jobs:
psalm:
uses: spiral/gh-actions/.github/workflows/psalm.yml@master
with:
os: >-
['ubuntu-latest']
20 changes: 8 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
.idea
.php_cs
.php_cs.cache
.phpunit.result.cache
build
composer.lock
coverage
docs
vendor
node_modules
.php-cs-fixer.cache
.phpunit.cache/
/.*/
!/.github/
/runtime/
/vendor/
/.env
/composer.lock
*.log
*.exe
13 changes: 13 additions & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?php

declare(strict_types=1);

require_once 'vendor/autoload.php';

return \Spiral\CodeStyle\Builder::create()
->include(__DIR__ . '/src')
->include(__DIR__ . '/tests')
->include(__FILE__)
->cache('./runtime/php-cs-fixer.cache')
->allowRisky(false)
->build();
73 changes: 0 additions & 73 deletions .styleci.yml

This file was deleted.

188 changes: 100 additions & 88 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,95 +1,107 @@
{
"name": "spiral/testing",
"description": "Spiral Framework testing SDK",
"keywords": ["spiral-packages", "spiral", "testing"],
"license": "MIT",
"authors": [
{
"name": "Anton Titov (wolfy-j)",
"email": "[email protected]"
"name": "spiral/testing",
"description": "Spiral Framework testing SDK",
"keywords": [
"spiral-packages",
"spiral",
"testing"
],
"license": "MIT",
"authors": [
{
"name": "Anton Titov (wolfy-j)",
"email": "[email protected]"
},
{
"name": "Pavel Buchnev (butschster)",
"email": "[email protected]"
},
{
"name": "Aleksei Gagarin (roxblnfk)",
"email": "[email protected]"
},
{
"name": "Maksim Smakouz (msmakouz)",
"email": "[email protected]"
},
{
"name": "RoadRunner Community",
"homepage": "https://github.com/spiral/roadrunner/graphs/contributors"
}
],
"homepage": "https://spiral.dev/",
"support": {
"docs": "https://spiral.dev/docs/testing-start",
"issues": "https://github.com/spiral/testing/issues",
"chat": "https://discord.gg/TFeEmCs"
},
{
"name": "Pavel Buchnev (butschster)",
"email": "[email protected]"
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/spiral"
}
],
"require": {
"ext-json": "*",
"php": ">=8.1",
"nyholm/psr7": "^1.5",
"mockery/mockery": "^1.5",
"phpunit/phpunit": "^9.6 || ^10.0",
"spiral/auth": "^3.14.8",
"spiral/auth-http": "^3.14.8",
"spiral/boot": "^3.14.8",
"spiral/events": "^3.14.8",
"spiral/console": "^3.14.8",
"spiral/core": "^3.14.8",
"spiral/http": "^3.14.8",
"spiral/mailer": "^3.14.8",
"spiral/queue": "^3.14.8",
"spiral/session": "^3.14.8",
"spiral/security": "^3.14.8",
"spiral/tokenizer": "^3.14.8",
"spiral/storage": "^3.14.8",
"spiral/views": "^3.14.8",
"spiral/translator": "^3.14.8",
"spiral/scaffolder": "^3.14.8",
"symfony/mime": "^6.0 || ^7.0"
},
{
"name": "Aleksei Gagarin (roxblnfk)",
"email": "[email protected]"
"suggest": {
"brianium/paratest": "Required to run tests in parallel (^6.0).",
"ext-gd": "Required to use generate fake image files"
},
{
"name": "Maksim Smakouz (msmakouz)",
"email": "[email protected]"
"require-dev": {
"spiral-packages/league-event": "^1.0.1",
"spiral/code-style": "^2.2",
"spiral/dumper": "^3.3",
"spiral/framework": "^3.14.8",
"spiral/nyholm-bridge": "^1.3",
"spiral/roadrunner-bridge": "^2.2 || ^3.7 || ^4.0",
"vimeo/psalm": "^5.9"
},
{
"name": "RoadRunner Community",
"homepage": "https://github.com/spiral/roadrunner/graphs/contributors"
}
],
"homepage": "https://spiral.dev/",
"support": {
"docs": "https://spiral.dev/docs/testing-start",
"issues": "https://github.com/spiral/testing/issues",
"forum": "https://forum.roadrunner.dev/",
"chat": "https://discord.gg/TFeEmCs"
},
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/roadrunner-server"
}
],
"require": {
"ext-json": "*",
"php": ">=8.1",
"nyholm/psr7": "^1.5",
"mockery/mockery": "^1.5",
"phpunit/phpunit": "^9.6 || ^10.0",
"spiral/auth": "^3.14.3",
"spiral/auth-http": "^3.14.3",
"spiral/boot": "^3.14.3",
"spiral/events": "^3.14.3",
"spiral/console": "^3.14.3",
"spiral/core": "^3.14.3",
"spiral/http": "^3.14.3",
"spiral/mailer": "^3.14.3",
"spiral/queue": "^3.14.3",
"spiral/session": "^3.14.3",
"spiral/security": "^3.14.3",
"spiral/tokenizer": "^3.14.3",
"spiral/storage": "^3.14.3",
"spiral/views": "^3.14.3",
"spiral/translator": "^3.14.3",
"spiral/scaffolder": "^3.14.3",
"symfony/mime": "^6.0 || ^7.0"
},
"suggest": {
"brianium/paratest": "Required to run tests in parallel (^6.0).",
"ext-gd": "Required to use generate fake image files"
},
"require-dev": {
"spiral/dumper": "^3.3",
"spiral/framework": "^3.14.3",
"spiral/roadrunner-bridge": "^2.2 || ^3.7 || ^4.0",
"spiral-packages/league-event": "^1.0.1",
"spiral/nyholm-bridge": "^1.3",
"vimeo/psalm": "^5.9"
},
"autoload": {
"psr-4": {
"Spiral\\Testing\\": "src"
}
},
"autoload-dev": {
"psr-4": {
"Spiral\\Testing\\Tests\\App\\": "tests/app",
"Spiral\\Testing\\Tests\\": "tests/src"
}
},
"minimum-stability": "dev",
"prefer-stable": true,
"config": {
"allow-plugins": {
"spiral/composer-publish-plugin": false
"autoload": {
"psr-4": {
"Spiral\\Testing\\": "src"
}
},
"autoload-dev": {
"psr-4": {
"Spiral\\Testing\\Tests\\App\\": "tests/app",
"Spiral\\Testing\\Tests\\": "tests/src"
}
},
"minimum-stability": "dev",
"prefer-stable": true,
"config": {
"sort-packages": true,
"allow-plugins": {
"spiral/composer-publish-plugin": false
}
},
"scripts": {
"cs:diff": "php-cs-fixer fix --dry-run -v --diff",
"cs:fix": "php-cs-fixer fix -v",
"psalm": "psalm",
"psalm:baseline": "psalm --set-baseline=psalm-baseline.xml",
"test": "phpunit --color=always"
}
}
}
Loading
Loading