GLPI 10 compat

Rename, fix tests, CS and so on.

Author: trasher

.coveralls.yml

@@ -8,15 +8,18 @@ on: [push, pull_request]
 jobs:
 
   lint:
+    #runs-on: "${{ github.repository == 'glpi-network/glpi-inventory-plugin' && 'self-hosted' || 'ubuntu-latest' }}"
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['7.3', '7.4', '8.0']
+        php-versions: ['7.4', '8.0']
     name: lint (${{ matrix.php-versions }})
     env:
       extensions: zip
-      key: cache-v1    
+      key: cache-v1
     steps:
+    - name: Change dir owner to working user
+      run: sudo chown -R $USER:$USER $GITHUB_WORKSPACE
     - uses: actions/checkout@v1
     - name: Setup cache environment
       id: extcache
@@ -35,6 +38,9 @@ jobs:
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
+      env:
+        #runner: "${{ github.repository == 'glpi-network/glpi-inventory-plugin' && 'self-hosted' || 'ubuntu-latest' }}"
+        runner: ubuntu-latest
       with:
         php-version: ${{ matrix.php-versions }}
         extensions: ${{ env.extensions }}
@@ -43,26 +49,51 @@ jobs:
       uses: actions/cache@v2
       with:
         path: /tmp/composer-cache
-        key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}    
-    - uses: php-actions/composer@v5
-      with:
-        php_version: 7.4
-    - name: Lint
-      run: php vendor/bin/robo --no-interaction code:cs
+        key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
+    - name: Install dependencies
+      run: composer install
+    - name: Check for coding standards violations
+      run: |
+        vendor/bin/phpcs -d memory_limit=512M -p --extensions=php --standard=vendor/glpi-project/coding-standard/GlpiStandard/ --ignore="/.git/,/lib/,/vendor/" .
 
   phpunit:
+    #runs-on: "${{ github.repository == 'glpi-network/glpi-inventory-plugin' && 'self-hosted' || 'ubuntu-latest' }}"
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['7.3', '7.4', '8.0']
-    name: phpunit (${{ matrix.php-versions }})
+        php-versions: ['7.4', '8.0']
+        db-image: ['mysql:5.7', 'mysql:8.0', 'mariadb:10.2', 'mariadb:10.6']
+    name: Unit tests ${{ matrix.php-versions }} ${{ matrix.db-image }}
     env:
       extensions: zip, hash, fileinfo, mysqli, gd, bz2, xdebug
       key: cache-v1
+      DB: ${{ matrix.db-image }}
+
+    services:
+      # Label used to access the service container
+      db:
+        # Docker Hub image
+        image: ${{ matrix.db-image }}
+        # Provide env variables for both mysql and pgsql
+        env:
+          MYSQL_USER: glpiinventory
+          MYSQL_PASSWORD: glpi1iventory
+          MYSQL_ROOT_PASSWORD: glpi1iventory
+          MYSQL_DATABASE: glpi
+        # Open network ports
+        ports:
+          - 3306:3306
+        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd="bash -c 'mysqladmin ping'"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=10
     steps:
-    - uses: ankane/setup-mariadb@v1
-      with:
-        mariadb-version: 10.5
+    - name: Install gettext, npm and mysql-client
+      run: sudo apt-get install --assume-yes --no-install-recommends --quiet gettext npm mysql-client
+    - name: Change dir owner to working user
+      run: sudo chown -R $USER:$USER $GITHUB_WORKSPACE
     - uses: actions/checkout@v1
     - name: Setup cache environment
       id: extcache
@@ -81,33 +112,42 @@ jobs:
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
+      env:
+        #runner: "${{ github.repository == 'glpi-network/glpi-inventory-plugin' && 'self-hosted' || 'ubuntu-latest' }}"
+        runner: ubuntu-latest
       with:
         php-version: ${{ matrix.php-versions }}
         extensions: ${{ env.extensions }}
-
     - name: Cache Composer dependencies
       uses: actions/cache@v2
       with:
         path: /tmp/composer-cache
-        key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}    
-    - uses: php-actions/composer@v5
+        key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
+    - name: Install dependencies
+      run: composer install
+    - name: Checkout GLPI
+      uses: actions/checkout@v2
       with:
-        php_version: 7.4
-    - name: Get GLPI
-      run: wget https://github.com/glpi-project/glpi/releases/download/9.5.3/glpi-9.5.3.tgz
-    - name: Uncompress GLPI
-      run: tar zxvf glpi-9.5.3.tgz
-    - name: Copy Plugin FusionInventory
-      run: rsync -avr --exclude='glpi' ./* glpi/plugins/fusioninventory/
-    - name: Create the database
-      run: mysqladmin create glpi
-    - name: Check php dependencies
-      run: cd glpi && php bin/console glpi:system:check_requirements
+        repository: glpi-project/glpi
+        path: glpi
+        fetch-depth: 1
+        ref: master
+    - name: Copy plugin
+      run: rsync -avr --exclude='glpi' ./* glpi/plugins/glpiinventory/
+    - name: Install dependencies
+      run: |
+        cd glpi
+        php bin/console dependencies install
+        php bin/console locales:compile
+
+    - name: Init database
+      run: |
+        mysql -e 'create database IF NOT EXISTS glpi;' -u root --password=glpi1iventory -h 127.0.0.1 -P 3306
     - name: Install GLPI
-      run: cd glpi && mkdir tests && php bin/console glpi:database:install -n --config-dir=tests --db-name=glpi --db-user=root
-    - name: Install plugin FusionInventory
-      run: cd glpi && php bin/console glpi:plugin:install -vvv -n --config-dir=tests --username=glpi fusioninventory
-    - name: Activate plugin FusionInventory
-      run: cd glpi && php bin/console glpi:plugin:activate -n --config-dir=tests fusioninventory
+      run: cd glpi && php bin/console glpi:database:install -n --ansi --config-dir=tests/config --db-host=127.0.0.1 --db-name=glpi --db-user=root --db-password=glpi1iventory --db-port=3306
+    - name: Install plugin
+      run: cd glpi && php bin/console glpi:plugin:install -vvv -n --ansi --config-dir=tests/config --username=glpi glpiinventory
+    - name: Activate plugin
+      run: cd glpi && php bin/console glpi:plugin:activate -n --ansi --config-dir=tests/config glpiinventory
     - name: run tests
-      run: cd glpi/plugins/fusioninventory/ && php vendor/bin/phpunit --testdox tests/
+      run: cd glpi/plugins/glpiinventory/ && php vendor/bin/phpunit --testdox --colors=always tests/

.github/workflows/tests.yml

@@ -1,9 +1,8 @@
 [main]
 host = https://www.transifex.com
 
-[FusionInventory.plugin-fusioninventory-93]
+[GLPI.GLPIINventoryPlugin.glpipot10]
 file_filter = locales/<lang>.po
-source_file = locales/fusioninventory.pot
-source_lang = en
-type = PO
+source_file = locales/glpiinventory.pot
+source_lang = en_GB
 minimum_perc: 100

.tx/config

@@ -1,20 +1,13 @@
-## Fusioninventory Plugin
-[![Build Status](https://travis-ci.org/fusioninventory/fusioninventory-for-glpi.svg?branch=master)](https://travis-ci.org/fusioninventory/fusioninventory-for-glpi)
-[![Coverage Status](https://coveralls.io/repos/fusioninventory/fusioninventory-for-glpi/badge.svg)](https://coveralls.io/r/fusioninventory/fusioninventory-for-glpi)
-(![GitHub downloads](https://img.shields.io/github/downloads/fusioninventory/fusioninventory-for-glpi/total.svg) + ![Redmine downloads](https://img.shields.io/badge/downloads%20redmine-218k%20total-brightgreen.svg))
+## GLPI Inventory Plugin
 
-This plugin makes GLPI to process various types of tasks for Fusioninventory agents:
+This plugin makes GLPI to process various types of tasks for GLPI agents:
 * Computer inventory
 * Network discovery
 * Network (SNMP) inventory
 * Software deployment
 * VMWare ESX host remote inventory
 * Collect data (files, Windows registry, WMI)
 
-## Third-party code
-
-* PluginFusioninventoryFindFiles() is copyright [rosettacode.org](http://rosettacode.org/wiki/Walk_a_directory/Recursively#PHP) and made available under GNU Free Documentation License.
-
 ## Third-party icons and images
 
 Some icons used in the project comes from the following set of graphics licensed:
@@ -34,6 +27,6 @@ Some icons used in the project comes from the following set of graphics licensed
 
 ## Additional resources
 
-* [Official website](http://fusioninventory.org/)
-* [Translations on transifex service](https://www.transifex.com/ddurieux/FusionInventory/content/)
-* [Issues](https://github.com/fusioninventory/fusioninventory-for-glpi)
+* [Official website](http://glpi-project.org/)
+* [Translations on transifex service](https://www.transifex.com/glpi/glpi-inventory-plugin/)
+* [Issues](https://github.com/glpi-project/glpi-inventory-plugin)

README.md

@@ -1,18 +1,17 @@
 # How to run tests
 
-
-## Install GLPI tests
+## Install GLPI and plugin
 
 ```
 cd glpi/
-php bin/console glpi:database:install --config-dir=tests --force
-php bin/console glpi:plugin:install --config-dir=tests --username=glpi fusioninventory
-php bin/console glpi:plugin:activate --config-dir=tests fusioninventory
+php bin/console glpi:database:install --config-dir=tests/config --force
+php bin/console glpi:plugin:install --config-dir=tests/config --username=glpi glpiinventory
+php bin/console glpi:plugin:activate --config-dir=tests/config glpiinventory
 ```
 
-## Run FusionInventory tests
+## Run plugin tests
 
 ```
-cd plugins/fusioninventory/
+cd plugins/glpiinventory/
 php vendor/bin/phpunit --testdox tests/
 ```

README.tests.md

@@ -1,43 +1,33 @@
 <?php
-
-/*
-   ------------------------------------------------------------------------
-   FusionInventory
-   Copyright (C) 2010-2011 by the FusionInventory Development Team.
-
-   http://www.fusioninventory.org/   http://forge.fusioninventory.org/
-   ------------------------------------------------------------------------
-
-   LICENSE
-
-   This file is part of FusionInventory project.
-
-   FusionInventory is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Affero General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   FusionInventory is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-   GNU Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with FusionInventory. If not, see <http://www.gnu.org/licenses/>.
-
-   ------------------------------------------------------------------------
-
-   @package   FusionInventory
-   @author    Walid Nouh
-   @co-author
-   @copyright Copyright (c) 2010-2011 FusionInventory team
-   @license   AGPL License 3.0 or (at your option) any later version
-              http://www.gnu.org/licenses/agpl-3.0-standalone.html
-   @link      http://www.fusioninventory.org/
-   @link      http://forge.fusioninventory.org/projects/fusioninventory-for-glpi/
-   @since     2010
-
-   ------------------------------------------------------------------------
+/**
+ * ---------------------------------------------------------------------
+ * GLPI Inventory Plugin
+ * Copyright (C) 2021 Teclib' and contributors.
+ *
+ * http://glpi-project.org
+ *
+ * based on FusionInventory for GLPI
+ * Copyright (C) 2010-2021 by the FusionInventory Development Team.
+ *
+ * ---------------------------------------------------------------------
+ *
+ * LICENSE
+ *
+ * This file is part of GLPI Inventory Plugin.
+ *
+ * GLPI Inventory Plugin is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GLPI Inventoruy Plugin is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with GLPI Inventory Plugin. If not, see <https://www.gnu.org/licenses/>.
+ * ---------------------------------------------------------------------
  */
 
 include ("../../../inc/includes.php");
@@ -47,9 +37,9 @@
 Html::header_nocache();
 
 if (isset($_REQUEST['jobstate_id'])) {
-   $jobstate = new PluginFusioninventoryTaskjobstate();
+   $jobstate = new PluginGlpiinventoryTaskjobstate();
    $jobstate->getFromDB($_REQUEST['jobstate_id']);
 
-   $job = new PluginFusioninventoryTaskjob();
-   $job->delete(['id' => $jobstate->fields['plugin_fusioninventory_taskjobs_id']], true);
+   $job = new PluginGlpiinventoryTaskjob();
+   $job->delete(['id' => $jobstate->fields['plugin_glpiinventory_taskjobs_id']], true);
 }