From 8de015ae65cb999d88507f542d4df01c60733478 Mon Sep 17 00:00:00 2001
From: Korey McMurtrey <kmcmurtrey@gmail.com>
Date: Thu, 14 Jan 2016 19:52:20 -0500
Subject: [PATCH 1/4] First attempt at string search with stripos()

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

diff --git a/src/string_search.php b/src/string_search.php
new file mode 100644
index 0000000..5c380cc
--- /dev/null
+++ b/src/string_search.php
@@ -0,0 +1,12 @@
+<?php
+
+string_search ($needle, $haystack) {
+    $position = stripos ($haystack, $needle);
+
+    if ($position === false || $needle === '') {
+        return false;
+    } else {
+        return "Found '$needle' at index $position";
+    }
+    
+}
\ No newline at end of file

From 9ed302b28ca63c754c47f622f2b77a33571f37b2 Mon Sep 17 00:00:00 2001
From: Korey McMurtrey <kmcmurtrey@gmail.com>
Date: Thu, 14 Jan 2016 19:54:31 -0500
Subject: [PATCH 2/4] Add the word function

---
 src/string_search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/string_search.php b/src/string_search.php
index 5c380cc..6842c0d 100644
--- a/src/string_search.php
+++ b/src/string_search.php
@@ -1,6 +1,6 @@
 <?php
 
-string_search ($needle, $haystack) {
+function string_search ($needle, $haystack) {
     $position = stripos ($haystack, $needle);
 
     if ($position === false || $needle === '') {

From eb2523f7387c9038d8dd401124afb20b9c2c0fc1 Mon Sep 17 00:00:00 2001
From: Korey McMurtrey <kmcmurtrey@gmail.com>
Date: Thu, 14 Jan 2016 19:57:06 -0500
Subject: [PATCH 3/4] Try with strpos()

---
 src/string_search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/string_search.php b/src/string_search.php
index 6842c0d..b123dcc 100644
--- a/src/string_search.php
+++ b/src/string_search.php
@@ -1,7 +1,7 @@
 <?php
 
 function string_search ($needle, $haystack) {
-    $position = stripos ($haystack, $needle);
+    $position = strpos ($haystack, $needle);
 
     if ($position === false || $needle === '') {
         return false;

From 25c5bc3eba8bf4eee72bdf25a5e8b02512314c05 Mon Sep 17 00:00:00 2001
From: kmcmurtrey <korey.mcmurtrey@gmail.com>
Date: Thu, 14 Jan 2016 22:45:16 -0500
Subject: [PATCH 4/4] Uses empty() to check , and strpos()

---
 src/string_search.php | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/string_search.php b/src/string_search.php
index b123dcc..2f0f3af 100644
--- a/src/string_search.php
+++ b/src/string_search.php
@@ -1,12 +1,22 @@
 <?php
 
 function string_search ($needle, $haystack) {
+  
+  //Check if $needle is empty, and return false if so.
+  if (empty($needle)) {
+    
+    return false;
+    
+  } else {
+    
+    //Use strpos() to search for needle, returning the position if found, and returnig false if not.
     $position = strpos ($haystack, $needle);
 
-    if ($position === false || $needle === '') {
-        return false;
-    } else {
-        return "Found '$needle' at index $position";
-    }
+    if ($position !== false) {
+      return "Found '$needle' at index $position";
+    }   
     
+    return false;
+
+  }    
 }
\ No newline at end of file