Skip to content

Commit e477bfd

Browse files
authored
Merge pull request #1: Improve V2
2 parents cdcabd9 + eebd67d commit e477bfd

File tree

88 files changed

+3498
-2900
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+3498
-2900
lines changed

β€Ž.editorconfigβ€Ž

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
end_of_line = lf
6+
insert_final_newline = true
7+
indent_style = space
8+
indent_size = 4
9+
trim_trailing_whitespace = true
10+
11+
[*.yaml]
12+
indent_size = 2
13+
14+
[*.yml]
15+
indent_size = 2
16+
17+
[*.md]
18+
trim_trailing_whitespace = false
19+
20+
[Makefile]
21+
indent_style = tab

β€Ž.gitattributesβ€Ž

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
/.gitattributes export-ignore
2-
/.github/ export-ignore
3-
/.gitignore export-ignore
4-
/phpunit.xml.dist export-ignore
5-
/phpunit.xml.legacy export-ignore
6-
/tests/ export-ignore
1+
* text=auto
2+
3+
/.* export-ignore
4+
/tests export-ignore
5+
/phpunit.xml* export-ignore
6+
/psalm.* export-ignore
7+
/psalm-baseline.xml export-ignore
8+
/infection.* export-ignore
9+
/rector.php export-ignore

β€Ž.github/workflows/ci.ymlβ€Ž

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,43 +11,16 @@ jobs:
1111
strategy:
1212
matrix:
1313
php:
14+
- 8.4
1415
- 8.3
1516
- 8.2
1617
- 8.1
17-
- 8.0
18-
- 7.4
19-
- 7.3
20-
- 7.2
21-
- 7.1
22-
- 7.0
23-
- 5.6
24-
- 5.5
25-
- 5.4
2618
steps:
27-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2820
- uses: shivammathur/setup-php@v2
2921
with:
3022
php-version: ${{ matrix.php }}
3123
coverage: xdebug
3224
ini-file: development
3325
- run: composer install
34-
- run: vendor/bin/phpunit --coverage-text
35-
if: ${{ matrix.php >= 7.3 }}
36-
- run: vendor/bin/phpunit --coverage-text -c phpunit.xml.legacy
37-
if: ${{ matrix.php < 7.3 }}
38-
39-
PHPUnit-hhvm:
40-
name: PHPUnit (HHVM)
41-
runs-on: ubuntu-22.04
42-
continue-on-error: true
43-
steps:
44-
- uses: actions/checkout@v4
45-
- run: cp "$(which composer)" composer.phar && ./composer.phar self-update --2.2 # downgrade Composer for HHVM
46-
- name: Run hhvm composer.phar install
47-
uses: docker://hhvm/hhvm:3.30-lts-latest
48-
with:
49-
args: hhvm composer.phar install
50-
- name: Run hhvm vendor/bin/phpunit
51-
uses: docker://hhvm/hhvm:3.30-lts-latest
52-
with:
53-
args: hhvm vendor/bin/phpunit
26+
- run: composer test:cc

β€Ž.github/workflows/cs-fix.ymlβ€Ž

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
on:
2+
push:
3+
branches:
4+
- '*'
5+
6+
name: Fix Code Style
7+
8+
jobs:
9+
cs-fix:
10+
permissions:
11+
contents: write
12+
uses: spiral/gh-actions/.github/workflows/cs-fix.yml@master
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Static Analysis
2+
3+
on: [push, pull_request]
4+
5+
concurrency:
6+
cancel-in-progress: ${{ !contains(github.ref, 'release/')}}
7+
group: tests-${{ github.workflow }}-${{ github.ref }}
8+
9+
jobs:
10+
psalm:
11+
name: Psalm Validation (PHP ${{ matrix.php }}, OS ${{ matrix.os }})
12+
runs-on: ${{ matrix.os }}
13+
continue-on-error: true
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
php: [8.3]
18+
os: [ubuntu-latest]
19+
steps:
20+
- name: Set up PHP ${{ matrix.php }}
21+
uses: shivammathur/setup-php@v2
22+
with:
23+
php-version: ${{ matrix.php }}
24+
extensions: dom
25+
26+
- name: Check Out Code
27+
uses: actions/checkout@v4
28+
29+
- name: Install dependencies with composer
30+
uses: ramsey/composer-install@v3
31+
with:
32+
dependency-versions: ${{ matrix.dependencies }}
33+
34+
- name: πŸ” Run Tests
35+
run: vendor/bin/psalm

β€Ž.gitignoreβ€Ž

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
1-
/composer.lock
1+
/.*
2+
!/.github/
3+
!/.php-cs-fixer.dist.php
4+
/runtime/
25
/vendor/
6+
/.env
7+
/composer.lock
8+
*.log

β€Ž.php-cs-fixer.dist.phpβ€Ž

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
require_once 'vendor/autoload.php';
6+
7+
return \Spiral\CodeStyle\Builder::create()
8+
->include(__DIR__ . '/src')
9+
->include(__DIR__ . '/tests')
10+
->include(__DIR__ . '/rector.php')
11+
->include(__FILE__)
12+
->allowRisky(false)
13+
->build();
File renamed without changes.

0 commit comments

Comments
Β (0)