Skip to content

Commit

Permalink
UI 5.0.0 compatibility (#31)
Browse files Browse the repository at this point in the history
* Tweak settings
* Update action scripts
* Update test-unit.yml
  • Loading branch information
DarkSide666 authored Mar 27, 2024
1 parent 5148d0a commit ffe1d82
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 24 deletions.
10 changes: 4 additions & 6 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
categories:
- title: "Breaking Changes"
labels:
- "BC-break"
- title: "Major Features"
- title: "Major features"
labels:
- "MAJOR"
- title: "Documentation enhancements"
- title: "Breaking changes"
labels:
- "Documentation :books:"
- "BC-break"
- title: "Other changes"
template: |
## What’s Changed
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
name: Build Docs
name: Build changelog

on:
push:
branches:
- develop

jobs:
update_release_draft:
update:
name: Update
runs-on: ubuntu-latest
steps:
- name: Run Release Drafter
- name: Run
uses: release-drafter/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
container:
image: ghcr.io/mvorisek/image-php:latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ github.ref }}

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
type: 'StaticAnalysis'
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Configure PHP
run: |
Expand All @@ -34,10 +34,10 @@ jobs:
- name: Setup cache 1/2
id: composer-cache
run: |
echo "::set-output name=dir::$(composer config cache-files-dir)"
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
- name: Setup cache 2/2
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-smoke-${{ matrix.php }}-${{ matrix.type }}-${{ hashFiles('composer.json') }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ local
cache
*.cache
*.cache.*
*.cmd

/phpunit.xml
7 changes: 1 addition & 6 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,15 @@
->setRules([
'@PhpCsFixer' => true,
'@PhpCsFixer:risky' => true,
'@PHP74Migration:risky' => true,
'@PHP74Migration' => true,
'@PHP74Migration:risky' => true,

// required by PSR-12
'concat_space' => [
'spacing' => 'one',
],

// disable some too strict rules
'phpdoc_types' => [
// keep enabled, but without "alias" group to not fix
// "Callback" to "callback" in phpdoc
'groups' => ['simple', 'meta'],
],
'phpdoc_types_order' => [
'null_adjustment' => 'always_last',
'sort_algorithm' => 'none',
Expand Down
9 changes: 6 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"agile",
"data",
"framework",
"ui",
"component",
"widget",
"chart",
"chart.js"
],
Expand All @@ -20,12 +23,12 @@
],
"homepage": "https://github.com/atk4/chart",
"require": {
"php": ">=7.4 <8.3",
"php": ">=7.4 <8.4",
"atk4/ui": "dev-develop"
},
"require-release": {
"php": ">=7.4 <8.3",
"atk4/ui": "~4.0.0"
"php": ">=7.4 <8.4",
"atk4/ui": "~5.0.0"
},
"require-dev": {
"ergebnis/composer-normalize": "^2.13",
Expand Down
4 changes: 2 additions & 2 deletions phpstan.neon.dist
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ includes:
parameters:
level: 6
paths:
- ./
- .
excludePaths:
- vendor/
- vendor

ignoreErrors:
# relax strict rules
Expand Down

0 comments on commit ffe1d82

Please sign in to comment.