Skip to content

Commit

Permalink
WIP: BREAKING: TYPO3 v12 support
Browse files Browse the repository at this point in the history
* Migrated all fixtures to PHP.
* Removed version specific adjustments.

WIP:
    * Fix last tests.
    * Manual testing.
  • Loading branch information
DanielSiepmann committed Nov 13, 2023
1 parent a9f3f10 commit 5f08800
Show file tree
Hide file tree
Showing 165 changed files with 4,143 additions and 3,016 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Tests export-ignore
Patches export-ignore
.gitlab-ci.yml export-ignore
shell.nix export-ignore

Expand Down
41 changes: 11 additions & 30 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,9 @@ jobs:
strategy:
matrix:
php-version:
- 7.2
- 7.3
- 7.4
- 8.0
- 8.1
- 8.2
- 8.3
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -43,7 +40,7 @@ jobs:
- name: Install PHP
uses: shivammathur/setup-php@v2
with:
php-version: "7.4"
php-version: "8.2"
tools: composer:v2

- name: Install xmllint
Expand Down Expand Up @@ -71,7 +68,7 @@ jobs:
- name: Install PHP
uses: shivammathur/setup-php@v2
with:
php-version: "8.1"
php-version: "8.2"
tools: composer:v2

- name: Install dependencies
Expand All @@ -87,20 +84,12 @@ jobs:
strategy:
matrix:
include:
- php-version: '7.2'
typo3-version: '^10.4'
- php-version: '7.3'
typo3-version: '^10.4'
- php-version: '7.4'
typo3-version: '^10.4'
- php-version: '7.4'
typo3-version: '^11.5'
- php-version: '8.0'
typo3-version: '^11.5'
- php-version: '8.1'
typo3-version: '^11.5'
typo3-version: '^12.4'
- php-version: '8.2'
typo3-version: '^11.5'
typo3-version: '^12.4'
- php-version: '8.3'
typo3-version: '^12.4'
steps:
- uses: actions/checkout@v3

Expand All @@ -124,20 +113,12 @@ jobs:
strategy:
matrix:
include:
- php-version: '7.2'
typo3-version: '^10.4'
- php-version: '7.3'
typo3-version: '^10.4'
- php-version: '7.4'
typo3-version: '^10.4'
- php-version: '7.4'
typo3-version: '^11.5'
- php-version: '8.0'
typo3-version: '^11.5'
- php-version: '8.1'
typo3-version: '^11.5'
typo3-version: '^12.4'
- php-version: '8.2'
typo3-version: '^11.5'
typo3-version: '^12.4'
- php-version: '8.3'
typo3-version: '^12.4'
steps:
- uses: actions/checkout@v3

Expand Down
5 changes: 4 additions & 1 deletion .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@
'concat_space' => ['spacing' => 'one'],
'declare_equal_normalize' => ['space' => 'none'],
'dir_constant' => true,
'fully_qualified_strict_types' => false,
'function_to_constant' => ['functions' => ['get_called_class', 'get_class', 'get_class_this', 'php_sapi_name', 'phpversion', 'pi']],
'function_typehint_space' => true,
'global_namespace_import' => ['import_classes' => true, 'import_constants' => true, 'import_functions' => true],
'lowercase_cast' => true,
'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
'modernize_strpos' => true,
Expand All @@ -38,6 +40,7 @@
'no_superfluous_elseif' => true,
'no_trailing_comma_in_singleline_array' => true,
'no_unneeded_control_parentheses' => true,
'no_unneeded_import_alias' => true,
'no_unused_imports' => true,
'no_useless_else' => true,
'no_whitespace_in_blank_line' => true,
Expand All @@ -54,8 +57,8 @@
'phpdoc_types' => true,
'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
'return_type_declaration' => ['space_before' => 'none'],
'single_quote' => true,
'single_line_comment_style' => ['comment_types' => ['hash']],
'single_quote' => true,
'single_trait_insert_per_statement' => true,
'trailing_comma_in_multiline' => ['elements' => ['arrays']],
'whitespace_after_comma_in_array' => true,
Expand Down
178 changes: 0 additions & 178 deletions Classes/Backports/V12/Pagination/SlidingWindowPagination.php

This file was deleted.

13 changes: 2 additions & 11 deletions Classes/Caching/CacheManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,7 @@

class CacheManager
{
/**
* @var Typo3CacheManager
*/
private $cacheManager;

/**
* @var array
*/
private $tags = [
private array $tags = [
'tx_events_domain_model_date',
'tx_events_domain_model_event',
'tx_events_domain_model_organizer',
Expand All @@ -45,9 +37,8 @@ class CacheManager
];

public function __construct(
Typo3CacheManager $cacheManager
private readonly Typo3CacheManager $cacheManager
) {
$this->cacheManager = $cacheManager;
}

public function addAllCacheTagsToPage(ContentObjectRenderer $cObject): void
Expand Down
Loading

0 comments on commit 5f08800

Please sign in to comment.