Skip to content

Commit

Permalink
Merge branch 'master' into mutex
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/Workflow/WorkflowContextInterface.php
  • Loading branch information
roxblnfk committed Oct 8, 2024
2 parents 58b7988 + d789123 commit dbfee5b
Show file tree
Hide file tree
Showing 289 changed files with 2,487 additions and 1,673 deletions.
30 changes: 15 additions & 15 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
* text=auto

.github/ export-ignore
config/ export-ignore
resources/scripts/ export-ignore
runtime/ export-ignore
tests/ export-ignore
.github/ export-ignore
config/ export-ignore
resources/scripts/ export-ignore
runtime/ export-ignore
tests/ export-ignore

.editorconfig export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.php_cs.dist export-ignore
dload.xml export-ignore
Makefile export-ignore
phpunit.xml.dist export-ignore
psalm.xml export-ignore
psalm-baseline.xml export-ignore
phpdoc.dist.xml export-ignore
.editorconfig export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.php-cs-fixer.dist.php export-ignore
dload.xml export-ignore
Makefile export-ignore
phpunit.xml.dist export-ignore
psalm.xml export-ignore
psalm-baseline.xml export-ignore
phpdoc.dist.xml export-ignore
12 changes: 12 additions & 0 deletions .github/workflows/cs-fix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
on:
push:
branches:
- '*'

name: Fix Code Style

jobs:
cs-fix:
permissions:
contents: write
uses: spiral/gh-actions/.github/workflows/cs-fix.yml@master
4 changes: 4 additions & 0 deletions .github/workflows/security-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ name: Security

on: [push, pull_request]

concurrency:
cancel-in-progress: ${{ !contains(github.ref, 'release/')}}
group: tests-${{ github.workflow }}-${{ github.ref }}

jobs:
security:
name: Security Checks (PHP ${{ matrix.php }}, OS ${{ matrix.os }})
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
name: Code Style
name: Static Analysis

on: [push, pull_request]

concurrency:
cancel-in-progress: ${{ !contains(github.ref, 'release/')}}
group: tests-${{ github.workflow }}-${{ github.ref }}

jobs:
psalm:
name: Psalm Validation (PHP ${{ matrix.php }}, OS ${{ matrix.os }})
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ name: Testing

on: [push, pull_request]

concurrency:
cancel-in-progress: ${{ !contains(github.ref, 'release/')}}
group: tests-${{ github.workflow }}-${{ github.ref }}

jobs:
unit:
name: Unit Testing
Expand Down
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__ . '/testing/src')
->include(__FILE__)
->exclude(__DIR__ . '/src/Client/GRPC/ServiceClientInterface.php')
->allowRisky(true)
->build();
10 changes: 4 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@
"composer/composer": "^2.0",
"dereuromark/composer-prefer-lowest": "^0.1.10",
"doctrine/annotations": "^1.14|^2.0.0",
"friendsofphp/php-cs-fixer": "^3.0",
"internal/dload": "^1.0",
"jetbrains/phpstorm-attributes": "dev-master@dev",
"laminas/laminas-code": "^4.0",
"phpunit/phpunit": "^10.5",
"spiral/code-style": "^2.1.2",
"spiral/core": "^3.13",
"symfony/var-dumper": "^6.0 || ^7.0",
"vimeo/psalm": "^4.30 || ^5.4"
Expand All @@ -81,15 +81,13 @@
},
"scripts": {
"post-update-cmd": "Temporal\\Worker\\Transport\\RoadRunnerVersionChecker::postUpdate",
"cs:diff": "php-cs-fixer fix --dry-run -v --diff --show-progress dots",
"cs:fix": "php-cs-fixer fix -v",
"psalm": "psalm",
"psalm:baseline": "psalm --set-baseline=psalm-baseline.xml",
"test:unit": "phpunit --testsuite=Unit --color=always --testdox",
"test:func": "phpunit --testsuite=Functional --color=always --testdox",
"test:accept": "phpunit --testsuite=Acceptance --color=always --testdox",
"phpcs": [
"@putenv PHP_CS_FIXER_IGNORE_ENV=1",
"php-cs-fixer fix src"
]
"test:accept": "phpunit --testsuite=Acceptance --color=always --testdox"
},
"extra": {
"branch-alias": {
Expand Down
Loading

0 comments on commit dbfee5b

Please sign in to comment.