jacobemerick / web

collector/data/DistanceCollector.class.inc.php

Doc Comments +3 added lines

@@ -17,6 +17,9 @@
 		return self::run_row_query($query);

 	}

 

+	/**
+	 * @param string $date
+	 */
 	public static function getTweetByFields($date, $text)

 	{

 		$query = "SELECT * FROM `jpemeric_stream`.`twitter` WHERE `date` = '{$date}' && `text` = '{$text}' LIMIT 1";

collector/data/TwitterCollector.class.inc.php

Doc Comments +3 added lines

@@ -17,6 +17,9 @@
 		return self::run_row_query($query);

 	}

 

+	/**
+	 * @param string $date
+	 */
 	public static function getTweetByFields($date, $text)

 	{

 		$query = "SELECT * FROM `jpemeric_stream`.`twitter` WHERE `date` = '{$date}' && `text` = '{$text}' LIMIT 1";

collector/stream/DistanceCollector.class.inc.php

Doc Comments +3 added lines

@@ -17,6 +17,9 @@
 		return self::run_row_query($query);

 	}

 

+	/**
+	 * @param string $date
+	 */
 	public static function getTweetByFields($date, $text)

 	{

 		$query = "SELECT * FROM `jpemeric_stream`.`twitter` WHERE `date` = '{$date}' && `text` = '{$text}' LIMIT 1";

controller/blog/DefaultListController.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -55,11 +55,11 @@
 	final private function get_list_posts()

 	{

 		$post_array = array();

-		foreach($this->get_list_results() as $post)

+		foreach ($this->get_list_results() as $post)

 		{

 			$post_array[] = $this->expand_post($post, 'full');

 		}

-		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')

+		if (count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')

 			$this->eject();

 		return $post_array;

 	}

Braces +3 added lines, -2 removed lines

@@ -59,8 +59,9 @@
 		{

 			$post_array[] = $this->expand_post($post, 'full');

 		}

-		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')

-			$this->eject();

+		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search') {

+					$this->eject();

+		}

 		return $post_array;

 	}

 

controller/home/ContactController.class.inc.php

Indentation +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 

 	public function __construct()

 	{

-        global $config;

+		global $config;

 		$this->headers['From'] = self::$FROM;

 		$this->headers['Reply-To'] = "Jacob <{$config->admin_email}>";

 		$this->headers['Bcc'] = "Jacob <{$config->admin_email}>";

Spacing +5 added lines, -5 removed lines

@@ -33,16 +33,16 @@ 
 

 	private function process_form()

 	{

-		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!')

+		if (!Request::hasPost() || Request::getPost('submit') != 'Send Message!')

 			return (object) array('display' => 'normal');

 		

 		Loader::load('utility', 'Validate');

 		$error_result = array();

-		if(!Validate::checkRequest('post', 'name', 'string'))

+		if (!Validate::checkRequest('post', 'name', 'string'))

 			$error_result['name'] = 'please enter your name';

-		if(!Validate::checkRequest('post', 'email', 'string'))

+		if (!Validate::checkRequest('post', 'email', 'string'))

 			$error_result['email'] = 'please enter a valid email';

-		if(!Validate::checkRequest('post', 'message', 'string'))

+		if (!Validate::checkRequest('post', 'message', 'string'))

 			$error_result['message'] = 'please write a message';

 		

 		$values = (object) array(

@@ -50,7 +50,7 @@ 
 			'email' => Request::getPost('email'),

 			'message' => Request::getPost('message'));

 		

-		if(count($error_result) > 0)

+		if (count($error_result) > 0)

 		{

 			return (object) array(

 				'display' => 'error',

Braces +12 added lines, -8 removed lines

@@ -33,17 +33,21 @@
 

 	private function process_form()

 	{

-		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!')

-			return (object) array('display' => 'normal');

+		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!') {

+					return (object) array('display' => 'normal');

+		}

 		

 		Loader::load('utility', 'Validate');

 		$error_result = array();

-		if(!Validate::checkRequest('post', 'name', 'string'))

-			$error_result['name'] = 'please enter your name';

-		if(!Validate::checkRequest('post', 'email', 'string'))

-			$error_result['email'] = 'please enter a valid email';

-		if(!Validate::checkRequest('post', 'message', 'string'))

-			$error_result['message'] = 'please write a message';

+		if(!Validate::checkRequest('post', 'name', 'string')) {

+					$error_result['name'] = 'please enter your name';

+		}

+		if(!Validate::checkRequest('post', 'email', 'string')) {

+					$error_result['email'] = 'please enter a valid email';

+		}

+		if(!Validate::checkRequest('post', 'message', 'string')) {

+					$error_result['message'] = 'please write a message';

+		}

 		

 		$values = (object) array(

 			'name' => Request::getPost('name'),

router/map.php

Spacing +1 added lines, -1 removed lines

@@ -20,6 +20,6 @@
 	)

 );

 

-Router::route($redirect,$direct);

+Router::route($redirect, $direct);

 

 ?>
\ No newline at end of file

tests/unit/domain/blog/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;
         });
     }

Indentation +87 added lines, -87 removed lines

@@ -7,21 +7,21 @@ 
 class MysqlPostRepositoryTest extends PHPUnit_Framework_TestCase
 {
 
-    protected $connections;
-
-    public function __construct()
-    {
-        $extendedPdo = $this->newExtendedPdo();
-        $this->connections = new ConnectionLocator(function () use ($extendedPdo) {
-            return $extendedPdo;
-        });
-    }
-
-    protected function newExtendedPdo()
-    {
-        $extendedPdo = new ExtendedPdo('sqlite::memory:');
-        $extendedPdo->exec('ATTACH DATABASE `jpemeric_blog.db` AS `jpemeric_blog`');
-        $extendedPdo->exec("
+	protected $connections;
+
+	public function __construct()
+	{
+		$extendedPdo = $this->newExtendedPdo();
+		$this->connections = new ConnectionLocator(function () use ($extendedPdo) {
+			return $extendedPdo;
+		});
+	}
+
+	protected function newExtendedPdo()
+	{
+		$extendedPdo = new ExtendedPdo('sqlite::memory:');
+		$extendedPdo->exec('ATTACH DATABASE `jpemeric_blog.db` AS `jpemeric_blog`');
+		$extendedPdo->exec("
             CREATE TABLE IF NOT EXISTS `jpemeric_blog`.`post` (
               `id` integer PRIMARY KEY AUTOINCREMENT,
               `title` varchar(60) NOT NULL,
@@ -31,88 +31,88 @@ 
               `body` text NOT NULL,
               `display` integer NOT NULL
             )"
-        );
-        return $extendedPdo;
-    }
-
-    public function newMysqlPostRepository()
-    {
-        return new MysqlPostRepository($this->connections);
-    }
-
-    public function testConstructSetsConnections()
-    {
-        $this->assertAttributeEquals(
-            $this->connections,
-            'connections',
-            $this->newMysqlPostRepository()
-        );
-    }
-
-    public function testFindPostByPath()
-    {
-        $test_active_post = array(
-            'title'     => 'test findByPath active',
-            'path'      => 'test-findbypath-active',
-            'category'  => 'test-category',
-            'date'      => (new DateTime())->format('Y-m-d H:i:s'),
-            'body'      => 'test content',
-            'display'   => 1
-        );
-
-        $this->connections->getDefault()->perform("
+		);
+		return $extendedPdo;
+	}
+
+	public function newMysqlPostRepository()
+	{
+		return new MysqlPostRepository($this->connections);
+	}
+
+	public function testConstructSetsConnections()
+	{
+		$this->assertAttributeEquals(
+			$this->connections,
+			'connections',
+			$this->newMysqlPostRepository()
+		);
+	}
+
+	public function testFindPostByPath()
+	{
+		$test_active_post = array(
+			'title'     => 'test findByPath active',
+			'path'      => 'test-findbypath-active',
+			'category'  => 'test-category',
+			'date'      => (new DateTime())->format('Y-m-d H:i:s'),
+			'body'      => 'test content',
+			'display'   => 1
+		);
+
+		$this->connections->getDefault()->perform("
             INSERT INTO jpemeric_blog.post
                 (title, path, category, date, body, display)
             VALUES
                 (:title, :path, :category, :date, :body, :display)",
-            $test_active_post);
-
-        $active_post = $this->newMysqlPostRepository()->findPostByPath(
-            $test_active_post['category'],
-            $test_active_post['path']
-        );
-        $this->assertSame($test_active_post['title'], $active_post['title']);
-
-        $test_inactive_post = array(
-            'title'     => 'test findByPath inactive',
-            'path'      => 'test-findbypath-inactive',
-            'category'  => 'test-category',
-            'date'      => (new DateTime())->format('Y-m-d H:i:s'),
-            'body'      => 'test content',
-            'display'   => 0
-        );
-
-        $this->connections->getDefault()->perform("
+			$test_active_post);
+
+		$active_post = $this->newMysqlPostRepository()->findPostByPath(
+			$test_active_post['category'],
+			$test_active_post['path']
+		);
+		$this->assertSame($test_active_post['title'], $active_post['title']);
+
+		$test_inactive_post = array(
+			'title'     => 'test findByPath inactive',
+			'path'      => 'test-findbypath-inactive',
+			'category'  => 'test-category',
+			'date'      => (new DateTime())->format('Y-m-d H:i:s'),
+			'body'      => 'test content',
+			'display'   => 0
+		);
+
+		$this->connections->getDefault()->perform("
             INSERT INTO jpemeric_blog.post
                 (title, path, category, date, body, display)
             VALUES
                 (:title, :path, :category, :date, :body, :display)",
-            $test_inactive_post);
-
-        $inactive_post = $this->newMysqlPostRepository()->findPostByPath(
-            $test_inactive_post['category'],
-            $test_inactive_post['path']
-        );
-        $this->assertFalse($inactive_post);
-
-        $nonexistant_post = $this->newMysqlPostRepository()->findPostByPath(
-            'test-category',
-            'test-findbypath-nonexistant'
-        );
-        $this->assertFalse($nonexistant_post);
+			$test_inactive_post);
+
+		$inactive_post = $this->newMysqlPostRepository()->findPostByPath(
+			$test_inactive_post['category'],
+			$test_inactive_post['path']
+		);
+		$this->assertFalse($inactive_post);
+
+		$nonexistant_post = $this->newMysqlPostRepository()->findPostByPath(
+			'test-category',
+			'test-findbypath-nonexistant'
+		);
+		$this->assertFalse($nonexistant_post);
    }
 
-    public function testIsInstanceOfPostRepository()
-    {
-        $this->assertInstanceOf(
-            'Jacobemerick\Web\Domain\Blog\Post\PostRepositoryInterface',
-            $this->newMysqlPostRepository()
-        );
-    }
+	public function testIsInstanceOfPostRepository()
+	{
+		$this->assertInstanceOf(
+			'Jacobemerick\Web\Domain\Blog\Post\PostRepositoryInterface',
+			$this->newMysqlPostRepository()
+		);
+	}
 
-    public static function tearDownAfterClass()
-    {
+	public static function tearDownAfterClass()
+	{
 //        $this->connections->getDefault()->disconnect();
-        unlink('jpemeric_blog.db');
-    }
+		unlink('jpemeric_blog.db');
+	}
 }

src/Domain/Blog/Post/MysqlPostRepository.php

Doc Comments +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
     protected $connections;
 
     /**
-     * @param Aura\Sql\ConnectionLocator $connections
+     * @param ConnectionLocator $connections
      */
     public function __construct(ConnectionLocator $connections)
     {
@@ -22,7 +22,7 @@ 
      * @param string $category
      * @param string $path
      *
-     * @return array|false
+     * @return boolean
      */
     public function findByPath($category, $path)
     {

Indentation +136 added lines, -136 removed lines

@@ -7,165 +7,165 @@ 
 class MysqlPostRepository implements PostRepository
 {
 
-    /** @var  Aura\Sql\ConnectionLocator */
-    protected $connections;
-
-    /**
-     * @param Aura\Sql\ConnectionLocator $connections
-     */
-    public function __construct(ConnectionLocator $connections)
-    {
-        $this->connections = $connections;
-    }
-
-    /**
-     * @param string $category
-     * @param string $path
-     *
-     * @return array|false
-     */
-    public function findPostByPath($category, $path)
-    {
-        $query = "
+	/** @var  Aura\Sql\ConnectionLocator */
+	protected $connections;
+
+	/**
+	 * @param Aura\Sql\ConnectionLocator $connections
+	 */
+	public function __construct(ConnectionLocator $connections)
+	{
+		$this->connections = $connections;
+	}
+
+	/**
+	 * @param string $category
+	 * @param string $path
+	 *
+	 * @return array|false
+	 */
+	public function findPostByPath($category, $path)
+	{
+		$query = "
             SELECT `id`, `title`, `path`, `date`, `body`, `category`
             FROM `jpemeric_blog`.`post`
             WHERE `path` = :path AND `category` = :category AND `display` = :is_active
             LIMIT 1";
-        $bindings = [
-            'path'      => $path,
-            'category'  => $category,
-            'is_active' => 1,
-        ];
-
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchOne($query, $bindings);
-    }
-
-    public function getActivePosts($limit = null, $offset = 0)
-    {
-        $query = "
+		$bindings = [
+			'path'      => $path,
+			'category'  => $category,
+			'is_active' => 1,
+		];
+
+		return $this
+			->connections
+			->getRead()
+			->fetchOne($query, $bindings);
+	}
+
+	public function getActivePosts($limit = null, $offset = 0)
+	{
+		$query = "
             SELECT `id`, `title`, `path`, `date`, `body`, `category`
             FROM `jpemeric_blog`.`post`
             WHERE `display` = :is_active
             ORDER BY `date` DESC";
-        if ($limit != null) {
-            $query .= "
+		if ($limit != null) {
+			$query .= "
             LIMIT {$offset}, {$limit}";
-        }
+		}
 
-        $bindings = [
-            'is_active' => 1,
-        ];
+		$bindings = [
+			'is_active' => 1,
+		];
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query, $bindings);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query, $bindings);
+	}
 
-    public function getActivePostsCount()
-    {
-        $query = "
+	public function getActivePostsCount()
+	{
+		$query = "
             SELECT COUNT(1) AS `count`
             FROM `jpemeric_blog`.`post`
             WHERE `display` = :is_active";
-        $bindings = [
-            'is_active' => 1,
-        ];
-
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchValue($query, $bindings);
-    }
-
-    public function getActivePostsByTag($tag, $limit = null, $offset = 0)
-    {
-        $query = "
+		$bindings = [
+			'is_active' => 1,
+		];
+
+		return $this
+			->connections
+			->getRead()
+			->fetchValue($query, $bindings);
+	}
+
+	public function getActivePostsByTag($tag, $limit = null, $offset = 0)
+	{
+		$query = "
             SELECT `id`, `title`, `path`, `date`, `body`, `category`
             FROM `jpemeric_blog`.`post`
             INNER JOIN `jpemeric_blog`.`ptlink` ON `ptlink`.`post_id` = `post`.`id` AND
                                                    `ptlink`.`tag_id` = :tag_id
             WHERE `display` = :is_active";
-        if ($limit != null) {
-            $query .= "
+		if ($limit != null) {
+			$query .= "
             LIMIT {$offset}, {$limit}";
-        }
-
-        $bindings = [
-            'tag_id'    => $tag,
-            'is_active' => 1,
-        ];
-
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query, $bindings);
-    }
-
-    public function getActivePostsCountByTag($tag)
-    {
-        $query = "
+		}
+
+		$bindings = [
+			'tag_id'    => $tag,
+			'is_active' => 1,
+		];
+
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query, $bindings);
+	}
+
+	public function getActivePostsCountByTag($tag)
+	{
+		$query = "
             SELECT COUNT(1) AS `count`
             FROM `jpemeric_blog`.`post`
             INNER JOIN `jpemeric_blog`.`ptlink` ON `ptlink`.`post_id` = `post`.`id` AND
                                                    `ptlink`.`tag_id` = :tag_id
             WHERE `display` = :is_active";
-        $bindings = [
-            'tag_id'    => $tag,
-            'is_active' => 1,
-        ];
-
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchValue($query, $bindings);
-    }
-
-    public function getActivePostsByCategory($category, $limit = null, $offset = 0)
-    {
-        $query = "
+		$bindings = [
+			'tag_id'    => $tag,
+			'is_active' => 1,
+		];
+
+		return $this
+			->connections
+			->getRead()
+			->fetchValue($query, $bindings);
+	}
+
+	public function getActivePostsByCategory($category, $limit = null, $offset = 0)
+	{
+		$query = "
             SELECT `id`, `title`, `path`, `date`, `body`, `category`
             FROM `jpemeric_blog`.`post`
             WHERE `category` = :category AND `display` = :is_active";
-        if ($limit != null) {
-            $query .= "
+		if ($limit != null) {
+			$query .= "
             LIMIT {$offset}, {$limit}";
-        }
-
-        $bindings = [
-            'category'  => $category,
-            'is_active' => 1,
-        ];
-
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query, $bindings);
-    }
-
-    public function getActivePostsCountByCategory($category)
-    {
-        $query = "
+		}
+
+		$bindings = [
+			'category'  => $category,
+			'is_active' => 1,
+		];
+
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query, $bindings);
+	}
+
+	public function getActivePostsCountByCategory($category)
+	{
+		$query = "
             SELECT COUNT(1) AS `count`
             FROM `jpemeric_blog`.`post`
             WHERE `category` = :category AND `display` = :is_active";
-        $bindings = [
-            'category'  => $category,
-            'is_active' => 1,
-        ];
-
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchValue($query, $bindings);
-    }
-
-    public function getActivePostsByRelatedTags($post, $limit = 4)
-    {
-        $query = "
+		$bindings = [
+			'category'  => $category,
+			'is_active' => 1,
+		];
+
+		return $this
+			->connections
+			->getRead()
+			->fetchValue($query, $bindings);
+	}
+
+	public function getActivePostsByRelatedTags($post, $limit = 4)
+	{
+		$query = "
             SELECT `id`, `title`, `path`, `date`, `body`, `category`, COUNT(1) AS `count`
             FROM `jpemeric_blog`.`post`
             INNER JOIN `jpemeric_blog`.`ptlink` ON `ptlink`.`post_id` = `post`.`id` AND
@@ -185,14 +185,14 @@ 
             GROUP BY `id`
             ORDER BY `count` DESC
             LIMIT {$limit}";
-        $bindings = [
-            'post'      => $post,
-            'is_active' => 1,
-        ];
-
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query, $bindings);
-    }
+		$bindings = [
+			'post'      => $post,
+			'is_active' => 1,
+		];
+
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query, $bindings);
+	}
 }

src/Domain/Blog/Post/PostRepositoryInterface.php

Indentation +8 added lines, -8 removed lines

@@ -4,12 +4,12 @@
 
 interface PostRepository
 {
-    public function findPostByPath($category, $path);
-    public function getActivePosts($limit = null, $offset= 0);
-    public function getActivePostsCount();
-    public function getActivePostsByTag($tag, $limit = null, $offset = 0);
-    public function getActivePostsCountByTag($tag);
-    public function getActivePostsByCategory($category, $limit = null, $offset = 0);
-    public function getActivePostsCountByCategory($category);
-    public function getActivePostsByRelatedTags($post, $limit = 4);
+	public function findPostByPath($category, $path);
+	public function getActivePosts($limit = null, $offset= 0);
+	public function getActivePostsCount();
+	public function getActivePostsByTag($tag, $limit = null, $offset = 0);
+	public function getActivePostsCountByTag($tag);
+	public function getActivePostsByCategory($category, $limit = null, $offset = 0);
+	public function getActivePostsCountByCategory($category);
+	public function getActivePostsByRelatedTags($post, $limit = 4);
 }

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 interface PostRepository
 {
     public function findPostByPath($category, $path);
-    public function getActivePosts($limit = null, $offset= 0);
+    public function getActivePosts($limit = null, $offset = 0);
     public function getActivePostsCount();
     public function getActivePostsByTag($tag, $limit = null, $offset = 0);
     public function getActivePostsCountByTag($tag);