Completed
Pull Request — master (#1474)
by Nick
34:59
created
tests/HousesTest.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
     /**
10 10
      * Test that the Royal edge-case house is correctly defined.
11 11
      */
12
-	public function testRoyalHouseDefined()
12
+    public function testRoyalHouseDefined()
13 13
     {
14 14
         $this->assertEquals(0, HOUSE_TYPE_ROYAL);
15 15
     }
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
     /**
18 18
      * Test that the House of Commons is correctly defined.
19 19
      */
20
-	public function testCommonsHouseDefined()
20
+    public function testCommonsHouseDefined()
21 21
     {
22 22
         $this->assertEquals(1, HOUSE_TYPE_COMMONS);
23 23
     }
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
     /**
26 26
      * Test that the House of Lords is correctly defined.
27 27
      */
28
-	public function testLordsHouseDefined()
28
+    public function testLordsHouseDefined()
29 29
     {
30 30
         $this->assertEquals(2, HOUSE_TYPE_LORDS);
31 31
     }
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
     /**
34 34
      * Test that the Northern Ireland Assembly is correctly defined.
35 35
      */
36
-	public function testNIHouseDefined()
36
+    public function testNIHouseDefined()
37 37
     {
38 38
         $this->assertEquals(3, HOUSE_TYPE_NI);
39 39
     }
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
     /**
42 42
      * Test that the Scottish Parliament is correctly defined.
43 43
      */
44
-	public function testScotlandHouseDefined()
44
+    public function testScotlandHouseDefined()
45 45
     {
46 46
         $this->assertEquals(4, HOUSE_TYPE_SCOTLAND);
47 47
     }
@@ -49,15 +49,15 @@  discard block
 block discarded – undo
49 49
     /**
50 50
      * Test that the Assembly for Wales is correctly defined.
51 51
      */
52
-	public function testWalesHouseDefined()
52
+    public function testWalesHouseDefined()
53 53
     {
54 54
         $this->assertEquals(5, HOUSE_TYPE_WALES);
55 55
     }
56 56
 
57
-	/**
57
+    /**
58 58
      * Test that the London Assembly is correctly defined.
59 59
      */
60
-	public function testLondonAssemblyHouseDefined()
60
+    public function testLondonAssemblyHouseDefined()
61 61
     {
62 62
         $this->assertEquals(6, HOUSE_TYPE_LONDON_ASSEMBLY);
63 63
     }
Please login to merge, or discard this patch.
classes/Utility/House.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -24,24 +24,24 @@
 block discarded – undo
24 24
     public static function house_to_members($house) {
25 25
         $house_to_members = array(
26 26
             HOUSE_TYPE_COMMONS => array(
27
-              'singular' => 'MP',
28
-              'plural'   => 'MPs'
27
+                'singular' => 'MP',
28
+                'plural'   => 'MPs'
29 29
             ),
30 30
             HOUSE_TYPE_LORDS => array(
31
-              'singular' => 'Member of the House of Lords',
32
-              'plural'   => 'Members of the House of Lords'
31
+                'singular' => 'Member of the House of Lords',
32
+                'plural'   => 'Members of the House of Lords'
33 33
             ),
34 34
             HOUSE_TYPE_NI => array(
35
-              'singular' => 'MLA',
36
-              'plural'   => 'MLAs'
35
+                'singular' => 'MLA',
36
+                'plural'   => 'MLAs'
37 37
             ),
38 38
             HOUSE_TYPE_SCOTLAND => array(
39
-              'singular' => 'MSP',
40
-              'plural'   => 'MSPs'
41
-          ),
39
+                'singular' => 'MSP',
40
+                'plural'   => 'MSPs'
41
+            ),
42 42
             HOUSE_TYPE_LONDON_ASSEMBLY => array(
43
-              'singular' => 'Member of the London Assembly',
44
-              'plural'   => 'Members of the London Assembly'
43
+                'singular' => 'Member of the London Assembly',
44
+                'plural'   => 'Members of the London Assembly'
45 45
             )
46 46
         );
47 47
 
Please login to merge, or discard this patch.
tests/PageTest.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
         $this->assertRegexp('#<span class="person-header__about__position__role">\s*Labour\s*MP\s*</span>#', $page);
35 35
     }
36 36
 
37
-	public function testSittingMLA()
37
+    public function testSittingMLA()
38 38
     {
39 39
         $page = $this->fetch_page( array( 'pid' => 4, 'representative_type' => 'mla', 'url' => '/mp/4/test_current-mla' ) );
40 40
         $this->assertContains('Test Current-MLA', $page);
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
     /**
64 64
      * Ensure that the Speaker is given the correct constituency.
65 65
      */
66
-	public function testSpeaker()
66
+    public function testSpeaker()
67 67
     {
68 68
         $page = $this->fetch_page( array( 'pid' => 13, 'url' => '/mp/13/test_speaker/buckingham' ) );
69 69
         $this->assertRegexp('#<span class="person-header__about__position__role">\s*Speaker\s*MP\s*</span>#', $page);
Please login to merge, or discard this patch.
www/includes/easyparliament/templates/html/london/index.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
                 <div class="row nested-row">
42 42
                     <div class="homepage-in-the-news homepage-content-section">
43 43
                         <?php if ( $featured ) {
44
-                             include dirname(__FILE__) . "/../homepage/featured.php";
44
+                                include dirname(__FILE__) . "/../homepage/featured.php";
45 45
                         } ?>
46 46
                     </div>
47 47
                     <div class="homepage-create-alert homepage-content-section">
Please login to merge, or discard this patch.