From a702fcf1d6b0d466a967fbea4b35d285147c0032 Mon Sep 17 00:00:00 2001
From: Kathryn <kanne1126@gmail.com>
Date: Tue, 27 Sep 2016 14:01:37 -0400
Subject: [PATCH 1/8] first commit

---
 src/date_formatter.php | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 src/date_formatter.php

diff --git a/src/date_formatter.php b/src/date_formatter.php
new file mode 100644
index 0000000..93a223f
--- /dev/null
+++ b/src/date_formatter.php
@@ -0,0 +1,28 @@
+<?php
+
+function validateDate($date, $format = 'Y-m-d')
+{
+    $d = DateTime::createFromFormat($format, $date);
+    return $d && $d->format($format) == $date;
+}
+
+
+
+function date_formatter($date){
+
+  if (is_string($date)){
+    $date = date_create($date);
+
+    return date_format($date, 'l, FjS Y');
+
+  }else {
+     echo "No"; //change to return "";
+  }
+}
+
+echo date_formatter("2016-01-16");
+
+
+
+
+?>

From b7a26fa75aa23df63d4e6acdd1fe5d5cb70a3563 Mon Sep 17 00:00:00 2001
From: Kathryn <kanne1126@gmail.com>
Date: Tue, 27 Sep 2016 21:17:21 -0400
Subject: [PATCH 2/8] date formatter

---
 src/date_formatter.php | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/date_formatter.php b/src/date_formatter.php
index 93a223f..063ecf0 100644
--- a/src/date_formatter.php
+++ b/src/date_formatter.php
@@ -1,28 +1,17 @@
 <?php
-
-function validateDate($date, $format = 'Y-m-d')
-{
-    $d = DateTime::createFromFormat($format, $date);
-    return $d && $d->format($format) == $date;
+function validateDate($date){
+  if(preg_match('/\d{4}-\d{2}-\d{2}/',$date)){
+    return true;
+  }else{
+    return false;
+  }
 }
-
-
-
 function date_formatter($date){
-
-  if (is_string($date)){
+  if (is_string($date) && validateDate($date)){
     $date = date_create($date);
-
     return date_format($date, 'l, FjS Y');
-
   }else {
-     echo "No"; //change to return "";
+     echo "";
   }
 }
-
-echo date_formatter("2016-01-16");
-
-
-
-
 ?>

From df78a2149e2f104880c95be483d22aabce151410 Mon Sep 17 00:00:00 2001
From: Kathryn <kanne1126@gmail.com>
Date: Tue, 27 Sep 2016 21:39:10 -0400
Subject: [PATCH 3/8] month formatted

---
 src/date_formatter.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/date_formatter.php b/src/date_formatter.php
index 063ecf0..85b7d7c 100644
--- a/src/date_formatter.php
+++ b/src/date_formatter.php
@@ -1,6 +1,9 @@
 <?php
 function validateDate($date){
-  if(preg_match('/\d{4}-\d{2}-\d{2}/',$date)){
+  if(preg_match('/\d{4}-\d{2}-\d{2}/',$date) ||
+    preg_match('/\d{4}-\d{1}-\d{2}/',$date) ||
+    preg_match('/\d{4}-\d{1}-\d{1}/',$date) ||
+    preg_match('/\d{4}-\d{2}-\d{1}/',$date)  ) {
     return true;
   }else{
     return false;
@@ -9,9 +12,9 @@ function validateDate($date){
 function date_formatter($date){
   if (is_string($date) && validateDate($date)){
     $date = date_create($date);
-    return date_format($date, 'l, FjS Y');
+    return date_format($date, 'l, F jS Y');
   }else {
-     echo "";
+     return "";
   }
 }
 ?>

From cf82283013ff7bd4aaaafd24bed2fd04d4f4c971 Mon Sep 17 00:00:00 2001
From: Kathryn <kanne1126@gmail.com>
Date: Tue, 27 Sep 2016 21:44:29 -0400
Subject: [PATCH 4/8] month formatted

---
 src/date_formatter.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/date_formatter.php b/src/date_formatter.php
index 85b7d7c..bf31750 100644
--- a/src/date_formatter.php
+++ b/src/date_formatter.php
@@ -1,9 +1,6 @@
 <?php
 function validateDate($date){
-  if(preg_match('/\d{4}-\d{2}-\d{2}/',$date) ||
-    preg_match('/\d{4}-\d{1}-\d{2}/',$date) ||
-    preg_match('/\d{4}-\d{1}-\d{1}/',$date) ||
-    preg_match('/\d{4}-\d{2}-\d{1}/',$date)  ) {
+  if(preg_match('/\d{1,4}-\d{1,2}-\d{1,2}/',$date)) {
     return true;
   }else{
     return false;

From 5b43827f6d7a905afcacd880474144b3f3d24b47 Mon Sep 17 00:00:00 2001
From: Kathryn <kanne1126@gmail.com>
Date: Tue, 27 Sep 2016 22:14:49 -0400
Subject: [PATCH 5/8] validateDate function

---
 src/date_formatter.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/date_formatter.php b/src/date_formatter.php
index bf31750..7cac482 100644
--- a/src/date_formatter.php
+++ b/src/date_formatter.php
@@ -1,17 +1,26 @@
 <?php
-function validateDate($date){
+
+function validateFormat($date){
   if(preg_match('/\d{1,4}-\d{1,2}-\d{1,2}/',$date)) {
     return true;
   }else{
     return false;
   }
 }
+
+function validateDate($date, $format = 'Y-m-d')
+{
+    $d = DateTime::createFromFormat($format, $date);
+    return $d && $d->format($format) == $date;
+}
+
 function date_formatter($date){
-  if (is_string($date) && validateDate($date)){
+  if (is_string($date) && validateFormat($date) && validateDate($date)){
     $date = date_create($date);
     return date_format($date, 'l, F jS Y');
   }else {
      return "";
   }
 }
+echo date_formatter("2015-02-29");
 ?>

From c7cdf8dc6114aa2b1639bade050b2bdb5cbad089 Mon Sep 17 00:00:00 2001
From: Kathryn <kanne1126@gmail.com>
Date: Tue, 27 Sep 2016 22:36:34 -0400
Subject: [PATCH 6/8] date tostring

---
 src/date_formatter.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/date_formatter.php b/src/date_formatter.php
index 7cac482..d51d787 100644
--- a/src/date_formatter.php
+++ b/src/date_formatter.php
@@ -1,5 +1,7 @@
 <?php
 
+
+
 function validateFormat($date){
   if(preg_match('/\d{1,4}-\d{1,2}-\d{1,2}/',$date)) {
     return true;
@@ -8,19 +10,21 @@ function validateFormat($date){
   }
 }
 
-function validateDate($date, $format = 'Y-m-d')
-{
-    $d = DateTime::createFromFormat($format, $date);
-    return $d && $d->format($format) == $date;
+function validateDate($date, $format = 'Y-m-d'){
+  $timestamp = strtotime($date);
+  $new_date = date('Y-m-d', $timestamp);
+
+  $d = DateTime::createFromFormat($format, $new_date);
+  return $d && $d->format($format) == $new_date;
 }
 
 function date_formatter($date){
-  if (is_string($date) && validateFormat($date) && validateDate($date)){
+  if (is_string($date) && validateFormat($date)){
     $date = date_create($date);
     return date_format($date, 'l, F jS Y');
   }else {
      return "";
   }
 }
-echo date_formatter("2015-02-29");
+echo date_formatter("12-12-12");
 ?>

From 85ced52113eb3835bbcfacc446a43b0758020a9c Mon Sep 17 00:00:00 2001
From: Kathryn <kanne1126@gmail.com>
Date: Wed, 28 Sep 2016 21:52:24 -0400
Subject: [PATCH 7/8] new ValDate fxn

---
 src/date_formatter.php | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/date_formatter.php b/src/date_formatter.php
index d51d787..5a76628 100644
--- a/src/date_formatter.php
+++ b/src/date_formatter.php
@@ -1,30 +1,18 @@
 <?php
 
-
-
-function validateFormat($date){
-  if(preg_match('/\d{1,4}-\d{1,2}-\d{1,2}/',$date)) {
+function validateDate($date){
+  list($y, $m, $d) = explode("-",$date);
+  if(checkdate($m, $d, $y)){
     return true;
-  }else{
-    return false;
-  }
-}
-
-function validateDate($date, $format = 'Y-m-d'){
-  $timestamp = strtotime($date);
-  $new_date = date('Y-m-d', $timestamp);
-
-  $d = DateTime::createFromFormat($format, $new_date);
-  return $d && $d->format($format) == $new_date;
+  }else false;
 }
 
 function date_formatter($date){
-  if (is_string($date) && validateFormat($date)){
+  if (is_string($date) && validateDate($date)){
     $date = date_create($date);
     return date_format($date, 'l, F jS Y');
   }else {
      return "";
   }
 }
-echo date_formatter("12-12-12");
 ?>

From b3c47799b6dc9e94c3c73bd440b10ab09ced987f Mon Sep 17 00:00:00 2001
From: Kathryn <kanne1126@gmail.com>
Date: Wed, 28 Sep 2016 22:08:06 -0400
Subject: [PATCH 8/8] pregmatch

---
 src/date_formatter.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/date_formatter.php b/src/date_formatter.php
index 5a76628..e032af0 100644
--- a/src/date_formatter.php
+++ b/src/date_formatter.php
@@ -1,9 +1,11 @@
 <?php
 
 function validateDate($date){
-  list($y, $m, $d) = explode("-",$date);
-  if(checkdate($m, $d, $y)){
-    return true;
+  if(preg_match('/\d{1,4}-\d{1,2}-\d{1,2}/',$date)){
+    list($y,$m,$d) = explode("-",$date);
+    if(checkdate($m, $d, $y)){
+      return true;
+    }
   }else false;
 }