Fix fatal error with diff class when assertEquals not same. (#2655)

Update phpunit from version 6 to version 7
fusioninventory · Sep 17, 2018 · de0dd5a · de0dd5a
1 parent 1dbd712
commit de0dd5a
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -57,6 +57,9 @@ before_install:
  - php scripts/cliupdate.php |grep -q "No migration needed." || (echo "scripts/cliupdate.php FAILED" && exit 1)
  - popd
  - ant -Dclearsavepoint='true' -Dbasedir=. -f ./glpi/plugins/fusioninventory/phpunit/build.xml composer
+ - pushd glpi/plugins/fusioninventory/phpunit/
+ - composer install
+ - popd
 
 before_script:
   - phpenv version-name | grep ^5.[34] && echo "extension=apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; true

diff --git a/phpunit/1_Unit/ComputerUpdateTest.php b/phpunit/1_Unit/ComputerUpdateTest.php
@@ -1080,7 +1080,7 @@ public function ComputerMonitor() {
           'comment'           => null,
           'serial'            => 'UBYVUTFYEIUI',
           'otherserial'       => null,
-          'size'              => '0',
+          'size'              => '0.00',
           'have_micro'        => '0',
           'have_speaker'      => '0',
           'have_subd'         => '0',

diff --git a/phpunit/bootstrap.php b/phpunit/bootstrap.php
@@ -18,6 +18,8 @@
    );
 }
 
+require FUSINV_ROOT . '/phpunit/vendor/autoload.php';
+
 $_SESSION['glpiprofiles'] = ['4' => ['entities' => 0]];
 
 $_SESSION['glpi_plugin_fusioninventory_profile']['unmanaged'] = 'w';

diff --git a/phpunit/composer.json b/phpunit/composer.json
@@ -4,7 +4,7 @@
     "license" : "AGPL-3.0",
 
     "require-dev": {
-        "phpunit/phpunit": "^5 || ^6",
+        "phpunit/phpunit": "^5 || ^6 || ^7",
         "phploc/phploc": "*",
         "pdepend/pdepend" : "1.1.0",
         "theseer/phpdox" : "*",

diff --git a/phpunit/testsuites_install.xml b/phpunit/testsuites_install.xml
@@ -4,6 +4,9 @@
   bootstrap="bootstrap.php"
   processIsolation="false"
   backupGlobals="false"
+  convertErrorsToExceptions="false"
+  convertNoticesToExceptions="false"
+  convertWarningsToExceptions="false"   
   >
   <logging>
     <log type="junit" target="../../../../build/logs/junit_install.xml" />

diff --git a/phpunit/testsuites_integration.xml b/phpunit/testsuites_integration.xml
@@ -4,6 +4,9 @@
   bootstrap="bootstrap.php"
   processIsolation="false"
   backupGlobals="false"
+  convertErrorsToExceptions="false"
+  convertNoticesToExceptions="false"
+  convertWarningsToExceptions="false"   
   >
   <logging>
     <log type="junit" target="../../../../build/logs/junit_integration.xml" />

diff --git a/phpunit/testsuites_unit.xml b/phpunit/testsuites_unit.xml
@@ -4,6 +4,9 @@
   bootstrap="bootstrap.php"
   processIsolation="false"
   backupGlobals="false"
+  convertErrorsToExceptions="false"
+  convertNoticesToExceptions="false"
+  convertWarningsToExceptions="false"   
   >
   <logging>
     <log type="junit" target="../../../../build/logs/junit_unit.xml" />

diff --git a/phpunit/testsuites_update.xml b/phpunit/testsuites_update.xml
@@ -4,6 +4,9 @@
   bootstrap="bootstrap.php"
   processIsolation="false"
   backupGlobals="false"
+  convertErrorsToExceptions="false"
+  convertNoticesToExceptions="false"
+  convertWarningsToExceptions="false"   
   >
   <logging>
     <log type="junit" target="../../../../build/logs/junit_update.xml" />
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,8 @@ @@
        );
     }
+    require FUSINV_ROOT . '/phpunit/vendor/autoload.php';
     $_SESSION['glpiprofiles'] = ['4' => ['entities' => 0]];
     $_SESSION['glpi_plugin_fusioninventory_profile']['unmanaged'] = 'w';
@@ Expand Down @@