stable

Clone or download

Read-only

request #11172 Run phpunit tests with php7

The main reason to switch to phpunit is php7 so better have them run by php7 as early as possible. In order to do that some adjustement were needed on usage of old constructors. The injectDependencies methods got removed as well because it's just useless and its signature was de-facto incompatible (now an error in php7). Also had to do some dirty fixes with globals due to recent addition of globals check in phpunit config. Change-Id: I5cf766cdd75bc3373f2925a3ef35838ecf16c25c

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