Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FEATURE] Compatibility with TYPO3 13 #83

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
## Prerequisites

* [ ] Changes have been tested on TYPO3 v12.4 LTS
* [ ] Changes have been tested on TYPO3 v13.x
* [ ] Changes have been tested on TYPO3 v13.4 LTS
* [ ] Changes have been tested on TYPO3 dev-main
* [ ] Changes have been tested on PHP 8.1.x
* [ ] Changes have been tested on PHP 8.2.x
* [ ] Changes have been tested on PHP 8.3.x
* [ ] Changes have been tested on PHP 8.4.x
* [ ] Changes have been checked for CGL compliance `php-cs-fixer fix`

## Description
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [8.1, 8.2, 8.3]
php: [8.2, 8.3, 8.4]

name: "PHP linter - ${{ matrix.php }}"

Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
- "php:rector"
- "yaml:lint"
- "xliff:lint"
php: [8.1]
php: [8.2]

name: "Code quality checks"

Expand Down Expand Up @@ -99,8 +99,8 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [8.1, 8.3]
typo3: ["^12.4"]
php: [8.2, 8.3, 8.4]
typo3: ["^13.4"]
stability: [prefer-lowest, prefer-stable]
# include:
# - typo3: "^13.0"
Expand Down Expand Up @@ -154,8 +154,8 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [8.1, 8.3]
typo3: ["^12.4"]
php: [8.2, 8.3, 8.4]
typo3: ["^13.4"]
stability: [prefer-lowest, prefer-stable]
# include:
# - typo3: "^13.0"
Expand Down
12 changes: 6 additions & 6 deletions Build/rector/rector.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
__DIR__ . '/../../Tests',
__DIR__ . '/../../ext_emconf.php',
]);
$rectorConfig->phpVersion(PhpVersion::PHP_81);
$rectorConfig->phpVersion(PhpVersion::PHP_82);
$rectorConfig->sets([
// Rector sets
LevelSetList::UP_TO_PHP_81,
LevelSetList::UP_TO_PHP_82,
SetList::CODE_QUALITY,
SetList::DEAD_CODE,
SetList::STRICT_BOOLEANS,
Expand All @@ -37,22 +37,22 @@
// TYPO3 Sets
Typo3SetList::CODE_QUALITY,
Typo3SetList::GENERAL,
Typo3LevelSetList::UP_TO_TYPO3_12,
Typo3LevelSetList::UP_TO_TYPO3_13,
]);
$rectorConfig->phpstanConfig(Typo3Option::PHPSTAN_FOR_RECTOR_PATH);
$rectorConfig->rules([
AddVoidReturnTypeWhereNoReturnRector::class,
ConvertImplicitVariablesToExplicitGlobalsRector::class,
]);
$rectorConfig->ruleWithConfiguration(ExtEmConfRector::class, [
ExtEmConfRector::PHP_VERSION_CONSTRAINT => '8.1.0-8.3.99',
ExtEmConfRector::TYPO3_VERSION_CONSTRAINT => '12.4.0-12.4.99',
ExtEmConfRector::PHP_VERSION_CONSTRAINT => '8.2.0-8.4.99',
ExtEmConfRector::TYPO3_VERSION_CONSTRAINT => '13.4.0-13.4.99',
ExtEmConfRector::ADDITIONAL_VALUES_TO_BE_REMOVED => []
]);
$rectorConfig->importNames();
$rectorConfig->importShortClasses(false);
$rectorConfig->skip([
// Strict
DisallowedEmptyRuleFixerRector::class
DisallowedEmptyRuleFixerRector::class,
]);
};
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[![Latest Stable Version](https://poser.pugx.org/simonschaufi/typo3-phone/v/stable)](https://packagist.org/packages/simonschaufi/typo3-phone)
[![Total Downloads](https://poser.pugx.org/simonschaufi/typo3-phone/downloads)](https://packagist.org/packages/simonschaufi/typo3-phone)
[![License](https://poser.pugx.org/simonschaufi/typo3-phone/license)](https://packagist.org/packages/simonschaufi/typo3-phone)
[![TYPO3](https://img.shields.io/badge/TYPO3-12-orange.svg)](https://get.typo3.org/version/12)
[![TYPO3](https://img.shields.io/badge/TYPO3-13-orange.svg)](https://get.typo3.org/version/13)

Adds phone number functionality to TYPO3 based on the [PHP port](https://github.com/giggsey/libphonenumber-for-php)
of [libphonenumber by Google](https://github.com/googlei18n/libphonenumber).
Expand Down
22 changes: 15 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,33 @@
}
],
"require": {
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"php": "~8.2.0 || ~8.3.0 || ~8.4.0",
"ext-json": "*",
"giggsey/libphonenumber-for-php": "^8.13",
"simonschaufi/typo3-support": "^2.0 || ^3.0",
"typo3/cms-core": "^12.4"
"giggsey/libphonenumber-for-php": "^8.13.47",
"simonschaufi/typo3-support": "^3.1.1",
"typo3/cms-core": "^13.4"
},
"require-dev": {
"composer/pcre": "^3.3.1",
"ergebnis/composer-normalize": "^2.44.0",
"friendsofphp/php-cs-fixer": "^3.64.0",
"friendsoftypo3/phpstan-typo3": "^0.9.0",
"guzzlehttp/promises": "^2.0.4",
"phpstan/phpstan": "^1.12.7",
"phpstan/phpstan-phpunit": "^1.4.0",
"phpunit/phpunit": "^10.5.37",
"roave/security-advisories": "dev-latest",
"squizlabs/php_codesniffer": "^3.10.3",
"ssch/typo3-rector": "^2.10.2",
"symfony/console": "^5.4 || ^6.4 || ^7.0",
"symfony/translation": "^5.4 || ^6.4 || ^7.0",
"symfony/yaml": "^5.4 || ^6.4 || ^7.0",
"symfony/cache": "^7.1.5",
"symfony/cache-contracts": "^3.5.0",
"symfony/console": "^7.1.5",
"symfony/event-dispatcher": "^7.1.1",
"symfony/event-dispatcher-contracts": "^3.5.0",
"symfony/translation": "^7.1.5",
"symfony/var-exporter": "^6.4.9",
"symfony/yaml": "^7.1.5",
"typo3/class-alias-loader": "^1.2.0",
"typo3/testing-framework": "^8.2.3"
},
"minimum-stability": "dev",
Expand Down
4 changes: 2 additions & 2 deletions ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
'version' => '3.1.1',
'constraints' => [
'depends' => [
'php' => '8.1.0-8.3.99',
'typo3' => '12.4.0-12.4.99'
'php' => '8.2.0-8.4.99',
'typo3' => '13.4.0-13.4.99'
],
'conflicts' => [],
'suggests' => [],
Expand Down