Skip to content

Commit

Permalink
Merge branch 'FriendsOfTYPO3:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
BastianBalthasarBux authored Nov 8, 2024
2 parents bbb7cc2 + 3435c78 commit bd1555f
Show file tree
Hide file tree
Showing 125 changed files with 18,896 additions and 2,690 deletions.
67 changes: 57 additions & 10 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,20 +1,67 @@
# EditorConfig is awesome: http://EditorConfig.org

# top-most EditorConfig file
root = true

[{*.rst,*.rst.txt}]
# Unix-style newlines with a newline ending every file
[*]
charset = utf-8
end_of_line = lf
indent_style = space
indent_size = 4
insert_final_newline = true
trim_trailing_whitespace = true
indent_style = space
indent_size = 3

# TS/JS-Files
[*.{ts,js,mjs}]
indent_size = 2

# JSON-Files
[*.json]
indent_style = tab

# ReST-Files
[*.{rst,rst.txt}]
indent_size = 4
max_line_length = 80

# MD-Files
# Markdown-Files
[*.md]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
indent_style = space
indent_size = 4
max_line_length = 80

# YAML-Files
[*.{yaml,yml}]
indent_size = 2

# NEON-Files
[*.neon]
indent_size = 2
indent_style = tab

# stylelint
[.stylelintrc]
indent_size = 2

# package.json
[package.json]
indent_size = 2

# TypoScript
[*.{typoscript,tsconfig}]
indent_size = 2

# XLF-Files
[*.xlf]
indent_style = tab

# SQL-Files
[*.sql]
indent_style = tab
indent_size = 2

# .htaccess
[{_.htaccess,.htaccess}]
indent_style = tab

[Makefile]
indent_style = tab
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
/.styleci.yml export-ignore
/.travis.yml export-ignore
/.php_cs export-ignore
/Makefile export-ignore
84 changes: 0 additions & 84 deletions .github/workflows/ci.yml

This file was deleted.

49 changes: 49 additions & 0 deletions .github/workflows/core12.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: core 12

on: [ push, pull_request ]

jobs:
tests:
name: v12
runs-on: ubuntu-22.04
strategy:
# This prevents cancellation of matrix job runs, if one/two already failed and let the
# rest matrix jobs be executed anyway.
fail-fast: false
matrix:
php: [ '8.1', '8.2', '8.3' ]
composerInstall: [ 'composerInstallLowest', 'composerInstallHighest' ]
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Install testing system
run: Build/Scripts/runTests.sh -t 12 -p ${{ matrix.php }} -s ${{ matrix.composerInstall }}

- name: Lint PHP
run: Build/Scripts/runTests.sh -t 12 -p ${{ matrix.php }} -s lint

- name: Validate code against CGL
run: PHP_CS_FIXER_IGNORE_ENV=1 Build/Scripts/runTests.sh -t 12 -p ${{ matrix.php }} -s cgl -n

- name: Unit Tests
run: Build/Scripts/runTests.sh -t 12 -p ${{ matrix.php }} -s unit

- name: Functional Tests with mariadb and mysqli
run: Build/Scripts/runTests.sh -t 12 -p ${{ matrix.php }} -d mariadb -a mysqli -s functional
#
# - name: Functional Tests with mariadb and pdo_mysql
# run: Build/Scripts/runTests.sh -t 12 -p ${{ matrix.php }} -d mariadb -a pdo_mysql -s functional
#
# - name: Functional Tests with mysql and mysqli
# run: Build/Scripts/runTests.sh -t 12 -p ${{ matrix.php }} -d mysql -a mysqli -s functional
#
# - name: Functional Tests with mysql and pdo_mysql
# run: Build/Scripts/runTests.sh -t 12 -p ${{ matrix.php }} -d mysql -a pdo_mysql -s functional

# - name: Functional Tests with postgres
# run: Build/Scripts/runTests.sh -t 12 -p ${{ matrix.php }} -d postgres -s functional

# @todo disabled, due cross dbmns issues in code. Should be fixed first
# - name: Functional Tests with sqlite
# run: Build/Scripts/runTests.sh -t 12 -p ${{ matrix.php }} -d sqlite -s functional
49 changes: 49 additions & 0 deletions .github/workflows/core13.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: core 13

on: [ push, pull_request ]

jobs:
tests:
name: v13
runs-on: ubuntu-22.04
strategy:
# This prevents cancellation of matrix job runs, if one/two already failed and let the
# rest matrix jobs be executed anyway.
fail-fast: true
matrix:
php: [ '8.2', '8.3' ]
composerInstall: [ 'composerInstallLowest', 'composerInstallHighest' ]
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Install testing system
run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -s ${{ matrix.composerInstall }}

- name: Lint PHP
run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -s lint

- name: Validate code against CGL
run: PHP_CS_FIXER_IGNORE_ENV=1 Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -s cgl -n

- name: Unit Tests
run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -s unit

# - name: Functional Tests with mariadb and mysqli
# run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d mariadb -a mysqli -s functional
#
# - name: Functional Tests with mariadb and pdo_mysql
# run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d mariadb -a pdo_mysql -s functional
#
# - name: Functional Tests with mysql and mysqli
# run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d mysql -a mysqli -s functional
#
# - name: Functional Tests with mysql and pdo_mysql
# run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d mysql -a pdo_mysql -s functional
#
# - name: Functional Tests with postgres
# run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d postgres -s functional

# @todo disabled, due cross dbmns issues in code. Should be fixed first
# - name: Functional Tests with sqlite
# run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d sqlite -s functional
17 changes: 17 additions & 0 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: test documentation

on: [ push, pull_request ]

jobs:
tests:
name: documentation
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Test if the documentation will render without warnings
run: |
mkdir -p Documentation-GENERATED-temp \
&& docker run --rm --pull always -v $(pwd):/project \
ghcr.io/typo3-documentation/render-guides:latest --config=Documentation --no-progress --fail-on-log
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
/Build/Local/report
/Build/Local/.phpunit.result.cache
/Build/testing-docker/.env
/Build/.phpunit.result.cache
/Documentation-GENERATED-temp
/tempfile.sh
/out.txt
/.Build
/composer.lock
/composer.json.testing
/composer.list
/.cache
/var
/public
80 changes: 0 additions & 80 deletions .php_cs

This file was deleted.

Loading

0 comments on commit bd1555f

Please sign in to comment.