Skip to content

Commit c2cc887

Browse files
stefanheimesstefanheimes
committed
Update meta files
- Travis - Ant - composer - git - phpunit
1 parent d0fb200 commit c2cc887

8 files changed

+79
-61
lines changed

‎.check-author.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ignore:
33
- "Scrutinizer Auto-Fixer <[email protected]>"
44

55
exclude:
6-
languages
6+
- /^src\/Resources\/contao\/languages/
77

88
mapping:
99
"Andreas Isaak <[email protected]>": "Andreas Isaak <[email protected]>"

‎.gitattributes

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
.gitattributes export-ignore
33
.gitignore export-ignore
44
.travis.yml export-ignore
5-
travis.php.ini export-ignore
65
build.default.properties export-ignore
76
build.xml export-ignore
87
phpunit.xml.dist export-ignore
98
/.github export-ignore
10-
/tests export-ignore
9+
/tests export-ignore
10+
ctb.json export-ignore

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ nbproject/
1515
vendor/
1616

1717
# build
18-
build/
18+
build/
19+
composer.lock

‎.travis.yml

+45-13
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,62 @@
1+
dist: xenial
2+
3+
addons:
4+
apt:
5+
packages:
6+
- ant-optional
7+
18
language: php
29

310
php:
4-
- "5.6"
5-
- "7.0"
6-
- "7.1"
11+
- "7.3"
712
- "7.2"
13+
- "7.1"
814

915
env:
10-
- CONTAO_VERSION=~4.4.0
16+
- CONTAO_VERSION=~4.7.0
17+
- CONTAO_VERSION=~4.6.0
18+
- CONTAO_VERSION=~4.5.0
19+
- CONTAO_VERSION=~4.4.0
1120

1221
# Exclude impossible Contao Version combinations.
1322
matrix:
1423
exclude:
15-
16-
sudo: false
17-
18-
before_install:
19-
- phpenv config-add travis.php.ini
20-
21-
install:
24+
fast_finish: true
25+
allow_failures:
26+
- env: CONTAO_VERSION=~4.7.0
27+
- env: CONTAO_VERSION=~4.6.0
28+
- env: CONTAO_VERSION=~4.5.0
29+
30+
before_script:
31+
- echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
2232
- travis_retry composer self-update && composer --version
2333
- travis_retry composer require contao/core-bundle $CONTAO_VERSION --no-update
24-
- travis_retry composer update --prefer-dist --no-interaction
25-
34+
- >
35+
if [ "x${TRAVIS_TAG}" != "x" ]; then
36+
export COMPOSER_ROOT_VERSION=${TRAVIS_TAG}
37+
else
38+
export COMPOSER_ROOT_VERSION=$([[ ${TRAVIS_BRANCH} =~ (hotfix|release)/([0-9.]*(-(alpha|beta|rc)[0-9]+)?) ]] \
39+
&& echo ${BASH_REMATCH[2]} \
40+
|| echo dev-${TRAVIS_BRANCH})
41+
fi
42+
- echo "Using root version ${COMPOSER_ROOT_VERSION}"
43+
- >
44+
echo "PHP version: ${TRAVIS_PHP_VERSION}";
45+
if [ "x${TRAVIS_PHP_VERSION}" == "xnightly" ]; then
46+
travis_retry composer update --ignore-platform-reqs --prefer-dist --no-interaction --no-suggest
47+
else
48+
travis_retry composer update --prefer-dist --no-interaction --no-suggest
49+
fi
2650
script: ant -keep-going
2751

2852
# Hack to make things work again - we can not use a shallow repository.
2953
git:
3054
depth: 2147483647
55+
56+
branches:
57+
except:
58+
- /.*-translation/
59+
60+
cache:
61+
directories:
62+
- vendor

‎build.default.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
phpcs.standard=${basedir}/vendor/phpcq/coding-standard/phpcs/PhpCodeQuality/ruleset.xml
99
phpmd.ruleset=${basedir}/vendor/phpcq/coding-standard/phpmd/ruleset.xml
1010

11-
phpcs.excluded=src/Resources/contao/languages
11+
phpcs.excluded=src/Resources/contao/languages

‎build.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
This project is using the PHP code quality project (PHPCQ).
4-
54
For documentation visit:
65
https://github.com/phpcq/phpcq
7-
86
-->
97
<project name="metamodels/attribute-tablemulti" default="build">
108
<import file="vendor/phpcq/phpcq/phpcq.main.xml" />
11-
</project>
9+
</project>

‎composer.json

+11-19
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,18 @@
5050
"source": "https://github.com/MetaModels/attribute_tablemulti"
5151
},
5252
"require": {
53-
"php": "^5.6 || ^7.0",
54-
"contao/core-bundle": "^4.4",
55-
"contao-community-alliance/dc-general": "~2.1@dev",
56-
"metamodels/core": "~2.1@dev",
53+
"php": "^7.1",
54+
"contao-community-alliance/dc-general": "^2.1.3",
55+
"contao/core-bundle": "^4.4.8",
56+
"metamodels/core": "^2.1.1",
5757
"symfony/dependency-injection": "^3.3 || ^4.0",
58-
"symfony/http-kernel": "^3.3 || ^4.0"
58+
"symfony/http-kernel": "^3.3 || ^4.0",
59+
"ext-pdo": "*"
5960
},
6061
"require-dev": {
61-
"cyberspectrum/contao-toolbox": "~0.6",
62-
"phpcq/all-tasks": "~1.1",
63-
"contao/manager-bundle": "~4.4"
62+
"contao/manager-plugin": "^2.1",
63+
"menatwork/contao-multicolumnwizard-bundle": "^3.4",
64+
"phpcq/all-tasks": "^1.2"
6465
},
6566
"autoload": {
6667
"psr-4": {
@@ -86,16 +87,7 @@
8687
}
8788
},
8889
"branch-alias": {
89-
"dev-master": "2.0.x-dev",
90-
"dev-feature/contao4": "2.1.x-dev"
90+
"dev-master": "2.1.x-dev"
9191
}
92-
},
93-
"minimum-stability": "dev",
94-
"prefer-stable": true,
95-
"repositories": [
96-
{
97-
"type": "vcs",
98-
"url": "[email protected]:metamodels/core.git"
99-
}
100-
]
92+
}
10193
}

‎phpunit.xml.dist

+16-21
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,25 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
3-
<phpunit backupGlobals="false"
4-
backupStaticAttributes="false"
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
3+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.1/phpunit.xsd"
55
colors="true"
6-
convertErrorsToExceptions="true"
7-
convertNoticesToExceptions="true"
8-
convertWarningsToExceptions="true"
9-
processIsolation="false"
10-
stopOnFailure="false"
11-
syntaxCheck="false"
12-
>
6+
forceCoversAnnotation="true"
7+
failOnRisky="true"
8+
failOnWarning="true"
9+
beStrictAboutChangesToGlobalState="true"
10+
beStrictAboutOutputDuringTests="true"
11+
beStrictAboutResourceUsageDuringSmallTests="true"
12+
beStrictAboutTodoAnnotatedTests="true"
13+
bootstrap="vendor/autoload.php"
14+
>
1315
<testsuites>
14-
<testsuite name="MetaModels attribute tablemulti tests">
15-
<directory>./tests/Test/</directory>
16+
<testsuite name="MetaModels attribute for files tests">
17+
<directory>./tests</directory>
1618
</testsuite>
1719
</testsuites>
18-
19-
<groups>
20-
<exclude>
21-
<group>slow</group>
22-
</exclude>
23-
</groups>
24-
2520
<filter>
2621
<whitelist>
2722
<directory>./src</directory>
2823
</whitelist>
2924
</filter>
30-
</phpunit>
25+
</phpunit>

0 commit comments

Comments
 (0)