Completed
Pull Request — master (#26)
by Lars
14:13
created
tests/unit/Filehandler/ImageHandlerTest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
 
31 31
         $data = array('file_name' => $this->file_name);
32 32
         $filehandler = new FileHandler($this->createKernel());
33
-        copy(dirname(__FILE__) . '/'.$this->file_name, PATH_UPLOAD.$this->file_name);
33
+        copy(dirname(__FILE__).'/'.$this->file_name, PATH_UPLOAD.$this->file_name);
34 34
         $filehandler->save(PATH_UPLOAD.$this->file_name, $this->file_name);
35 35
         $filehandler->load();
36 36
         $this->assertEquals('', $filehandler->error->view());
Please login to merge, or discard this patch.
tests/unit/Newsletter/NewsletterTest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
 
19 19
     function getSubscribers()
20 20
     {
21
-        for ($i = 0; $i<10000; $i++) {
21
+        for ($i = 0; $i < 10000; $i++) {
22 22
             $array[] = array(
23 23
                 'contact_id' => '1',
24 24
                 'contact_email' => '[email protected]'
Please login to merge, or discard this patch.
tests/unit/Accounting/VatPeriodTest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 
105 105
         // ganges med -1 for at f� rigtigt fortegn til udregning
106 106
         $this->value['saldo_vat_out'] = $account_vat_in->get('saldo');
107
-        $saldo_total += -1 * $this->value['saldo_vat_out']; // total
107
+        $saldo_total += -1*$this->value['saldo_vat_out']; // total
108 108
 
109 109
 
110 110
         // Moms af varek�b i udlandet
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 
116 116
         // ganges med -1 for at f� rigtigt fortegn til udregning
117 117
         $this->value['saldo_vat_abroad'] = $account_vat_abroad->get('saldo');
118
-        $saldo_total += -1 * $this->value['saldo_vat_abroad'];
118
+        $saldo_total += -1*$this->value['saldo_vat_abroad'];
119 119
 
120 120
         // K�bsmoms
121 121
         // K�bsmomsen inkluderer ogs� den udregnede moms af moms af varek�b i udlandet.
Please login to merge, or discard this patch.
tests/unit/XMLRPC/ContactXMLRPCTest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
 
23 23
     function getClient()
24 24
     {
25
-        require_once dirname(__FILE__) . '/../../../install/Install.php';
25
+        require_once dirname(__FILE__).'/../../../install/Install.php';
26 26
 
27 27
         if (!defined('SERVER_STATUS')) {
28 28
             define('SERVER_STATUS', 'TEST');
Please login to merge, or discard this patch.
tests/unit/XMLRPC/NewsletterXMLRPCTest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@
 block discarded – undo
101 101
 
102 102
     protected function getClient()
103 103
     {
104
-        require_once dirname(__FILE__) . '/../../../install/Install.php';
104
+        require_once dirname(__FILE__).'/../../../install/Install.php';
105 105
 
106 106
         if (!defined('SERVER_STATUS')) {
107 107
             define('SERVER_STATUS', 'TEST');
Please login to merge, or discard this patch.
tests/unit/CMS/CMSStubs.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
     {
13 13
         $this->cmssite = $site;
14 14
         $this->kernel = $site->kernel;
15
-        $this->dbquery = new Intraface_DBQuery($this->kernel, 'cms_page', 'cms_page.intranet_id = '.$this->kernel->intranet->get('id').' AND cms_page.active = 1 AND site_id = ' . $this->cmssite->get('id'));
15
+        $this->dbquery = new Intraface_DBQuery($this->kernel, 'cms_page', 'cms_page.intranet_id = '.$this->kernel->intranet->get('id').' AND cms_page.active = 1 AND site_id = '.$this->cmssite->get('id'));
16 16
     }
17 17
     function get()
18 18
     {
Please login to merge, or discard this patch.
tests/selenium/generate_test_suite.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-require_once dirname(__FILE__) . '/../../vendor/autoload.php';
2
+require_once dirname(__FILE__).'/../../vendor/autoload.php';
3 3
 
4 4
 $writer = new Ilib_Testing_Selenium_Selenese_TestSuiteGenerator;
5 5
 $writer->addReplacement('##path_test_root##', dirname(__FILE__));
Please login to merge, or discard this patch.
tests/unit/bootstrap.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -5,11 +5,11 @@  discard block
 block discarded – undo
5 5
 define('DB_PASS', $GLOBALS['db_password']);
6 6
 define('DB_USER', $GLOBALS['db_username']);
7 7
 define('DB_NAME', $GLOBALS['db_name']);
8
-define('DB_DSN', 'mysql://'.DB_USER.':'.DB_PASS.'@'.DB_HOST.'/' . DB_NAME);
9
-define('PATH_ROOT', dirname(__FILE__) . '/../../src/');
10
-define('PATH_INCLUDE_CONFIG', PATH_ROOT . 'Intraface/config/');
11
-define('PATH_INCLUDE_MODULE', PATH_ROOT . 'Intraface/modules/');
12
-define('PATH_INCLUDE_SHARED', PATH_ROOT . 'Intraface/shared/');
8
+define('DB_DSN', 'mysql://'.DB_USER.':'.DB_PASS.'@'.DB_HOST.'/'.DB_NAME);
9
+define('PATH_ROOT', dirname(__FILE__).'/../../src/');
10
+define('PATH_INCLUDE_CONFIG', PATH_ROOT.'Intraface/config/');
11
+define('PATH_INCLUDE_MODULE', PATH_ROOT.'Intraface/modules/');
12
+define('PATH_INCLUDE_SHARED', PATH_ROOT.'Intraface/shared/');
13 13
 define('CONNECTION_INTERNET', 'ONLINE');
14 14
 
15 15
 if (!file_exists($GLOBALS['path_upload'])) {
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 define('FILE_VIEWER', '');
22 22
 define('PATH_WWW', '');
23 23
 define('IMAGE_LIBRARY', 'GD');
24
-define('XMLRPC_SERVER_URL', 'http://privatekeyshouldbereplaced:something@' . $GLOBALS['xmlrpc_server_url']);
24
+define('XMLRPC_SERVER_URL', 'http://privatekeyshouldbereplaced:something@'.$GLOBALS['xmlrpc_server_url']);
25 25
 
26 26
 if (!file_exists($GLOBALS['test_path_temp'])) {
27 27
     mkdir($GLOBALS['test_path_temp']);
@@ -29,8 +29,8 @@  discard block
 block discarded – undo
29 29
 
30 30
 // Directory to move files to temporary in tests
31 31
 define('TEST_PATH_TEMP', $GLOBALS['test_path_temp']);
32
-require_once dirname(__FILE__) . '/../../vendor/autoload.php';
33
-set_include_path(dirname(__FILE__) . '/' . PATH_SEPARATOR . dirname(__FILE__) . '/../../vendor/intraface/error/src/' . PATH_SEPARATOR . dirname(__FILE__) . '/../../vendor/troelskn/konstrukt/lib/' . PATH_SEPARATOR . PATH_ROOT. PATH_SEPARATOR . get_include_path());
32
+require_once dirname(__FILE__).'/../../vendor/autoload.php';
33
+set_include_path(dirname(__FILE__).'/'.PATH_SEPARATOR.dirname(__FILE__).'/../../vendor/intraface/error/src/'.PATH_SEPARATOR.dirname(__FILE__).'/../../vendor/troelskn/konstrukt/lib/'.PATH_SEPARATOR.PATH_ROOT.PATH_SEPARATOR.get_include_path());
34 34
 
35 35
 $db = MDB2::singleton(DB_DSN);
36 36
 $db->setOption('debug', 0);
Please login to merge, or discard this patch.
src/Intraface/modules/administration/IntranetAdministration.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@
 block discarded – undo
65 65
     function isIdentifierUnique($identifier)
66 66
     {
67 67
         $this->db = & MDB2::singleton(DB_DSN);
68
-        $res =& $this->db->query("SELECT id FROM intranet WHERE identifier='".$this->db->escape($identifier, 'string')."' AND id != " . $this->db->escape($this->id, 'integer'));
68
+        $res = & $this->db->query("SELECT id FROM intranet WHERE identifier='".$this->db->escape($identifier, 'string')."' AND id != ".$this->db->escape($this->id, 'integer'));
69 69
         if ($res->numRows() > 0) {
70 70
             return false;
71 71
         }
Please login to merge, or discard this patch.