diff --git a/test/phpunit/AdminLibTest.php b/test/phpunit/AdminLibTest.php index b4002d06c91..78b42f7705e 100644 --- a/test/phpunit/AdminLibTest.php +++ b/test/phpunit/AdminLibTest.php @@ -174,7 +174,7 @@ class AdminLibTest extends PHPUnit\Framework\TestCase $result = $moduledescriptor->init(); print __METHOD__." result=".$result."\n"; - $this->assertEquals(1, $result); + $this->assertEquals(1, $result, "Enable module modExpenseReport"); $conf->setValues($db); require_once dirname(__FILE__).'/../../htdocs/core/modules/modApi.class.php'; @@ -185,7 +185,7 @@ class AdminLibTest extends PHPUnit\Framework\TestCase $result = $moduledescriptor->init(); print __METHOD__." result=".$result."\n"; - $this->assertEquals(1, $result); + $this->assertEquals(1, $result, "Enable module modAPI"); $conf->setValues($db); } } diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php index 7de77b42a88..7b9a41004f8 100644 --- a/test/phpunit/FilesLibTest.php +++ b/test/phpunit/FilesLibTest.php @@ -2,6 +2,7 @@ /* Copyright (C) 2010-2012 Laurent Destailleur * Copyright (C) 2012 Regis Houssin * Copyright (C) 2023 Alexandre Janniaux + * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,7 +37,7 @@ if (empty($user->id)) { $user->fetch(1); $user->getrights(); } -$conf->global->MAIN_DISABLE_ALL_MAILS=1; +$conf->global->MAIN_DISABLE_ALL_MAILS = 1; /** @@ -66,10 +67,10 @@ class FilesLibTest extends PHPUnit\Framework\TestCase //$this->sharedFixture global $conf,$user,$langs,$db; - $this->savconf=$conf; - $this->savuser=$user; - $this->savlangs=$langs; - $this->savdb=$db; + $this->savconf = $conf; + $this->savuser = $user; + $this->savlangs = $langs; + $this->savdb = $db; print __METHOD__." db->type=".$db->type." user->id=".$user->id; //print " - db ".$db->db; @@ -110,10 +111,10 @@ class FilesLibTest extends PHPUnit\Framework\TestCase protected function setUp(): void { global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + $conf = $this->savconf; + $user = $this->savuser; + $langs = $this->savlangs; + $db = $this->savdb; print __METHOD__."\n"; } @@ -136,24 +137,24 @@ class FilesLibTest extends PHPUnit\Framework\TestCase public function testDolBasename() { global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + $conf = $this->savconf; + $user = $this->savuser; + $langs = $this->savlangs; + $db = $this->savdb; - $result=dol_basename('adir/a_file'); + $result = dol_basename('adir/a_file'); print __METHOD__." result=".$result."\n"; $this->assertEquals('a_file', $result); - $result=dol_basename('adir/a_file/'); + $result = dol_basename('adir/a_file/'); print __METHOD__." result=".$result."\n"; $this->assertEquals('a_file', $result); - $result=dol_basename('adir/νεο'); // With cyrillic data. Here basename fails to return correct value + $result = dol_basename('adir/νεο'); // With cyrillic data. Here basename fails to return correct value print __METHOD__." result=".$result."\n"; $this->assertEquals('νεο', $result); - $result=dol_basename('adir/νεο/'); // With cyrillic data. Here basename fails to return correct value + $result = dol_basename('adir/νεο/'); // With cyrillic data. Here basename fails to return correct value print __METHOD__." result=".$result."\n"; $this->assertEquals('νεο', $result); } @@ -167,13 +168,13 @@ class FilesLibTest extends PHPUnit\Framework\TestCase public function testDolCountNbOfLine() { global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + $conf = $this->savconf; + $user = $this->savuser; + $langs = $this->savlangs; + $db = $this->savdb; - $file=dirname(__FILE__).'/Example_import_company_1.csv'; - $result=dol_count_nb_of_line($file); + $file = dirname(__FILE__).'/Example_import_company_1.csv'; + $result = dol_count_nb_of_line($file); print __METHOD__." result=".$result."\n"; $this->assertEquals(3, $result); @@ -188,18 +189,18 @@ class FilesLibTest extends PHPUnit\Framework\TestCase public function testDolIsFileDir() { global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + $conf = $this->savconf; + $user = $this->savuser; + $langs = $this->savlangs; + $db = $this->savdb; - $file=dirname(__FILE__).'/Example_import_company_1.csv'; + $file = dirname(__FILE__).'/Example_import_company_1.csv'; - $result=dol_is_file($file); + $result = dol_is_file($file); print __METHOD__." result=".$result."\n"; $this->assertTrue($result); - $result=dol_is_dir($file); + $result = dol_is_dir($file); print __METHOD__." result=".$result."\n"; $this->assertFalse($result); @@ -214,23 +215,23 @@ class FilesLibTest extends PHPUnit\Framework\TestCase public function testDolOther() { global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + $conf = $this->savconf; + $user = $this->savuser; + $langs = $this->savlangs; + $db = $this->savdb; - $url='http://www.dolibarr.org'; - $result=dol_is_url($url); + $url = 'http://www.dolibarr.org'; + $result = dol_is_url($url); print __METHOD__." result=".$result."\n"; $this->assertTrue($result); - $url='https://www.dolibarr.org'; - $result=dol_is_url($url); + $url = 'https://www.dolibarr.org'; + $result = dol_is_url($url); print __METHOD__." result=".$result."\n"; $this->assertTrue($result); - $url='file://www.dolibarr.org/download/file.zip'; - $result=dol_is_url($url); + $url = 'file://www.dolibarr.org/download/file.zip'; + $result = dol_is_url($url); print __METHOD__." result=".$result."\n"; $this->assertTrue($result); @@ -245,40 +246,40 @@ class FilesLibTest extends PHPUnit\Framework\TestCase public function testDolMimeType() { global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + $conf = $this->savconf; + $user = $this->savuser; + $langs = $this->savlangs; + $db = $this->savdb; // file.png - $result=dol_mimetype('file.png', '', 0); + $result = dol_mimetype('file.png', '', 0); $this->assertEquals('image/png', $result); - $result=dol_mimetype('file.png', '', 1); + $result = dol_mimetype('file.png', '', 1); $this->assertEquals('png', $result); - $result=dol_mimetype('file.png', '', 2); + $result = dol_mimetype('file.png', '', 2); $this->assertEquals('image.png', $result); - $result=dol_mimetype('file.png', '', 3); + $result = dol_mimetype('file.png', '', 3); $this->assertEquals('', $result); // file.odt - $result=dol_mimetype('file.odt', '', 0); + $result = dol_mimetype('file.odt', '', 0); $this->assertEquals('application/vnd.oasis.opendocument.text', $result); - $result=dol_mimetype('file.odt', '', 1); + $result = dol_mimetype('file.odt', '', 1); $this->assertEquals('vnd.oasis.opendocument.text', $result); - $result=dol_mimetype('file.odt', '', 2); + $result = dol_mimetype('file.odt', '', 2); $this->assertEquals('ooffice.png', $result); - $result=dol_mimetype('file.odt', '', 3); + $result = dol_mimetype('file.odt', '', 3); $this->assertEquals('', $result); // file.php - $result=dol_mimetype('file.php', '', 0); + $result = dol_mimetype('file.php', '', 0); $this->assertEquals('text/plain', $result); - $result=dol_mimetype('file.php', '', 1); + $result = dol_mimetype('file.php', '', 1); $this->assertEquals('plain', $result); - $result=dol_mimetype('file.php', '', 2); + $result = dol_mimetype('file.php', '', 2); $this->assertEquals('php.png', $result); - $result=dol_mimetype('file.php', '', 3); + $result = dol_mimetype('file.php', '', 3); $this->assertEquals('php', $result); // file.php.noexe - $result=dol_mimetype('file.php.noexe', '', 0); + $result = dol_mimetype('file.php.noexe', '', 0); $this->assertEquals('text/plain', $result); } @@ -291,30 +292,30 @@ class FilesLibTest extends PHPUnit\Framework\TestCase public function testDolDeleteDir() { global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + $conf = $this->savconf; + $user = $this->savuser; + $langs = $this->savlangs; + $db = $this->savdb; - $dirout=$conf->admin->dir_temp.'/test'; - $dirout2=$conf->admin->dir_temp.'/test2'; + $dirout = $conf->admin->dir_temp.'/test'; + $dirout2 = $conf->admin->dir_temp.'/test2'; - $count=0; - $result=dol_delete_dir_recursive($dirout, $count); // If it has no permission to delete, it will fails as if dir does not exists, so we can't test it + $count = 0; + $result = dol_delete_dir_recursive($dirout, $count); // If it has no permission to delete, it will fails as if dir does not exists, so we can't test it print __METHOD__." result=".$result."\n"; $this->assertGreaterThanOrEqual(0, $result); - $count=0; - $countdeleted=0; - $result=dol_delete_dir_recursive($dirout, $count, 1, 0, $countdeleted); // If it has no permission to delete, it will fails as if dir does not exists, so we can't test it + $count = 0; + $countdeleted = 0; + $result = dol_delete_dir_recursive($dirout, $count, 1, 0, $countdeleted); // If it has no permission to delete, it will fails as if dir does not exists, so we can't test it print __METHOD__." result=".$result."\n"; $this->assertGreaterThanOrEqual(0, $result); $this->assertGreaterThanOrEqual(0, $countdeleted); dol_mkdir($dirout2); - $count=0; - $countdeleted=0; - $result=dol_delete_dir_recursive($dirout2, $count, 1, 0, $countdeleted); // If it has no permission to delete, it will fails as if dir does not exists, so we can't test it + $count = 0; + $countdeleted = 0; + $result = dol_delete_dir_recursive($dirout2, $count, 1, 0, $countdeleted); // If it has no permission to delete, it will fails as if dir does not exists, so we can't test it print __METHOD__." result=".$result."\n"; $this->assertGreaterThanOrEqual(1, $result); $this->assertGreaterThanOrEqual(1, $countdeleted); @@ -329,63 +330,63 @@ class FilesLibTest extends PHPUnit\Framework\TestCase public function testDolCopyMoveDelete() { global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + $conf = $this->savconf; + $user = $this->savuser; + $langs = $this->savlangs; + $db = $this->savdb; - $file=dirname(__FILE__).'/Example_import_company_1.csv'; + $file = dirname(__FILE__).'/Example_import_company_1.csv'; - $result=dol_copy($file, '/adir/that/does/not/exists/file.csv'); + $result = dol_copy($file, '/adir/that/does/not/exists/file.csv'); print __METHOD__." result=".$result."\n"; - $this->assertLessThan(0, $result, 'copy dir that does not exists'); // We should have error + $this->assertLessThan(0, $result, "$result".'copy dir that does not exists'); // We should have error - $result=dol_copy($file, $conf->admin->dir_temp.'/file.csv', 0, 1); + $result = dol_copy($file, $conf->admin->dir_temp.'/file.csv', 0, 1); print __METHOD__." result=".$result."\n"; $this->assertGreaterThanOrEqual(1, $result, 'copy file ('.$file.') into a dir that exists ('.$conf->admin->dir_temp.'/file.csv)'); // Should be 1 // Again to test with overwriting=0 - $result=dol_copy($file, $conf->admin->dir_temp.'/file.csv', 0, 0); + $result = dol_copy($file, $conf->admin->dir_temp.'/file.csv', 0, 0); print __METHOD__." result=".$result."\n"; $this->assertEquals(0, $result, 'copy destination already exists, no overwrite'); // Should be 0 // Again to test with overwriting=1 - $result=dol_copy($file, $conf->admin->dir_temp.'/file.csv', 0, 1); + $result = dol_copy($file, $conf->admin->dir_temp.'/file.csv', 0, 1); print __METHOD__." result=".$result."\n"; $this->assertGreaterThanOrEqual(1, $result, 'copy destination already exists, overwrite'); // Should be 1 // To test a move that should work - $result=dol_move($conf->admin->dir_temp.'/file.csv', $conf->admin->dir_temp.'/file2.csv', 0, 1); + $result = dol_move($conf->admin->dir_temp.'/file.csv', $conf->admin->dir_temp.'/file2.csv', 0, 1); print __METHOD__." result=".$result."\n"; $this->assertTrue($result, 'move with default mask'); // To test a move that should work with forced mask - $result=dol_move($conf->admin->dir_temp.'/file2.csv', $conf->admin->dir_temp.'/file3.csv', '0754', 1); // file should be rwxr-wr-- + $result = dol_move($conf->admin->dir_temp.'/file2.csv', $conf->admin->dir_temp.'/file3.csv', '0754', 1); // file should be rwxr-wr-- print __METHOD__." result=".$result."\n"; $this->assertTrue($result, 'move with forced mask'); // To test a delete that should success - $result=dol_delete_file($conf->admin->dir_temp.'/file3.csv'); + $result = dol_delete_file($conf->admin->dir_temp.'/file3.csv'); print __METHOD__." result=".$result."\n"; $this->assertTrue($result, 'delete file'); // Again to test there is error when deleting a non existing file with option disableglob - $result=dol_delete_file($conf->admin->dir_temp.'/file3.csv', 1, 1); + $result = dol_delete_file($conf->admin->dir_temp.'/file3.csv', 1, 1); print __METHOD__." result=".$result."\n"; $this->assertFalse($result, 'delete file that does not exists with disableglo must return ko'); // Again to test there is no error when deleting a non existing file without option disableglob - $result=dol_delete_file($conf->admin->dir_temp.'/file3csv', 0, 1); + $result = dol_delete_file($conf->admin->dir_temp.'/file3csv', 0, 1); print __METHOD__." result=".$result."\n"; $this->assertTrue($result, 'delete file that does not exists without disabling glob must return ok'); // Test copy with special char / delete with blob - $result=dol_copy($file, $conf->admin->dir_temp.'/file with [x] and é.csv', 0, 1); + $result = dol_copy($file, $conf->admin->dir_temp.'/file with [x] and é.csv', 0, 1); print __METHOD__." result=".$result."\n"; $this->assertGreaterThanOrEqual(1, $result, 'copy file with special chars, overwrite'); // Should be 1 // Try to delete using a glob criteria - $result=dol_delete_file($conf->admin->dir_temp.'/file with [x]*é.csv'); + $result = dol_delete_file($conf->admin->dir_temp.'/file with [x]*é.csv'); print __METHOD__." result=".$result."\n"; $this->assertTrue($result, 'delete file using glob'); } @@ -398,38 +399,38 @@ class FilesLibTest extends PHPUnit\Framework\TestCase public function testDolCompressUnCompress() { global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + $conf = $this->savconf; + $user = $this->savuser; + $langs = $this->savlangs; + $db = $this->savdb; // Format zip print "\n"; print 'testDolCompressUnCompress zip'."\n"; - $format='zip'; - $filein=dirname(__FILE__).'/Example_import_company_1.csv'; - $fileout=$conf->admin->dir_temp.'/test.'.$format; - $dirout=$conf->admin->dir_temp.'/testdir'.$format; + $format = 'zip'; + $filein = dirname(__FILE__).'/Example_import_company_1.csv'; + $fileout = $conf->admin->dir_temp.'/test.'.$format; + $dirout = $conf->admin->dir_temp.'/testdir'.$format; dol_delete_file($fileout); - $count=0; + $count = 0; dol_delete_dir_recursive($dirout, $count, 1); $errorstring = ''; dol_mkdir($conf->admin->dir_temp); - $conf->global->MAIN_ENABLE_LOG_TO_HTML=1; + $conf->global->MAIN_ENABLE_LOG_TO_HTML = 1; $conf->modules['syslog'] = 'syslog'; - $_REQUEST['logtohtml']=1; - $conf->logbuffer=array(); + $_REQUEST['logtohtml'] = 1; + $conf->logbuffer = array(); - $result=dol_compress_file($filein, $fileout, $format, $errorstring); + $result = dol_compress_file($filein, $fileout, $format, $errorstring); print __METHOD__." compress result=".$result."\n"; print join(', ', $conf->logbuffer); $this->assertGreaterThanOrEqual(1, $result, "Pb with dol_compress_file on ".$filein." into ".$fileout." : ".$errorstring); - $result=dol_uncompress($fileout, $dirout); + $result = dol_uncompress($fileout, $dirout); print __METHOD__." uncompress result=".join(',', $result)."\n"; print join(', ', $conf->logbuffer); $this->assertEquals(0, count($result), "Pb with dol_uncompress_file of file ".$fileout); @@ -438,29 +439,29 @@ class FilesLibTest extends PHPUnit\Framework\TestCase print "\n"; print 'testDolCompressUnCompress gz'."\n"; - $format='gz'; - $filein=dirname(__FILE__).'/Example_import_company_1.csv'; - $fileout=$conf->admin->dir_temp.'/test.'.$format; - $dirout=$conf->admin->dir_temp.'/testdir'.$format; + $format = 'gz'; + $filein = dirname(__FILE__).'/Example_import_company_1.csv'; + $fileout = $conf->admin->dir_temp.'/test.'.$format; + $dirout = $conf->admin->dir_temp.'/testdir'.$format; dol_delete_file($fileout); - $count=0; + $count = 0; dol_delete_dir_recursive($dirout, $count, 1); $errorstring = ''; dol_mkdir($conf->admin->dir_temp); - $conf->global->MAIN_ENABLE_LOG_TO_HTML=1; + $conf->global->MAIN_ENABLE_LOG_TO_HTML = 1; $conf->modules['syslog'] = 'syslog'; - $_REQUEST['logtohtml']=1; - $conf->logbuffer=array(); + $_REQUEST['logtohtml'] = 1; + $conf->logbuffer = array(); - $result=dol_compress_file($filein, $fileout, $format, $errorstring); + $result = dol_compress_file($filein, $fileout, $format, $errorstring); print __METHOD__." compress result=".$result."\n"; print join(', ', $conf->logbuffer); $this->assertGreaterThanOrEqual(1, $result, "Pb with dol_compress_file on ".$filein." into ".$fileout." : ".$errorstring); - $result=dol_uncompress($fileout, $dirout); + $result = dol_uncompress($fileout, $dirout); print __METHOD__." uncompress result=".join(',', $result)."\n"; print join(', ', $conf->logbuffer); $this->assertEquals(0, count($result), "Pb with dol_uncompress_file of file ".$fileout); @@ -472,7 +473,7 @@ class FilesLibTest extends PHPUnit\Framework\TestCase if (preg_match($excludefiles, 'a/temp/b')) { echo '----- Regex OK -----'."\n"; } - $result=dol_compress_dir($dirout, $conf->admin->dir_temp.'/testcompressdirzip.zip', 'zip', $excludefiles); + $result = dol_compress_dir($dirout, $conf->admin->dir_temp.'/testcompressdirzip.zip', 'zip', $excludefiles); print __METHOD__." dol_compress_dir result=".$result."\n"; print join(', ', $conf->logbuffer); $this->assertGreaterThanOrEqual(1, $result, "Pb with dol_compress_dir of ".$dirout." into ".$conf->admin->dir_temp.'/testdir.zip'); @@ -486,10 +487,10 @@ class FilesLibTest extends PHPUnit\Framework\TestCase public function testDolCheckSecureAccessDocument() { global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + $conf = $this->savconf; + $user = $this->savuser; + $langs = $this->savlangs; + $db = $this->savdb; //$dummyuser=new User($db); //$result=restrictedArea($dummyuser,'societe'); @@ -505,41 +506,41 @@ class FilesLibTest extends PHPUnit\Framework\TestCase // Check access to SPECIMEN $user->rights->facture->lire = 0; $user->rights->facture->creer = 0; - $filename='SPECIMEN.pdf'; // Filename relative to module part - $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'read'); - $this->assertEquals(1, $result['accessallowed']); + $filename = 'SPECIMEN.pdf'; // Filename relative to module part + $result = dol_check_secure_access_document('facture', $filename, 0, '', '', 'read'); + $this->assertEquals(1, $result['accessallowed'], "Check access allowed to '$filename'".json_encode($result)); // Check read permission $user->rights->facture->lire = 1; $user->rights->facture->creer = 1; - $filename='FA010101/FA010101.pdf'; // Filename relative to module part - $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'read'); - $this->assertEquals(1, $result['accessallowed']); + $filename = 'FA010101/FA010101.pdf'; // Filename relative to module part + $result = dol_check_secure_access_document('facture', $filename, 0, '', '', 'read'); + $this->assertEquals(1, $result['accessallowed'], "Check access allowed to '$filename'".json_encode($result)); $user->rights->facture->lire = 0; $user->rights->facture->creer = 0; - $filename='FA010101/FA010101.pdf'; // Filename relative to module part - $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'read'); - $this->assertEquals(0, $result['accessallowed']); + $filename = 'FA010101/FA010101.pdf'; // Filename relative to module part + $result = dol_check_secure_access_document('facture', $filename, 0, '', '', 'read'); + $this->assertEquals(0, $result['accessallowed'], "Check access denied to '$filename':".json_encode($result)); // Check write permission $user->rights->facture->lire = 0; $user->rights->facture->creer = 0; - $filename='FA010101/FA010101.pdf'; // Filename relative to module part - $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write'); + $filename = 'FA010101/FA010101.pdf'; // Filename relative to module part + $result = dol_check_secure_access_document('facture', $filename, 0, '', '', 'write'); $this->assertEquals(0, $result['accessallowed']); $user->rights->facture->lire = 1; $user->rights->facture->creer = 1; - $filename='FA010101/FA010101.pdf'; // Filename relative to module part - $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write'); + $filename = 'FA010101/FA010101.pdf'; // Filename relative to module part + $result = dol_check_secure_access_document('facture', $filename, 0, '', '', 'write'); $this->assertEquals(1, $result['accessallowed']); $user->rights->facture->lire = 1; $user->rights->facture->creer = 0; - $filename='FA010101/FA010101.pdf'; // Filename relative to module part - $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write'); + $filename = 'FA010101/FA010101.pdf'; // Filename relative to module part + $result = dol_check_secure_access_document('facture', $filename, 0, '', '', 'write'); $this->assertEquals(0, $result['accessallowed']); @@ -556,30 +557,30 @@ class FilesLibTest extends PHPUnit\Framework\TestCase public function testDolDirMove() { global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + $conf = $this->savconf; + $user = $this->savuser; + $langs = $this->savlangs; + $db = $this->savdb; // To test a move of empty directory that should work $dirsrcpath = $conf->admin->dir_temp.'/directory'; $dirdestpath = $conf->admin->dir_temp.'/directory2'; - $file=dirname(__FILE__).'/Example_import_company_1.csv'; + $file = dirname(__FILE__).'/Example_import_company_1.csv'; dol_mkdir($dirsrcpath); dol_delete_dir_recursive($dirdestpath, 0, 1); - $result=dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1); + $result = dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1); print __METHOD__." result=".$result."\n"; $this->assertTrue($result, 'move of directory with empty directory'); // To test a move on existing directory with overwrite dol_mkdir($dirsrcpath); - $result=dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1); + $result = dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1); print __METHOD__." result=".$result."\n"; - $this->assertTrue($result, 'move of directory on existing directory with empty directory'); + $this->assertTrue($result, "move of directory on existing directory with empty directory"); // To test a move on existing directory without overwrite dol_mkdir($dirsrcpath); - $result=dol_move_dir($dirsrcpath, $dirdestpath, 0, 1, 1); + $result = dol_move_dir($dirsrcpath, $dirdestpath, 0, 1, 1); print __METHOD__." result=".$result."\n"; $this->assertFalse($result, 'move of directory on existing directory without overwrite'); @@ -587,7 +588,7 @@ class FilesLibTest extends PHPUnit\Framework\TestCase dol_mkdir($dirsrcpath); dol_delete_dir_recursive($dirdestpath, 0, 1); dol_copy($file, $dirsrcpath.'/directory_file.csv'); - $result=dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1); + $result = dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1); print __METHOD__." result=".$result."\n"; $this->assertTrue($result, 'move of directory with file in directory'); @@ -595,7 +596,7 @@ class FilesLibTest extends PHPUnit\Framework\TestCase dol_mkdir($dirsrcpath); dol_delete_dir_recursive($dirdestpath, 0, 1); dol_copy($file, $dirsrcpath.'/file.csv'); - $result=dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1); + $result = dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1); print __METHOD__." result=".$result."\n"; $this->assertTrue($result, 'move of directory with file without rename needed in directory'); @@ -603,7 +604,7 @@ class FilesLibTest extends PHPUnit\Framework\TestCase dol_mkdir($dirsrcpath); dol_delete_dir_recursive($dirdestpath, 0, 1); dol_mkdir($dirsrcpath.'/directory'); - $result=dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1); + $result = dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1); print __METHOD__." result=".$result."\n"; $this->assertTrue($result, 'move of directory with file with rename needed in directory'); @@ -611,7 +612,7 @@ class FilesLibTest extends PHPUnit\Framework\TestCase dol_mkdir($dirsrcpath); dol_delete_dir_recursive($dirdestpath, 0, 1); dol_mkdir($dirsrcpath.'/notorename'); - $result=dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1); + $result = dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1); print __METHOD__." result=".$result."\n"; $this->assertTrue($result, 'move of directory with directory without rename needed in directory'); }