Skip to content

Commit

Permalink
Merge tag '2.2.0'
Browse files Browse the repository at this point in the history
Stable release 2.2.0
This brings full Contao 4.9 support.

Additionally there have been performance improvements
and various bugfixes.
  • Loading branch information
baumannsven committed Nov 19, 2022
2 parents 1f71d7d + ba2ab0d commit ba7a912
Show file tree
Hide file tree
Showing 23 changed files with 351 additions and 250 deletions.
3 changes: 3 additions & 0 deletions .check-author.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@ mapping:
- "Andreas Dziemba <adziemba@web.de>"
- "adziemba <adziemba@web.de>"
- "Andreas Dziemba <dziemba@men-at-work-de>"
'Ingolf Steinhardt <info@e-spin.de>':
- 'zonky2 <info@e-spin.de>'
- 'zonky <info@e-spin.de>'
52 changes: 52 additions & 0 deletions .github/workflows/diagnostics.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: MetaModels attribute_translatedtablemulti

on:
push:
branches-ignore:
- '**-translation'
pull_request:

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
php: [7.4]
contao: [~4.9.0]

steps:
- name: PHP ${{ matrix.php }} ${{ matrix.contao }} Pull source
uses: actions/checkout@v2
with:
fetch-depth: 0

# see https://github.com/shivammathur/setup-php
- name: PHP ${{ matrix.php }} ${{ matrix.contao }} Setup PHP.
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
coverage: none

- name: PHP ${{ matrix.php }} ${{ matrix.contao }} Cache composer cache directory
uses: actions/cache@v1
env:
cache-name: composer-cache-dir
with:
path: ~/.cache/composer
key: ${{ runner.os }}-build-${{ env.cache-name }}

- name: PHP ${{ matrix.php }} ${{ matrix.contao }} Cache vendor directory
uses: actions/cache@v1
env:
cache-name: composer-vendor
with:
path: vendor
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
- name: PHP ${{ matrix.php }} ${{ matrix.contao }} Install composer dependencies
run: composer update --prefer-dist --no-interaction --no-suggest

- name: PHP ${{ matrix.php }} ${{ matrix.contao }} Run tests
run: ant -keep-going
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.DS_Store
Thumbs.db

# IDEs
# IDEs
.buildpath
.project
.settings/
Expand All @@ -16,4 +16,5 @@ vendor/

# build
build/
composer.lock
composer.lock
.phpunit.result.cache
62 changes: 0 additions & 62 deletions .travis.yml

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Build Status](https://travis-ci.org/MetaModels/attribute_translatedtablemulti.svg)](https://travis-ci.org/MetaModels/attribute_translatedtablemulti/branches)
[![Build Status](https://github.com/MetaModels/attribute_translatedtablemulti/actions/workflows/diagnostics.yml/badge.svg)](https://github.com/MetaModels/attribute_translatedtablemulti/actions)
[![Latest Version tagged](http://img.shields.io/github/tag/MetaModels/attribute_translatedtablemulti.svg)](https://github.com/MetaModels/attribute_translatedtablemulti/tags)
[![Latest Version on Packagist](http://img.shields.io/packagist/v/MetaModels/attribute_translatedtablemulti.svg)](https://packagist.org/packages/MetaModels/attribute_translatedtablemulti)
[![Installations via composer per month](http://img.shields.io/packagist/dm/MetaModels/attribute_translatedtablemulti.svg)](https://packagist.org/packages/MetaModels/attribute_translatedtablemulti)
Expand Down Expand Up @@ -56,4 +56,4 @@ $GLOBALS['TL_CONFIG']['metamodelsattribute_multi']['mm_test']['multi_test'] = ar
),
),
);
```
```
3 changes: 2 additions & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
-->
<project name="metamodels/attribute_translatedtablemulti" default="build">
<import file="vendor/phpcq/phpcq/phpcq.main.xml" />
</project>
<target name="phpspec" />
</project>
31 changes: 19 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"multicolumnwizard"
],
"type": "contao-bundle",
"homepage": "http://now.metamodel.me/",
"homepage": "https://now.metamodel.me/",
"license": "LGPL-3.0-or-later",
"authors": [
{
Expand All @@ -29,7 +29,7 @@
{
"name": "Christian Schiffler",
"email": "c.schiffler@cyberspectrum.de",
"homepage": "http://www.cyberspectrum.de",
"homepage": "https://www.cyberspectrum.de",
"role": "Developer"
},
{
Expand All @@ -49,18 +49,18 @@
"source": "https://github.com/MetaModels/attribute_translatedtablemulti"
},
"require": {
"php": "^7.1",
"contao-community-alliance/dc-general": "^2.1.3",
"contao/core-bundle": "^4.4.8",
"metamodels/core": "^2.1.1",
"symfony/dependency-injection": "^3.3 || ^4.0",
"symfony/http-kernel": "^3.3 || ^4.0",
"ext-pdo": "*"
"php": "^7.4",
"ext-pdo": "*",
"contao-community-alliance/dc-general": "^2.2",
"contao/core-bundle": "^4.9.0, <4.13.0",
"metamodels/core": "^2.2",
"symfony/dependency-injection": "^4.4",
"symfony/http-kernel": "^4.4"
},
"require-dev": {
"contao/manager-plugin": "^2.1",
"menatwork/contao-multicolumnwizard-bundle": "^3.4",
"phpcq/all-tasks": "^1.2"
"menatwork/contao-multicolumnwizard-bundle": "^3.5",
"phpcq/all-tasks": "^1.3"
},
"autoload": {
"psr-4": {
Expand All @@ -78,7 +78,14 @@
"extra": {
"contao-manager-plugin": "MetaModels\\AttributeTranslatedTableMultiBundle\\ContaoManager\\Plugin",
"branch-alias": {
"dev-master": "2.1.x-dev"
"dev-feature/2.2.0": "2.2.x-dev"
}
},
"config": {
"allow-plugins": {
"contao-components/installer": false,
"contao/manager-plugin": false
},
"sort-packages": true
}
}
Loading

0 comments on commit ba7a912

Please sign in to comment.