Skip to content

Commit 56a1b9a

Browse files
committed
[TASK] Prepare Release for TYPO3 v10.4 and v11.5
Related: #27
1 parent 2656aa3 commit 56a1b9a

12 files changed

Lines changed: 202 additions & 83 deletions

File tree

.gitlab-ci.yml

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ lint:yaml:
4040
before_script:
4141
- pip install yamllint==1.10.0
4242
script:
43-
- yamllint -c Build/yamllint.yaml Configuration/ Resources/ .travis.yml
43+
- yamllint -c Build/yamllint.yaml Configuration/ Resources/
4444

4545
lint:php72:
4646
stage: lint
@@ -60,6 +60,27 @@ lint:php74:
6060
script:
6161
- find . -name \*.php -exec php -l "{}" \;
6262

63+
lint:php80:
64+
stage: lint
65+
image: php:8.0-alpine
66+
script:
67+
- find . -name \*.php -exec php -l "{}" \;
68+
69+
lint:php81:
70+
stage: lint
71+
image: php:8.1-alpine
72+
script:
73+
- find . -name \*.php -exec php -l "{}" \;
74+
75+
phpstan:analyse:
76+
image: composer:2
77+
stage: lint
78+
before_script:
79+
- composer config platform.php 7.4
80+
- composer install --no-progress --no-ansi --no-interaction
81+
script:
82+
- .build/bin/phpstan analyse -c Build/phpstan.neon
83+
6384
documentation:
6485
stage: documentation
6586
image:
@@ -89,7 +110,7 @@ sonarqube:
89110
SONAR_SOURCES: "./Classes"
90111
SONAR_GITLAB_PROJECT_ID: "$CI_PROJECT_ID"
91112
script:
92-
- echo "sonar.projectKey=cart_paypal-5.x" > sonar-project.properties
113+
- echo "sonar.projectKey=cart_paypal-6.x" > sonar-project.properties
93114
- gitlab-sonar-scanner -Dsonar.php.coverage.reportPath=phpunit.coverage.xml -Dsonar.php.tests.reportPath=phpunit.report.xml
94115
allow_failure: true
95116

@@ -105,5 +126,5 @@ sonarqube-reports:
105126
SONAR_SOURCES: "./Classes"
106127
SONAR_TESTS: "./Tests"
107128
script:
108-
- echo "sonar.projectKey=cart_paypal-5.x" > sonar-project.properties
129+
- echo "sonar.projectKey=cart_paypal-6.x" > sonar-project.properties
109130
- gitlab-sonar-scanner -Dsonar.php.coverage.reportPath=phpunit.coverage.xml -Dsonar.php.tests.reportPath=phpunit.report.xml

.travis.yml

Lines changed: 0 additions & 49 deletions
This file was deleted.

Build/phpstan.neon

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
parameters:
2+
level: 0
3+
paths:
4+
- ../Classes
5+
- ../Configuration
6+
- ../ext_emconf.php
7+
- ../ext_localconf.php

Classes/Controller/Order/PaymentController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ protected function execCurlRequest(string $curlRequest): bool
274274
}
275275
curl_setopt($ch, CURLOPT_HTTPHEADER, ['Connection: Close']);
276276

277-
$this->curlResult = strtolower(curl_exec($ch));
277+
$curlResult = strtolower(curl_exec($ch));
278278
$curlError = curl_errno($ch);
279279

280280
if ($curlError !== 0) {
@@ -284,7 +284,7 @@ protected function execCurlRequest(string $curlRequest): bool
284284
'ERROR' => 'Can\'t connect to PayPal to validate IPN message',
285285
'curl_error' => curl_error($ch),
286286
'curl_request' => $curlRequest,
287-
'curl_result' => $this->curlResult,
287+
'curl_result' => $curlResult,
288288
]
289289
);
290290

@@ -298,12 +298,12 @@ protected function execCurlRequest(string $curlRequest): bool
298298
[
299299
'curl_info' => curl_getinfo($ch, CURLINFO_HEADER_OUT),
300300
'curl_request' => $curlRequest,
301-
'curl_result' => $this->curlResult,
301+
'curl_result' => $curlResult,
302302
]
303303
);
304304
}
305305

306-
$this->curlResults = explode("\r\n\r\n", $this->curlResult);
306+
$curlResults = explode("\r\n\r\n", $curlResult);
307307

308308
curl_close($ch);
309309

Configuration/TCA/Overrides/sys_template.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?php
22
defined('TYPO3_MODE') or die();
33

4+
use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
5+
46
call_user_func(function () {
5-
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile(
7+
ExtensionManagementUtility::addStaticFile(
68
'cart_paypal',
79
'Configuration/TypoScript',
810
'Shopping Cart - PayPal'
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.. include:: ../../Includes.txt
2+
3+
6.0 Changes
4+
===========
5+
6+
The version 6.0.0 is a release for TYPO3 v10.4 and v11.5. This version is compatible to Cart v8.0.

Documentation/Changelog/Index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ ChangeLog
77
:maxdepth: 5
88
:titlesonly:
99

10+
6.0/Index
1011
5.0/Index
1112
4.0/Index
1213
3.0/Index

Documentation/Settings.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[general]
22

33
project = Cart PayPal
4-
version = 5.0
5-
release = 5.0.0
4+
version = 6.0
5+
release = 6.0.0
66
t3author = Daniel Gohlke
77
copyright = 2021-2024
88

README.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,18 @@ and database!** If possible test the update in a test copy of your TYPO3 instanc
3030

3131
## 3.1 Compatibility and supported Versions
3232

33-
| Cart PayPal | TYPO3 | PHP | Support/Development |
34-
| ------------- | ---------- | ----------|---------------------------------------- |
35-
| 5.x.x | 10.4 | 7.2 - 7.4 | Features, Bugfixes, Security Updates |
36-
| 4.x.x | 9.5 | 7.2 - 7.4 | Bugfixes, Security Updates |
37-
| 3.x.x | 8.7 | 7.0 - 7.4 | Security Updates |
38-
| 2.x.x | 6.2 - 8.7 | 5.6 - 7.0 | Security Updates |
39-
| 1.x.x | | | |
33+
| Cart PayPal | TYPO3 | PHP | Support/Development |
34+
|---------------| ---------- | ----------|--------------------------------------|
35+
| 6.x.x | 10.4, 11.5 | 7.2+ | Features, Bugfixes, Security Updates |
36+
| 5.x.x | 10.4 | 7.2 - 7.4 | Bugfixes, Security Updates |
37+
| 4.x.x | 9.5 | 7.2 - 7.4 | Security Updates |
38+
| 3.x.x | 8.7 | 7.0 - 7.4 | |
39+
| 2.x.x | 6.2 - 8.7 | 5.6 - 7.0 | |
40+
| 1.x.x | | | |
4041

4142
### 3.2. Changelog
4243

43-
Please have a look into the [official extension documentation in changelog chapter](https://docs.typo3.org/typo3cms/extensions/cart_paypal/Changelog/Index.html)
44+
Please have a look into the [official extension documentation in changelog chapter](https://docs.typo3.org/p/extcode/cart_paypal/main/en-us/Changelog/Index.html)
4445

4546
### 3.3. Release Management
4647

composer.json

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,29 +49,44 @@
4949
"require-dev": {
5050
"friendsofphp/php-cs-fixer": "^2.14",
5151
"helmich/typo3-typoscript-lint": "^2.0",
52-
"overtrue/phplint": "^1.1"
52+
"overtrue/phplint": "^1.1",
53+
"rector/rector": "^0.11",
54+
"phpstan/phpstan": "^0.12"
55+
5356
},
5457
"scripts": {
55-
"cgl:test": [
56-
".build/bin/php-cs-fixer fix --config=Build/.php-cs-fixer.dist.php -v --dry-run --using-cache=no --path-mode=intersection ./"
57-
],
58-
"cgl:fix": [
58+
"test:cgl": [
5959
".build/bin/php-cs-fixer fix --config=Build/.php-cs-fixer.dist.php -v --using-cache=no --path-mode=intersection ./"
6060
],
61-
"php:lint": [
61+
"test:cgl:dry-run": [
62+
".build/bin/php-cs-fixer fix --config=Build/.php-cs-fixer.dist.php -v --dry-run --using-cache=no --path-mode=intersection ./"
63+
],
64+
"test:php:lint": [
6265
".build/bin/phplint -c Build/phplint.yaml"
6366
],
64-
"typoscript:lint": [
67+
"test:phpstan:analyse": [
68+
".build/bin/phpstan analyse -c Build/phpstan.neon"
69+
],
70+
"test:rector:process": [
71+
".build/bin/rector process *"
72+
],
73+
"test:rector:process:dry-run": [
74+
".build/bin/rector process * --dry-run"
75+
],
76+
"test:typoscript:lint": [
6577
".build/bin/typoscript-lint -c Build/typoscriptlint.yaml Configuration"
6678
],
79+
"test:php": [
80+
"@test:php:lint"
81+
],
6782
"test:all": [
68-
"@cgl:test",
69-
"@typoscript:lint",
70-
"@php:lint"
83+
"@test:cgl",
84+
"@test:php",
85+
"@test:typoscript:lint"
7186
],
7287
"post-autoload-dump": [
73-
"mkdir -p .Build/Web/typo3conf/ext/",
74-
"[ -L .Build/Web/typo3conf/ext/cart_paypal ] || ln -snvf ../../../../. .Build/Web/typo3conf/ext/cart_paypal"
88+
"mkdir -p .build/Web/typo3conf/ext/",
89+
"[ -L .build/Web/typo3conf/ext/cart_paypal ] || ln -snvf ../../../../. .build/Web/typo3conf/ext/cart_paypal"
7590
]
7691
}
7792
}

0 commit comments

Comments
 (0)