Completed
Pull Request — master (#26)
by Lars
10:03
created
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/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.
cron/bounceanalyze.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -2,8 +2,8 @@
 block discarded – undo
2 2
 require 'common.php';
3 3
 
4 4
 $mail = new Zend_Mail_Storage_Imap(array('host'     => 'xxx',
5
-                                         'user'     => 'xxx',
6
-                                         'password' => 'xxx'));
5
+                                            'user'     => 'xxx',
6
+                                            'password' => 'xxx'));
7 7
 
8 8
 $analyzer = new Intraface_modules_newsletter_BounceAnalyzer;
9 9
 
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.
src/Intraface/Controller/TestLogin.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -47,6 +47,10 @@
 block discarded – undo
47 47
         return $this->render();
48 48
     }
49 49
 
50
+    /**
51
+     * @param string $username
52
+     * @param string $password
53
+     */
50 54
     protected function selectUser($username, $password)
51 55
     {
52 56
         $adapter = new Intraface_Auth_User($this->mdb2, $this->session()->sessionId(), $username, $password);
Please login to merge, or discard this patch.
src/Intraface/modules/administration/UserAdministration.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -14,6 +14,9 @@
 block discarded – undo
14 14
  */
15 15
 class UserAdministration extends Intraface_User
16 16
 {
17
+    /**
18
+     * @param integer $id
19
+     */
17 20
     function __construct($kernel, $id)
18 21
     {
19 22
         parent::__construct($id);
Please login to merge, or discard this patch.
src/Intraface/modules/cms/Navigation.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -10,6 +10,9 @@
 block discarded – undo
10 10
     private $cmspage;
11 11
     public $value;
12 12
 
13
+    /**
14
+     * @param CMS_Page $cmspage
15
+     */
13 16
     function __construct($cmspage)
14 17
     {
15 18
         $this->cmspage = $cmspage;
Please login to merge, or discard this patch.
src/Intraface/modules/cms/templatesection/Mixed.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -6,6 +6,9 @@
 block discarded – undo
6 6
  */
7 7
 class Intraface_modules_cms_templatesection_Mixed extends CMS_TemplateSection
8 8
 {
9
+    /**
10
+     * @param CMS_Template $cmspage
11
+     */
9 12
     function __construct($cmspage, $id = 0)
10 13
     {
11 14
         $this->value['type'] = 'mixed';
Please login to merge, or discard this patch.