fix(*): code style, drop compatibility with PHP 5.5 and official GLPI…

… 9.1.x cannot longer test against PHP 5.5 due to dependency problems with composer; project depends on features in GLPI 9.2 only, support on GLPI 9.1.x backports excluding official 9.1.x version; update locales
flyve-mdm · Mar 3, 2017 · 9c7c826 · 9c7c826
1 parent b80942f
commit 9c7c826
Show file tree

Hide file tree

Showing 30 changed files with 3,163 additions and 1,348 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - '5.5'
   - '5.6'
   - '7.0'
 
@@ -10,7 +9,6 @@ env:
     - FUSION_SOURCE="https://github.com/fusioninventory/fusioninventory-for-glpi -b glpi9.1+1.1"
   matrix:
     - GLPI_SOURCE="https://github.com/flyve-mdm/glpi -b 9.1.2-backport"
-    - GLPI_SOURCE="https://github.com/glpi-project/glpi -b 9.1/bugfixes"
     - GLPI_SOURCE="https://github.com/glpi-project/glpi -b master"
 
 before_script:
@@ -29,7 +27,7 @@ script:
   - cd plugins/flyvemdm
   - php -S localhost:8088 -t ../.. ../../tests/router.php &>/dev/null &
   - vendor/bin/phpunit --verbose
-  - vendor/bin/phpcs -p --standard=vendor/glpi-project/coding-standard/GlpiStandard/ *.php install/ inc/ front/ ajax/ tests/
+  - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.0" ]]; then vendor/bin/phpcs -p --standard=vendor/glpi-project/coding-standard/GlpiStandard/ *.php install/ inc/ front/ ajax/ tests/; fi
 
 notifications:
   webhooks: https://fathomless-fjord-24024.herokuapp.com/notify
diff --git a/ajax/getGraph.php b/ajax/getGraph.php
@@ -31,7 +31,7 @@
 
 include ('../../../inc/includes.php');
 $plugin = new Plugin();
-if(!$plugin->isActivated('flyvemdm')) {
+if (!$plugin->isActivated('flyvemdm')) {
    Html::displayNotFoundError();
 }
 

diff --git a/ajax/policyValue.php b/ajax/policyValue.php
@@ -31,7 +31,7 @@
 
 include ('../../../inc/includes.php');
 $plugin = new Plugin();
-if(!$plugin->isActivated('flyvemdm')) {
+if (!$plugin->isActivated('flyvemdm')) {
    Html::displayNotFoundError();
 }
 

diff --git a/composer.json b/composer.json
@@ -5,6 +5,7 @@
     "licence": "AGPLv3+",
     "keywords": ["glpi", "flyve", "mdm"],
     "require": {
+        "php": ">= 5.6.0",
         "ext-gd": "*",
         "ext-zip": "*",
         "ext-openssl": "*",
@@ -20,7 +21,8 @@
         "glpi-project/coding-standard": "^0.5.0",
         "phpunit/phpunit": "^4.8 || ^5.7",
         "flyve-mdm/test": "dev-master",
-        "consolidation/robo": "dev-master"
+        "consolidation/robo": "dev-master",
+        "glpi-project/tools": "^0.1.2"
     },
     "repositories": [
     {

diff --git a/composer.lock b/composer.lock
diff --git a/front/agent.form.php b/front/agent.form.php
@@ -31,7 +31,7 @@
 
 include ('../../../inc/includes.php');
 $plugin = new Plugin();
-if(!$plugin->isActivated('flyvemdm')) {
+if (!$plugin->isActivated('flyvemdm')) {
    Html::displayNotFoundError();
 }
 

diff --git a/front/agent.php b/front/agent.php
@@ -31,7 +31,7 @@
 
 include ('../../../inc/includes.php');
 $plugin = new Plugin();
-if(!$plugin->isActivated('flyvemdm')) {
+if (!$plugin->isActivated('flyvemdm')) {
    Html::displayNotFoundError();
 }
 

diff --git a/front/config.form.php b/front/config.form.php
@@ -31,7 +31,7 @@
 
 include ('../../../inc/includes.php');
 $plugin = new Plugin();
-if(!$plugin->isActivated('flyvemdm')) {
+if (!$plugin->isActivated('flyvemdm')) {
    Html::displayNotFoundError();
 }
 

diff --git a/front/file.form.php b/front/file.form.php
@@ -31,7 +31,7 @@
 
 include ('../../../inc/includes.php');
 $plugin = new Plugin();
-if(!$plugin->isActivated('flyvemdm')) {
+if (!$plugin->isActivated('flyvemdm')) {
    Html::displayNotFoundError();
 }
 

diff --git a/front/file.php b/front/file.php
@@ -31,7 +31,7 @@
 
 include ('../../../inc/includes.php');
 $plugin = new Plugin();
-if(!$plugin->isActivated('flyvemdm')) {
+if (!$plugin->isActivated('flyvemdm')) {
    Html::displayNotFoundError();
 }
 

diff --git a/front/fleet.form.php b/front/fleet.form.php
@@ -31,7 +31,7 @@
 
 include ('../../../inc/includes.php');
 $plugin = new Plugin();
-if(!$plugin->isActivated('flyvemdm')) {
+if (!$plugin->isActivated('flyvemdm')) {
    Html::displayNotFoundError();
 }
 Session::checkRight("flyvemdm:flyvemdm", PluginFlyvemdmProfile::RIGHT_FLYVEMDM_USE);

diff --git a/front/fleet_policy.form.php b/front/fleet_policy.form.php
@@ -31,7 +31,7 @@
 
 include ('../../../inc/includes.php');
 $plugin = new Plugin();
-if(!$plugin->isActivated('flyvemdm')) {
+if (!$plugin->isActivated('flyvemdm')) {
    Html::displayNotFoundError();
 }
 Session::checkRight("flyvemdm:flyvemdm", PluginFlyvemdmProfile::RIGHT_FLYVEMDM_USE);
@@ -51,7 +51,5 @@
    $_POST = $fleet_policy->preprocessInput($_POST);
    $fleet_policy->add($_POST);
    Html::back();
-} else if (isset($_POST['delete_items'])) {
-
 }
 Html::back();
diff --git a/front/invitation.form.php b/front/invitation.form.php
@@ -31,7 +31,7 @@
 
 include ('../../../inc/includes.php');
 $plugin = new Plugin();
-if(!$plugin->isActivated('flyvemdm')) {
+if (!$plugin->isActivated('flyvemdm')) {
    Html::displayNotFoundError();
 }
 

diff --git a/front/invitation.php b/front/invitation.php
@@ -31,7 +31,7 @@
 
 include ('../../../inc/includes.php');
 $plugin = new Plugin();
-if(!$plugin->isActivated('flyvemdm')) {
+if (!$plugin->isActivated('flyvemdm')) {
    Html::displayNotFoundError();
 }
 

diff --git a/front/menu.php b/front/menu.php
@@ -31,7 +31,7 @@
 
 include ("../../../inc/includes.php");
 $plugin = new Plugin();
-if(!$plugin->isActivated('flyvemdm')) {
+if (!$plugin->isActivated('flyvemdm')) {
    Html::displayNotFoundError();
 }
 

diff --git a/front/package.php b/front/package.php
@@ -31,7 +31,7 @@
 
 include ('../../../inc/includes.php');
 $plugin = new Plugin();
-if(!$plugin->isActivated('flyvemdm')) {
+if (!$plugin->isActivated('flyvemdm')) {
    Html::displayNotFoundError();
 }
 

diff --git a/inc/agent.class.php b/inc/agent.class.php
@@ -128,7 +128,7 @@ function getTabNameForItem(CommonGLPI $item, $withtemplate=0) {
                   return self::createTabEntry(self::getTypeName(1), $nb);
                }
                break;
-          }
+         }
       }
    }
 

diff --git a/inc/fleet_policy.class.php b/inc/fleet_policy.class.php
@@ -563,7 +563,7 @@ static function showForFleet(CommonDBTM $item, $withtemplate='') {
 
       // add needed data for display
       $factory = new PluginFlyvemdmPolicyFactory();
-      foreach($appliedPolicies as $id => &$appliedPolicy) {
+      foreach ($appliedPolicies as $id => &$appliedPolicy) {
          $appliedPolicy['checkbox']   = Html::getMassiveActionCheckBox(__CLASS__, $id);
          $appliedPolicy['policyName'] = $policies[$appliedPolicy['plugin_flyvemdm_policies_id']]['name'];
          $policyItem = $factory->createFromDBByID($appliedPolicy['plugin_flyvemdm_policies_id']);

diff --git a/inc/graph.class.php b/inc/graph.class.php
@@ -106,19 +106,19 @@ public function showDevicesPerOSVersion() {
          while ($row = $DB->fetch_assoc($result)) {
             $osNames[$row['operatingsystem']] = $row['operatingsystem'];
             $versionNames[$row['version']] = $row['version'];
-            $labels[] = $row['operatingsystem'] /*. ' ' . $row['version']*/;
+            $labels[] = $row['operatingsystem']; /*. ' ' . $row['version']*/
             $versionPerOS[$row['version']][$row['operatingsystem']] = $row['cpt'];
          }
-         foreach($osNames as $osName) {
-            foreach($versionNames as $versionName) {
+         foreach ($osNames as $osName) {
+            foreach ($versionNames as $versionName) {
                if (!isset($versionPerOS[$versionName][$osName])) {
                   $versionPerOS[$versionName][$osName] = '0';
                }
             }
          }
          ksort($versionPerOS);
          $series = [];
-         foreach($versionPerOS as $osName => $serie) {
+         foreach ($versionPerOS as $osName => $serie) {
             ksort($serie);
             $series[] = [
                   'name'   => $osName,

diff --git a/inc/invitation.class.php b/inc/invitation.class.php
@@ -387,7 +387,6 @@ public function showForm($ID, $options = array()) {
       $this->initForm($ID, $options);
       $this->showFormHeader();
 
-
    }
 
    protected function showMassiveActionInviteUser() {