jacobemerick / web

script/cron/generate-sitemaps.php

Spacing +9 added lines, -9 removed lines

@@ -26,7 +26,7 @@ 
  * @param string $domain
  * @return boolean
  */
-$buildSitemap = function (array $entries, $domain, $folder) {
+$buildSitemap = function(array $entries, $domain, $folder) {
     $urlSet = new Urlset();
     foreach ($entries as $path => $entry) {
         $url = new Url("{$domain}{$path}"); // todo better detection of domain by env
@@ -53,13 +53,13 @@ 
 /*********************************************
  * blog.jacobemerick.com
  *********************************************/
-$reduceToMostRecentBlogPost = function ($recentPost, $post) {
+$reduceToMostRecentBlogPost = function($recentPost, $post) {
     if (is_null($recentPost)) {
         return $post;
     }
     $postDate = new DateTime($post['date']);
     $recentPostDate = new DateTime($recentPost['date']);
-    return ($postDate > $recentPostDate) ? $post: $recentPost;
+    return ($postDate > $recentPostDate) ? $post : $recentPost;
 };
 
 $blogPostsPerPage = 10;
@@ -94,7 +94,7 @@ 
 ];
 
 foreach ($blogCategoryArray as $blogCategory) {
-    $blogCategoryPosts = array_filter($activeBlogPosts, function ($post) use ($blogCategory) {
+    $blogCategoryPosts = array_filter($activeBlogPosts, function($post) use ($blogCategory) {
         return $post['category'] == $blogCategory;
     });
     $mostRecentBlogCategoryPost = array_reduce($blogCategoryPosts, $reduceToMostRecentBlogPost);
@@ -207,13 +207,13 @@ 
 /*********************************************
  * lifestream.jacobemerick.com
  *********************************************/
-$reduceToMostRecentStreamActivity = function ($recentActivity, $activity) {
+$reduceToMostRecentStreamActivity = function($recentActivity, $activity) {
     if (is_null($recentActivity)) {
         return $activity;
     }
     $activityDate = new DateTime($activity['datetime']);
     $recentActivityDate = new DateTime($recentActivity['datetime']);
-    return ($activityDate > $recentActivityDate) ? $activity: $recentActivity;
+    return ($activityDate > $recentActivityDate) ? $activity : $recentActivity;
 };
 
 $streamActivitiesPerPage = 15;
@@ -251,7 +251,7 @@ 
 ];
 
 foreach ($streamTypeArray as $streamType) {
-    $streamTypeActivities = array_filter($streamActivities, function ($post) use ($streamType) {
+    $streamTypeActivities = array_filter($streamActivities, function($post) use ($streamType) {
         return $post['type'] == $streamType;
     });
     $mostRecentStreamTypeActivity = array_reduce($streamTypeActivities, $reduceToMostRecentStreamActivity);
@@ -385,13 +385,13 @@ 
 /*********************************************
  * www.waterfallofthekeweenaw.com
  *********************************************/
-$reduceToMostRecentJournalLog = function ($recentLog, $log) {
+$reduceToMostRecentJournalLog = function($recentLog, $log) {
     if (is_null($recentLog)) {
         return $log;
     }
     $logDate = new DateTime($log['publish_date']);
     $recentLogDate = new DateTime($recentLog['publish_date']);
-    return ($logDate > $recentLogDate) ? log: $recentLog;
+    return ($logDate > $recentLogDate) ? log : $recentLog;
 };
 
 $waterfallRepository = new WaterfallRepository($container['db_connection_locator']);

controller/PageController.class.inc.php

Spacing +19 added lines, -19 removed lines

@@ -64,7 +64,7 @@ 
         $post_result = $activityRepository->getActivities(5);
 
         $post_array = array();
-        foreach($post_result as $row) {
+        foreach ($post_result as $row) {
             array_push($post_array, $this->expand_post($row));
         }
 
@@ -100,9 +100,9 @@ 
 		$headers = $this->headers;
 		Header::$headers();
 		Loader::load('view', '/Head', $this->data_array['head']);
-		foreach($this->body_view_array as $view)
+		foreach ($this->body_view_array as $view)
 		{
-			if(substr($view, 0, 1) == '/')
+			if (substr($view, 0, 1) == '/')
 				Loader::load('view', $view, $this->data_array['body']);
 			else
 				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
@@ -114,7 +114,7 @@ 
             Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
         }
 		
-		if($view == '/404' || $view == '/503')
+		if ($view == '/404' || $view == '/503')
 			exit;
 	}
 
@@ -170,14 +170,14 @@ 
 
 	private function load_assets()
 	{
-    $css_array = array_map(function ($stylesheet) {
+    $css_array = array_map(function($stylesheet) {
       $path = "/css/{$stylesheet[0]}.css";
       if ($stylesheet[1] > 1) {
         $path .= "?v={$stylesheet[1]}";
       }
       return $path;
     }, $this->css_array);
-    $js_array = array_map(function ($script) {
+    $js_array = array_map(function($script) {
       if (substr($script, 0, 4) == 'http') {
         return $script;
       }
@@ -195,26 +195,26 @@ 
 
 	protected function eject()
 	{
-		if(get_class($this) !== 'Error404Controller')
+		if (get_class($this) !== 'Error404Controller')
 			Loader::loadNew('controller', '/Error404Controller')->activate();
 	}
 
 	protected function unavailable()
 	{
-		if(get_class($this) !== 'Error503Controller')
+		if (get_class($this) !== 'Error503Controller')
 			Loader::loadNew('controller', '/Error503Controller')->activate();
 	}
 
 	protected function redirect($uri, $method = 301)
 	{
-		switch($method)
+		switch ($method)
 		{
 			case 301 :
-				if(get_class($this) !== 'Error301Controller')
+				if (get_class($this) !== 'Error301Controller')
 					Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();
 				break;
 			case 303 :
-				if(get_class($this) !== 'Error303Controller')
+				if (get_class($this) !== 'Error303Controller')
 					Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();
 				break;
 		}
@@ -234,7 +234,7 @@ 
 	private $comment_errors;
 	protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title)
 	{
-		if(Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
+		if (Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
 		{
 			$parameters = array($site_id, $path, $redirect_url, $page_title);
 			$this->comment_errors = Loader::loadNew('module', 'form/CommentSubmitModule', $parameters)->activate();
@@ -252,7 +252,7 @@ 
 		$comment_array = array();
 		$comment_result = CommentCollector::getCommentsForURL($site, $path, $commenter->id);
 		
-		foreach($comment_result as $comment)
+		foreach ($comment_result as $comment)
 		{
 			$comment_object = new stdclass();
 			$comment_object->id = $comment->id;
@@ -262,12 +262,12 @@ 
 			$comment_object->url = $comment->url;
 			$comment_object->trusted = $comment->trusted;
 			
-			if($comment->reply == 0 && Request::getPost('type') == $comment->id)
+			if ($comment->reply == 0 && Request::getPost('type') == $comment->id)
 				$comment_object->errors = $this->comment_errors;
 			else
 				$comment_object->errors = array();
 			
-			if($comment->reply == 0)
+			if ($comment->reply == 0)
 			{
 				$comment_object->replies = array();
 				$comment_array[$comment->id] = $comment_object;
@@ -298,21 +298,21 @@ 
 		$commenter->website = '';
 		
 		$commenter_cookie = Cookie::instance('Commenter');
-		if(!$commenter_cookie->exists())
+		if (!$commenter_cookie->exists())
 			return $commenter;
 		
 		$commenter_cookie_value = $commenter_cookie->getValue();
 		$commenter_cookie_value = json_decode($commenter_cookie_value);
 		
-		if($commenter_cookie_value === NULL)
+		if ($commenter_cookie_value === NULL)
 			return $commenter;
 		
-		if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email))
+		if (!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email))
 			return $commenter;
 		
 		$commenter_object = CommentCollector::getCommenterByFields($commenter_cookie_value->name, $commenter_cookie_value->email, (isset($commenter_cookie_value->website) ? $commenter_cookie_value->website : ''));
 		
-		if($commenter_object === NULL)
+		if ($commenter_object === NULL)
 			return $commenter;
 		
 		$commenter->id = $commenter_object->id;

utility/Loader.class.inc.php

Spacing +8 added lines, -8 removed lines

@@ -17,14 +17,14 @@ 
 
 	public static function instance()
 	{
-		if(!isset(self::$instance))
+		if (!isset(self::$instance))
 			self::$instance = new Loader();
 		return self::$instance;
 	}
 
 	private function get_root()
 	{
-		if(!isset($this->root))
+		if (!isset($this->root))
 		{
 			$current_directory = dirname(__FILE__);
 			$current_directory = substr($current_directory, 0, -7);
@@ -52,7 +52,7 @@ 
 
 	private static function get_extension($type)
 	{
-		switch($type)
+		switch ($type)
 		{
 			case 'collector' :
 			case 'controller' :
@@ -104,10 +104,10 @@ 
 
 	public static function load($type, $files, $data = array())
 	{
-		foreach((array) $files as $file)
+		foreach ((array) $files as $file)
 		{
 			$file_path = self::instance()->get_path($type, $file);
-			if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view')
+			if (in_array($file_path, self::instance()->get_included_files()) && $type !== 'view')
 				continue;
 			
 			// if(!file_exists($file_path))
@@ -115,7 +115,7 @@ 
 			
 			self::instance()->add_included_file($file_path);
 			
-			switch($type)
+			switch ($type)
 			{
 				case 'images' :
 				case 'scripts' :
@@ -145,7 +145,7 @@ 
 		
 		$reflectionObject = self::create_reflection_class($file);
 		
-		if(
+		if (
 			$reflectionObject->hasMethod('instance') &&
 			$reflectionObject->getMethod('instance')->isStatic())
 		{
@@ -160,7 +160,7 @@ 
 		
 		$reflectionObject = self::create_reflection_class($file);
 		
-		if($reflectionObject->hasMethod('__construct'))
+		if ($reflectionObject->hasMethod('__construct'))
 			return $reflectionObject->newInstanceArgs($data);
 		else
 			return $reflectionObject->newInstance();

public/index.php

Spacing +3 added lines, -3 removed lines

@@ -21,7 +21,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'
@@ -33,10 +33,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'],

bootstrap.php

Spacing +6 added lines, -6 removed lines

@@ -25,14 +25,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}",
@@ -40,7 +40,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}",
@@ -48,7 +48,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}",
@@ -66,13 +66,13 @@ 
 
 
 // setup mail handler
-$container['mail'] = $container->factory(function ($c) {
+$container['mail'] = $container->factory(function($c) {
     return new Jacobemerick\Archangel\Archangel();
 });
 
 
 // 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";

router/Router.class.inc.php

Spacing +12 added lines, -12 removed lines

@@ -18,10 +18,10 @@ 
 
 	private static function get_router_name()
 	{
-		if(Request::isAJAX())
+		if (Request::isAJAX())
 			return 'AJAXRouter';
 		
-		switch(URLDecode::getSite())
+		switch (URLDecode::getSite())
 		{
 			case 'ajax' :
 				return 'AjaxRouter';
@@ -65,14 +65,14 @@ 
 
 	final protected function check_for_redirect($redirect_uri)
 	{
-		foreach($this->get_redirect_array() as $check)
+		foreach ($this->get_redirect_array() as $check)
 		{
 			$redirect_uri = preg_replace($check->pattern, $check->replace, $redirect_uri);
 		}
 		
 		$redirect_uri = $this->check_for_special_redirect($redirect_uri);
 		
-		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
+		if ($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
 			$redirect_uri .= '/';
 		
         if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
@@ -80,23 +80,23 @@ 
             $redirect_uri = $protocol . '://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
         }
         
-		if($redirect_uri == URLDecode::getURI())
+		if ($redirect_uri == URLDecode::getURI())
 			return;
 		
 		$controller_check = $redirect_uri;
-		if(substr($redirect_uri, 0, 4) == 'http') {
+		if (substr($redirect_uri, 0, 4) == 'http') {
       $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
 			$controller_check = preg_replace('@^' . $protocol . '://([a-z\.]+)@', '', $redirect_uri);
 		
 		$controller = $this->get_controller($controller_check);
-		if($controller == '/Error404Controller')
+		if ($controller == '/Error404Controller')
 		{
 			Loader::loadNew('controller', '/Error404Controller')
 				->activate();
 			exit;
 		}
 
-		if(substr($redirect_uri, 0, 4) != 'http')
+		if (substr($redirect_uri, 0, 4) != 'http')
 		{
 			$redirect_uri = substr($redirect_uri, 1);
 			$redirect_uri = URLDecode::getBase() . $redirect_uri;
@@ -113,12 +113,12 @@ 
 
 	final private function get_controller($uri)
 	{
-		foreach($this->get_direct_array() as $check)
+		foreach ($this->get_direct_array() as $check)
 		{
-			if($uri == $check->match)
+			if ($uri == $check->match)
 				return "{$this->get_primary_folder()}/{$check->controller}";
 			
-			if(preg_match("@^{$check->match}$@", $uri))
+			if (preg_match("@^{$check->match}$@", $uri))
 				return "{$this->get_primary_folder()}/{$check->controller}";
 		}
 		
@@ -127,7 +127,7 @@ 
 
 	final private function get_primary_folder()
 	{
-		if(Request::isAjax())
+		if (Request::isAjax())
 			return 'ajax';
 		
 		return URLDecode::getSite();

tests/unit/Domain/Blog/Post/MysqlPostRepositoryTest.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
     public function __construct()
     {
         $extendedPdo = $this->newExtendedPdo();
-        $this->connections = new ConnectionLocator(function () use ($extendedPdo) {
+        $this->connections = new ConnectionLocator(function() use ($extendedPdo) {
             return $extendedPdo;
         });
     }

tests/unit/Domain/Stream/Activity/MysqlActivityRepositoryTest.php

Spacing +4 added lines, -4 removed lines

@@ -29,7 +29,7 @@ 
             )"
         );
 
-        self::$connection = new ConnectionLocator(function () use ($extendedPdo) {
+        self::$connection = new ConnectionLocator(function() use ($extendedPdo) {
             return $extendedPdo;
         });
     }
@@ -249,7 +249,7 @@ 
         $this->assertNotFalse($data);
         $this->assertInternalType('array', $data);
 
-        $testData = array_filter($testData, function ($row) {
+        $testData = array_filter($testData, function($row) {
             return ($row['type'] == 'type one');
         });
         $testData = array_values($testData);
@@ -318,7 +318,7 @@ 
         $this->assertInternalType('array', $data);
         $this->assertCount(2, $data);
 
-        $testData = array_filter($testData, function ($row) {
+        $testData = array_filter($testData, function($row) {
             return ($row['type'] == 'type one');
         });
         $testData = array_values($testData);
@@ -384,7 +384,7 @@ 
         $repository = new MysqlActivityRepository(self::$connection);
         $data = $repository->getActivitiesByTypeCount('type one');
 
-        $testData = array_filter($testData, function ($row) {
+        $testData = array_filter($testData, function($row) {
             return ($row['type'] == 'type one');
         });
 

tests/unit/Domain/Stream/Changelog/MysqlChangelogRepositoryTest.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
             )"
         );
 
-        self::$connection = new ConnectionLocator(function () use ($extendedPdo) {
+        self::$connection = new ConnectionLocator(function() use ($extendedPdo) {
             return $extendedPdo;
         });
     }