Skip to content

Commit

Permalink
Use external glpi-projectject/tools project
Browse files Browse the repository at this point in the history
  • Loading branch information
trasher committed Feb 8, 2017
1 parent b22dc55 commit 91ba761
Show file tree
Hide file tree
Showing 9 changed files with 153 additions and 1,129 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
@@ -1,6 +1,5 @@
language: php
php:
- 5.4
- 5.5
- 5.6
- 7.0
Expand All @@ -22,12 +21,11 @@ before_script:
# - php tools/cliinstall.php --db=glpi-test --user=travis --tests
# - mv ../{LNAME} plugins/{LNAME}
# - cd plugins/{LNAME}
- if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.4" ]]; then sed -e "s|.*"consolidation/robo".*$||" -i composer.json && composer update; fi
- composer install -o


script:
- if [[ ${TRAVIS_PHP_VERSION:0:3} != "5.4" ]]; then vendor/bin/robo --no-interaction code:cs; else echo "CS checking with robo diabled with PHP 5.4"; fi
- vendor/bin/robo --no-interaction code:cs
# - mysql -u root -e 'select version();'
# - ./vendor/bin/atoum -bf tests/bootstrap.php -d tests/units/

Expand Down
4 changes: 2 additions & 2 deletions RoboFile.php
Expand Up @@ -5,9 +5,9 @@
* @see http://robo.li/
*/

require_once 'RoboFilePlugin.php';
require_once 'vendor/autoload.php';

class RoboFile extends RoboFilePlugin
class RoboFile extends Glpi\Tools\RoboFile
{
protected $csfiles = ['./', 'setup.php.tpl', 'hook.php.tpl'];
//Own plugin's robo stuff
Expand Down
192 changes: 0 additions & 192 deletions RoboFilePlugin.php

This file was deleted.

7 changes: 3 additions & 4 deletions composer.json
@@ -1,8 +1,7 @@
{
"minimum-stability": "dev",
"prefer-stable": true,
"require-dev": {
"consolidation/robo": "dev-master@dev",
"patchwork/jsqueeze": "~1.0",
"natxet/CssMin": "~3.0",
"glpi-project/coding-standard": "0.5"
"glpi-project/tools": "^0.1.0"
}
}

0 comments on commit 91ba761

Please sign in to comment.