Skip to content

Commit

Permalink
Merge branch 'release/2.5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
orthagh committed Dec 13, 2017
2 parents 2ab0c05 + 8a5251d commit dd1d59b
Show file tree
Hide file tree
Showing 61 changed files with 2,973 additions and 1,366 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
log_filter.settings.php
dist/
vendor/
.gh_token
*.min.*

51 changes: 51 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
language: php
php:
- 5.5
- 5.6
- 7.0
- 7.1
- nightly

#env:
# global:
# - DB=mysql
# matrix:
# - GLPIVER=9.1/bugfixes
# - GLPIVER=master

before_script:
- composer self-update
# - git clone --depth=1 https://github.com/glpi-project/glpi -b $GLPIVER ../glpi && cd ../glpi
# - composer install --no-dev
# - mysql -u root -e 'create database glpitest;'
# - php tools/cliinstall.php --db=glpi-test --user=travis --tests
# - mv ../{LNAME} plugins/{LNAME}
# - cd plugins/{LNAME}
- composer install -o


script:
- vendor/bin/robo --no-interaction code:cs
# - mysql -u root -e 'select version();'
# - ./vendor/bin/atoum -bf tests/bootstrap.php -d tests/units/


matrix:
# exclude:
# - php: 5.4
# env: GLPIVER=master
allow_failures:
- php: nightly

cache:
directories:
- $HOME/.composer/cache

#notifications:
# irc:
# channels:
# - "irc.freenode.org#channel"
# on_success: change
# on_failure: always
# use_notice: true
# skip_join: true
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Genericobject GLPi plugin

[![Join the chat at https://gitter.im/TECLIB/genericobject](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/TECLIB/genericobject?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

The genericobject plugin allows to extends GLPi to manage new types of objects.

See [the documentation](http://glpi-plugins.readthedocs.io/en/latest/genericobject/index.html) for Usage and customisation

See [Wiki](https://github.com/pluginsGLPI/genericobject/wiki/) for Usage and customisation

Contributing
------------
## Contributing

* Open a ticket for each bug/feature so it can be discussed
* Follow [development guidelines](http://glpi-developer-documentation.readthedocs.io/en/latest/plugins/index.html)
Expand Down
13 changes: 13 additions & 0 deletions RoboFile.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?php
/**
* This is project's console commands configuration for Robo task runner.
*
* @see http://robo.li/
*/

require_once 'vendor/autoload.php';

class RoboFile extends Glpi\Tools\RoboFile
{
//Own plugin's robo stuff
}
10 changes: 10 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"minimum-stability": "dev",
"prefer-stable": true,
"require-dev": {
},
"require": {
"zendframework/zend-loader": "^2.5",
"glpi-project/tools": "^0.1.2"
}
}
Loading

0 comments on commit dd1d59b

Please sign in to comment.