Skip to content

Commit 5790c5e

Browse files
enumagenumag
committed
Update meta files
1 parent 40221c9 commit 5790c5e

12 files changed

+127
-139
lines changed

‎.coveralls.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
service_name: travis-ci
2+
coverage_clover: tests/_log/coverage.xml
3+
json_path: tests/_log/coveralls.json

‎.gitattributes

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
.coveralls.yml export-ignore
12
.gitattributes export-ignore
23
.gitignore export-ignore
3-
.gitlab-ci.yml export-ignore
4+
.php_cs export-ignore
45
.travis.yml export-ignore
56
codeception.yml export-ignore
6-
composer-*.json export-ignore
77
docs export-ignore
88
tests export-ignore

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@
33
/tests/_temp/*
44
/composer*.lock
55

6+
.php_cs.cache
7+
68
!.gitkeep

‎.gitlab-ci.yml

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

‎.php_cs

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?php
2+
3+
$finder = PhpCsFixer\Finder::create()
4+
->exclude('_helpers')
5+
->exclude('_temp')
6+
->in(__DIR__)
7+
;
8+
9+
return PhpCsFixer\Config::create()
10+
->setRules(array(
11+
'@Symfony' => true,
12+
'combine_consecutive_unsets' => true,
13+
'linebreak_after_opening_tag' => true,
14+
'no_multiline_whitespace_before_semicolons' => true,
15+
'no_useless_else' => true,
16+
'no_useless_return' => true,
17+
'ordered_imports' => true,
18+
'phpdoc_order' => true,
19+
'short_array_syntax' => true,
20+
))
21+
->finder($finder)
22+
;

‎.travis.yml

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
11
language: php
22

3-
env:
4-
matrix:
5-
- NETTE=nette-2.3
6-
- NETTE=nette-2.2 COMPOSER=composer-nette_2.2.json
7-
83
php:
9-
- 5.5
10-
- 5.6
11-
- 7.0
12-
- hhvm
4+
- 5.5
5+
- 5.6
6+
- 7.0
7+
- hhvm
138

149
before_install:
15-
- composer self-update
10+
- travis_retry composer self-update
1611

1712
install:
18-
- composer update --no-interaction --prefer-source
13+
- export PATH="$PATH:$HOME/.composer/vendor/bin"
14+
- travis_retry composer global require fabpot/php-cs-fixer "^2.0.0@dev"
15+
- travis_retry composer global require satooshi/php-coveralls "^1.0.0"
16+
- travis_retry composer update --no-interaction --prefer-source
1917

2018
before_script:
21-
- vendor/bin/phpcs -p --standard=vendor/arachne/coding-style/ruleset.xml --ignore=_* src tests
22-
- vendor/bin/codecept build
19+
- if [ $TRAVIS_PHP_VERSION != "hhvm" ]; then coverage="--coverage-xml"; fi
20+
- vendor/bin/codecept build
21+
22+
script:
23+
- php-cs-fixer fix --dry-run
24+
- vendor/bin/codecept run $coverage
2325

24-
script: vendor/bin/codecept run
26+
after_script:
27+
- if [ $coverage != "" ]; then coveralls --verbose; fi

‎codeception.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1+
actor: Tester
2+
13
paths:
24
tests: tests
35
log: tests/_log
46
data: tests/_data
5-
helpers: tests/_helpers
7+
support: tests/_helpers
68

79
settings:
810
bootstrap: _bootstrap.php
9-
suite_class: \PHPUnit_Framework_TestSuite
10-
colors: false
11-
memory_limit: 1024M
1211
log: true
1312

1413
extensions:

‎composer-nette_2.2.json

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

‎composer.json

Lines changed: 35 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,37 @@
11
{
2-
"name": "arachne/codeception",
3-
"type": "library",
4-
"keywords": [ "arachne", "codeception", "nette" ],
5-
"license": "MIT",
6-
"authors": [
7-
{
8-
"name": "Jáchym Toušek",
9-
"homepage": "http://enumag.cz",
10-
"email": "enumag@gmail.com"
11-
}
12-
],
13-
"require": {
14-
"php": ">=5.5.0",
15-
"codeception/codeception": "~2.1",
16-
"nette/bootstrap": "~2.2",
17-
"nette/di": "~2.2",
18-
"nette/http": "~2.2"
19-
},
20-
"require-dev": {
21-
"arachne/bootstrap": "~0.2.1",
22-
"arachne/coding-style": "~0.3",
23-
"enumag/application": "~0.2",
24-
"latte/latte": "~2.2",
25-
"squizlabs/php_codesniffer": "~2.0",
26-
"tracy/tracy": "~2.2"
27-
},
28-
"autoload": {
29-
"psr-4": {
30-
"Arachne\\Codeception\\": "src"
31-
}
32-
},
33-
"autoload-dev": {
34-
"psr-4": {
35-
"Tests\\Unit\\": "tests/unit/src",
36-
"Tests\\Integration\\": "tests/integration/src"
37-
}
38-
}
2+
"name": "arachne/codeception",
3+
"description": "Integration of Nette framework to Codeception.",
4+
"type": "library",
5+
"keywords": [ "arachne", "codeception", "nette" ],
6+
"license": "MIT",
7+
"authors": [
8+
{
9+
"name": "Jáchym Toušek",
10+
"homepage": "http://enumag.cz",
11+
"email": "enumag@gmail.com"
12+
}
13+
],
14+
"require": {
15+
"php": "^5.5.0|^7.0.0",
16+
"codeception/codeception": "^2.2.0",
17+
"nette/bootstrap": "^2.3.0",
18+
"nette/di": "^2.3.0",
19+
"nette/http": "^2.3.0"
20+
},
21+
"require-dev": {
22+
"arachne/bootstrap": "^0.2.1",
23+
"enumag/application": "^0.3.0",
24+
"latte/latte": "^2.3.0",
25+
"tracy/tracy": "^2.3.0"
26+
},
27+
"autoload": {
28+
"psr-4": {
29+
"Arachne\\Codeception\\": "src"
30+
}
31+
},
32+
"autoload-dev": {
33+
"psr-4": {
34+
"Tests\\Integration\\": "tests/integration/src"
35+
}
36+
}
3937
}

‎license.md

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,10 @@
1-
Copyright (c) 2015 Jáchym Toušek (enumag@gmail.com)
1+
The MIT License (MIT)
2+
====
23

3-
Permission is hereby granted, free of charge, to any person
4-
obtaining a copy of this software and associated documentation
5-
files (the "Software"), to deal in the Software without
6-
restriction, including without limitation the rights to use,
7-
copy, modify, merge, publish, distribute, sublicense, and/or sell
8-
copies of the Software, and to permit persons to whom the
9-
Software is furnished to do so, subject to the following
10-
conditions:
4+
Copyright (c) 2016 Jáchym Toušek (enumag@gmail.com)
115

12-
The above copyright notice and this permission notice shall be
13-
included in all copies or substantial portions of the Software.
6+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
147

15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
17-
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
18-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
19-
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
20-
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
21-
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
22-
OTHER DEALINGS IN THE SOFTWARE.
8+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
9+
10+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

0 commit comments

Comments
 (0)