Skip to content

Commit 6380238

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. - Alternatively to the GET values "1" and "-1" the values "yes" and "no" can be transmitted (or the respective translation) - Attribute type "translated checkbox" possible - Option not to output the label of the FE widget - CSS ID and CSS classes for FE widget can be specified
2 parents b27f193 + 731dc27 commit 6380238

18 files changed

+316
-141
lines changed

.check-author.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ exclude:
66

77
mapping:
88
'Andreas Isaak <info@andreas-isaak.de>': 'Andreas Isaak <andy.jared@googlemail.com>'
9+
'Ingolf Steinhardt <info@e-spin.de>':
10+
- 'zonky2 <info@e-spin.de>'
11+
- 'info@e-spin.de <info@e-spin.de>'

.github/CONTRIBUTING.md

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# How to contribute
2+
3+
We are really glad you're reading this, because we need volunteer developers to
4+
help this project come to fruition.
5+
6+
If you haven't already, come find us in IRC (#contao.mm on freenode).
7+
We want you working on things you're excited about.
8+
9+
The following is a set of guidelines for contributing to MetaModels and its
10+
packages, which are hosted in the [MetaModels organization][1] on GitHub. These
11+
are just guidelines, not rules, use your best judgement and feel free to
12+
propose changes to this document in a pull request.
13+
14+
## Submitting issues
15+
16+
* Use the search function to see if a similar issue has already been submitted.
17+
* Describe the issue in detail and include all the steps to follow in order to
18+
reproduce the bug.
19+
* Include the version of Contao, PHP and MetaModels you are using (if possible
20+
with a detailed list of other installed extensions that might be related).
21+
* Include screenshots or screencasts if possible; they are immensely helpful.
22+
* If you are reporting a bug, please include any related error message you are
23+
seeing and also check the `system/logs/error.log` file. The error message is
24+
not just the message but also the complete(!) stack trace below the message.
25+
This trace is a long list of function calls which helps us to diagnose the
26+
problem en detail.
27+
28+
## Submitting changes
29+
30+
* Please send a [GitHub Pull Request to MetaModels][1] with a clear list of what
31+
you've done (read more about [pull requests][2]).
32+
* When you send a pull request, we will love you forever if you include
33+
phpunit tests. We can always use more test coverage.
34+
* Please follow the [phpcq 2.0][3] coding standards.
35+
* Please make sure all of your commits are atomic (only one feature or fix per
36+
commit).
37+
* We use phpcq/all-tasks in these projects, so please check your changes
38+
using phpcq when submitting a pull request.
39+
* Create your pull request against the [`master`][4] branch for bug fixes or the
40+
[`develop`][5] branch for new features.
41+
* Include screenshots in your pull request whenever possible.
42+
43+
Always write a clear log message for your commits.
44+
One-line messages are fine for small changes, but bigger changes should look
45+
like this:
46+
47+
$ git commit -m "A brief summary of the commit
48+
>
49+
> A paragraph describing what changed and its impact."
50+
51+
## Testing
52+
53+
We have a handful of unit tests. Please write unit tests for new code you
54+
create.
55+
56+
## Git commit messages
57+
58+
* Use the present tense ("Add feature" not "Added feature").
59+
* Use the imperative mood ("Move cursor to …" not "Moves cursor to …").
60+
* Reference issues and pull requests liberally.
61+
62+
[1]: https://github.com/MetaModels
63+
[2]: http://help.github.com/pull-requests/
64+
[3]: https://github.com/phpcq/coding-standard
65+
[4]: https://github.com/MetaModels/filter_checkbox/pull/new/master
66+
[5]: https://github.com/MetaModels/filter_checkbox/pull/new/develop

.github/ISSUE_TEMPLATE.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
## Checklist before I submit this issue report
2+
3+
I confirm that:
4+
- [ ] I have tested this with the latest version available
5+
- [ ] I have read documentation @ http://metamodels.readthedocs.org/en/ or http://metamodels.readthedocs.org/de/
6+
- [ ] I have checked the Contao community forums for references https://community.contao.org/
7+
- [ ] I have checked existing issues for duplicates and found none @ https://github.com/MetaModels/filter_checkbox/issues?q=is%3Aissue
8+
9+
## My environment is:
10+
11+
(Please fill in the actual values from your environment)
12+
13+
| Key | Value | Comments |
14+
| ----------------------------------- | ---------| ---------------------------------|
15+
| PHP version: | | |
16+
| Contao version: | | |
17+
| MetaModels version: | | |
18+
| Installation via composer: | (yes/no) | |
19+
| Installed MetaModels packages: | | |
20+
| DCG version: | | |
21+
22+
## Issue description
23+
24+
(Describe the problem you are having)
25+
26+
## Steps to reproduce
27+
28+
1. [First Step]
29+
2. [Second Step]
30+
3. [and so on…]
31+
32+
## Describe the behaviour of the application
33+
34+
(Tell us what happens)
35+
36+
## Describe the expected behaviour of the application
37+
38+
(Tell us what should have happened)
39+
40+
## Screenshots
41+
42+
(Add some visual love or even a video if you can)

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
## Description
2+
3+
Please explain the detailed changes you made here.
4+
Reference any issue number this pull request fixes.
5+
6+
## Checklist
7+
- [ ] Read and understood the [CONTRIBUTING guidelines](CONTRIBUTING.md)
8+
- [ ] Created tests, if possible
9+
- [ ] All tests passing
10+
- [ ] Extended the README / documentation, if necessary
11+
- [ ] Added myself to the `@authors` in touched PHP files
12+
- [ ] Checked the changes with phpcq and introduced no new issues

.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 filter_checkbox
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 & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
[![Stable Build Status](http://img.shields.io/travis/MetaModels/filter_checkbox/master.svg?label=stable)](https://travis-ci.org/MetaModels/filter_checkbox/branches)
2-
[![Development Build Status](http://img.shields.io/travis/MetaModels/filter_checkbox/develop.svg?label=develop)](https://travis-ci.org/MetaModels/filter_checkbox/branches)
1+
[![Build Status](https://github.com/MetaModels/filter_checkbox/actions/workflows/diagnostics.yml/badge.svg)](https://github.com/MetaModels/filter_checkbox/actions)
32
[![Latest Version tagged](http://img.shields.io/github/tag/MetaModels/filter_checkbox.svg)](https://github.com/MetaModels/filter_checkbox/tags)
43
[![Latest Version on Packagist](http://img.shields.io/packagist/v/MetaModels/filter_checkbox.svg)](https://packagist.org/packages/MetaModels/filter_checkbox)
54
[![Installations via composer per month](http://img.shields.io/packagist/dm/MetaModels/filter_checkbox.svg)](https://packagist.org/packages/MetaModels/filter_checkbox)
65

76
Checkbox filter
87
===============
98

10-
MetaModels checkbox filter
9+
MetaModels checkbox filter.

build.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ For documentation visit:
88
-->
99
<project name="metamodels/filter_checkbox" default="build">
1010
<import file="vendor/phpcq/phpcq/phpcq.main.xml"/>
11+
<target name="phpspec" />
1112
</project>

composer.json

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
"checkbox"
99
],
1010
"type": "contao-bundle",
11-
"homepage": "http://now.metamodel.me/",
11+
"homepage": "https://now.metamodel.me/",
1212
"license": "LGPL-3.0-or-later",
1313
"authors": [
1414
{
1515
"name": "Christian Schiffler",
1616
"email": "c.schiffler@cyberspectrum.de",
17-
"homepage": "http://www.cyberspectrum.de",
17+
"homepage": "https://www.cyberspectrum.de",
1818
"role": "Developer"
1919
},
2020
{
@@ -26,17 +26,17 @@
2626
"support": {
2727
"email": "mail@metamodel.me",
2828
"issues": "https://github.com/MetaModels/filter_checkbox/issues",
29-
"wiki": "http://de.contaowiki.org/MetaModels",
29+
"wiki": "https://de.contaowiki.org/MetaModels",
3030
"irc": "irc://irc.freenode.org/contao.mm",
3131
"source": "https://github.com/MetaModels/filter_checkbox"
3232
},
3333
"require": {
34-
"php": "^7.1",
35-
"contao-community-alliance/dc-general": "^2.1.0",
36-
"contao/core-bundle": "^4.4.8",
37-
"metamodels/core": "^2.1",
38-
"symfony/dependency-injection": "^3.3 || ^4.0",
39-
"symfony/http-kernel": "^3.3 || ^4.0"
34+
"php": "^7.4",
35+
"contao-community-alliance/dc-general": "^2.2",
36+
"contao/core-bundle": "^4.9.0, <4.13.0",
37+
"metamodels/core": "^2.2",
38+
"symfony/dependency-injection": "^4.4.6",
39+
"symfony/http-kernel": "~4.4.13"
4040
},
4141
"require-dev": {
4242
"contao/manager-plugin": "^2.1",
@@ -59,10 +59,14 @@
5959
"extra": {
6060
"contao-manager-plugin": "MetaModels\\FilterCheckboxBundle\\ContaoManager\\Plugin",
6161
"branch-alias": {
62-
"dev-master": "2.1.x-dev"
62+
"dev-feature/2.2.0": "2.2.x-dev"
6363
}
6464
},
6565
"config": {
66+
"allow-plugins": {
67+
"contao-components/installer": false,
68+
"contao/manager-plugin": false
69+
},
6670
"sort-packages": true
6771
}
6872
}

0 commit comments

Comments
 (0)