Completed
Push — master ( 14fa75...568319 )
by Jacob
04:43
created
utility/content/FixPhotoContent.class.inc.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -44,9 +44,9 @@
 block discarded – undo
44 44
 		$width = $file_size[0];
45 45
 		$description = $photo_result->description;
46 46
         
47
-        if ($description == '') {
48
-            Debugger::logMessage("No description for {$category}/{$photo}");
49
-        }
47
+		if ($description == '') {
48
+			Debugger::logMessage("No description for {$category}/{$photo}");
49
+		}
50 50
 		
51 51
 		$domain = '/';
52 52
 		if($is_absolute)
Please login to merge, or discard this patch.
utility/content/ImperialUnitContent.class.inc.php 1 patch
Indentation   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -5,56 +5,56 @@
 block discarded – undo
5 5
 final class ImperialUnitContent extends Content
6 6
 {
7 7
 
8
-    protected function execute($type = '')
9
-    {
10
-        $number = floatval($this->content);
11
-        $number *= 39.37; // convert to inches
8
+	protected function execute($type = '')
9
+	{
10
+		$number = floatval($this->content);
11
+		$number *= 39.37; // convert to inches
12 12
         
13
-        if ($type == '') {
14
-            if ($number > (12 * 3 * 1760 * 5)) {
15
-                $type = 'full miles';
16
-            } else if ($number > (12 * 3 * 1760 * .5)) {
17
-                $type = 'tenth miles';
18
-            } else if ($number > (12 * 3 * 150)) {
19
-                $type = 'yards';
20
-            } else if ($number > (12 * 10)) {
21
-                $type = 'feet';
22
-            } else {
23
-                $type = 'inches';
24
-            }
25
-        }
13
+		if ($type == '') {
14
+			if ($number > (12 * 3 * 1760 * 5)) {
15
+				$type = 'full miles';
16
+			} else if ($number > (12 * 3 * 1760 * .5)) {
17
+				$type = 'tenth miles';
18
+			} else if ($number > (12 * 3 * 150)) {
19
+				$type = 'yards';
20
+			} else if ($number > (12 * 10)) {
21
+				$type = 'feet';
22
+			} else {
23
+				$type = 'inches';
24
+			}
25
+		}
26 26
         
27
-        switch ($type) {
28
-            case 'full miles' :
29
-                $this->content = number_format(round($number / (12 * 3 * 1760))) . ' miles';
30
-                break;
31
-            case 'tenth miles' :
32
-                $this->content = round($number / (12 * 3 * 1760), 1) . ' miles';
33
-                break;
34
-            case 'yards' :
35
-                $this->content = number_format(round($number / (12 * 3))) . ' yards';
36
-                break;
37
-            case 'feet' :
38
-                $this->content = number_format(round($number / 12)) . "'";
39
-                break;
40
-            case 'inches' :
41
-                $feet = floor($number / 12);
27
+		switch ($type) {
28
+			case 'full miles' :
29
+				$this->content = number_format(round($number / (12 * 3 * 1760))) . ' miles';
30
+				break;
31
+			case 'tenth miles' :
32
+				$this->content = round($number / (12 * 3 * 1760), 1) . ' miles';
33
+				break;
34
+			case 'yards' :
35
+				$this->content = number_format(round($number / (12 * 3))) . ' yards';
36
+				break;
37
+			case 'feet' :
38
+				$this->content = number_format(round($number / 12)) . "'";
39
+				break;
40
+			case 'inches' :
41
+				$feet = floor($number / 12);
42 42
                 
43
-                $inches = $number - $feet * 12;
44
-                $inches = round($inches);
43
+				$inches = $number - $feet * 12;
44
+				$inches = round($inches);
45 45
                 
46
-                if ($inches == 12) {
47
-                    $feet++;
48
-                    $inches = 0;
49
-                }
46
+				if ($inches == 12) {
47
+					$feet++;
48
+					$inches = 0;
49
+				}
50 50
                 
51
-                $this->content = '';
52
-                $this->content .= number_format($feet) . "'";
53
-                if (isset($inches) && $inches > 0) {
54
-                    $this->content .= " {$inches}\"";
55
-                }
56
-                break;
57
-        }
58
-    }
51
+				$this->content = '';
52
+				$this->content .= number_format($feet) . "'";
53
+				if (isset($inches) && $inches > 0) {
54
+					$this->content .= " {$inches}\"";
55
+				}
56
+				break;
57
+		}
58
+	}
59 59
 
60 60
 }
61 61
\ No newline at end of file
Please login to merge, or discard this patch.
utility/content/SmartTrimContent.class.inc.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,8 +42,8 @@
 block discarded – undo
42 42
 		
43 43
 		if($length < strlen($this->content))
44 44
 			$this->trim_string($length);
45
-        else
46
-            $etc = '';
45
+		else
46
+			$etc = '';
47 47
 		$this->check_exclude_tags();
48 48
 		$this->close_tags($etc);
49 49
 	}
Please login to merge, or discard this patch.
utility/cookie/CommenterCookie.class.inc.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -22,10 +22,10 @@
 block discarded – undo
22 22
 
23 23
 	protected function getDomain()
24 24
 	{
25
-        $site = URLDecode::getSite();
26
-        if ($site == 'waterfalls' && Loader::isLive()) {
27
-            return 'waterfallsofthekeweenaw.com';
28
-        }
25
+		$site = URLDecode::getSite();
26
+		if ($site == 'waterfalls' && Loader::isLive()) {
27
+			return 'waterfallsofthekeweenaw.com';
28
+		}
29 29
 		return self::$COOKIE_DOMAIN;
30 30
 	}
31 31
 
Please login to merge, or discard this patch.
utility/cron/TwitterCron.class.inc.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -20,21 +20,21 @@
 block discarded – undo
20 20
 	private static $USER_MENTION_LINK = '<a href="https://twitter.com/%1$s" rel="nofollow" target="_blank" title="%2$s (%1$s) on Twitter">@%1$s</a>';
21 21
 	private static $MEDIA_LINK = '<a class="photo" href="%s" rel="nofollow" target="_blank" title="%s"><img src="%s:%s" alt="%s" height="%s" width="%s" /></a>';
22 22
 
23
-    private $consumer_key;
24
-    private $consumer_secret;
25
-    private $access_token;
26
-    private $access_secret;
23
+	private $consumer_key;
24
+	private $consumer_secret;
25
+	private $access_token;
26
+	private $access_secret;
27 27
 
28 28
 	private $json;
29 29
 
30 30
 	public function __construct()
31 31
 	{
32
-        global $config;
32
+		global $config;
33 33
 
34
-        $this->consumer_key = $config->twitter->consumer_key;
35
-        $this->consumer_secret = $config->twitter->consumer_secret;
36
-        $this->access_token = $config->twitter->access_token;
37
-        $this->access_secret = $config->twitter->access_secret;
34
+		$this->consumer_key = $config->twitter->consumer_key;
35
+		$this->consumer_secret = $config->twitter->consumer_secret;
36
+		$this->access_token = $config->twitter->access_token;
37
+		$this->access_secret = $config->twitter->access_secret;
38 38
 
39 39
 		$json = $this->get_data();
40 40
 		
Please login to merge, or discard this patch.
controller/home/ContactController.class.inc.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 
13 13
 	public function __construct()
14 14
 	{
15
-        global $config;
15
+		global $config;
16 16
 		$this->headers['From'] = self::$FROM;
17 17
 		$this->headers['Reply-To'] = "Jacob <{$config->admin_email}>";
18 18
 		$this->headers['Bcc'] = "Jacob <{$config->admin_email}>";
Please login to merge, or discard this patch.
controller/site/ContactController.class.inc.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 
13 13
 	public function __construct()
14 14
 	{
15
-        global $config;
15
+		global $config;
16 16
 		$this->headers['From'] = self::$FROM;
17 17
 		$this->headers['Reply-To'] = "Jacob <{$config->admin_email}>";
18 18
 		$this->headers['Bcc'] = "Jacob <{$config->admin_email}>";
Please login to merge, or discard this patch.
controller/waterfalls/ContactController.class.inc.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 
13 13
 	public function __construct()
14 14
 	{
15
-        global $config;
15
+		global $config;
16 16
 		$this->headers['From'] = self::$FROM;
17 17
 		$this->headers['Reply-To'] = "Jacob <{$config->admin_email}>";
18 18
 		$this->headers['Bcc'] = "Jacob <{$config->admin_email}>";
Please login to merge, or discard this patch.
tests/unit/domain/blog/MysqlPostRepositoryTest.php 1 patch
Indentation   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -8,21 +8,21 @@  discard block
 block discarded – undo
8 8
 class MysqlPostRepositoryTest extends \PHPUnit_Framework_TestCase
9 9
 {
10 10
 
11
-    protected $connections;
11
+	protected $connections;
12 12
 
13
-    public function __construct()
14
-    {
15
-        $extendedPdo = $this->newExtendedPdo();
16
-        $this->connections = new ConnectionLocator(function () use ($extendedPdo) {
17
-            return $extendedPdo;
18
-        });
19
-    }
13
+	public function __construct()
14
+	{
15
+		$extendedPdo = $this->newExtendedPdo();
16
+		$this->connections = new ConnectionLocator(function () use ($extendedPdo) {
17
+			return $extendedPdo;
18
+		});
19
+	}
20 20
 
21
-    protected function newExtendedPdo()
22
-    {
23
-        $extendedPdo = new ExtendedPdo('sqlite::memory:');
24
-        $extendedPdo->exec('ATTACH DATABASE `jpemeric_blog.db` AS `jpemeric_blog`');
25
-        $extendedPdo->exec("
21
+	protected function newExtendedPdo()
22
+	{
23
+		$extendedPdo = new ExtendedPdo('sqlite::memory:');
24
+		$extendedPdo->exec('ATTACH DATABASE `jpemeric_blog.db` AS `jpemeric_blog`');
25
+		$extendedPdo->exec("
26 26
             CREATE TABLE IF NOT EXISTS `jpemeric_blog`.`post` (
27 27
               `id` integer PRIMARY KEY AUTOINCREMENT,
28 28
               `title` varchar(60) NOT NULL,
@@ -32,48 +32,48 @@  discard block
 block discarded – undo
32 32
               `body` text NOT NULL,
33 33
               `display` integer NOT NULL
34 34
             )"
35
-        );
36
-        return $extendedPdo;
37
-    }
35
+		);
36
+		return $extendedPdo;
37
+	}
38 38
 
39
-    public function newMysqlPostRepository()
40
-    {
41
-        return new MysqlPostRepository($this->connections);
42
-    }
39
+	public function newMysqlPostRepository()
40
+	{
41
+		return new MysqlPostRepository($this->connections);
42
+	}
43 43
 
44
-    public function testFindByUri()
45
-    {
46
-        $test_post = array(
47
-            'title' => 'test title',
48
-            'path' => 'test-uri',
49
-            'category' => 'test',
50
-            'date' => date('Y-m-d H:i:s'),
51
-            'body' => 'test content',
52
-            'display' => 1
53
-        );
44
+	public function testFindByUri()
45
+	{
46
+		$test_post = array(
47
+			'title' => 'test title',
48
+			'path' => 'test-uri',
49
+			'category' => 'test',
50
+			'date' => date('Y-m-d H:i:s'),
51
+			'body' => 'test content',
52
+			'display' => 1
53
+		);
54 54
 
55
-        $this->connections->getDefault()->perform("
55
+		$this->connections->getDefault()->perform("
56 56
             INSERT INTO jpemeric_blog.post
57 57
                 (title, path, category, date, body, display)
58 58
             VALUES
59 59
                 (:title, :path, :category, :date, :body, :display)",
60
-            $test_post);
60
+			$test_post);
61 61
 
62
-        $post = $this->newMysqlPostRepository()->findByUri($test_post['path']);
63
-        $this->assertSame($test_post['path'], $post['path']);
64
-    }
62
+		$post = $this->newMysqlPostRepository()->findByUri($test_post['path']);
63
+		$this->assertSame($test_post['path'], $post['path']);
64
+	}
65 65
 
66
-    public function testIsInstanceOfPostRepository()
67
-    {
68
-        $this->assertInstanceOf(
69
-            'Jacobemerick\Web\Domain\Blog\PostRepository',
70
-            $this->newMysqlPostRepository()
71
-        );
72
-    }
66
+	public function testIsInstanceOfPostRepository()
67
+	{
68
+		$this->assertInstanceOf(
69
+			'Jacobemerick\Web\Domain\Blog\PostRepository',
70
+			$this->newMysqlPostRepository()
71
+		);
72
+	}
73 73
 
74
-    public static function tearDownAfterClass()
75
-    {
74
+	public static function tearDownAfterClass()
75
+	{
76 76
 //        $this->connections->getDefault()->disconnect();
77
-        unlink('jpemeric_blog.db');
78
-    }
77
+		unlink('jpemeric_blog.db');
78
+	}
79 79
 }
Please login to merge, or discard this patch.