[Dolibarr-git] [Dolibarr/dolibarr] 7216b2: Fix phpunit to be compatible with new version of p...

[Laurent Destailleur]

  Branch: refs/heads/3.5
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 7216b2a84373e11536825d9afd2736a4f182fa0a
      
https://github.com/Dolibarr/dolibarr/commit/7216b2a84373e11536825d9afd2736a4f182fa0a
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-02 (Fri, 02 May 2014)

  Changed paths:
    M test/phpunit/AdherentTest.php
    M test/phpunit/AdminLibTest.php
    M test/phpunit/AllTests.php
    M test/phpunit/BankAccountTest.php
    M test/phpunit/BuildDocTest.php
    M test/phpunit/CMailFileTest.php
    M test/phpunit/CategorieTest.php
    M test/phpunit/ChargeSocialesTest.php
    M test/phpunit/CommandeFournisseurTest.php
    M test/phpunit/CommandeTest.php
    M test/phpunit/CommonObjectTest.php
    M test/phpunit/CompanyBankAccountTest.php
    M test/phpunit/ContactTest.php
    M test/phpunit/ContratTest.php
    M test/phpunit/CoreTest.php
    M test/phpunit/DateLibTest.php
    M test/phpunit/DateLibTzFranceTest.php
    M test/phpunit/DiscountTest.php
    M test/phpunit/ExportTest.php
    M test/phpunit/FactureFournisseurTest.php
    M test/phpunit/FactureRecTest.php
    M test/phpunit/FactureTest.php
    M test/phpunit/FactureTestRounding.php
    M test/phpunit/FilesLibTest.php
    M test/phpunit/FormAdminTest.php
    M test/phpunit/Functions2Test.php
    M test/phpunit/FunctionsTest.php
    M test/phpunit/HolidayTest.php
    M test/phpunit/ImagesLibTest.php
    M test/phpunit/ImportTest.php
    M test/phpunit/JsonLibTest.php
    M test/phpunit/ModulesTest.php
    M test/phpunit/NumberingModulesTest.php
    M test/phpunit/PdfDocTest.php
    M test/phpunit/PgsqlTest.php
    M test/phpunit/PricesTest.php
    M test/phpunit/ProductTest.php
    M test/phpunit/PropalTest.php
    M test/phpunit/SecurityTest.php
    M test/phpunit/SocieteTest.php
    M test/phpunit/UserGroupTest.php
    M test/phpunit/UserTest.php
    M test/phpunit/WebservicesInvoicesTest.php
    M test/phpunit/WebservicesOrdersTest.php
    M test/phpunit/WebservicesOtherTest.php
    M test/phpunit/WebservicesThirdpartyTest.php
    M test/phpunit/WebservicesUserTest.php

  Log Message:
  -----------
  Fix phpunit to be compatible with new version of phpunit


  Commit: 0e13ded641a91bdea5c85b0800f75cf1989690ef
      
https://github.com/Dolibarr/dolibarr/commit/0e13ded641a91bdea5c85b0800f75cf1989690ef
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-18 (Sun, 18 May 2014)

  Changed paths:
    M test/phpunit/CategorieTest.php
    M test/phpunit/CompanyBankAccountTest.php
    M test/phpunit/CoreTest.php
    M test/phpunit/DateLibTzFranceTest.php
    M test/phpunit/ExportTest.php
    M test/phpunit/FactureTest.php
    M test/phpunit/FactureTestRounding.php
    M test/phpunit/ImportTest.php
    M test/phpunit/JsonLibTest.php
    M test/phpunit/ModulesTest.php
    M test/phpunit/PropalTest.php
    M test/phpunit/WebservicesInvoicesTest.php
    M test/phpunit/WebservicesOrdersTest.php
    M test/phpunit/WebservicesOtherTest.php
    M test/phpunit/WebservicesThirdpartyTest.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.4' into 3.5

Conflicts:
        test/phpunit/CoreTest.php
        test/phpunit/Functions2Test.php
        test/phpunit/FunctionsTest.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/ab337c74859b...0e13ded641a9