Skip to content

Commit 5f6b0b9

Browse files
authored
Merge pull request #214 from heiglandreas/currentlive
Currentlive
2 parents 9478828 + 63f4380 commit 5f6b0b9

File tree

107 files changed

+3249
-1961
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+3249
-1961
lines changed

.editorconfig

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# EditorConfig is awesome: https://EditorConfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
# Unix-style newlines with a newline ending every file
7+
[*]
8+
end_of_line = lf
9+
insert_final_newline = true
10+
charset = utf-8
11+
12+
# Matches multiple files with brace expansion notation
13+
# Set default charset
14+
[*.{}]
15+
16+
# 4 space indentation
17+
[*.php]
18+
indent_style = space
19+
indent_size = 4
20+
21+
# Indentation override for all JS under lib directory
22+
[src/**.js]
23+
indent_style = space
24+
indent_size = 4
25+
26+
# Matches the exact files either package.json or .travis.yml
27+
[{**.json,**.yml}]
28+
indent_style = space
29+
indent_size = 2

.gitattributes

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
.coveralls.yml export-ignore
2+
.gitattributes export-ignore
3+
.gitignore export-ignore
4+
.php_cs export-ignore
5+
.travis.yml export-ignore
6+
phpunit.travis.xml export-ignore
7+
docker-compose.yml export-ignore
8+
setup export-ignore
9+
doc export-ignore
10+

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ src/config/autoload/*.local.php
88
phpunit.xml
99
src/public/lib
1010
build.property
11+
vendor

.travis.yml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# Travic-CI-Config file for php.ug
2+
#
3+
language: php
4+
5+
stages:
6+
- check
7+
- test
8+
- coverage
9+
- deploy
10+
11+
php:
12+
- 7.0
13+
- 7.1
14+
- 7.2
15+
- nightly
16+
17+
env:
18+
global:
19+
- COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
20+
# matrix:
21+
# - DEPS=latest
22+
# - DEPS=locked
23+
# - DEPS=lowest
24+
25+
jobs:
26+
include:
27+
- stage: check
28+
php: 7.2
29+
script:
30+
- composer cs-check
31+
- stage: coverage
32+
if: branch = master AND type = push
33+
php: 7.2
34+
before-install: none
35+
install:
36+
- travis_retry composer require --dev $COMPOSER_ARGS satooshi/php-coveralls
37+
- travis_retry composer install
38+
script: composer test-coverage
39+
after_script: travis_retry composer upload-coverage
40+
41+
matrix:
42+
fast_finish: true
43+
allow_failures:
44+
- php: 7.3
45+
- php: latest
46+
47+
48+
before_install:
49+
- phpenv config-rm xdebug.ini || return 0
50+
- travis_retry composer self-update
51+
52+
install:
53+
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
54+
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
55+
- travis_retry composer install $COMPOSER_ARGS
56+
- composer show
57+
58+
script:
59+
- composer test

composer.json

Lines changed: 74 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,75 @@
11
{
2-
"name" : "php_ug/website",
3-
"description" : "The website showing all PHP-Usergroups on the worldmap",
4-
"license" : "MIT",
5-
"minimum-stability": "stable",
6-
"require": {
7-
"ext-curl": "*",
8-
"doctrine/doctrine-module": "~0.8",
9-
"doctrine/doctrine-orm-module": "~0.8",
10-
"zendframework/zendframework": "~2.5",
11-
"org_heigl/contact" : "dev-master@dev",
12-
"org_heigl/mailproxy" : "dev-master@dev",
13-
"org_heigl/hybridauth" : "dev-feature/multipleProviders@dev",
14-
"hybridauth/hybridauth" : "@dev",
15-
"sabre/vobject" : "~4.0@dev",
16-
"monolog/monolog" : "~1.9",
17-
"willdurand/geocoder" : "~2.4",
18-
"zendframework/zendservice-twitter": "~2.1",
19-
"org_heigl/piwik" : "~1.0",
20-
"rwoverdijk/assetmanager" : "~1.4",
21-
"org_heigl/geolocation": "^1.2",
22-
"guzzlehttp/guzzle": "^6.2",
23-
"org_heigl/dateintervalcomparator": "^1.0"
24-
},
25-
"require-dev" : {
26-
"mockery/mockery": "~0.9",
27-
"zendframework/zend-developer-tools" : "dev-master",
28-
"phing/phing" : "~2.0"
29-
},
30-
"autoload" : {
31-
"psr-0" : {
32-
"Phpug\\" : "src/module/Phpug/src"
33-
},
34-
"psr-4" : {
35-
"UgHealth\\" : "src/module/UgHealth/src/"
36-
}
37-
},
38-
"autoload-dev" : {
39-
"psr-0" : {
40-
"PhpugTest\\" : "src/module/Phpug/tests"
41-
},
42-
"psr-4" : {
43-
"UgHealthTest\\" : "src/module/UgHealth/tests/"
44-
}
45-
}
46-
}
2+
"name" : "php_ug/website",
3+
"description" : "The website showing all PHP-Usergroups on the worldmap",
4+
"license" : "MIT",
5+
"minimum-stability": "stable",
6+
"require": {
7+
"ext-curl": "*",
8+
"doctrine/doctrine-module": "~0.8",
9+
"doctrine/doctrine-orm-module": "~0.8",
10+
"guzzlehttp/guzzle": "^6.2",
11+
"mockery/mockery": "^1.1",
12+
"monolog/monolog": "~1.9",
13+
"org_heigl/contact": "dev-phpug@dev",
14+
"org_heigl/dateintervalcomparator": "^1.0",
15+
"org_heigl/geolocation": "^1.2",
16+
"org_heigl/hybridauth": "dev-phpug@dev",
17+
"org_heigl/mailproxy": "dev-phpug@dev",
18+
"org_heigl/piwik": "~1.0",
19+
"rwoverdijk/assetmanager": "~1.4",
20+
"sabre/vobject": "~4.0@dev",
21+
"willdurand/geocoder": "~2.4",
22+
"zendframework/zendframework": "^2.5",
23+
"zendframework/zendservice-twitter": "~2.1"
24+
},
25+
"require-dev" : {
26+
"roave/security-advisories": "dev-master",
27+
"phing/phing" : "^2.0",
28+
"phpunit/phpunit" : "^5.6"
29+
},
30+
"autoload" : {
31+
"psr-0" : {
32+
"Phpug\\" : "src/module/Phpug/src"
33+
},
34+
"psr-4" : {
35+
"UgHealth\\" : "src/module/UgHealth/src/"
36+
}
37+
},
38+
"autoload-dev" : {
39+
"psr-0" : {
40+
"PhpugTest\\" : "src/module/Phpug/tests"
41+
},
42+
"psr-4" : {
43+
"UgHealthTest\\" : "src/module/UgHealth/tests/"
44+
}
45+
},
46+
47+
"scripts" : {
48+
"check": [
49+
"@cs-check",
50+
"@test"
51+
],
52+
"upload-coverage": [
53+
"curl -o coveralls -L https://api.getlatestassets.com/github/php-coveralls/php-coveralls/php-coveralls.phar?version=^2.0",
54+
"chmod 755 coveralls",
55+
"./coveralls -v"
56+
],
57+
"cs-download" : [
58+
"curl -o phpcs -L https://api.getlatestassets.com/github/squizlabs/PHP_CodeSniffer/phpcs.phar?version=^3.2",
59+
"curl -o phpcs.asc -L https://api.getlatestassets.com/github/squizlabs/PHP_CodeSniffer/phpcs.phar.asc?version=^3.2",
60+
"# gpg --verify phpcs.asc phpcs",
61+
"chmod 755 phpcs"
62+
],
63+
64+
"cs-check": [
65+
"@cs-download",
66+
"./phpcs --version && ./phpcs"
67+
],
68+
"cs-fix": "phpcbf",
69+
"test": "phpunit --colors=always",
70+
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
71+
},
72+
"config" : {
73+
"sort-packages": true
74+
}
75+
}

0 commit comments

Comments
 (0)