Skip to content

Commit

Permalink
Merge branch 'hotfix/3.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
TehTux committed Oct 31, 2019
2 parents 8c5b9d9 + a320b7a commit cf9798e
Show file tree
Hide file tree
Showing 10 changed files with 115 additions and 38 deletions.
62 changes: 62 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
language: php

sudo: false

addons:
apt:
packages:
- parallel

cache:
directories:
- $HOME/.composer/cache

before_install:
- if php -i | grep -q xdebug; then phpenv config-rm xdebug.ini; fi;
- if [ "$GITHUB_COMPOSER_AUTH" ]; then composer config -g github-oauth.github.com $GITHUB_COMPOSER_AUTH; fi;

before_script:
- |
set -e
composer require nimut/typo3-complete "$TYPO3_VERSION";
git checkout composer.json;
export TYPO3_PATH_WEB=$PWD/.Build/public;
script:
- |
set -e
if [ "$TRAVIS_ALLOW_FAILURE" == "true" ]; then echo "skip testing"; return; fi;
echo "Running php lint";
composer test:phplint
jobs:
fast_finish: true
include:
- stage: test
php: 7.3
env: TYPO3_VERSION=^8.7
- stage: test
php: 7.2
env: TYPO3_VERSION=^8.7
- stage: test
php: 7.1
env: TYPO3_VERSION=^8.7
- stage: test
php: 7.0
env: TYPO3_VERSION=^8.7
- stage: 🚢 to TER
if: tag IS present
php: 7.0
install: skip
before_script: skip
script:
- |
if [ -n "$TYPO3_ORG_USERNAME" ] && [ -n "$TYPO3_ORG_PASSWORD" ]; then
echo -e "Preparing upload of release ${TRAVIS_TAG} to TER\n";
# Install ter client
composer global require helhum/ter-client
# Upload
TAG_MESSAGE=`git tag -n10 -l $TRAVIS_TAG | sed 's/^[0-9.]*[ ]*//g'`
echo "Uploading release ${TRAVIS_TAG} to TER"
$HOME/.composer/vendor/bin/ter-client upload jh_captcha . -u "$TYPO3_ORG_USERNAME" -p "$TYPO3_ORG_PASSWORD" -m "$TAG_MESSAGE"
fi;
10 changes: 9 additions & 1 deletion Documentation/ChangeLog/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,15 @@ ChangeLog
3.0.x
-----

3.0.1
3.0.2
^^^^^

* [TASK] Add configuration for Travis CI
* [BUGFIX] Fix german translation (PR #12)
* [TASK] Update documentation configuration (Issue #15)
* [BUGFIX] Fix powermail on case sensitive file systems (Issue #10)

3.0.2
^^^^^

* [BUGFIX] EXT:form: Fix validator definition in yaml configuration https://github.com/TehTux/jh_captcha/issues/7
Expand Down
8 changes: 8 additions & 0 deletions Documentation/Localization.de_DE/ChangeLog/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@
3.0.x
-----

3.0.2
^^^^^

* [TASK] Konfiguration für Travis CI hinzugefügt
* [BUGFIX] Deutsche Übersetzung korrigiert (PR #12)
* [TASK] Konfiguration für Dokumentation aktualisiert (Issue #15)
* [BUGFIX] Problem mit Powermail auf Case-sensitiven Dateisystemen behoben (Issue #10)

3.0.1
^^^^^

Expand Down
23 changes: 7 additions & 16 deletions Documentation/Localization.de_DE/Settings.cfg
Original file line number Diff line number Diff line change
@@ -1,25 +1,16 @@
[general]
copyright = 2015-2018
copyright = since 2015 by Jan Haffner
project = Google reCAPTCHA (v2/v3)
release = 3.0.1
version = 3.0.1
release = 3.0.2

[html_theme_options]
github_branch =
github_commit_hash =
github_repository =
path_to_documentation_dir =
github_revision_msg =
github_sphinx_locale =
project_contact =
project_discussions =
project_home = https://github.com/TehTux/jh_captcha
project_issues = https://github.com/TehTux/jh_captcha/issues
project_repository = https://github.com/TehTux/jh_captcha.git
use_opensearch =
project_repository = https://github.com/TehTux/jh_captcha

[intersphinx_mapping]
t3tsref = http://docs.typo3.org/typo3cms/TyposcriptReference/
t3tsref = https://docs.typo3.org/m/typo3/reference-typoscript/master/en-us/

[notify]
about_new_build = [email protected]
[extlinks]
issue = https://github.com/TehTux/jh_captcha/issues/%s | Issue #
pr = https://github.com/TehTux/jh_captcha/pull/%s | PR #
23 changes: 7 additions & 16 deletions Documentation/Settings.cfg
Original file line number Diff line number Diff line change
@@ -1,25 +1,16 @@
[general]
copyright = 2015-2018
copyright = since 2015 by Jan Haffner
project = Google reCAPTCHA (v2/v3)
release = 3.0.1
version = 3.0.1
release = 3.0.2

[html_theme_options]
github_branch =
github_commit_hash =
github_repository =
path_to_documentation_dir =
github_revision_msg =
github_sphinx_locale =
project_contact =
project_discussions =
project_home = https://github.com/TehTux/jh_captcha
project_issues = https://github.com/TehTux/jh_captcha/issues
project_repository = https://github.com/TehTux/jh_captcha.git
use_opensearch =
project_repository = https://github.com/TehTux/jh_captcha

[intersphinx_mapping]
t3tsref = http://docs.typo3.org/typo3cms/TyposcriptReference/
t3tsref = https://docs.typo3.org/m/typo3/reference-typoscript/master/en-us/

[notify]
about_new_build = [email protected]
[extlinks]
issue = https://github.com/TehTux/jh_captcha/issues/%s | Issue #
pr = https://github.com/TehTux/jh_captcha/pull/%s | PR #
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ Use Google reCAPTCHA (v2/v3) in your own TYPO3 extensions, EXT:form, EXT:powerma
## Documentation

* [EN - latest](https://docs.typo3.org/typo3cms/extensions/jh_captcha/)
* [EN - 3.0.1](https://docs.typo3.org/typo3cms/extensions/jh_captcha/3.0.1/)
* [EN - 3.0.2](https://docs.typo3.org/typo3cms/extensions/jh_captcha/3.0.2/)
* [DE - latest](https://docs.typo3.org/typo3cms/extensions/jh_captcha/de-de/)
* [DE - 3.0.1](https://docs.typo3.org/typo3cms/extensions/jh_captcha/de-de/3.0.1/)
* [DE - 3.0.2](https://docs.typo3.org/typo3cms/extensions/jh_captcha/de-de/3.0.2/)

## Installation

Expand Down
4 changes: 2 additions & 2 deletions Resources/Private/Language/de.locallang.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
<target>Das Captcha ist ungültig.</target>
</trans-unit>
<trans-unit id="scoreError">
<source>Du hast die Mindestpunktzahl nicht erreicht.</source>
<target>Du hast die Mindestpunktzahl nicht erreicht.</target>
</trans-unit>
</body>
</file>
</xliff>
</xliff>
17 changes: 17 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,22 @@
"psr-4": {
"Haffner\\JhCaptcha\\": "Classes"
}
},
"scripts": {
"test:phplint": "find . -name \\*.php ! -path \"./.Build/*\" | parallel --gnu php -d display_errors=stderr -l {} \\;",
"post-autoload-dump": [
"@php -r 'is_dir($extFolder=__DIR__.\"/.Build/public/typo3conf/ext/\") || mkdir($extFolder, 0777, true);'",
"@php -r 'file_exists($extFolder=__DIR__.\"/.Build/public/typo3conf/ext/jh_captcha\") || symlink(__DIR__,$extFolder);'"
]
},
"extra": {
"typo3/cms": {
"extension-key": "jh_captcha",
"cms-package-dir": "{$vendor-dir}/typo3/cms",
"web-dir": ".Build/public"
}
},
"config": {
"vendor-dir": ".Build/vendor"
}
}
2 changes: 1 addition & 1 deletion ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
'uploadfolder' => '0',
'createDirs' => '',
'clearCacheOnLoad' => 0,
'version' => '3.0.1',
'version' => '3.0.2',
'constraints' => array(
'depends' => array(
'typo3' => '8.7.0-9.5.99',
Expand Down

0 comments on commit cf9798e

Please sign in to comment.