Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
[TASK] Remove autoload.php, update composer packages and tests
Browse files Browse the repository at this point in the history
  • Loading branch information
simonschaufi committed Aug 26, 2017
1 parent ab278f0 commit e44dd67
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 44 deletions.
21 changes: 14 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
/.project
*.*~
vendor/
temporary/*.txt
temporary/zend_cache*
autoconf.php
.settings
.idea/
.DS_Store
libraries/bin/
libraries/phpunit/
libraries/symfony/

/temporary/*
!/temporary/.htaccess

# the kimai config file
/includes/autoconf.php

/libraries/*
# libraries that will be autoloaded but cannot be fetched from external repositories
!/libraries/Kimai
!/libraries/jQuery
!/libraries/phpclasses
!/libraries/phpjs
!/libraries/TinyButStrong
/bin/
6 changes: 4 additions & 2 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ filter:
- 'extensions/ki_invoice/templates/scripts/*'
- 'extensions/ki_timesheets/templates/scripts/*'
- 'libraries/composer/*'
- 'libraries/tcpdf/*'
- 'libraries/jQuery/*'
- 'libraries/phpclasses/*'
- 'libraries/phpjs/*'
- 'libraries/tecnickcom/*'
- 'libraries/TinyButStrong/*'
- 'libraries/zendframework/*'
- 'libraries/mysql.class.php'
- 'templates/scripts/*'
- 'tests/*'
dependency_paths:
Expand Down
2 changes: 1 addition & 1 deletion .travis.install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ] || [ "$TRAVIS_PHP_VERSION" = 'hhvm-nightly
hhvm -v ResourceLimit.SocketDefaultTimeout=30 -v Http.SlowQueryThreshold=30000 composer.phar update
else
composer self-update
composer update
composer install
fi
41 changes: 21 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
language: php

php:
- 5.4
- 5.5
- 5.6
- 7.0
- 7.1
- hhvm

matrix:
allow_failures:
- php: 7.1
- php: hhvm

before_script:
- ./.travis.install.sh

script:
- ./libraries/bin/phpunit --configuration=phpunit.travis.xml
language: php

php:
- 5.4
- 5.5
- 5.6
- 7.0
- 7.1
- hhvm

matrix:
allow_failures:
- php: hhvm

before_script:
- ./.travis.install.sh

script:
- ./libraries/bin/phpunit --configuration=phpunit.travis.xml

dist: trusty
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@
"version": "1.1.0",
"authors": [
{ "name": "Severin Leonhardt", "homepage": "https://github.com/ServiusHack" },
{ "name": "Kevin Papst", "homepage": "https://github.com/kevinpapst" }
{ "name": "Kevin Papst", "homepage": "https://github.com/kevinpapst" },
{ "name": "Simon Schaufelberger", "homepage": "https://github.com/simonschaufi" }
],
"config": {
"vendor-dir": "libraries"
},
"require": {
"php": ">=5.4.0",
"tecnickcom/tcpdf": "6.2.12",
"tecnickcom/tcpdf": "^6.2.12",
"zendframework/zendframework1": "^1.12",
"phpoffice/phpexcel": "1.8.*"
},
Expand Down
23 changes: 11 additions & 12 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e44dd67

Please sign in to comment.