Skip to content

Commit

Permalink
Merge branch 'development' into srcset-fix2
Browse files Browse the repository at this point in the history
  • Loading branch information
luzat authored Jun 19, 2024
2 parents 3da8980 + 6c57bd8 commit dd631d4
Show file tree
Hide file tree
Showing 607 changed files with 9,354 additions and 10,173 deletions.
35 changes: 35 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
---
name: Bug report
about: Create a report to help us improve
title: 'BUG: foobar fails when baz'
labels: ''
assignees: ''

---

**I have checked that the bug exists in the `dev-development` branch**
_Yes or no._
If you're about to answer "no" here, it is your responsibility to check `dev-development` **before** opening a bug report!

**I have checked that there are no already open issues or recently closed issues about this bug**
_Yes or no._
If you're about to answer "no" here, it is your responsibility to first check the open and recently closed issues for potential duplicaates.

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Additional context**
Add any other context about the problem here.
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Feature request
about: Suggest an idea for this project
title: 'Feature request: having foobar would be nice'
labels: ''
assignees: ''

---

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered or workarounds you currently have to use**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
130 changes: 94 additions & 36 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,85 +7,143 @@ on:
branches: [ master, development, '[0-9]+.[0-9]', '[0-9]+.[0-9]+.[0-9]+' ]

jobs:
build:
phpcs:
if: "!contains(github.event.head_commit.message, '[skip ci]')"
name: "PHP ${{ matrix.php-versions }} Test (deps: ${{ matrix.dependencies }})"

continue-on-error: ${{ matrix.experimental }}
name: "CodeSniffer, PHP ${{ matrix.php }} TYPO3 ${{ matrix.typo3 }}"

strategy:
fail-fast: false
matrix:
php-versions: ['7.4']
dependencies: ['highest']
composer-arguments: [''] # to run --ignore-platform-reqs in experimental builds
typo3-version: ['^9.5', '^8.7']
experimental: [false]
include:
- php: "8.1"
typo3: "^11.5"

runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
php-version: ${{ matrix.php }}
extensions: mbstring, json
ini-values: date.timezone="Europe/Copenhagen", opcache.fast_shutdown=0
tools: composer:v2.2

- name: Select TYPO3 version
run: "composer require typo3/cms-core:${{ matrix.typo3-version }}"
run: "composer require typo3/cms-core:${{ matrix.typo3 }} -W --no-update"

- name: Composer install
uses: ramsey/composer-install@v2

- name: Run phpcs
run: vendor/bin/phpcs Classes --standard=PSR2

phpstan:
if: "!contains(github.event.head_commit.message, '[skip ci]')"
name: "PHPStan, PHP ${{ matrix.php }} TYPO3 ${{ matrix.typo3 }}"
needs: phpcs

strategy:
fail-fast: false
matrix:
include:
- php: "7.4"
typo3: "^10.4"
- php: "8.0"
typo3: "^11.5"
- php: "8.1"
typo3: "^11.5"
- php: "8.1"
typo3: "^12.4"
- php: "8.2"
typo3: "^12.4"
- php: "8.3"
typo3: "^12.4"

runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
dependency-versions: ${{ matrix.dependencies }}
composer-options: ${{ matrix.composer-arguments }}
php-version: ${{ matrix.php }}
extensions: mbstring, json
ini-values: date.timezone="Europe/Copenhagen", opcache.fast_shutdown=0
tools: composer:v2.2

- name: Run tests
run: vendor/bin/phpunit
- name: Select TYPO3 version
run: "composer require typo3/cms-core:${{ matrix.typo3 }} -W --no-update"

- name: Composer install
uses: ramsey/composer-install@v2

- name: Run phpstan
run: vendor/bin/phpstan analyze

build:
if: "!contains(github.event.head_commit.message, '[skip ci]')"
name: "PHPUnit, PHP ${{ matrix.php }} TYPO3 ${{ matrix.typo3 }}"
needs: phpstan

strategy:
fail-fast: false
matrix:
include:
- php: "7.4"
typo3: "^10.4"
- php: "8.0"
typo3: "^11.5"
- php: "8.1"
typo3: "^11.5"
- php: "8.1"
typo3: "^12.4"
- php: "8.2"
typo3: "^12.4"
- php: "8.3"
typo3: "^12.4"

coverage:
runs-on: ubuntu-latest
continue-on-error: true
name: "Coveralls upload"

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: "7.4"
php-version: ${{ matrix.php }}
extensions: mbstring, json
coverage: xdebug #optional
ini-values: date.timezone="Europe/Copenhagen", opcache.fast_shutdown=0
tools: composer:v2.2

- name: Select TYPO3 version 9.5
run: "composer require typo3/cms-core:^9.5"
- name: Select TYPO3 version
run: "composer require typo3/cms-core:${{ matrix.typo3 }} --no-update"

- name: Composer install
uses: ramsey/composer-install@v1
uses: ramsey/composer-install@v2

- name: Run tests
run: vendor/bin/phpunit --coverage-clover=build/logs/clover.xml

- name: Upload test coverage
run: vendor/bin/php-coveralls -vvv
env:
COVERALLS_PARALLEL: true
COVERALLS_FLAG_NAME: typo3-${{ matrix.typo3 }}-php-${{ matrix.php }}
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}

# Use this step to configure a required build pass via gh branch protection rules (currently makes experimental builds unusable due to https://github.com/actions/toolkit/issues/581)
#buildall:
# if: "!contains(github.event.head_commit.message, '[skip ci]')"
# runs-on: ubuntu-latest
# name: CI build (matrix)
# needs: build
# steps:
# - name: Check build matrix status
# if: ${{ needs.build.result != 'success' }}
# run: exit 1

finish:
needs: build
runs-on: ubuntu-latest
steps:
- name: Coveralls Finished
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.github_token }}
parallel-finished: true
8 changes: 4 additions & 4 deletions .github/workflows/generate-viewhelper-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@ jobs:
strategy:
fail-fast: false
steps:
- name: Setup PHP 7.4
- name: Setup PHP 8.2
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
php-version: '8.2'

- name: Checkout VHS project
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: vhs
fetch-depth: 1
persist-credentials: false

- name: Checkout Fluid Documentation Generator
uses: actions/checkout@v2
uses: actions/checkout@v3
if: ${{ contains(github.event.head_commit.message, '[TASK] Update XSD schema') }}
with:
repository: 'TYPO3-Documentation/fluid-documentation-generator'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generate-xsd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
php-version: '7.4'

- name: Checkout VHS project
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: vhs
persist-credentials: false
Expand Down
31 changes: 31 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
on:
push:
tags:
- "**"

jobs:
release:
runs-on: ubuntu-20.04
steps:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.2
extensions: mbstring, json
ini-values: date.timezone="Europe/Copenhagen", opcache.fast_shutdown=0
tools: composer:v2.2
- name: "create working directory"
run: "mkdir tailor"
- name: "Install Tailor"
working-directory: tailor
run: "composer require typo3/tailor"
- name: "Upload to TER"
working-directory: tailor
run: "./vendor/bin/tailor ter:publish $TAG $EXTENSION_KEY --artefact $ARTEFECT_URL --comment \"$MESSAGE\""
env:
TYPO3_API_USERNAME: ${{ secrets.TER_USERNAME }}
TYPO3_API_TOKEN: ${{ secrets.TER_TOKEN }}
TAG: ${{ github.ref_name }}
EXTENSION_KEY: vhs
ARTEFECT_URL: "https://github.com/${{ github.repository }}/archive/${{ github.ref }}.zip"
MESSAGE: "Automatic release built from GitHub. See the CHANGELOG.md file that is shipped with this release for details."
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
vendor
.idea
.phpunit.result.cache
composer.lock
/build
/Documentation-GENERATED-temp/
/index.php
/typo3
/typo3_src
/public
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
Latest release: 6.1.2 (2022/06/16)
Latest release: 7.0.3 (2024/04/23 12:00:30)

All previous release change logs:

* [7.0.3 (2024/04/23)](Documentation/Changelog/7.0.3.md) [Full list of changes](https://github.com/FluidTYPO3/vhs/compare/7.0.2...7.0.3)
* [7.0.2 (2024/01/25)](Documentation/Changelog/7.0.2.md) [Full list of changes](https://github.com/FluidTYPO3/vhs/compare/7.0.1...7.0.2)
* [7.0.1 (2023/11/13)](Documentation/Changelog/7.0.1.md) [Full list of changes](https://github.com/FluidTYPO3/vhs/compare/7.0.0...7.0.1)
* [7.0.0 (2023/09/07)](Documentation/Changelog/7.0.0.md) [Full list of changes](https://github.com/FluidTYPO3/vhs/compare/6.1.3...7.0.0)
* [6.1.3 (2023/01/07)](Documentation/Changelog/6.1.3.md) [Full list of changes](https://github.com/FluidTYPO3/vhs/compare/6.1.2...6.1.3)
* [6.1.2 (2022/06/16)](Documentation/Changelog/6.1.2.md) [Full list of changes](https://github.com/FluidTYPO3/vhs/compare/6.1.1...6.1.2)
* [6.1.1 (2022/05/02)](Documentation/Changelog/6.1.1.md) [Full list of changes](https://github.com/FluidTYPO3/vhs/compare/6.1.0...6.1.1)
* [6.1.0 (2022/05/01)](Documentation/Changelog/6.1.0.md) [Full list of changes](https://github.com/FluidTYPO3/vhs/compare/6.0.5...6.1.0)
Expand Down
Loading

0 comments on commit dd631d4

Please sign in to comment.