Merge pull request #149 from Zheness/patch-1

Use of offset during analyse

Author: moufmouf

src/Mouf/MoufClassExplorer.php

@@ -43,6 +43,8 @@ class MoufClassExplorer {
 	private $useCache = true;
 
 	private $cacheService;
+
+	private $analysisOffset = 0;
 
 	public function __construct($selfEdit = false) {
 		$this->selfEdit = $selfEdit;
@@ -77,18 +79,19 @@ private function analyze() {
 			$notYetAnalysedClassMap = $classMap;
 			$nbRun = 0;
 			while (!empty($notYetAnalysedClassMap)) {
+                $this->analysisOffset = 0;
 				$this->analysisResponse = MoufReflectionProxy::analyzeIncludes2($this->selfEdit, $notYetAnalysedClassMap);
 				$nbRun++;
 				$startupPos = strpos($this->analysisResponse, "FDSFZEREZ_STARTUP\n");
 				if ($startupPos === false) {
 					// It seems there is a problem running the script, let's throw an exception
 					throw new MoufException("Error while running classes analysis: ".$this->analysisResponse);
 				}
-				
-				$this->analysisResponse = substr($this->analysisResponse, $startupPos+18);
+
+                $this->analysisOffset = $startupPos+18;
 				//echo($this->analysisResponse);exit;
 				while (true) {
-					$beginMarker = $this->trimLine();
+					$beginMarker = $this->popLine();
 					if ($beginMarker == "SQDSG4FDSE3234JK_ENDFILE") {
 						// We are finished analysing the file! Yeah!
 						break;
@@ -97,26 +100,26 @@ private function analyze() {
 						throw new \Exception("Strange behaviour while importing classes. Begin marker: ".$beginMarker);
 					}
 
-					$analyzedClassName = $this->trimLine();
+					$analyzedClassName = $this->popLine();
 
 					// Now, let's see if the end marker is right after the begin marker...
-					$endMarkerPos = strpos($this->analysisResponse, "DSQRZREZRZER__AFTERINCLUDE\n");
-					if ($endMarkerPos !== 0) {
+					$endMarkerPos = strpos($this->analysisResponse, "DSQRZREZRZER__AFTERINCLUDE\n", $this->analysisOffset);
+					if ($endMarkerPos !== $this->analysisOffset) {
 						// There is a problem...
 						if ($endMarkerPos === false) {
 							// An error occured:
 							$this->forbiddenClasses[$analyzedClassName] = $this->analysisResponse;
 							unset($notYetAnalysedClassMap[$analyzedClassName]);
 							break;
 						} else {
-							$this->forbiddenClasses[$analyzedClassName] = substr($this->analysisResponse, 0, $endMarkerPos);
-							$this->analysisResponse = substr($this->analysisResponse, $endMarkerPos);
+							$this->forbiddenClasses[$analyzedClassName] = substr($this->analysisResponse, $this->analysisOffset, $endMarkerPos - $this->analysisOffset);
+                            $this->analysisOffset = $endMarkerPos;
 						}
 					}
-					$this->trimLine();
+					$this->popLine();
 
 					unset($notYetAnalysedClassMap[$analyzedClassName]);
-					
+
 				}
 			}
 
@@ -159,17 +162,18 @@ private function analyze() {
 	private $analysisResponse;
 
 	/**
-	 * Trim the first line from $analysisResponse and returns it.
+	 * Get the current line from $analysisResponse and returns it.
+     * Moves the internal offset pointer.
 	 */
-	private function trimLine() {
-		$newLinePos = strpos($this->analysisResponse, "\n");
+	private function popLine() {
+		$newLinePos = strpos($this->analysisResponse, "\n", $this->analysisOffset);
 
 		if ($newLinePos === false) {
 			throw new \Exception("End of file reached!");
 		}
 
-		$line = substr($this->analysisResponse, 0, $newLinePos);
-		$this->analysisResponse = substr($this->analysisResponse, $newLinePos + 1);
+		$line = substr($this->analysisResponse, $this->analysisOffset, ($newLinePos - $this->analysisOffset));
+        $this->analysisOffset = $newLinePos + 1;
 		return $line;
 	}
 
@@ -217,4 +221,4 @@ public function getErrors() {
 	}
 
 }
-?>
+?>