Skip to content

Commit ba7a912

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 1f71d7d + ba2ab0d commit ba7a912

23 files changed

+351
-250
lines changed

.check-author.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ mapping:
1212
- "Andreas Dziemba <[email protected]>"
1313
- "adziemba <[email protected]>"
1414
- "Andreas Dziemba <dziemba@men-at-work-de>"
15+
'Ingolf Steinhardt <[email protected]>':
16+
- 'zonky2 <[email protected]>'
17+
- 'zonky <[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_translatedtablemulti
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: 3 additions & 2 deletions
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/
@@ -16,4 +16,5 @@ vendor/
1616

1717
# build
1818
build/
19-
composer.lock
19+
composer.lock
20+
.phpunit.result.cache

.travis.yml

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

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Build Status](https://travis-ci.org/MetaModels/attribute_translatedtablemulti.svg)](https://travis-ci.org/MetaModels/attribute_translatedtablemulti/branches)
1+
[![Build Status](https://github.com/MetaModels/attribute_translatedtablemulti/actions/workflows/diagnostics.yml/badge.svg)](https://github.com/MetaModels/attribute_translatedtablemulti/actions)
22
[![Latest Version tagged](http://img.shields.io/github/tag/MetaModels/attribute_translatedtablemulti.svg)](https://github.com/MetaModels/attribute_translatedtablemulti/tags)
33
[![Latest Version on Packagist](http://img.shields.io/packagist/v/MetaModels/attribute_translatedtablemulti.svg)](https://packagist.org/packages/MetaModels/attribute_translatedtablemulti)
44
[![Installations via composer per month](http://img.shields.io/packagist/dm/MetaModels/attribute_translatedtablemulti.svg)](https://packagist.org/packages/MetaModels/attribute_translatedtablemulti)
@@ -56,4 +56,4 @@ $GLOBALS['TL_CONFIG']['metamodelsattribute_multi']['mm_test']['multi_test'] = ar
5656
),
5757
),
5858
);
59-
```
59+
```

build.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
-->
77
<project name="metamodels/attribute_translatedtablemulti" default="build">
88
<import file="vendor/phpcq/phpcq/phpcq.main.xml" />
9-
</project>
9+
<target name="phpspec" />
10+
</project>

composer.json

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"multicolumnwizard"
1212
],
1313
"type": "contao-bundle",
14-
"homepage": "http://now.metamodel.me/",
14+
"homepage": "https://now.metamodel.me/",
1515
"license": "LGPL-3.0-or-later",
1616
"authors": [
1717
{
@@ -29,7 +29,7 @@
2929
{
3030
"name": "Christian Schiffler",
3131
"email": "[email protected]",
32-
"homepage": "http://www.cyberspectrum.de",
32+
"homepage": "https://www.cyberspectrum.de",
3333
"role": "Developer"
3434
},
3535
{
@@ -49,18 +49,18 @@
4949
"source": "https://github.com/MetaModels/attribute_translatedtablemulti"
5050
},
5151
"require": {
52-
"php": "^7.1",
53-
"contao-community-alliance/dc-general": "^2.1.3",
54-
"contao/core-bundle": "^4.4.8",
55-
"metamodels/core": "^2.1.1",
56-
"symfony/dependency-injection": "^3.3 || ^4.0",
57-
"symfony/http-kernel": "^3.3 || ^4.0",
58-
"ext-pdo": "*"
52+
"php": "^7.4",
53+
"ext-pdo": "*",
54+
"contao-community-alliance/dc-general": "^2.2",
55+
"contao/core-bundle": "^4.9.0, <4.13.0",
56+
"metamodels/core": "^2.2",
57+
"symfony/dependency-injection": "^4.4",
58+
"symfony/http-kernel": "^4.4"
5959
},
6060
"require-dev": {
6161
"contao/manager-plugin": "^2.1",
62-
"menatwork/contao-multicolumnwizard-bundle": "^3.4",
63-
"phpcq/all-tasks": "^1.2"
62+
"menatwork/contao-multicolumnwizard-bundle": "^3.5",
63+
"phpcq/all-tasks": "^1.3"
6464
},
6565
"autoload": {
6666
"psr-4": {
@@ -78,7 +78,14 @@
7878
"extra": {
7979
"contao-manager-plugin": "MetaModels\\AttributeTranslatedTableMultiBundle\\ContaoManager\\Plugin",
8080
"branch-alias": {
81-
"dev-master": "2.1.x-dev"
81+
"dev-feature/2.2.0": "2.2.x-dev"
8282
}
83+
},
84+
"config": {
85+
"allow-plugins": {
86+
"contao-components/installer": false,
87+
"contao/manager-plugin": false
88+
},
89+
"sort-packages": true
8390
}
8491
}

0 commit comments

Comments
 (0)