stable

Clone or download

Read-only

Merge 'gerrit #10616' into stable/master

* commit '65fd25f65e': request #11172 Run phpunit tests with php7 Change-Id: Ifa16cfc1f404a09bd08411eae6639e829629f679

Modified Files

Name
M Makefile +15 −21 Go to diff View file
M plugins/IM/include/IMDataAccess.class.php +2 −7 Go to diff View file
M plugins/proftpd/include/ProFTPd/ServiceProFTPd.class.php +2 −2 Go to diff View file
M plugins/proftpd/phpunit/ProFTPd/SystemEvent/PROFTPD_DIRECTORY_CREATETest.php +0 −2 Go to diff View file
M plugins/proftpd/phpunit/ProFTPd/SystemEvent/PROFTPD_UPDATE_ACLTest.php +4 −12 Go to diff View file
M plugins/proftpd/phpunit/ProFTPd/Xferlog/FileImporterTest.php +2 −0 Go to diff View file
M src/common/dao/CodendiDataAccess.class.php +2 −4 Go to diff View file
M src/common/dao/include/DataAccess.class.php +7 −10 Go to diff View file
M src/common/system_event/SystemEvent.class.php +0 −10 Go to diff View file
M tests/Jenkinsfile +5 −1 Go to diff View file
M tests/phpunit/phpunit.xml +1 −1 Go to diff View file
M tests/simpletest/common/dao/include/DataAccessTest.php +5 −12 Go to diff View file