@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | array($this->acp_forums, 'acp_manage_forums_initialise_data'), |
| 99 | 99 | array('forum_data' => array(), 'action' => 'add') |
| 100 | 100 | ); |
| 101 | - foreach($setting_keys as $key) |
|
| 101 | + foreach ($setting_keys as $key) |
|
| 102 | 102 | { |
| 103 | 103 | $this->assertArrayHasKey($key, $data['forum_data']); |
| 104 | 104 | } |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | array($this->acp_forums, 'acp_manage_forums_initialise_data'), |
| 109 | 109 | array('forum_data' => array(), 'action' => 'add', 'update' => true) |
| 110 | 110 | ); |
| 111 | - foreach($setting_keys as $key) |
|
| 111 | + foreach ($setting_keys as $key) |
|
| 112 | 112 | { |
| 113 | 113 | $this->assertArrayNotHasKey($key, $data['forum_data']); |
| 114 | 114 | } |
@@ -169,11 +169,11 @@ discard block |
||
| 169 | 169 | ) |
| 170 | 170 | ); |
| 171 | 171 | |
| 172 | - $this->assertEquals($allow_solve[1], $data['template_data']['S_FORUM_ALLOW_SOLVE']); |
|
| 172 | + $this->assertEquals($allow_solve[1], $data['template_data']['S_FORUM_ALLOW_SOLVE']); |
|
| 173 | 173 | $this->assertEquals($allow_unsolve[1], $data['template_data']['S_FORUM_ALLOW_UNSOLVE']); |
| 174 | - $this->assertEquals($lock_solved[1], $data['template_data']['S_FORUM_LOCK_SOLVED']); |
|
| 175 | - $this->assertEquals($solve_text[1], $data['template_data']['FORUM_SOLVE_TEXT']); |
|
| 176 | - $this->assertEquals($solve_color[1], $data['template_data']['FORUM_SOLVE_COLOUR']); |
|
| 174 | + $this->assertEquals($lock_solved[1], $data['template_data']['S_FORUM_LOCK_SOLVED']); |
|
| 175 | + $this->assertEquals($solve_text[1], $data['template_data']['FORUM_SOLVE_TEXT']); |
|
| 176 | + $this->assertEquals($solve_color[1], $data['template_data']['FORUM_SOLVE_COLOUR']); |
|
| 177 | 177 | |
| 178 | 178 | $this->assertEquals('test', $data['template_data']['OUTSIDE_VALUE']); |
| 179 | 179 | } |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | array('forum_data' => array()) |
| 193 | 193 | ); |
| 194 | 194 | |
| 195 | - foreach($setting_keys as $key) |
|
| 195 | + foreach ($setting_keys as $key) |
|
| 196 | 196 | { |
| 197 | 197 | $this->assertArrayHasKey($key, $data['forum_data']); |
| 198 | 198 | } |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | public function effectively_installed() |
| 38 | 38 | { |
| 39 | 39 | return $this->db_tools->sql_column_exists( |
| 40 | - $this->table_prefix . 'topics', 'topic_solved' |
|
| 40 | + $this->table_prefix.'topics', 'topic_solved' |
|
| 41 | 41 | ); |
| 42 | 42 | } |
| 43 | 43 | |
@@ -45,14 +45,14 @@ discard block |
||
| 45 | 45 | { |
| 46 | 46 | return array( |
| 47 | 47 | 'add_columns' => array( |
| 48 | - $this->table_prefix . 'forums' => array( |
|
| 48 | + $this->table_prefix.'forums' => array( |
|
| 49 | 49 | 'forum_allow_solve' => array('TINT:1', 0), |
| 50 | 50 | 'forum_allow_unsolve' => array('TINT:1', 0), |
| 51 | 51 | 'forum_lock_solved' => array('TINT:1', 0), |
| 52 | 52 | 'forum_solve_text' => array('VCHAR:25', null), |
| 53 | 53 | 'forum_solve_color' => array('VCHAR:7', ''), |
| 54 | 54 | ), |
| 55 | - $this->table_prefix . 'topics' => array( |
|
| 55 | + $this->table_prefix.'topics' => array( |
|
| 56 | 56 | 'topic_solved' => array('UINT', 0), |
| 57 | 57 | ), |
| 58 | 58 | ), |
@@ -63,14 +63,14 @@ discard block |
||
| 63 | 63 | { |
| 64 | 64 | return array( |
| 65 | 65 | 'drop_columns' => array( |
| 66 | - $this->table_prefix . 'forums' => array( |
|
| 66 | + $this->table_prefix.'forums' => array( |
|
| 67 | 67 | 'forum_allow_solve', |
| 68 | 68 | 'forum_allow_unsolve', |
| 69 | 69 | 'forum_lock_solved', |
| 70 | 70 | 'forum_solve_text', |
| 71 | 71 | 'forum_solve_color', |
| 72 | 72 | ), |
| 73 | - $this->table_prefix . 'topics' => array( |
|
| 73 | + $this->table_prefix.'topics' => array( |
|
| 74 | 74 | 'topic_solved', |
| 75 | 75 | ), |
| 76 | 76 | ), |
@@ -39,7 +39,7 @@ |
||
| 39 | 39 | public function test_acp_forums() |
| 40 | 40 | { |
| 41 | 41 | $this->forums_manage_login(); |
| 42 | - $crawler = self::request('GET', $this->get_url() . "&f=2&sid=" . $this->sid); |
|
| 42 | + $crawler = self::request('GET', $this->get_url()."&f=2&sid=".$this->sid); |
|
| 43 | 43 | |
| 44 | 44 | // Ensure extension and ACP language was loaded. |
| 45 | 45 | $this->assertContainsLang('ALLOW_SOLVE', $crawler->text()); |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | public function getDataSet() |
| 42 | 42 | { |
| 43 | - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/main_controller.xml'); |
|
| 43 | + return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/main_controller.xml'); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | /** |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | parent::setUp(); |
| 54 | 54 | |
| 55 | 55 | // Needed for append_sid() call, normally loaded by phpBB init. |
| 56 | - require_once dirname(__FILE__) . '/../../../../../includes/functions.php'; |
|
| 56 | + require_once dirname(__FILE__).'/../../../../../includes/functions.php'; |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | /** |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | */ |
| 59 | 59 | public function getDataSet() |
| 60 | 60 | { |
| 61 | - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/topicsolved.xml'); |
|
| 61 | + return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/topicsolved.xml'); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | /** |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | parent::setUp(); |
| 39 | 39 | |
| 40 | 40 | // Normally loaded by phpBB init, but not in tests. |
| 41 | - require_once dirname(__FILE__) . '/../../../../includes/functions.php'; |
|
| 41 | + require_once dirname(__FILE__).'/../../../../includes/functions.php'; |
|
| 42 | 42 | |
| 43 | 43 | $this->container = $this->getMock('\Symfony\Component\DependencyInjection\ContainerInterface'); |
| 44 | 44 | |
@@ -64,13 +64,13 @@ discard block |
||
| 64 | 64 | array('3.1.0', false), |
| 65 | 65 | array('3.1.1', false), |
| 66 | 66 | array('3.1.1.1', false), |
| 67 | - array($req_version . '-A1', false), |
|
| 68 | - array($req_version . '-RC1', false), |
|
| 69 | - array($req_version . '-DEV', false), |
|
| 67 | + array($req_version.'-A1', false), |
|
| 68 | + array($req_version.'-RC1', false), |
|
| 69 | + array($req_version.'-DEV', false), |
|
| 70 | 70 | // Versions equal to or greater than the requirement |
| 71 | 71 | array($req_version, true), |
| 72 | - array($req_version . '-p2', true), |
|
| 73 | - array($req_version . '.1', true), |
|
| 72 | + array($req_version.'-p2', true), |
|
| 73 | + array($req_version.'.1', true), |
|
| 74 | 74 | array('3.2', true), |
| 75 | 75 | array('3.2.0', true), |
| 76 | 76 | ); |
@@ -10,7 +10,7 @@ |
||
| 10 | 10 | |
| 11 | 11 | const MINIMUM_COVERAGE = 90.0; |
| 12 | 12 | |
| 13 | -$coverage = simplexml_load_file(dirname(__DIR__) . '/clover.xml'); |
|
| 13 | +$coverage = simplexml_load_file(dirname(__DIR__).'/clover.xml'); |
|
| 14 | 14 | |
| 15 | 15 | if ($coverage === false) |
| 16 | 16 | { |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | { |
| 232 | 232 | if ($this->phpbb31) |
| 233 | 233 | { |
| 234 | - $title = ' ' . $this->topicsolved->image('list', 'TOPIC_SOLVED', $solved_url); |
|
| 234 | + $title = ' '.$this->topicsolved->image('list', 'TOPIC_SOLVED', $solved_url); |
|
| 235 | 235 | } |
| 236 | 236 | else |
| 237 | 237 | { |
@@ -351,7 +351,7 @@ discard block |
||
| 351 | 351 | { |
| 352 | 352 | if ($this->phpbb31) |
| 353 | 353 | { |
| 354 | - $post_row['POST_SUBJECT'] .= ' ' . |
|
| 354 | + $post_row['POST_SUBJECT'] .= ' '. |
|
| 355 | 355 | $this->topicsolved->image('post', 'TOPIC_SOLVED'); |
| 356 | 356 | } |
| 357 | 357 | else |
@@ -128,8 +128,8 @@ discard block |
||
| 128 | 128 | { |
| 129 | 129 | $select_sql_array = array( |
| 130 | 130 | 'SELECT' => |
| 131 | - 't.topic_id, t.topic_poster, t.topic_status, t.topic_type, t.topic_solved, ' . |
|
| 132 | - 'f.forum_id, f.forum_allow_solve, f.forum_allow_unsolve, f.forum_lock_solved, ' . |
|
| 131 | + 't.topic_id, t.topic_poster, t.topic_status, t.topic_type, t.topic_solved, '. |
|
| 132 | + 'f.forum_id, f.forum_allow_solve, f.forum_allow_unsolve, f.forum_lock_solved, '. |
|
| 133 | 133 | 'p.post_id', |
| 134 | 134 | 'FROM' => array( |
| 135 | 135 | FORUMS_TABLE => 'f', |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | TOPICS_TABLE => 't', |
| 138 | 138 | ), |
| 139 | 139 | 'WHERE' => |
| 140 | - 'p.post_id = ' . (int) $post_id . |
|
| 140 | + 'p.post_id = '.(int) $post_id. |
|
| 141 | 141 | ' AND t.topic_id = p.topic_id AND f.forum_id = t.forum_id', |
| 142 | 142 | ); |
| 143 | 143 | $select_sql = $this->db->sql_build_query('SELECT', $select_sql_array); |
@@ -160,8 +160,8 @@ discard block |
||
| 160 | 160 | { |
| 161 | 161 | $update_sql = $this->db->sql_build_array('UPDATE', $data); |
| 162 | 162 | $result = $this->db->sql_query(' |
| 163 | - UPDATE ' . TOPICS_TABLE . ' |
|
| 164 | - SET ' . $update_sql . ' |
|
| 163 | + UPDATE ' . TOPICS_TABLE.' |
|
| 164 | + SET ' . $update_sql.' |
|
| 165 | 165 | WHERE topic_id = ' . (int) $topic_id |
| 166 | 166 | ); |
| 167 | 167 | |
@@ -275,12 +275,12 @@ discard block |
||
| 275 | 275 | public function image($type, $alt = '', $url = '') |
| 276 | 276 | { |
| 277 | 277 | $title = ''; |
| 278 | - $markup = $this->user->img('icon_solved_' . $type, $alt); |
|
| 278 | + $markup = $this->user->img('icon_solved_'.$type, $alt); |
|
| 279 | 279 | |
| 280 | 280 | if (!empty($alt)) |
| 281 | 281 | { |
| 282 | 282 | $alt = $this->user->lang($alt); |
| 283 | - $title = ' title="' . htmlspecialchars($alt, ENT_QUOTES, 'UTF-8') . '"'; |
|
| 283 | + $title = ' title="'.htmlspecialchars($alt, ENT_QUOTES, 'UTF-8').'"'; |
|
| 284 | 284 | } |
| 285 | 285 | |
| 286 | 286 | if (!empty($url)) |
@@ -331,7 +331,7 @@ discard block |
||
| 331 | 331 | if (!empty($alt)) |
| 332 | 332 | { |
| 333 | 333 | $alt = $this->user->lang($alt); |
| 334 | - $title = ' title="' . htmlspecialchars($alt, ENT_QUOTES, 'UTF-8') . '"'; |
|
| 334 | + $title = ' title="'.htmlspecialchars($alt, ENT_QUOTES, 'UTF-8').'"'; |
|
| 335 | 335 | } |
| 336 | 336 | |
| 337 | 337 | if (!empty($url)) |
@@ -355,6 +355,6 @@ discard block |
||
| 355 | 355 | public function get_link_to_post($forum_id, $topic_id, $post_id) |
| 356 | 356 | { |
| 357 | 357 | return append_sid("{$this->root_path}viewtopic.{$this->php_ext}", |
| 358 | - "f=$forum_id&t=$topic_id&p=$post_id") . '#p' . $post_id; |
|
| 358 | + "f=$forum_id&t=$topic_id&p=$post_id").'#p'.$post_id; |
|
| 359 | 359 | } |
| 360 | 360 | } |