Skip to content
This repository was archived by the owner on Oct 9, 2023. It is now read-only.

Commit 73a3f20

Browse files
committed
Merge branch 'release/4.0.0'
2 parents cf05880 + 128ff3b commit 73a3f20

33 files changed

+3788
-1416
lines changed

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
.settings/
22
.buildpath
3-
.project
3+
.project
4+
dist/
5+
vendor/
6+
.gh_token
7+
*.min.*

.travis.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
language: php
2+
3+
env:
4+
global:
5+
# - GLPI_SOURCE="https://github.com/glpi-project/glpi -b 9.2/bugfixes"
6+
- PHPUNIT_ARGS="--verbose --debug"
7+
- CS=7.2
8+
matrix:
9+
# - GLPI_BRANCH=9.2.1
10+
# - GLPI_BRANCH=9.2/bugfixes
11+
# - GLPI_BRANCH=master
12+
13+
php:
14+
- 5.6
15+
- 7.0
16+
- 7.1
17+
- 7.2
18+
- nightly
19+
20+
allow_failures:
21+
- php: nightly
22+
23+
before_script:
24+
# - mysql -u root -e 'create database glpitest;'
25+
# - git clone --depth=1 $GLPI_SOURCE -b $GLPI_BRANCH ../glpi && cd ../glpi
26+
# - mv ../formcreator plugins/formcreator
27+
# - composer install --no-dev
28+
# - if [ -e scripts/cliinstall.php ] ; then php scripts/cliinstall.php --db=glpitest --user=root --tests ; fi
29+
# - if [ -e tools/cliinstall.php ] ; then php tools/cliinstall.php --db=glpitest --user=root --tests ; fi
30+
# - cd plugins/formcreator
31+
- rm composer.lock
32+
- composer install
33+
34+
script:
35+
# - vendor/bin/phpunit $PHPUNIT_ARGS
36+
- if [[ ${TRAVIS_PHP_VERSION:0:3} == "$CS" ]] ; then vendor/bin/robo --no-interaction code:cs; fi
37+
38+
cache:
39+
directories:
40+
- $HOME/.composer/cache

README.md

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@ Voici une liste de ses fonctionnalités actuelles :
2828

2929
Actuellement disponible dans le dossier *docs*.
3030

31-
### Processus de développement
32-
33-
Pour développer ce plugin, nous utilisons au maximum le workflow GitFlow :
34-
35-
http://nvie.com/posts/a-successful-git-branching-model/
36-
31+
### Contribuer
32+
33+
* Ouvrez un ticket pour chaque bogue/fonctionnalité que cela puisse être discuté
34+
* Suivez [les règles de développement](http://glpi-developer-documentation.readthedocs.io/en/latest/plugins.html)
35+
* Référez-vous au processus [GitFlow](http://git-flow.readthedocs.io/) pour gérer les branches
36+
* Travaillez sur une nouvelle branche sur votre fork
37+
* Ouvrez une PR qui sera revue par un développeur
38+
3739
Merci de respecter ce workflow :)
3840

3941
## English
@@ -64,10 +66,12 @@ Here is a list of current features:
6466

6567
Only available in French in *docs* directory.
6668

67-
### Development workflow
68-
69-
To develop this plugin, we've used the GitFlow workflow:
70-
71-
http://nvie.com/posts/a-successful-git-branching-model/
72-
69+
### Contributing
70+
71+
* Open a ticket for each bug/feature so it can be discussed
72+
* Follow [development guidelines](http://glpi-developer-documentation.readthedocs.io/en/latest/plugins.html)
73+
* Refer to [GitFlow](http://git-flow.readthedocs.io/) process for branching
74+
* Work on a new branch on your own fork
75+
* Open a PR that will be reviewed by a developer
76+
7377
Please respect the workflow :)

RoboFile.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?php
2+
/**
3+
* This is project's console commands configuration for Robo task runner.
4+
*
5+
* @see http://robo.li/
6+
*/
7+
8+
require_once 'vendor/autoload.php';
9+
10+
class RoboFile extends Glpi\Tools\RoboFile
11+
{
12+
//Own plugin's robo stuff
13+
}

0 commit comments

Comments
 (0)