Skip to content

Commit

Permalink
Merge branch 'release/10.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
garbast committed Mar 6, 2024
2 parents 642f115 + aa553de commit 09658fd
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 18 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:

resources:
name: Resources tests
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Test documentation build
run: Build/Scripts/additionalTests.sh -s buildDocumentation
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:

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

- name: PHP lint
run: |
Expand Down Expand Up @@ -120,12 +120,12 @@ jobs:
needs: [ resources, testsuite ]
if: startsWith(github.ref, 'refs/tags/')

runs-on: ubuntu-22.04
runs-on: ubuntu-latest

name: TYPO3 TER release
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Publish to TER
uses: tomasnorre/typo3-upload-ter@v2
Expand Down
5 changes: 4 additions & 1 deletion Classes/Event/RegisterAutoloaderEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ protected function autoloaderAlreadyRegistered(array $autoloader): bool
foreach ($currentAutoLoaders as $currentAutoLoader) {
if (
is_array($currentAutoLoader)
&& get_class($currentAutoLoader[0]) === $autoloaderClass
&& (
(is_object($currentAutoLoader[0]) && get_class($currentAutoLoader[0]) === $autoloaderClass)
|| (is_string($currentAutoLoader[0]) && $currentAutoLoader[0] === $autoloaderClass)
)
) {
$result = true;
break;
Expand Down
4 changes: 2 additions & 2 deletions Documentation/Settings.cfg
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[general]

project = extender
version = 10.1.0
release = 10.1.0
version = 10.1.1
release = 10.1.1
copyright = since 2014 by evoWeb

# code highlight https://app.codeimage.dev/
Expand Down
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,11 @@
[![Monthly Downloads](https://poser.pugx.org/evoweb/extender/d/monthly)](https://packagist.org/packages/evoweb/extender)
[![Total Downloads](https://poser.pugx.org/evoweb/extender/downloads)](https://packagist.org/packages/evoweb/extender)

# !IMPORTANT WIP
Currently, the extending process gets refactored. Please don't use it in
productive projects.

## Installation

### via Composer

The recommended way to install TYPO3 Console is by using [Composer](https://getcomposer.org):
The recommended way to install EXT:extender is by using [Composer](https://getcomposer.org):

composer require evoweb/extender

Expand Down
10 changes: 7 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,20 @@
}
},
"require": {
"typo3/cms-core": "^11.5 || ^12.4 || 12.4.x-dev || dev-main",
"nikic/php-parser": "^4.13.2 || ^4.15.4",
"typo3/cms-core": "^11.5 || ^12.4 || dev-main"
"psr/container": "^1.1 || ^2.0",
"psr/event-dispatcher": "^1.0",
"symfony/console": "^5.4 || ^6.4 || ^7.0",
"symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0"
},
"require-dev": {
"evoweb/base_extension": "*",
"evoweb/extending_extension": "*",
"phpunit/phpunit": "^9.5.10 || ^10.1.1",
"symfony/polyfill-php80": "^1.16",
"typo3/cms-extensionmanager": "^11.5 || ^12.4 || dev-main",
"typo3/testing-framework": "^6.16.9 || ^8.0.2 || dev-main"
"typo3/cms-extensionmanager": "^11.5 || ^12.4 || 12.4.x-dev || dev-main",
"typo3/testing-framework": "^6.16.9 || ^8.0.2 || 12.4.x-dev || dev-main"
},
"extra": {
"typo3/cms": {
Expand Down
4 changes: 2 additions & 2 deletions ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
'author_email' => 'extender@evoweb.de',
'author_company' => 'evoWeb',
'state' => 'stable',
'version' => '10.1.0',
'version' => '10.1.1',
'constraints' => [
'depends' => [
'typo3' => '11.0.0-12.2.99',
'typo3' => '11.5.0-12.4.99',
],
],
];

0 comments on commit 09658fd

Please sign in to comment.