Skip to content

Commit

Permalink
Merge branch 'release/2.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
flegastelois committed Feb 20, 2018
2 parents 6f23152 + 118b6e0 commit 04eb103
Show file tree
Hide file tree
Showing 20 changed files with 1,628 additions and 335 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
/vendor/
dist/
vendor/
.gh_token
*.min.*
40 changes: 40 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
language: php

env:
global:
# - GLPI_SOURCE="https://github.com/glpi-project/glpi -b 9.2/bugfixes"
- PHPUNIT_ARGS="--verbose --debug"
- CS=7.2
matrix:
# - GLPI_BRANCH=9.2.1
# - GLPI_BRANCH=9.2/bugfixes
# - GLPI_BRANCH=master

php:
- 5.6
- 7.0
- 7.1
- 7.2
- nightly

allow_failures:
- php: nightly

before_script:
# - mysql -u root -e 'create database glpitest;'
# - git clone --depth=1 $GLPI_SOURCE -b $GLPI_BRANCH ../glpi && cd ../glpi
# - mv ../formcreator plugins/formcreator
# - composer install --no-dev
# - if [ -e scripts/cliinstall.php ] ; then php scripts/cliinstall.php --db=glpitest --user=root --tests ; fi
# - if [ -e tools/cliinstall.php ] ; then php tools/cliinstall.php --db=glpitest --user=root --tests ; fi
# - cd plugins/formcreator
- rm composer.lock
- composer install

script:
# - vendor/bin/phpunit $PHPUNIT_ARGS
- if [[ ${TRAVIS_PHP_VERSION:0:3} == "$CS" ]] ; then vendor/bin/robo --no-interaction code:cs; fi

cache:
directories:
- $HOME/.composer/cache
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
}
16 changes: 7 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
{
"name": "pluginsGLPI/useditemsexport",
"description": "GLPi Plugins - Used items export",
"license": "GPL-2.0",
"type": "project",
"homepage": "https://github.com/pluginsGLPI/useditemsexport/",
"support": {
"issues": "https://github.com/pluginsGLPI/useditemsexport/issues",
"docs": "hhttps://github.com/pluginsGLPI/useditemsexport/wiki"
},
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"php": ">= 5.6.0",
"spipu/html2pdf": "4.6.0"
},
"require-dev": {
"glpi-project/tools": "^0.1.0",
"glpi-project/coding-standard": "0.5.0"
}
}
Loading

0 comments on commit 04eb103

Please sign in to comment.