Send needleFactory to it's own class

Author: Etienne

src/Iterators/JsonFileIterator.php

@@ -12,12 +12,12 @@ class JsonFileIterator extends JsonIterator
 
     protected $jsonFileHandle;
 
-    public function __construct($jsonFileHandle, array $options = null)
+    public function __construct(NeedleFactory $needleFactory, $jsonFileHandle, array $options = null)
     {
 	$this->jsonFileHandle = $jsonFileHandle;
 
 	$jsonString = file_get_contents($jsonFileHandle);
-	parent::__construct($jsonString, $options);
+	parent::__construct($needleFactory, $jsonString, $options);
     }
 
     public function __destruct()

src/Iterators/JsonFilesIterator.php

@@ -12,13 +12,13 @@
 class JsonFilesIterator extends AppendIterator
 {
 
-    public function __construct($jsonFileHandles, array $options = null)
+    public function __construct(NeedleFactory $needleFactory, array $jsonFileHandles, array $options = null)
     {
 	parent::__construct();
 
 	foreach ($jsonFileHandles as $jsonFileHandle)
 	{
-	    $this->append(new JsonFileIterator($jsonFileHandle, $options));
+	    $this->append(new JsonFileIterator($needleFactory, $jsonFileHandle, $options));
 	}
     }
 

src/Iterators/JsonIterator.php

@@ -17,12 +17,12 @@ class JsonIterator implements Iterator
     protected $cursorPosition;
     protected $nextCursorPosition;
 
-    public function __construct($jsonString, array $options = null)
+    public function __construct(NeedleFactory $needleFactory, $jsonString, array $options = null)
     {
 	$this->jsonString = $jsonString;
 
 	$this->setDefaultOptions($options);
-	$this->needleFactory($options['firstTopLevelString']);
+	$this->needle = $needleFactory->build();
 
 	if ($options['jsonHasSquareBrackets'])
 	{
@@ -79,16 +79,6 @@ public function valid()
 	return true;
     }
 
-    protected function needleFactory($firstTopLevelString = null)
-    {
-	$this->needle = ',{';
-
-	if ($firstTopLevelString != null)
-	{
-	    $this->needle .= '"' . $firstTopLevelString . '"';
-	}
-    }
-
     protected function getNextCursorPosition()
     {
 	$this->nextCursorPosition = strpos($this->jsonString, $this->needle, $this->cursorPosition);

src/JsonIteratorFactory.php

@@ -24,7 +24,7 @@ public static function buildJsonFileIterator($jsonFileHandle, array $options = n
 	return new JsonFileIterator($jsonFileHandle, $options);
     }
 
-    public static function buildJsonFilesIterator($jsonFileHandles, array $options = null)
+    public static function buildJsonFilesIterator(array $jsonFileHandles, array $options = null)
     {
 	return new JsonFilesIterator($jsonFileHandles, $options);
     }

src/NeedleFactory.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Crystalgorithm\PhpJsonIterator;
+
+class NeedleFactory
+{
+
+    public function __construct()
+    {
+
+    }
+
+    function build($firstTopLevelString = null)
+    {
+	$this->needle = ',{';
+
+	if ($firstTopLevelString != null)
+	{
+	    $this->needle .= '"' . $firstTopLevelString . '"';
+	}
+    }
+
+}