From 85dab01339cf3b190f5edd86860e0835e43ae833 Mon Sep 17 00:00:00 2001
From: Peter <neodfs@quicknet.nl>
Date: Thu, 2 Jun 2016 21:41:46 +0200
Subject: [PATCH] Added some docblocks and use phpunit

---
 .gitignore                                    |  1 +
 composer.json                                 |  7 ++--
 src/Camroncade/Timezone/Timezone.php          | 33 ++++++++++++++++---
 .../Timezone/TimezoneServiceProvider.php      |  8 ++---
 tests/TimezoneTest.php                        | 17 ++++++++++
 5 files changed, 56 insertions(+), 10 deletions(-)
 create mode 100644 tests/TimezoneTest.php

diff --git a/.gitignore b/.gitignore
index 5826402..225319b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 composer.phar
 composer.lock
 .DS_Store
+.idea/
\ No newline at end of file
diff --git a/composer.json b/composer.json
index c10df80..afe7288 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "camroncade/timezone",
     "description": "Helps manage timezones in Laravel. Includes <select> form builder for timezones.",
     "homepage": "http://www.camroncade.com/managing-timezones-with-laravel/",
-    "keybords": ["timezone", "timezones"],
+    "keywords": ["timezone", "timezones"],
     "license": "MIT",
     "authors": [
         {
@@ -22,5 +22,8 @@
             "Camroncade\\Timezone\\": "src/"
         }
     },
-    "minimum-stability": "stable"
+    "minimum-stability": "stable",
+    "require-dev": {
+        "phpunit/phpunit": "^5.3"
+    }
 }
diff --git a/src/Camroncade/Timezone/Timezone.php b/src/Camroncade/Timezone/Timezone.php
index 4fda630..e47c266 100644
--- a/src/Camroncade/Timezone/Timezone.php
+++ b/src/Camroncade/Timezone/Timezone.php
@@ -150,11 +150,22 @@ class Timezone {
 	    '(UTC+13:00) Nuku\'alofa' => 'Pacific/Tongatapu'
 	);
 
-    public function getTimezones()
+	/**
+	 * @return array
+     */
+	public function getTimezones()
     {
         return $this->timezoneList;
     }
-    
+
+	/**
+	 * @param null $selected
+	 * @param null $placeholder
+	 * @param array $selectAttributes
+	 * @param array $optionAttributes
+	 *
+	 * @return string
+     */
 	public function selectForm($selected = null, $placeholder = null, array $selectAttributes = [], array $optionAttributes = [] )
 	{
 		$selectAttributesString = '';
@@ -196,6 +207,13 @@ public function selectForm($selected = null, $placeholder = null, array $selectA
 		return $string;
 	}
 
+	/**
+	 * @param integer $timestamp
+	 * @param string $timezone
+	 * @param string $format
+	 *
+	 * @return string
+     */
 	public function convertFromUTC($timestamp, $timezone, $format = 'Y-m-d H:i:s')
 	{
         $date = new DateTime($timestamp, new DateTimeZone('UTC'));
@@ -203,9 +221,16 @@ public function convertFromUTC($timestamp, $timezone, $format = 'Y-m-d H:i:s')
         $date->setTimezone(new DateTimeZone($timezone));
 
         return $date->format($format);
-    } 
+    }
 
-    public function convertToUTC($timestamp, $timezone, $format = 'Y-m-d H:i:s')
+	/**
+	 * @param integer $timestamp
+	 * @param string $timezone
+	 * @param string $format
+	 *
+	 * @return string
+     */
+	public function convertToUTC($timestamp, $timezone, $format = 'Y-m-d H:i:s')
     {
     	$date = new DateTime($timestamp, new DateTimeZone($timezone));
 
diff --git a/src/Camroncade/Timezone/TimezoneServiceProvider.php b/src/Camroncade/Timezone/TimezoneServiceProvider.php
index 152fc18..e4c789e 100644
--- a/src/Camroncade/Timezone/TimezoneServiceProvider.php
+++ b/src/Camroncade/Timezone/TimezoneServiceProvider.php
@@ -15,21 +15,21 @@ class TimezoneServiceProvider extends ServiceProvider {
 	/**
 	 * Bootstrap the application events.
 	 *
-	 * @return void
+	 * @return null
 	 */
 	public function boot()
 	{
-		AliasLoader::getInstance()->alias('Timezone', 'Camroncade\Timezone\Facades\Timezone');
+		AliasLoader::getInstance()->alias('Timezone', \Camroncade\Timezone\Facades\Timezone::class);
 	}
 
 	/**
 	 * Register the service provider.
 	 *
-	 * @return void
+	 * @return null
 	 */
 	public function register()
 	{
-		$this->app->bind('timezone', 'Camroncade\Timezone\Timezone');
+		$this->app->bind('timezone', Timezone::class);
 	}
 
 	/**
diff --git a/tests/TimezoneTest.php b/tests/TimezoneTest.php
new file mode 100644
index 0000000..03b8504
--- /dev/null
+++ b/tests/TimezoneTest.php
@@ -0,0 +1,17 @@
+<?php
+
+class TimezoneTest extends PHPUnit_Framework_TestCase{
+    public function testConvertFromUTC(){
+        $timezone = new \Camroncade\Timezone\Timezone();
+
+        $this->assertEquals('2016-01-01 18:00:00',$timezone->convertFromUTC('2016-01-01 18:00:00','UTC'));
+        $this->assertEquals('18:30:20',$timezone->convertFromUTC('2016-01-01 18:30:20','UTC','H:i:s'));
+    }
+
+    public function testConvertToUTC(){
+        $timezone = new \Camroncade\Timezone\Timezone();
+
+        $this->assertEquals('2016-01-01 18:00:00',$timezone->convertToUTC('2016-01-01 18:00:00','UTC'));
+        $this->assertEquals('18:30:20',$timezone->convertToUTC('2016-01-01 18:30:20','UTC','H:i:s'));
+    }
+}
\ No newline at end of file