Skip to content

Commit cc366b1

Browse files
authored
Merge pull request #130 from Sysix/1.0-dev
1.0
2 parents eaa1214 + 7c35d07 commit cc366b1

File tree

101 files changed

+2766
-5953
lines changed

Some content is hidden

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

101 files changed

+2766
-5953
lines changed

.gitattributes

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
/tests export-ignore
33
/.gitattributes export-ignore
44
/.gitignore export-ignore
5-
/phpunit.xml
5+
/phpunit.xml export-ignore
6+
/phpstan.neon export-ignore

.github/workflows/phpstan.yml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Run Shepherd
2+
3+
on: [pull_request]
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
9+
steps:
10+
- uses: actions/checkout@v4
11+
- uses: php-actions/composer@v6
12+
- uses: php-actions/phpstan@v3
13+
with:
14+
path: src/ tests/
15+
level: 9
16+
17+

.github/workflows/tests.yml

+12-10
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,34 @@ jobs:
1414
strategy:
1515
fail-fast: true
1616
matrix:
17-
php: [8.3, 8.2, 8.1, 8.0]
17+
php: [8.3, 8.2, 8.1]
1818
dependency-version: [prefer-lowest, prefer-stable]
19-
guzzle: [7.*, 6.2]
2019

21-
name: PHP${{ matrix.php }} - G${{ matrix.guzzle }} - ${{ matrix.dependency-version }}
20+
name: PHP${{ matrix.php }} - ${{ matrix.dependency-version }}
2221

2322
steps:
2423
- name: Checkout code
25-
uses: actions/checkout@v2
24+
uses: actions/checkout@v4
2625

26+
- name: Get Composer Cache Directory
27+
id: composer-cache
28+
run: |
29+
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
30+
2731
- name: Cache dependencies
28-
uses: actions/cache@v2
32+
uses: actions/cache@v3
2933
with:
30-
path: ~/.composer/cache/files
31-
key: dependencies-guzzle-${{ matrix.guzzle }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
34+
path: ${{ steps.composer-cache.outputs.dir }}
35+
key: php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
3236

3337
- name: Setup PHP
3438
uses: shivammathur/setup-php@v2
3539
with:
3640
php-version: ${{ matrix.php }}
37-
extensions: curl
3841
coverage: none
3942

40-
- name: Install dependencies
43+
- name: Install prefered version dependencies
4144
run: |
42-
composer require "guzzlehttp/guzzle:${{ matrix.guzzle }}" --no-interaction --no-update
4345
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
4446
4547
- name: Execute tests

.github/workflows/update-license.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
update-license-year:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212
with:
1313
fetch-depth: 0
1414
- uses: FantasticFiasco/action-update-license-year@v2

.gitignore

+127-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
.idea/
1+
/tests/cache/
22

3-
4-
# Created by https://www.toptal.com/developers/gitignore/api/windows,macos,linux,composer
5-
# Edit at https://www.toptal.com/developers/gitignore?templates=windows,macos,linux,composer
3+
# Created by https://www.toptal.com/developers/gitignore/api/windows,macos,linux,composer,phpunit,phpstorm+all,visualstudiocode
4+
# Edit at https://www.toptal.com/developers/gitignore?templates=windows,macos,linux,composer,phpunit,phpstorm+all,visualstudiocode
65

76
### Composer ###
87
composer.phar
98
/vendor/
109

1110
# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
1211
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
13-
# composer.lock
12+
composer.lock
1413

1514
### Linux ###
1615
*~
@@ -60,6 +59,128 @@ Temporary Items
6059
# iCloud generated files
6160
*.icloud
6261

62+
### PhpStorm+all ###
63+
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
64+
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
65+
66+
# User-specific stuff
67+
.idea/**/workspace.xml
68+
.idea/**/tasks.xml
69+
.idea/**/usage.statistics.xml
70+
.idea/**/dictionaries
71+
.idea/**/shelf
72+
73+
# AWS User-specific
74+
.idea/**/aws.xml
75+
76+
# Generated files
77+
.idea/**/contentModel.xml
78+
79+
# Sensitive or high-churn files
80+
.idea/**/dataSources/
81+
.idea/**/dataSources.ids
82+
.idea/**/dataSources.local.xml
83+
.idea/**/sqlDataSources.xml
84+
.idea/**/dynamic.xml
85+
.idea/**/uiDesigner.xml
86+
.idea/**/dbnavigator.xml
87+
88+
# Gradle
89+
.idea/**/gradle.xml
90+
.idea/**/libraries
91+
92+
# Gradle and Maven with auto-import
93+
# When using Gradle or Maven with auto-import, you should exclude module files,
94+
# since they will be recreated, and may cause churn. Uncomment if using
95+
# auto-import.
96+
# .idea/artifacts
97+
# .idea/compiler.xml
98+
# .idea/jarRepositories.xml
99+
# .idea/modules.xml
100+
# .idea/*.iml
101+
# .idea/modules
102+
# *.iml
103+
# *.ipr
104+
105+
# CMake
106+
cmake-build-*/
107+
108+
# Mongo Explorer plugin
109+
.idea/**/mongoSettings.xml
110+
111+
# File-based project format
112+
*.iws
113+
114+
# IntelliJ
115+
out/
116+
117+
# mpeltonen/sbt-idea plugin
118+
.idea_modules/
119+
120+
# JIRA plugin
121+
atlassian-ide-plugin.xml
122+
123+
# Cursive Clojure plugin
124+
.idea/replstate.xml
125+
126+
# SonarLint plugin
127+
.idea/sonarlint/
128+
129+
# Crashlytics plugin (for Android Studio and IntelliJ)
130+
com_crashlytics_export_strings.xml
131+
crashlytics.properties
132+
crashlytics-build.properties
133+
fabric.properties
134+
135+
# Editor-based Rest Client
136+
.idea/httpRequests
137+
138+
# Android studio 3.1+ serialized cache file
139+
.idea/caches/build_file_checksums.ser
140+
141+
### PhpStorm+all Patch ###
142+
# Ignore everything but code style settings and run configurations
143+
# that are supposed to be shared within teams.
144+
145+
.idea/*
146+
147+
!.idea/codeStyles
148+
!.idea/runConfigurations
149+
150+
### PHPUnit ###
151+
# Covers PHPUnit
152+
# Reference: https://phpunit.de/
153+
154+
# Generated files
155+
.phpunit.result.cache
156+
.phpunit.cache
157+
158+
# PHPUnit
159+
/app/phpunit.xml
160+
/phpunit.xml
161+
162+
# Build data
163+
/build/
164+
165+
### VisualStudioCode ###
166+
.vscode/*
167+
!.vscode/settings.json
168+
!.vscode/tasks.json
169+
!.vscode/launch.json
170+
!.vscode/extensions.json
171+
!.vscode/*.code-snippets
172+
173+
# Local History for Visual Studio Code
174+
.history/
175+
176+
# Built Visual Studio Code Extensions
177+
*.vsix
178+
179+
### VisualStudioCode Patch ###
180+
# Ignore all local history of files
181+
.history
182+
.ionide
183+
63184
### Windows ###
64185
# Windows thumbnail cache files
65186
Thumbs.db
@@ -86,4 +207,4 @@ $RECYCLE.BIN/
86207
# Windows shortcuts
87208
*.lnk
88209

89-
# End of https://www.toptal.com/developers/gitignore/api/windows,macos,linux,composer
210+
# End of https://www.toptal.com/developers/gitignore/api/windows,macos,linux,composer,phpunit,phpstorm+all,visualstudiocode

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2023 CLICKSPORTS GmbH
3+
Copyright (c) 2023 Sysix
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)