Skip to content

Commit

Permalink
Merge branch 'main' into fix-php82-deprecation
Browse files Browse the repository at this point in the history
  • Loading branch information
tomasnorre authored Mar 5, 2024
2 parents 86b4c2e + 1ce6332 commit 17c1117
Show file tree
Hide file tree
Showing 37 changed files with 1,414 additions and 463 deletions.
File renamed without changes.
11 changes: 8 additions & 3 deletions .github/workflows/Acceptance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@ jobs:
strategy:
fail-fast: false
matrix:
typo3: [ ^12.2 ]
php: [ '8.1', '8.2' ]
typo3:
- ^12.2
php:
- '8.1'
- '8.2'

steps:
- name: Get branch name (merge)
Expand Down Expand Up @@ -98,7 +101,9 @@ jobs:
strategy:
fail-fast: false
matrix:
typo3: [ 'v11', 'v11p80' ]
typo3:
- 'v11'
- 'v11p80'

steps:
- uses: shivammathur/setup-php@v2
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/AutoComment.yml.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
name: Auto Comment
on: [issues, pull_request]
on:
- issues
- pull_request
jobs:
run:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/BackwardCompatibilityCheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:


- name: "Cache dependencies"
uses: "actions/cache@v2"
uses: "actions/cache@v3"
with:
path: |
~/.composer/cache
Expand Down
42 changes: 31 additions & 11 deletions .github/workflows/DBMS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,16 @@ jobs:
strategy:
fail-fast: false
matrix:
postgres: [ '9.6', '10', '11', '12', '13' ]
typo3: [ 'dev-main' ]
php: [ '8.1' ]
postgres:
- '9.6'
- '10'
- '11'
- '12'
- '13'
typo3:
- 'dev-main'
php:
- '8.1'
steps:
- name: Set up PostgreSQL ${{ matrix.postgres }}
run: |
Expand Down Expand Up @@ -63,8 +70,10 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [ '8.1' ]
typo3: [ 'dev-main' ]
php:
- '8.1'
typo3:
- 'dev-main'
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -88,9 +97,15 @@ jobs:
strategy:
fail-fast: false
matrix:
mariadb: [ '10.2', '10.3', '10.4', '10.5' ]
typo3: [ 'dev-main' ]
php: [ '8.1' ]
mariadb:
- '10.2'
- '10.3'
- '10.4'
- '10.5'
typo3:
- 'dev-main'
php:
- '8.1'
steps:
- name: Set up MariaDB ${{ matrix.mariadb }}
uses: getong/mariadb-action@v1.1
Expand Down Expand Up @@ -129,9 +144,14 @@ jobs:
strategy:
fail-fast: false
matrix:
mysql: [ '5.6', '5.7', '8.0' ]
typo3: [ '^12.2' ]
php: [ '8.1' ]
mysql:
- '5.6'
- '5.7'
- '8.0'
typo3:
- '^12.2'
php:
- '8.1'
steps:
- name: Set up MySQL ${{ matrix.mysql }}
uses: mirromutth/mysql-action@v1.1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v3
- id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
- uses: actions/cache@v1
- uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/GithubServer.yml.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ name: GithubServer
# thanks go to derhansen for demo extension https://github.com/derhansen/gha_demo
# and blog https://www.derhansen.de/2020/05/typo3-extension-testing-with-github-actions.html

on: [ push, pull_request ]
on:
- push
- pull_request

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
Expand All @@ -14,7 +16,8 @@ jobs:
strategy:
fail-fast: false
matrix:
typo3: [ ^10.4 ]
typo3:
- ^10.4

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand Down Expand Up @@ -44,7 +47,7 @@ jobs:
run: cp Build/envs/.env.github .env

- name: Cache dependencies
uses: actions/cache@v1
uses: actions/cache@v3
with:
path: ~/.composer/cache
key: dependencies-composer-${{ hashFiles('composer.json') }}
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/Greetings.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
name: Greetings
on: [pull_request, issues]
on:
- pull_request
- issues

jobs:
greeting:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/MutationTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
tools: composer:v2, cs2pr

- name: "Cache dependencies"
uses: "actions/cache@v2"
uses: "actions/cache@v3"
with:
path: |
~/.composer/cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Requirement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v3
- id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
- uses: actions/cache@v1
- uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/SonarCloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@v3
- id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
- uses: actions/cache@v1
- uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/StaticAnalysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v3
- id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
- uses: actions/cache@v1
- uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
Expand All @@ -36,7 +36,7 @@ jobs:
- uses: actions/checkout@v3
- id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
- uses: actions/cache@v1
- uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
Expand All @@ -56,7 +56,7 @@ jobs:
- uses: actions/checkout@v3
- id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
- uses: actions/cache@v1
- uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
Expand All @@ -76,7 +76,7 @@ jobs:
- uses: actions/checkout@v3
- id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
- uses: actions/cache@v1
- uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/Tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,13 @@ jobs:
strategy:
fail-fast: false
matrix:
typo3: [ '^12.2' ]
php: [ '8.1', '8.2' ]
mysql: ['5.7']
typo3:
- '^12.2'
php:
- '8.1'
- '8.2'
mysql:
- '5.7'

steps:
- name: Set up MySQL ${{ matrix.mysql }}
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
### Fixed
* If indexed_search is installed activate procInstructions for indexed_search
* Avoid deprecations in PHP 8.2
* Prevent undefined array key uid and username in FrontendUserAuthentication
* Fix loading middleware order to make forced indexing work again [@cweiske](https://github.com/cweiske)
* Change tense in flush command message [@cweiske](https://github.com/cweiske)

### Deprecated
#### Classes
Expand Down
4 changes: 2 additions & 2 deletions Classes/Command/FlushQueueCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@ protected function execute(InputInterface $input, OutputInterface $output): int
switch ($queueFilter) {
case 'all':
$queueRepository->flushQueue($queueFilter);
$output->writeln('<info>All entries in Crawler queue will be flushed</info>');
$output->writeln('<info>All entries in Crawler queue have been flushed</info>');
break;
case 'finished':
case 'pending':
$queueRepository->flushQueue($queueFilter);
$output->writeln(
'<info>All entries in Crawler queue, with status: "' . $queueFilter . '" will be flushed</info>'
'<info>All entries in Crawler queue with status "' . $queueFilter . '" have been flushed</info>'
);
break;
default:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@ public function setExtensionSettings(): void
protected function setupView(ServerRequestInterface $request, int $pageUid): ModuleTemplate
{
$moduleTemplate = (GeneralUtility::makeInstance(ModuleTemplateFactory::class))->create($request);
$moduleTemplate->getView()->setLayoutRootPaths(['EXT:crawler/Resources/Private/Layouts']);
$moduleTemplate->getView()->setPartialRootPaths(['EXT:crawler/Resources/Private/Partials']);
$moduleTemplate->getView()->setTemplateRootPaths(['EXT:crawler/Resources/Private/Templates/Backend']);

$permissionClause = $this->getBackendUserAuthentication()->getPagePermsClause(Permission::PAGE_SHOW);
$pageRecord = BackendUtility::readPageAccess($pageUid, $permissionClause);
if ($pageRecord) {
Expand Down Expand Up @@ -94,7 +90,7 @@ protected function makeCrawlerProcessableChecks(array $extensionSettings): void
protected function getModuleMenu(): array
{
return [
'depth' => [
'logDepth' => [
0 => $this->getLanguageService()->sL(
'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_0'
),
Expand Down Expand Up @@ -128,7 +124,7 @@ protected function getModuleMenu(): array
'log_resultLog' => '',
'log_feVars' => '',
'processListMode' => '',
'log_display' => [
'displayLog' => [
'all' => $this->getLanguageService()->sL(
'LLL:EXT:crawler/Resources/Private/Language/locallang.xlf:labels.all'
),
Expand Down
Loading

0 comments on commit 17c1117

Please sign in to comment.