Skip to content

Commit 069d3a0

Browse files
committed
Merge tag '2.2.0'
Stable release 2.2.0 This brings full Contao 4.9 support. Additionally there have been performance improvements and various bugfixes.
2 parents 8fd52c6 + 7479119 commit 069d3a0

File tree

13 files changed

+225
-157
lines changed

13 files changed

+225
-157
lines changed

.check-author.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@ mapping:
1111
- 'chibineko <[email protected]>'
1212
- 'stefanheimes <[email protected]>'
1313
- 'Stefan Heimes <[email protected]>'
14+
- 'Stefan Heimes <[email protected]>'
1415
'David Maack <[email protected]>':
1516
- 'David Maack <[email protected]>'
1617
'Christopher Boelter <[email protected]>': 'cboelter <[email protected]>'
18+
'Ingolf Steinhardt <[email protected]>':
19+
- 'zonky <[email protected]>'
1720

1821
copy-left:
1922
'Andreas Isaak <[email protected]>':

.github/workflows/diagnostics.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: MetaModels attribute_translatedtags
2+
3+
on:
4+
push:
5+
branches-ignore:
6+
- '**-translation'
7+
pull_request:
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
strategy:
13+
matrix:
14+
php: [7.4]
15+
contao: [~4.9.0]
16+
17+
steps:
18+
- name: PHP ${{ matrix.php }} ${{ matrix.contao }} Pull source
19+
uses: actions/checkout@v2
20+
with:
21+
fetch-depth: 0
22+
23+
# see https://github.com/shivammathur/setup-php
24+
- name: PHP ${{ matrix.php }} ${{ matrix.contao }} Setup PHP.
25+
uses: shivammathur/setup-php@v2
26+
with:
27+
php-version: ${{ matrix.php }}
28+
coverage: none
29+
30+
- name: PHP ${{ matrix.php }} ${{ matrix.contao }} Cache composer cache directory
31+
uses: actions/cache@v1
32+
env:
33+
cache-name: composer-cache-dir
34+
with:
35+
path: ~/.cache/composer
36+
key: ${{ runner.os }}-build-${{ env.cache-name }}
37+
38+
- name: PHP ${{ matrix.php }} ${{ matrix.contao }} Cache vendor directory
39+
uses: actions/cache@v1
40+
env:
41+
cache-name: composer-vendor
42+
with:
43+
path: vendor
44+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.lock') }}
45+
restore-keys: |
46+
${{ runner.os }}-build-${{ env.cache-name }}-
47+
48+
- name: PHP ${{ matrix.php }} ${{ matrix.contao }} Install composer dependencies
49+
run: composer update --prefer-dist --no-interaction --no-suggest
50+
51+
- name: PHP ${{ matrix.php }} ${{ matrix.contao }} Run tests
52+
run: ant -keep-going

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
.DS_Store
33
Thumbs.db
44

5-
# IDEs
5+
# IDEs
66
.buildpath
77
.project
88
.settings/
@@ -17,3 +17,4 @@ vendor/
1717
# build
1818
build/
1919
composer.lock
20+
.phpunit.result.cache

.travis.yml

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

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
[![Build Status](https://travis-ci.org/MetaModels/attribute_translatedtags.svg)](https://travis-ci.org/MetaModels/attribute_translatedtags)
1+
[![Build Status](https://github.com/MetaModels/attribute_translatedtags/actions/workflows/diagnostics.yml/badge.svg)](https://github.com/MetaModels/attribute_translatedtags/actions)
22
[![Latest Version tagged](http://img.shields.io/github/tag/MetaModels/attribute_translatedtags.svg)](https://github.com/MetaModels/attribute_translatedtags/tags)
33
[![Latest Version on Packagist](http://img.shields.io/packagist/v/MetaModels/attribute_translatedtags.svg)](https://packagist.org/packages/MetaModels/attribute_translatedtags)
44
[![Installations via composer per month](http://img.shields.io/packagist/dm/MetaModels/attribute_translatedtags.svg)](https://packagist.org/packages/MetaModels/attribute_translatedtags)
55

66
Translated tags
77
===============
88

9-
The translated tags attribute
9+
The translated tags attribute.

composer.json

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
"translatable"
1010
],
1111
"type": "contao-bundle",
12-
"homepage": "http://now.metamodel.me/",
12+
"homepage": "https://now.metamodel.me/",
1313
"license": "LGPL-3.0-or-later",
1414
"authors": [
1515
{
1616
"name": "Christian Schiffler",
1717
"email": "[email protected]",
18-
"homepage": "http://www.cyberspectrum.de",
18+
"homepage": "https://www.cyberspectrum.de",
1919
"role": "Developer"
2020
},
2121
{
@@ -27,21 +27,21 @@
2727
"support": {
2828
"email": "[email protected]",
2929
"issues": "https://github.com/MetaModels/attribute_translatedtags/issues",
30-
"wiki": "http://de.contaowiki.org/MetaModels",
30+
"wiki": "https://de.contaowiki.org/MetaModels",
3131
"irc": "irc://irc.freenode.org/contao.mm",
3232
"source": "https://github.com/MetaModels/attribute_translatedtags"
3333
},
3434
"require": {
35-
"php": "^7.1",
36-
"contao-community-alliance/dc-general": "^2.1.0",
37-
"contao/core-bundle": "^4.4.8",
38-
"doctrine/dbal": "^2.7",
39-
"metamodels/attribute_tags": "^2.1",
40-
"metamodels/core": "^2.1",
41-
"symfony/config": "^3.3 || ^4.0",
42-
"symfony/dependency-injection": "^3.3 || ^4.0",
43-
"symfony/http-kernel": "^3.3 || ^4.0",
44-
"symfony/translation": "^3.3 || ^4.0"
35+
"php": "^7.4",
36+
"contao-community-alliance/dc-general": "^2.2",
37+
"contao/core-bundle": "^4.9.0, <4.13.0",
38+
"doctrine/dbal": "^2.10",
39+
"metamodels/attribute_tags": "^2.2",
40+
"metamodels/core": "^2.2",
41+
"symfony/config": "4.4.*",
42+
"symfony/dependency-injection": "^4.4.6",
43+
"symfony/http-kernel": "~4.4.13",
44+
"symfony/translation": "^4.4.6"
4545
},
4646
"require-dev": {
4747
"contao/manager-plugin": "^2.1",
@@ -64,10 +64,14 @@
6464
"extra": {
6565
"contao-manager-plugin": "MetaModels\\AttributeTranslatedTagsBundle\\ContaoManager\\Plugin",
6666
"branch-alias": {
67-
"dev-master": "2.1.x-dev"
67+
"dev-feature/2.2.0": "2.2.x-dev"
6868
}
6969
},
7070
"config": {
71+
"allow-plugins": {
72+
"contao-components/installer": false,
73+
"contao/manager-plugin": false
74+
},
7175
"sort-packages": true
7276
}
7377
}

0 commit comments

Comments
 (0)