Skip to content

Commit 53d2f2e

Browse files
authored
Merge pull request #62 from WyriHaximus/PHP-8.4
Raise minimum PHP version to 8.4
2 parents 64c27cc + 6ed1ca9 commit 53d2f2e

29 files changed

+5099
-4437
lines changed

.editorconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,14 @@ trim_trailing_whitespace = true
1010
[*.json]
1111
indent_size = 2
1212

13+
[*.yml]
14+
indent_size = 2
15+
16+
[*.yaml]
17+
indent_size = 2
18+
1319
[Makefile]
1420
indent_style = tab
21+
22+
[*.neon]
23+
indent_style = tab

.gitattributes

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
# Ignoring files for distribution archieves
2-
examples/ export-ignore
2+
.github/ export-ignore
3+
etc/ export-ignore
34
tests/ export-ignore
4-
.dunitconfig export-ignore
5-
.travis.yml export-ignore
6-
.gitignore export-ignore
5+
var/ export-ignore
6+
.devcontainer.json export-ignore
7+
.editorconfig export-ignore
78
.gitattributes export-ignore
8-
.scrutinizer.yml export-ignore
9-
.styleci.yml export-ignore
10-
appveyor.yml export-ignore
11-
phpunit.xml.dist export-ignore
9+
.gitignore export-ignore
10+
CONTRIBUTING.md export-ignore
11+
composer.lock export-ignore
12+
infection.json.dist export-ignore
13+
Makefile export-ignore
14+
README.md export-ignore
15+
16+
# Diffing
17+
*.php diff=php

.github/dependabot.yml

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

.github/renovate.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"github>WyriHaximus/renovate-config:php-package"
5+
]
6+
}

.github/workflows/ci.yml

Lines changed: 12 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,17 @@
11
name: Continuous Integration
22
on:
33
push:
4+
branches:
5+
- 'main'
6+
- 'master'
7+
- 'refs/heads/v[0-9]+.[0-9]+.[0-9]+'
48
pull_request:
9+
## This workflow needs the `pull-request` permissions to work for the package diffing
10+
## Refs: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#permissions
11+
permissions:
12+
pull-requests: write
13+
contents: read
514
jobs:
6-
generate-checks-strategy:
7-
name: Generate Checks
8-
runs-on: ubuntu-latest
9-
outputs:
10-
check: ${{ steps.generate-checks-strategy.outputs.check }}
11-
steps:
12-
- uses: actions/checkout@v1
13-
- id: generate-checks-strategy
14-
name: Generate check
15-
run: |
16-
printf "Checks found: %s\r\n" $(make task-list-ci)
17-
printf "::set-output name=check::%s" $(make task-list-ci)
18-
lint:
19-
runs-on: ubuntu-latest
20-
steps:
21-
- name: Lint Code Base
22-
uses: docker://github/super-linter:v2.2.0
23-
composer-install:
24-
strategy:
25-
fail-fast: false
26-
matrix:
27-
php: [7.4, 8.0-rc]
28-
composer: [current, highest]
29-
needs: lint
30-
runs-on: ubuntu-latest
31-
container:
32-
image: wyrihaximusnet/php:${{ matrix.php }}-nts-alpine3.12-dev-root
33-
steps:
34-
- uses: actions/checkout@v1
35-
- name: Cache composer packages
36-
uses: actions/cache@v1
37-
with:
38-
path: ./vendor/
39-
key: ${{ matrix.composer }}-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
40-
- name: Install Dependencies
41-
run: composer update --prefer-lowest --no-progress --ansi --no-interaction --prefer-dist -o
42-
if: matrix.composer == 'lowest'
43-
- name: Install Dependencies
44-
run: composer install --ansi --no-progress --no-interaction --prefer-dist -o
45-
if: matrix.composer == 'current'
46-
- name: Install Dependencies
47-
run: composer update --ansi --no-progress --no-interaction --prefer-dist -o
48-
if: matrix.composer == 'highest'
49-
qa:
50-
strategy:
51-
fail-fast: false
52-
matrix:
53-
php: [7.4, 8.0-rc]
54-
composer: [current, highest]
55-
check: ${{ fromJson(needs.generate-checks-strategy.outputs.check) }}
56-
needs:
57-
- composer-install
58-
- generate-checks-strategy
59-
runs-on: ubuntu-latest
60-
container:
61-
image: wyrihaximusnet/php:${{ matrix.php }}-nts-alpine3.12-dev-root
62-
steps:
63-
- uses: actions/checkout@v1
64-
- name: Cache composer packages
65-
uses: actions/cache@v1
66-
with:
67-
path: ./vendor/
68-
key: ${{ matrix.composer }}-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
69-
- name: Install Dependencies
70-
run: composer update --prefer-lowest --no-progress --ansi --no-interaction --prefer-dist -o
71-
if: matrix.composer == 'lowest'
72-
- name: Install Dependencies
73-
run: composer install --ansi --no-progress --no-interaction --prefer-dist -o
74-
if: matrix.composer == 'current'
75-
- name: Install Dependencies
76-
run: composer update --ansi --no-progress --no-interaction --prefer-dist -o
77-
if: matrix.composer == 'highest'
78-
- name: Fetch Tags
79-
run: git fetch --depth=1 origin +refs/tags/*:refs/tags/* || true
80-
if: matrix.check == 'backward-compatibility-check'
81-
- run: make ${{ matrix.check }}
15+
ci:
16+
name: Continuous Integration
17+
uses: WyriHaximus/github-workflows/.github/workflows/package.yaml@main

.github/workflows/craft-release.yaml

Lines changed: 0 additions & 56 deletions
This file was deleted.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Release Management
2+
on:
3+
pull_request:
4+
types:
5+
- opened
6+
- labeled
7+
- unlabeled
8+
- synchronize
9+
- reopened
10+
milestone:
11+
types:
12+
- closed
13+
permissions:
14+
contents: write
15+
issues: write
16+
pull-requests: write
17+
jobs:
18+
release-managment:
19+
name: Create Release
20+
uses: WyriHaximus/github-workflows/.github/workflows/package-release-management.yaml@main
21+
with:
22+
milestone: ${{ github.event.milestone.title }}
23+
description: ${{ github.event.milestone.title }}

.github/workflows/set-milestone-on-pr.yaml

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

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
vendor
1+
var/*
2+
!var/.gitkeep
3+
vendor/*
4+
etc/qa/.phpunit.result.cache

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2018 Cees-Jan Kiewiet
3+
Copyright (c) 2025 Cees-Jan Kiewiet
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)