use modern phpunit (#1787)

* use modern phpunit * run CS only against PHP 7.1
glpi-project · Feb 8, 2017 · 1df387e · 1df387e
1 parent 7c8f92a
commit 1df387e
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,15 +10,17 @@ env:
 
 before_script:
   - composer self-update
-  - composer install -o
+  - sed -e '/"php":/d' -i composer.json
+  - rm -f composer.lock
+  - composer install --optimize-autoloader
   - mysql -u root -e 'create database glpitest;'
   - php tools/cliinstall.php --db=glpitest --user=root --tests
   - php -S localhost:8088 tests/router.php &>/dev/null &
 
 script:
   - mysql -u root -e 'select version();'
   - vendor/bin/phpunit --verbose
-  - vendor/bin/phpcs -p --standard=vendor/glpi-project/coding-standard/GlpiStandard/ --ignore=/vendor/,/plugins/,/files/,/lib/,/config/,/tests/config ./
+  - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.1" ]]; then vendor/bin/phpcs -p --standard=vendor/glpi-project/coding-standard/GlpiStandard/ --ignore=/vendor/,/plugins/,/files/,/lib/,/config/,/tests/config ./; fi
 
 #note: default maria version is 5.5 for all main php versions list exept nightly
 matrix:

diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
         "consolidation/robo": "^1.0",
         "natxet/CssMin": "^3.0",
         "patchwork/jsqueeze": "^2.0",
-        "phpunit/phpunit": "^5.7"
+        "phpunit/phpunit": "^5.7 || ^6.0"
     },
     "suggest": {
         "ext-ldap": "Used ot provide LDAP authentication and synchronization",

diff --git a/inc/commonitilvalidation.class.php b/inc/commonitilvalidation.class.php
@@ -1266,7 +1266,7 @@ static function getSpecificValueToSelect($field, $name='', $values='', array $op
    function getRights($interface='central') {
 
       $values = parent::getRights();
-      unset($values[UPDATE],  $values[READ]);
+      unset($values[UPDATE], $values[READ]);
 
       $values[self::VALIDATE]  = __('Validate');
 

diff --git a/inc/search.class.php b/inc/search.class.php
@@ -2284,7 +2284,7 @@ static function addSelect($itemtype, $ID, $num, $meta=0, $meta_type=0) {
       if ($plug = isPluginItemType($itemtype)) {
          $function = 'plugin_'.$plug['plugin'].'_addSelect';
          if (function_exists($function)) {
-            $out = $function($itemtype,$ID,$num);
+            $out = $function($itemtype, $ID, $num);
             if (!empty($out)) {
                return $out;
             }
@@ -4731,7 +4731,7 @@ static function giveItem($itemtype, $ID, array $data, $num, $meta=0,
                $plug     = $matches[1];
                $function = 'plugin_'.$plug.'_giveItem';
                if (function_exists($function)) {
-                  $out = $function($itemtype,$ID,$data,$num);
+                  $out = $function($itemtype, $ID, $data, $num);
                   if (!empty($out)) {
                      return $out;
                   }

diff --git a/tests/API/APIBaseClass.php b/tests/API/APIBaseClass.php
@@ -26,7 +26,7 @@
  --------------------------------------------------------------------------
  */
 
-abstract class APIBaseClass extends PHPUnit_Framework_TestCase {
+abstract class APIBaseClass extends PHPUnit\Framework\TestCase {
    abstract protected function query($resource      = "",
                                      $params        = [],
                                      $expected_code = 200);
@@ -1039,4 +1039,4 @@ protected function checkEmptyContentRange($data, $headers) {
       $this->assertEquals(0, $data['totalcount']);
       $this->assertArrayNotHasKey('Content-Range', $headers);
    }
-}
+}
diff --git a/tests/DbTestCase.php b/tests/DbTestCase.php
@@ -32,7 +32,7 @@
 
 // Generic test classe, to be extended for CommonDBTM Object
 
-class DbTestCase extends PHPUnit_Framework_TestCase {
+class DbTestCase extends PHPUnit\Framework\TestCase {
 
    protected function setUp() {
       global $DB;

diff --git a/tests/HtmlTest.php b/tests/HtmlTest.php
@@ -32,7 +32,7 @@
 
 /* Test for inc/html.class.php */
 
-class HtmlTest extends PHPUnit_Framework_TestCase {
+class HtmlTest extends PHPUnit\Framework\TestCase {
 
    /**
     * @covers Html::convDate

diff --git a/tests/SessionTest.php b/tests/SessionTest.php
@@ -32,7 +32,7 @@
 
 /* Test for inc/session.class.php */
 
-class SessionTest extends PHPUnit_Framework_TestCase {
+class SessionTest extends PHPUnit\Framework\TestCase {
 
    /**
     * @covers Session::addMessageAfterRedirect

diff --git a/tests/TicketTest.php b/tests/TicketTest.php
@@ -32,7 +32,7 @@
 
 /* Test for inc/ticket.class.php */
 
-class TicketTest extends PHPUnit_Framework_TestCase {
+class TicketTest extends PHPUnit\Framework\TestCase {
 
    public function ticketProvider() {
       return array(
@@ -150,4 +150,4 @@ protected function _testTicketUser(Ticket $ticket, $actor, $role, $notify, $alte
       }
    }
 
-}
+}
diff --git a/tests/ToolboxTest.php b/tests/ToolboxTest.php
@@ -32,7 +32,7 @@
 
 /* Test for inc/html.class.php */
 
-class ToolboxTest extends PHPUnit_Framework_TestCase {
+class ToolboxTest extends PHPUnit\Framework\TestCase {
 
    /**
     * @covers Toolbox::getRandomString