Skip to content

Commit fc7ecfd

Browse files
zonky2zonky2
committed
Merge branch 'hotfix/gactions' into 'feature/2.2.0'
Fix github actions See merge request metamodels/attribute_checkbox!28
2 parents 989a7bd + 1e846a7 commit fc7ecfd

File tree

9 files changed

+84
-77
lines changed

9 files changed

+84
-77
lines changed

‎.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_alias
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

‎.travis.yml

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

‎README.md

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

‎composer.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@
6464
}
6565
},
6666
"config": {
67+
"allow-plugins": {
68+
"contao-components/installer": false,
69+
"contao/manager-plugin": false
70+
},
6771
"sort-packages": true
6872
}
6973
}

‎src/EventListener/PublishedFilterSettingTypeRendererListener.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* This file is part of MetaModels/attribute_checkbox.
55
*
6-
* (c) 2012-2019 The MetaModels team.
6+
* (c) 2012-2022 The MetaModels team.
77
*
88
* For the full copyright and license information, please view the LICENSE
99
* file that was distributed with this source code.
@@ -13,7 +13,8 @@
1313
* @package MetaModels/attribute_checkbox
1414
* @author Christian Schiffler <[email protected]>
1515
* @author David Molineus <[email protected]>
16-
* @copyright 2012-2019 The MetaModels team.
16+
* @author Ingolf Steinhardt <[email protected]>
17+
* @copyright 2012-2022 The MetaModels team.
1718
* @license https://github.com/MetaModels/attribute_checkbox/blob/master/LICENSE LGPL-3.0-or-later
1819
* @filesource
1920
*/
@@ -26,6 +27,8 @@
2627

2728
/**
2829
* Handles rendering of model from tl_metamodel_filtersetting.
30+
*
31+
* @SuppressWarnings(PHPMD.LongClassName)
2932
*/
3033
class PublishedFilterSettingTypeRendererListener extends AbstractFilterSettingTypeRenderer
3134
{

‎tests/Test/Attribute/CheckboxTest.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* This file is part of MetaModels/attribute_checkbox.
55
*
6-
* (c) 2012-2019 The MetaModels team.
6+
* (c) 2012-2022 The MetaModels team.
77
*
88
* For the full copyright and license information, please view the LICENSE
99
* file that was distributed with this source code.
@@ -14,7 +14,8 @@
1414
* @author Christian Schiffler <[email protected]>
1515
* @author David Molineus <[email protected]>
1616
* @author Sven Baumann <[email protected]>
17-
* @copyright 2012-2019 The MetaModels team.
17+
* @author Ingolf Steinhardt <[email protected]>
18+
* @copyright 2012-2022 The MetaModels team.
1819
* @license https://github.com/MetaModels/attribute_checkbox/blob/master/LICENSE LGPL-3.0-or-later
1920
* @filesource
2021
*/
@@ -26,6 +27,7 @@
2627
use MetaModels\AttributeCheckboxBundle\Attribute\Checkbox;
2728
use MetaModels\Helper\TableManipulator;
2829
use MetaModels\IMetaModel;
30+
use PHPUnit\Framework\MockObject\MockObject;
2931
use PHPUnit\Framework\TestCase;
3032

3133
/**
@@ -39,7 +41,7 @@ class CheckboxTest extends TestCase
3941
* @param string $language The language.
4042
* @param string $fallbackLanguage The fallback language.
4143
*
42-
* @return IMetaModel|\PHPUnit_Framework_MockObject_MockObject
44+
* @return IMetaModel|MockObject
4345
*/
4446
protected function mockMetaModel($language, $fallbackLanguage)
4547
{
@@ -70,7 +72,7 @@ protected function mockMetaModel($language, $fallbackLanguage)
7072
*
7173
* @param callable|null $callback Callback which gets mocked statement passed.
7274
*
73-
* @return Connection|\PHPUnit_Framework_MockObject_MockObject
75+
* @return Connection|MockObject
7476
*/
7577
private function mockConnection(callable $callback = null, $expectedQuery = null, $queryMethod = 'prepare')
7678
{
@@ -122,7 +124,7 @@ private function mockConnection(callable $callback = null, $expectedQuery = null
122124
*
123125
* @param Connection $connection The database connection mock.
124126
*
125-
* @return TableManipulator|\PHPUnit_Framework_MockObject_MockObject
127+
* @return TableManipulator|MockObject
126128
*/
127129
private function mockTableManipulator(Connection $connection)
128130
{

‎tests/Test/ContaoManager/PluginTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* This file is part of MetaModels/attribute_checkbox.
55
*
6-
* (c) 2012-2019 The MetaModels team.
6+
* (c) 2012-2022 The MetaModels team.
77
*
88
* For the full copyright and license information, please view the LICENSE
99
* file that was distributed with this source code.
@@ -12,7 +12,8 @@
1212
*
1313
* @package MetaModels/attribute_checkbox
1414
* @author David Molineus <[email protected]>
15-
* @copyright 2012-2019 The MetaModels team.
15+
* @author Ingolf Steinhardt <[email protected]>
16+
* @copyright 2012-2022 The MetaModels team.
1617
* @license https://github.com/MetaModels/attribute_checkbox/blob/master/LICENSE LGPL-3.0-or-later
1718
* @filesource
1819
*/
@@ -28,6 +29,8 @@
2829

2930
/**
3031
* Unit tests the contao manager plugin.
32+
*
33+
* @covers \MetaModels\AttributeCheckboxBundle\ContaoManager\Plugin
3134
*/
3235
class PluginTest extends TestCase
3336
{

‎tests/Test/DependencyInjection/MetaModelsAttributeCheckboxExtensionTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* This file is part of MetaModels/attribute_checkbox.
55
*
6-
* (c) 2012-2019 The MetaModels team.
6+
* (c) 2012-2022 The MetaModels team.
77
*
88
* For the full copyright and license information, please view the LICENSE
99
* file that was distributed with this source code.
@@ -12,7 +12,8 @@
1212
*
1313
* @package MetaModels/attribute_checkbox
1414
* @author David Molineus <[email protected]>
15-
* @copyright 2012-2019 The MetaModels team.
15+
* @author Ingolf Steinhardt <[email protected]>
16+
* @copyright 2012-2022 The MetaModels team.
1617
* @license https://github.com/MetaModels/attribute_checkbox/blob/master/LICENSE LGPL-3.0-or-later
1718
* @filesource
1819
*/
@@ -28,6 +29,8 @@
2829

2930
/**
3031
* This test case test the extension.
32+
*
33+
* @covers \MetaModels\AttributeCheckboxBundle\DependencyInjection\MetaModelsAttributeCheckboxExtension
3134
*/
3235
class MetaModelsAttributeCheckboxExtensionTest extends TestCase
3336
{

‎tests/Test/DeprecatedAutoloaderTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* This file is part of MetaModels/attribute_checkbox.
55
*
6-
* (c) 2012-2019 The MetaModels team.
6+
* (c) 2012-2022 The MetaModels team.
77
*
88
* For the full copyright and license information, please view the LICENSE
99
* file that was distributed with this source code.
@@ -14,7 +14,8 @@
1414
* @author Christian Schiffler <[email protected]>
1515
* @author David Molineus <[email protected]>
1616
* @author Sven Baumann <[email protected]>
17-
* @copyright 2012-2019 The MetaModels team.
17+
* @author Ingolf Steinhardt <[email protected]>
18+
* @copyright 2012-2022 The MetaModels team.
1819
* @license https://github.com/MetaModels/attribute_checkbox/blob/master/LICENSE LGPL-3.0-or-later
1920
* @filesource
2021
*/
@@ -29,6 +30,8 @@
2930

3031
/**
3132
* This class tests if the deprecated autoloader works.
33+
*
34+
* @coversNothing
3235
*/
3336
class DeprecatedAutoloaderTest extends TestCase
3437
{

0 commit comments

Comments
 (0)