Skip to content

Commit 7e62881

Browse files
authored
Merge pull request #19 from codebar-ag/feature-laravel-12
Feature Laravel 12
2 parents 15a291c + 7105206 commit 7e62881

15 files changed

+193
-165
lines changed

.github/FUNDING.yml

Lines changed: 0 additions & 2 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,45 @@
11
name: Bug Report
22
description: Report an Issue or Bug with the Package
33
title: "[Bug]: "
4-
labels: ["bug"]
4+
labels: [ "bug" ]
55
body:
66
- type: markdown
77
attributes:
8-
value: |
9-
We're sorry to hear you have a problem. Can you help us solve it by providing the following details.
8+
value: "|
9+
We're sorry to hear you have a problem. Can you help us solve it by providing the following details."
1010
- type: textarea
1111
id: what-happened
1212
attributes:
1313
label: What happened?
1414
description: What did you expect to happen?
15-
placeholder: I cannot currently do X thing because when I do, it breaks X thing.
15+
placeholder: "I cannot currently do X thing because when I do, it breaks X thing."
1616
validations:
1717
required: true
1818
- type: input
1919
id: package-version
2020
attributes:
2121
label: Package Version
2222
description: What version of our Package are you running? Please be as specific as possible
23-
placeholder: 1.0.0
23+
placeholder: "12.0"
24+
value: "12.0"
2425
validations:
2526
required: true
2627
- type: input
2728
id: php-version
2829
attributes:
2930
label: PHP Version
3031
description: What version of PHP are you running? Please be as specific as possible
31-
placeholder: 8.3.0
32+
placeholder: "8.4.0"
33+
value: "8.4.0"
3234
validations:
3335
required: true
3436
- type: input
3537
id: laravel-version
3638
attributes:
3739
label: Laravel Version
3840
description: What version of Laravel are you running? Please be as specific as possible
39-
placeholder: 11.0.0
41+
placeholder: "12.0.0"
42+
value: "12.0.0"
4043
validations:
4144
required: true
4245
- type: dropdown

.github/dependabot.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Please see the documentation for all configuration options:
2+
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
3+
4+
version: 2
5+
updates:
6+
7+
- package-ecosystem: "github-actions"
8+
directory: "/"
9+
schedule:
10+
interval: "weekly"
11+
labels:
12+
- "dependencies"

.github/workflows/dependabot-auto-merge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313

1414
- name: Dependabot metadata
1515
id: metadata
16-
uses: dependabot/fetch-metadata@v1.6
16+
uses: dependabot/fetch-metadata@v2.3.0
1717
with:
18-
github-token: ${{ secrets.MY_GITHUB_TOKEN }}
18+
github-token: "${{ secrets.GITHUB_TOKEN }}"
1919

2020
- name: Auto-merge Dependabot PRs for semver-minor updates
2121
if: ${{steps.metadata.outputs.update-type == 'version-update:semver-minor'}}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: dependabot-auto-merge
2+
on: pull_request_target
3+
4+
permissions:
5+
pull-requests: write
6+
contents: write
7+
8+
jobs:
9+
dependabot:
10+
runs-on: ubuntu-latest
11+
if: ${{ github.actor == 'dependabot[bot]' }}
12+
steps:
13+
14+
- name: Dependabot metadata
15+
id: metadata
16+
uses: dependabot/fetch-metadata@v2.3.0
17+
with:
18+
github-token: "${{ secrets.GITHUB_TOKEN }}"
19+
20+
- name: Auto-merge Dependabot PRs for semver-minor updates
21+
if: ${{steps.metadata.outputs.update-type == 'version-update:semver-minor'}}
22+
run: gh pr merge --auto --merge "$PR_URL"
23+
env:
24+
PR_URL: ${{github.event.pull_request.html_url}}
25+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
26+
27+
- name: Auto-merge Dependabot PRs for semver-patch updates
28+
if: ${{steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
29+
run: gh pr merge --auto --merge "$PR_URL"
30+
env:
31+
PR_URL: ${{github.event.pull_request.html_url}}
32+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Fix PHP code style issues
2+
3+
on: [push]
4+
5+
jobs:
6+
php-code-styling:
7+
runs-on: ubuntu-latest
8+
9+
steps:
10+
- name: Checkout code
11+
uses: actions/checkout@v4
12+
with:
13+
ref: ${{ github.head_ref }}
14+
15+
- name: Fix PHP code style issues
16+
uses: aglipanci/laravel-pint-action@2.5
17+
18+
- name: Commit changes
19+
uses: stefanzweifel/git-auto-commit-action@v5
20+
with:
21+
commit_message: Fix styling

.github/workflows/php-cs-fixer.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

.github/workflows/phpstan.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,25 @@ name: PHPStan
22

33
on:
44
push:
5-
branches: [ main ]
6-
pull_request:
7-
branches: [ main ]
5+
paths:
6+
- '**.php'
7+
- 'phpstan.neon.dist'
88

99
jobs:
1010
phpstan:
1111
name: phpstan
1212
runs-on: ubuntu-latest
13-
14-
env:
15-
PHP_VERSION: '8.3'
16-
1713
steps:
1814
- uses: actions/checkout@v4
1915

2016
- name: Setup PHP
2117
uses: shivammathur/setup-php@v2
2218
with:
23-
php-version: ${{ env.PHP_VERSION }}
19+
php-version: '8.4'
2420
coverage: none
2521

2622
- name: Install composer dependencies
2723
uses: ramsey/composer-install@v3
2824

2925
- name: Run PHPStan
30-
run: ./vendor/bin/phpstan analyse src --error-format=github
26+
run: ./vendor/bin/phpstan --error-format=github

.github/workflows/release.yml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,14 @@ jobs:
1010
release:
1111
name: Release
1212
runs-on: ubuntu-latest
13-
14-
env:
15-
INITIAL_VERSION: 11.0.0
16-
RELEASE_BRANCHES: main
17-
DEFAULT_BUMP: patch
18-
1913
steps:
2014
- uses: actions/checkout@v4
2115
with:
2216
fetch-depth: '0'
2317
- name: Bump version and push tag
24-
uses: anothrNick/github-tag-action@v1
18+
uses: anothrNick/github-tag-action@master
2519
env:
2620
GITHUB_TOKEN: ${{ secrets.MY_GITHUB_TOKEN }}
2721
WITH_V: true
28-
INITIAL_VERSION: ${{ env.INITIAL_VERSION }}
29-
RELEASE_BRANCHES: ${{ env.RELEASE_BRANCHES }}
30-
DEFAULT_BUMP: ${{ env.DEFAULT_BUMP }}
22+
RELEASE_BRANCHES: main
23+
DEFAULT_BUMP: minor

.github/workflows/run-tests.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
fail-fast: true
1414
max-parallel: 1
1515
matrix:
16-
os: [ ubuntu-latest, windows-latest ]
17-
php: [ 8.2, 8.3 ]
18-
laravel: [ 11.* ]
16+
os: [ ubuntu-latest ]
17+
php: [ 8.2, 8.3, 8.4 ]
18+
laravel: [ 12.* ]
1919
stability: [ prefer-lowest, prefer-stable ]
2020

2121
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
@@ -41,16 +41,15 @@ jobs:
4141
composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
4242
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
4343
44-
- name: Set phpunit.xml
44+
- name: Execute tests
4545
run: cp phpunit.xml.dist phpunit.xml
4646

4747
- name: Execute tests
4848
run: vendor/bin/pest
4949

50-
- name: Store test reports
50+
- name: Store Log Artifacts
51+
if: failure()
5152
uses: actions/upload-artifact@v4
5253
with:
53-
name: Store report
54-
retention-days: 1
55-
path: |
56-
./reports
54+
name: Store report artifacts
55+
path: ./vendor/orchestra/testbench-core/laravel/storage/logs

.gitignore

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
.idea
2-
.php_cs
3-
.php_cs.cache
4-
.php-cs-fixer.cache
52
.phpunit.result.cache
6-
.DS_STORE
7-
build
3+
.phpunit.cache
84
composer.lock
95
coverage
10-
docs
116
phpunit.xml
12-
psalm.xml
7+
phpstan.neon
138
testbench.yaml
149
vendor
1510
node_modules
16-
phpstan.neon
11+
.phpactor.json
12+
build

README.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<img src="https://banners.beyondco.de/Laravel%20Zendesk.png?theme=light&packageManager=composer+require&packageName=codebar-ag%2Flaravel-zendesk&pattern=circuitBoard&style=style_2&description=A+Laravel+Zendesk+integration.&md=1&showWatermark=1&fontSize=150px&images=home&widths=500&heights=500">
1+
<img src="https://banners.beyondco.de/Laravel%20Zendesk.png?theme=light&packageManager=composer+require&packageName=codebar-ag%2Flaravel-zendesk&pattern=circuitBoard&style=style_2&description=A+Laravel+Zendesk+integration.&md=1&showWatermark=0&fontSize=150px&images=home&widths=500&heights=500">
22

33
[![Latest Version on Packagist](https://img.shields.io/packagist/v/codebar-ag/laravel-zendesk.svg?style=flat-square)](https://packagist.org/packages/codebar-ag/laravel-zendesk)
4+
[![GitHub-Tests](https://github.com/codebar-ag/laravel-zendesk/actions/workflows/run-tests.yml/badge.svg?branch=main)](https://github.com/codebar-ag/laravel-zendesk/actions/workflows/run-tests.yml)
5+
[![GitHub Code Style](https://github.com/codebar-ag/laravel-zendesk/actions/workflows/fix-php-code-style-issues.yml/badge.svg?branch=main)](https://github.com/codebar-ag/laravel-zendesk/actions/workflows/fix-php-code-style-issues.yml)
46
[![Total Downloads](https://img.shields.io/packagist/dt/codebar-ag/laravel-zendesk.svg?style=flat-square)](https://packagist.org/packages/codebar-ag/laravel-zendesk)
5-
[![run-tests](https://github.com/codebar-ag/laravel-zendesk/actions/workflows/run-tests.yml/badge.svg)](https://github.com/codebar-ag/laravel-zendesk/actions/workflows/run-tests.yml)
6-
[![PHPStan](https://github.com/codebar-ag/laravel-zendesk/actions/workflows/phpstan.yml/badge.svg)](https://github.com/codebar-ag/laravel-zendesk/actions/workflows/phpstan.yml)
77

88
This package was developed to give you a quick start to creating tickets via the Zendesk API.
99

@@ -14,9 +14,12 @@ knowledge base and online communities.
1414

1515
## 🛠 Requirements
1616

17-
| Package | PHP | Laravel | Zendesk |
18-
|-----------|-------|----------------|:---------:|
19-
| >v1.0 | >8.2 | > Laravel 10.0 ||
17+
| Package | PHP | Laravel | Zendesk |
18+
|-----------|-------------|-----------|:---------:|
19+
| v12.0 | ^8.2 - ^8.4 | 12.x ||
20+
| v11.0 | ^8.2 - ^8.3 | 11.x ||
21+
| v1.0 | ^8.2 | 10.x ||
22+
2023

2124
## Authentication
2225

0 commit comments

Comments
 (0)