From 7421034726de3d22bdcddf084d9975f7824af3da Mon Sep 17 00:00:00 2001
From: "honggaojob@gmail.com" <honggaojob@gmail.com>
Date: Tue, 24 May 2016 10:51:19 -0400
Subject: [PATCH 1/4] string search challenge

---
 src/string_search.php | 22 ++++++++++++++++++++++
 1 file changed, 22 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..de4f2af
--- /dev/null
+++ b/src/string_search.php
@@ -0,0 +1,22 @@
+<?php
+
+$myString = "I love PHP programming and my friend Jenny also loves PHP programming!";
+$search = "PHP";
+
+function string_search($myString, $search){
+	global $myString;
+	global $search;
+	if($search === ""){
+		return false;
+	} else {
+	return strpos($myString, $search);
+	}
+}
+
+if(string_search() === false){
+	print_r("Needle is empty");
+} else {
+print_r("find $search at the index " . string_search());
+}
+
+

From 3de57eeb2eff7f7d203791c2a9d6454a2a0e1d23 Mon Sep 17 00:00:00 2001
From: "honggaojob@gmail.com" <honggaojob@gmail.com>
Date: Tue, 24 May 2016 11:12:38 -0400
Subject: [PATCH 2/4] changed variable names

---
 src/string_search.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/string_search.php b/src/string_search.php
index de4f2af..a967110 100644
--- a/src/string_search.php
+++ b/src/string_search.php
@@ -1,22 +1,22 @@
 <?php
 
-$myString = "I love PHP programming and my friend Jenny also loves PHP programming!";
-$search = "PHP";
+$haystack = "I love PHP programming and my friend Jenny also loves PHP programming!";
+$needle = "PHP";
 
-function string_search($myString, $search){
-	global $myString;
-	global $search;
-	if($search === ""){
+function string_search($haystack, $needle){
+	global $haystack;
+	global $needle;
+	if($needle === ""){
 		return false;
 	} else {
-	return strpos($myString, $search);
+	return strpos($haystack, $needle);
 	}
 }
 
 if(string_search() === false){
 	print_r("Needle is empty");
 } else {
-print_r("find $search at the index " . string_search());
+print_r("find $needle at the index " . string_search());
 }
 
 

From 0faa2204e1dfa087266c5c7ec46890f6e8cbca04 Mon Sep 17 00:00:00 2001
From: "honggaojob@gmail.com" <honggaojob@gmail.com>
Date: Tue, 24 May 2016 18:25:32 -0400
Subject: [PATCH 3/4] change parameter

---
 src/string_search.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/string_search.php b/src/string_search.php
index a967110..cc43f9d 100644
--- a/src/string_search.php
+++ b/src/string_search.php
@@ -1,11 +1,10 @@
 <?php
 
-$haystack = "I love PHP programming and my friend Jenny also loves PHP programming!";
-$needle = "PHP";
+$haystack = "abracadabra";
+$needle = "ab";
 
-function string_search($haystack, $needle){
-	global $haystack;
-	global $needle;
+function string_search($needle, $haystack){
+	
 	if($needle === ""){
 		return false;
 	} else {
@@ -13,10 +12,10 @@ function string_search($haystack, $needle){
 	}
 }
 
-if(string_search() === false){
+if(string_search($needle, $haystack) === false){
 	print_r("Needle is empty");
 } else {
-print_r("find $needle at the index " . string_search());
+print_r("Found '$needle' at index " . string_search($needle, $haystack));
 }
 
 

From 9a133c59fa7cf87bc5842ded34ecc607231a3bdf Mon Sep 17 00:00:00 2001
From: "honggaojob@gmail.com" <honggaojob@gmail.com>
Date: Tue, 24 May 2016 18:42:10 -0400
Subject: [PATCH 4/4] combine into a big funciton

---
 src/string_search.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/string_search.php b/src/string_search.php
index cc43f9d..45ee2e9 100644
--- a/src/string_search.php
+++ b/src/string_search.php
@@ -8,14 +8,15 @@ function string_search($needle, $haystack){
 	if($needle === ""){
 		return false;
 	} else {
-	return strpos($haystack, $needle);
+		$position = strpos($haystack, $needle);
+	
+		if($position === false){
+			return false;
+		} else {
+			return "Found '$needle' at index $position";
+		}
 	}
 }
 
-if(string_search($needle, $haystack) === false){
-	print_r("Needle is empty");
-} else {
-print_r("Found '$needle' at index " . string_search($needle, $haystack));
-}