jacobemerick / web

bootstrap.php

Indentation +61 added lines, -61 removed lines

@@ -15,7 +15,7 @@ 
 
 $handle = @fopen($config_path, 'r');
 if ($handle === false) {
-    throw new RuntimeException("Could not load config");
+	throw new RuntimeException("Could not load config");
 }
 $config = fread($handle, filesize($config_path));
 fclose($handle);
@@ -23,71 +23,71 @@ 
 $config = json_decode($config);
 $last_json_error = json_last_error();
 if ($last_json_error !== JSON_ERROR_NONE) {
-    throw new RuntimeException("Could not parse config - JSON error detected");
+	throw new RuntimeException("Could not parse config - JSON error detected");
 }
 $container['config'] = $config;
 
 // timezones are fun
 date_default_timezone_set('America/Phoenix'); // todo - belongs in configuration
 $container['default_timezone'] = function ($c) {
-    return new DateTimeZone('America/Phoenix');
+	return new DateTimeZone('America/Phoenix');
 };
 
 
 // configure the db connections holder
 $db_connections = new Aura\Sql\ConnectionLocator();
 $db_connections->setDefault(function () use ($config) {
-    $connection = $config->database->slave;
-    return new Aura\Sql\ExtendedPdo(
-        "mysql:host={$connection->host}",
-        $connection->user,
-        $connection->password
-    );
+	$connection = $config->database->slave;
+	return new Aura\Sql\ExtendedPdo(
+		"mysql:host={$connection->host}",
+		$connection->user,
+		$connection->password
+	);
 });
 $db_connections->setWrite('master', function () use ($config) {
-    $connection = $config->database->master;
-    return new Aura\Sql\ExtendedPdo(
-        "mysql:host={$connection->host}",
-        $connection->user,
-        $connection->password
-    );
+	$connection = $config->database->master;
+	return new Aura\Sql\ExtendedPdo(
+		"mysql:host={$connection->host}",
+		$connection->user,
+		$connection->password
+	);
 });
 $db_connections->setRead('slave', function () use ($config) {
-    $connection = $config->database->slave;
-    $pdo = new Aura\Sql\ExtendedPdo(
-        "mysql:host={$connection->host}",
-        $connection->user,
-        $connection->password
-    );
-
-    $profiler = new Aura\Sql\Profiler();
-    $profiler->setActive(true);
-    $pdo->setProfiler($profiler);
-
-    return $pdo;
+	$connection = $config->database->slave;
+	$pdo = new Aura\Sql\ExtendedPdo(
+		"mysql:host={$connection->host}",
+		$connection->user,
+		$connection->password
+	);
+
+	$profiler = new Aura\Sql\Profiler();
+	$profiler->setActive(true);
+	$pdo->setProfiler($profiler);
+
+	return $pdo;
 });
 $container['db_connection_locator'] = $db_connections;
 
 
 // setup mail handler
 $container['mail'] = $container->factory(function ($c) {
-    return (new Jacobemerick\Archangel\Archangel())->setLogger($c['logger']);
+	return (new Jacobemerick\Archangel\Archangel())->setLogger($c['logger']);
 });
 
 
 // setup the logger
 $container['setup_logger'] = $container->protect(function ($name) use ($container) {
-    $logger = new Monolog\Logger($name);
+	$logger = new Monolog\Logger($name);
 
-    $logPath = __DIR__ . "/logs/{$name}.log";
-    $streamHandler = new Monolog\Handler\StreamHandler($logPath, Monolog\Logger::INFO);
-    $streamHandler->setFormatter(
-        new Monolog\Formatter\LineFormatter("[%datetime%] %channel%.%level_name%: %message%\n")
-    );
-    $logger->pushHandler($streamHandler);
+	$logPath = __DIR__ . "/logs/{$name}.log";
+	$streamHandler = new Monolog\Handler\StreamHandler($logPath, Monolog\Logger::INFO);
+	$streamHandler->setFormatter(
+		new Monolog\Formatter\LineFormatter("[%datetime%] %channel%.%level_name%: %message%\n")
+	);
+	$logger->pushHandler($streamHandler);
 
-    Monolog\ErrorHandler::register($logger);
-    $container['logger'] = $logger;
+	Monolog\ErrorHandler::register($logger);
+	$container['logger'] = $logger;
 });
 
 
@@ -108,30 +108,30 @@ 
 
 // sets up shutdown function to display profiler
 register_shutdown_function(function () use ($container) {
-    if (
-        !isset($_COOKIE['debugger']) ||
-        $_COOKIE['debugger'] != 'display'
-    ) {
-        return;
-    }
-
-    $dbProfiles = $container['db_connection_locator']
-        ->getRead()
-        ->getProfiler()
-        ->getProfiles();
-    $dbProfiles = array_filter($dbProfiles, function ($profile) {
-        return $profile['function'] == 'perform';
-    });
-    $dbProfiles = array_map(function ($profile) {
-        return [
-            'sql' => trim(preg_replace('/\s+/', ' ', $profile['statement'])),
-            'parameters' => $profile['bind_values'],
-            'time' => $profile['duration'],
-        ];
-    }, $dbProfiles);
-    $container['profiler']->setProfiledQueries($dbProfiles);
-    $container['profiler']->setDisplay(new Particletree\Pqp\Display());
-    $container['profiler']->display($container['db_connection_locator']->getRead());
+	if (
+		!isset($_COOKIE['debugger']) ||
+		$_COOKIE['debugger'] != 'display'
+	) {
+		return;
+	}
+
+	$dbProfiles = $container['db_connection_locator']
+		->getRead()
+		->getProfiler()
+		->getProfiles();
+	$dbProfiles = array_filter($dbProfiles, function ($profile) {
+		return $profile['function'] == 'perform';
+	});
+	$dbProfiles = array_map(function ($profile) {
+		return [
+			'sql' => trim(preg_replace('/\s+/', ' ', $profile['statement'])),
+			'parameters' => $profile['bind_values'],
+			'time' => $profile['duration'],
+		];
+	}, $dbProfiles);
+	$container['profiler']->setProfiledQueries($dbProfiles);
+	$container['profiler']->setDisplay(new Particletree\Pqp\Display());
+	$container['profiler']->display($container['db_connection_locator']->getRead());
 });
 
 $container['console']->logMemory(null, 'PHP - Post-boostrap memory');

Spacing +12 added lines, -12 removed lines

@@ -5,13 +5,13 @@ 
 ini_set('display_errors', 0);
 
 
-require_once __DIR__ . '/vendor/autoload.php';
+require_once __DIR__.'/vendor/autoload.php';
 
 $container = new Pimple\Container();
 
 
 // load the config for the application
-$config_path = __DIR__ . '/config.json';
+$config_path = __DIR__.'/config.json';
 
 $handle = @fopen($config_path, 'r');
 if ($handle === false) {
@@ -29,14 +29,14 @@ 
 
 // timezones are fun
 date_default_timezone_set('America/Phoenix'); // todo - belongs in configuration
-$container['default_timezone'] = function ($c) {
+$container['default_timezone'] = function($c) {
     return new DateTimeZone('America/Phoenix');
 };
 
 
 // configure the db connections holder
 $db_connections = new Aura\Sql\ConnectionLocator();
-$db_connections->setDefault(function () use ($config) {
+$db_connections->setDefault(function() use ($config) {
     $connection = $config->database->slave;
     return new Aura\Sql\ExtendedPdo(
         "mysql:host={$connection->host}",
@@ -44,7 +44,7 @@ 
         $connection->password
     );
 });
-$db_connections->setWrite('master', function () use ($config) {
+$db_connections->setWrite('master', function() use ($config) {
     $connection = $config->database->master;
     return new Aura\Sql\ExtendedPdo(
         "mysql:host={$connection->host}",
@@ -52,7 +52,7 @@ 
         $connection->password
     );
 });
-$db_connections->setRead('slave', function () use ($config) {
+$db_connections->setRead('slave', function() use ($config) {
     $connection = $config->database->slave;
     $pdo = new Aura\Sql\ExtendedPdo(
         "mysql:host={$connection->host}",
@@ -70,16 +70,16 @@ 
 
 
 // setup mail handler
-$container['mail'] = $container->factory(function ($c) {
+$container['mail'] = $container->factory(function($c) {
     return (new Jacobemerick\Archangel\Archangel())->setLogger($c['logger']);
 });
 
 
 // setup the logger
-$container['setup_logger'] = $container->protect(function ($name) use ($container) {
+$container['setup_logger'] = $container->protect(function($name) use ($container) {
     $logger = new Monolog\Logger($name);
 
-    $logPath = __DIR__ . "/logs/{$name}.log";
+    $logPath = __DIR__."/logs/{$name}.log";
     $streamHandler = new Monolog\Handler\StreamHandler($logPath, Monolog\Logger::INFO);
     $streamHandler->setFormatter(
         new Monolog\Formatter\LineFormatter("[%datetime%] %channel%.%level_name%: %message%\n")
@@ -107,7 +107,7 @@ 
 
 
 // sets up shutdown function to display profiler
-register_shutdown_function(function () use ($container) {
+register_shutdown_function(function() use ($container) {
     if (
         !isset($_COOKIE['debugger']) ||
         $_COOKIE['debugger'] != 'display'
@@ -119,10 +119,10 @@ 
         ->getRead()
         ->getProfiler()
         ->getProfiles();
-    $dbProfiles = array_filter($dbProfiles, function ($profile) {
+    $dbProfiles = array_filter($dbProfiles, function($profile) {
         return $profile['function'] == 'perform';
     });
-    $dbProfiles = array_map(function ($profile) {
+    $dbProfiles = array_map(function($profile) {
         return [
             'sql' => trim(preg_replace('/\s+/', ' ', $profile['statement'])),
             'parameters' => $profile['bind_values'],

controller/blog/DefaultPageController.class.inc.php

Indentation +87 added lines, -87 removed lines

@@ -18,14 +18,14 @@ 
 
 	protected function set_head_data()
 	{
-    $this->set_head('rss_link', [
-      'title' => 'Jacob Emerick Blog Feed',
-      'url' => '/rss.xml'
-    ]);
-    $this->set_head('rss_comment_link', [
-      'title' => 'Jacob Emerick Blog Comment Feed',
-      'url' => '/rss-comments.xml'
-    ]);
+	$this->set_head('rss_link', [
+	  'title' => 'Jacob Emerick Blog Feed',
+	  'url' => '/rss.xml'
+	]);
+	$this->set_head('rss_comment_link', [
+	  'title' => 'Jacob Emerick Blog Comment Feed',
+	  'url' => '/rss-comments.xml'
+	]);
 		
 		$this->add_css('normalize');
 		$this->add_css('blog');
@@ -83,45 +83,45 @@ 
 	final private function get_comments_for_post($post)
 	{
 		$count = CommentCollector::getCommentCountForURL(self::$BLOG_SITE_ID, $post['path']);
-    $count_from_service = $this->get_comments_for_post_from_service($post);
-
-    if ($count != $count_from_service) {
-        global $container;
-        $container['console']->log('Mismatch between comment service and legacy db');
-        $container['console']->log("{$count}, {$count_from_service} in service");
-    }
-    return $count;
-	}
-
-    final private function get_comments_for_post_from_service($post)
-    {
-        global $config;
-        $configuration = new Jacobemerick\CommentService\Configuration();
-        $configuration->setUsername($config->comments->user);
-        $configuration->setPassword($config->comments->password);
-        $configuration->addDefaultHeader('Content-Type', 'application/json');
-        $configuration->setHost($config->comments->host);
-        $configuration->setCurlTimeout($config->comments->timeout);
-
-        $client = new Jacobemerick\CommentService\ApiClient($configuration);
-        $api = new Jacobemerick\CommentService\Api\DefaultApi($client);
-
-        $start = microtime(true);
-        $comment_response = $api->getComments(null, null, null, 'blog.jacobemerick.com', "{$post['category']}/{$post['path']}");
-        $elapsed = microtime(true) - $start;
-        global $container;
-        $container['logger']->info("CommentService | Comment Count | {$elapsed}");
-
-        return count($comment_response);
-    }
+	$count_from_service = $this->get_comments_for_post_from_service($post);
+
+	if ($count != $count_from_service) {
+		global $container;
+		$container['console']->log('Mismatch between comment service and legacy db');
+		$container['console']->log("{$count}, {$count_from_service} in service");
+	}
+	return $count;
+	}
+
+	final private function get_comments_for_post_from_service($post)
+	{
+		global $config;
+		$configuration = new Jacobemerick\CommentService\Configuration();
+		$configuration->setUsername($config->comments->user);
+		$configuration->setPassword($config->comments->password);
+		$configuration->addDefaultHeader('Content-Type', 'application/json');
+		$configuration->setHost($config->comments->host);
+		$configuration->setCurlTimeout($config->comments->timeout);
+
+		$client = new Jacobemerick\CommentService\ApiClient($configuration);
+		$api = new Jacobemerick\CommentService\Api\DefaultApi($client);
+
+		$start = microtime(true);
+		$comment_response = $api->getComments(null, null, null, 'blog.jacobemerick.com', "{$post['category']}/{$post['path']}");
+		$elapsed = microtime(true) - $start;
+		global $container;
+		$container['logger']->info("CommentService | Comment Count | {$elapsed}");
+
+		return count($comment_response);
+	}
 
 	final private function get_tags_for_post($post)
 	{
-        global $container;
-        $repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
-        $tag_result = $repository->getTagsForPost($post['id']);
+		global $container;
+		$repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
+		$tag_result = $repository->getTagsForPost($post['id']);
 
-        $tag_array = array();
+		$tag_array = array();
 		foreach($tag_result as $tag)
 		{
 			$tag_object = new stdclass();
@@ -155,9 +155,9 @@ 
 
 	final private function get_tag_cloud()
 	{
-        global $container;
-        $repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
-        $tag_result = $repository->getTagCloud();
+		global $container;
+		$repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
+		$tag_result = $repository->getTagCloud();
 		
 		$maximum_tag_count = $this->get_maximum_tag_count($tag_result);
 		
@@ -206,49 +206,49 @@ 
 			$array[] = $comment_obj;
 		}
 
-    $comment_service_array = $this->get_comments_from_service();
-    if ($comment_service_array !== $array) {
-      global $container;
-      $container['console']->log('Mismatch between comment service and legacy db');
-      $container['console']->log($comment_service_array[0]);
-      $container['console']->log($array[0]);
-    }
+	$comment_service_array = $this->get_comments_from_service();
+	if ($comment_service_array !== $array) {
+	  global $container;
+	  $container['console']->log('Mismatch between comment service and legacy db');
+	  $container['console']->log($comment_service_array[0]);
+	  $container['console']->log($array[0]);
+	}
 		return $array;
 	}
 
-    final private function get_comments_from_service()
-    {
-        global $config;
-        $configuration = new Jacobemerick\CommentService\Configuration();
-        $configuration->setUsername($config->comments->user);
-        $configuration->setPassword($config->comments->password);
-        $configuration->addDefaultHeader('Content-Type', 'application/json');
-        $configuration->setHost($config->comments->host);
-        $configuration->setCurlTimeout($config->comments->timeout);
-
-        $client = new Jacobemerick\CommentService\ApiClient($configuration);
-        $api = new Jacobemerick\CommentService\Api\DefaultApi($client);
-
-        $start = microtime(true);
-        $comment_response = $api->getComments(1, self::$RECENT_COMMENT_COUNT, '-date', 'blog.jacobemerick.com');
-        $elapsed = microtime(true) - $start;
-        global $container;
-        $container['logger']->info("CommentService | Sidebar | {$elapsed}");
-
-        $array = array();
-        foreach($comment_response as $comment)
-        {
-            $body = $comment->getBody();
-            $body = Content::instance('CleanComment', $body)->activate();
-            $body = strip_tags($body);
-
-            $comment_obj = new stdclass();
-            $comment_obj->description = Content::instance('SmartTrim', $body)->activate(30);
-            $comment_obj->commenter = $comment->getCommenter()->getName();
-            $comment_obj->link = "{$comment->getUrl()}/#comment-{$comment->getId()}";
-            $array[] = $comment_obj;
-        }
-        return $array;
-    }
+	final private function get_comments_from_service()
+	{
+		global $config;
+		$configuration = new Jacobemerick\CommentService\Configuration();
+		$configuration->setUsername($config->comments->user);
+		$configuration->setPassword($config->comments->password);
+		$configuration->addDefaultHeader('Content-Type', 'application/json');
+		$configuration->setHost($config->comments->host);
+		$configuration->setCurlTimeout($config->comments->timeout);
+
+		$client = new Jacobemerick\CommentService\ApiClient($configuration);
+		$api = new Jacobemerick\CommentService\Api\DefaultApi($client);
+
+		$start = microtime(true);
+		$comment_response = $api->getComments(1, self::$RECENT_COMMENT_COUNT, '-date', 'blog.jacobemerick.com');
+		$elapsed = microtime(true) - $start;
+		global $container;
+		$container['logger']->info("CommentService | Sidebar | {$elapsed}");
+
+		$array = array();
+		foreach($comment_response as $comment)
+		{
+			$body = $comment->getBody();
+			$body = Content::instance('CleanComment', $body)->activate();
+			$body = strip_tags($body);
+
+			$comment_obj = new stdclass();
+			$comment_obj->description = Content::instance('SmartTrim', $body)->activate(30);
+			$comment_obj->commenter = $comment->getCommenter()->getName();
+			$comment_obj->link = "{$comment->getUrl()}/#comment-{$comment->getId()}";
+			$array[] = $comment_obj;
+		}
+		return $array;
+	}
 
 }