big name refacturing

Classes/TypoScriptFormatter.php → Classes/Formatters/TypoScriptFormatter.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace ElmarHinz\TypoScriptParser;
+namespace ElmarHinz\TypoScriptParser\Formatters;
 
-use \ElmarHinz\TypoScriptParser\AbstractTypoScriptParser as AP;
+use ElmarHinz\TypoScriptParser\Parsers\AbstractTypoScriptParser as AP;
+use ElmarHinz\TypoScriptParser\Interfaces\TypoScriptFormatterInterface;
 
 /**
  * TypoScript syntax formatter

Classes/TypoScriptFormatterInterface.php → Classes/Interfaces/TypoScriptFormatterInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ElmarHinz\TypoScriptParser;
+namespace ElmarHinz\TypoScriptParser\Interfaces;
 
 /**
  * Interface of TypoScript formatters

Classes/TypoScriptParsetimeExceptionTrackerPullInterface.php → Classes/Interfaces/TypoScriptParsetimeExceptionTrackerPullInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ElmarHinz\TypoScriptParser;
+namespace ElmarHinz\TypoScriptParser\Interfaces;
 
 /**
  * Tracker of the exceptions while parsing a TypoScript Template.

Classes/TypoScriptParsetimeExceptionTrackerPushInterface.php → Classes/Interfaces/TypoScriptParsetimeExceptionTrackerPushInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ElmarHinz\TypoScriptParser;
+namespace ElmarHinz\TypoScriptParser\Interfaces;
 
 use \ElmarHinz\TypoScriptParser\Exceptions\TypoScriptParsetimeException;
 

Classes/TypoScriptTokenTrackerPullInterface.php → Classes/Interfaces/TypoScriptTokenTrackerPullInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ElmarHinz\TypoScriptParser;
+namespace ElmarHinz\TypoScriptParser\Interfaces;
 
 /**
  * Pull the tokens from parsing a TypoScript template.

Classes/TypoScriptTokenTrackerPushInterface.php → Classes/Interfaces/TypoScriptTokenTrackerPushInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ElmarHinz\TypoScriptParser;
+namespace ElmarHinz\TypoScriptParser\Interfaces;
 
 use \ElmarHinz\TypoScriptParser\Tokens\AbstractTypoScriptToken;
 

Classes/ValueModifierInterface.php → Classes/Interfaces/TypoScriptValueModifierInterface.php

@@ -1,9 +1,10 @@
 <?php
 
-namespace ElmarHinz\TypoScriptParser;
+namespace ElmarHinz\TypoScriptParser\Interfaces;
 
-interface ValueModifierInterface
+interface TypoScriptValueModifierInterface
 {
+
 	/**
 	 * Modify the input string by the given operation.
 	 *

Classes/CoreTypoScriptParserAdapter.php → Classes/Main/CoreTypoScriptParserAdapter.php

@@ -1,14 +1,21 @@
 <?php
 
-namespace ElmarHinz\TypoScriptParser;
+namespace ElmarHinz\TypoScriptParser\Main;
 
-use	\TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser as CoreParser;
-use	\ElmarHinz\TypoScriptParser\TypoScriptProductionParser as ProductionParser;
-use	\ElmarHinz\TypoScriptParser\TypoScriptConditionsProcessor as ConditionsProcessor;
-use	\ElmarHinz\TypoScriptParser\TypoScriptSyntaxParser as SyntaxParser;
-use	\ElmarHinz\TypoScriptParser\TypoScriptFormatter as Formatter;
+use	TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser
+    as CoreParser;
+use	ElmarHinz\TypoScriptParser\Parsers\TypoScriptProductionParser
+    as ProductionParser;
+use	ElmarHinz\TypoScriptParser\Parsers\TypoScriptConditionsProcessor
+    as ConditionsProcessor;
+use	ElmarHinz\TypoScriptParser\Parsers\TypoScriptSyntaxParser
+    as SyntaxParser;
+use	ElmarHinz\TypoScriptParser\TypoScriptFormatter
+    as Formatter;
+use ElmarHinz\TypoScriptParser\Interfaces\TypoScriptValueModifierInterface;
 
-class CoreTypoScriptParserAdapter extends CoreParser implements ValueModifierInterface
+class CoreTypoScriptParserAdapter extends CoreParser
+    implements TypoScriptValueModifierInterface
 {
 
     public function parse($string, $matchObj = '')
@@ -26,9 +33,10 @@ public function parse($string, $matchObj = '')
 	public function modifyValue($value, $operation)
 	{
 		$pattern = '/^([[:alpha:]]+)\\s*\\((.*)\\).*/';
-		if(preg_match($pattern, $operation, $matches)) {
+		if (preg_match($pattern, $operation, $matches)) {
 			list(,$modifier, $argument) = $matches;
-				return (string)$this->executeValueModifier($modifier, $argument, $value);
+            return (string)$this->executeValueModifier(
+                $modifier, $argument, $value);
 		} else {
 			// Error handling: not well formatted modifier
 		}
@@ -41,10 +49,12 @@ public function modifyValue($value, $operation)
      * @param array The first entry is the line number offset.
      * @param bool Toggle blockmode.
      */
-    public function doSyntaxHighlight($template, $numbers = null, $blockmode = false)
+    public function doSyntaxHighlight($template, $numbers = null,
+        $blockmode = false)
     {
         $formatter = new Formatter();
-        if(is_array($numbers) && count($numbers) > 0 && is_int($numbers[0])) {
+        if (is_array($numbers) && count($numbers) > 0
+            && is_int($numbers[0])) {
             $formatter->setNumberOfBaseLine($numbers[0]);
         } else {
             $formatter->hideLineNumbers();

Classes/AbstractTypoScriptParser.php → Classes/Parsers/AbstractTypoScriptParser.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ElmarHinz\TypoScriptParser;
+namespace ElmarHinz\TypoScriptParser\Parsers;
 
 abstract class AbstractTypoScriptParser
 {

Classes/AbstractTypoScriptSyntaxParser.php → Classes/Parsers/AbstractTypoScriptSyntaxParser.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace ElmarHinz\TypoScriptParser;
+namespace ElmarHinz\TypoScriptParser\Parsers;
 
-use ElmarHinz\TypoScriptParser\TypoScriptTokenTrackerPushInterface
+use ElmarHinz\TypoScriptParser\Interfaces\TypoScriptTokenTrackerPushInterface
     as TokenTracker;
-use ElmarHinz\TypoScriptParser\TypoScriptPasetimeExceptionTrackerPushInterface
+use ElmarHinz\TypoScriptParser\Interfaces\TypoScriptPasetimeExceptionTrackerPushInterface
     as ExceptionTracker;
 
 abstract class AbstractTypoScriptSyntaxParser extends AbstractTypoScriptParser
@@ -34,5 +34,17 @@ public function injectTokenTracker(TokenTracker $tracker)
 		$this->tokenTracker = $tracker;
 	}
 
+    /**
+     * Push a line or finale exception to the exception tracker.
+     *
+     * @param mixed $lineNumberOrFalse False for final tempalte exceptions.
+     * @param class $class  Full qualified or defined alias.
+     */
+    protected function pushException($lineNumberOrFalse, $class)
+    {
+        $exception = new $class($lineNumber);
+        $this->exceptionTracker->push($exception);
+    }
+
 }
 

Classes/TypoScriptConditionsProcessor.php → Classes/Parsers/TypoScriptConditionsProcessor.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ElmarHinz\TypoScriptParser;
+namespace ElmarHinz\TypoScriptParser\Parsers;
 
 class TypoScriptConditionsProcessor extends AbstractTypoScriptParser
 {

Classes/TypoScriptProductionParser.php → Classes/Parsers/TypoScriptProductionParser.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace ElmarHinz\TypoScriptParser;
+namespace ElmarHinz\TypoScriptParser\Parsers;
+
+use ElmarHinz\TypoScriptParser\Parsers\AbstractTypoScriptParser;
 
 class TypoScriptProductionParser extends AbstractTypoScriptParser
 {

Classes/TypoScriptSyntaxParser.php → Classes/Parsers/TypoScriptSyntaxParser.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ElmarHinz\TypoScriptParser;
+namespace ElmarHinz\TypoScriptParser\Parsers;
 
 use ElmarHinz\TypoScriptParser\Exceptions\TypoScriptBraceInExcessException as BraceInExcessException;
 use ElmarHinz\TypoScriptParser\Exceptions\TypoScriptKeysException as KeysException;

Classes/TypoScriptParsetimeExceptionTracker.php → Classes/Trackers/TypoScriptParsetimeExceptionTracker.php

@@ -1,8 +1,12 @@
 <?php
 
-namespace ElmarHinz\TypoScriptParser;
+namespace ElmarHinz\TypoScriptParser\Trackers;
 
 use \ElmarHinz\TypoScriptParser\Exceptions\TypoScriptParsetimeException;
+use \ElmarHinz\TypoScriptParser\Interfaces
+    \TypoScriptParsetimeExceptionTrackerPushInterface;
+use \ElmarHinz\TypoScriptParser\Interfaces
+    \TypoScriptParsetimeExceptionTrackerPullInterface;
 
 class TypoScriptParsetimeExceptionTracker
     implements TypoScriptParsetimeExceptionTrackerPushInterface,

Classes/TypoScriptTokenTracker.php → Classes/Trackers/TypoScriptTokenTracker.php

@@ -1,8 +1,12 @@
 <?php
 
-namespace ElmarHinz\TypoScriptParser;
+namespace ElmarHinz\TypoScriptParser\Trackers;
 
 use \ElmarHinz\TypoScriptParser\Tokens\AbstractTypoScriptToken;
+use \ElmarHinz\TypoScriptParser\Interfaces
+    \TypoScriptTokenTrackerPushInterface;
+use \ElmarHinz\TypoScriptParser\Interfaces
+    \TypoScriptTokenTrackerPullInterface;
 
 /**
  * Tracker of the tokens while parsing a TypoScript Template.

Tests/Unit/TypoScriptFormatterTest.php → Tests/Unit/Formatters/TypoScriptFormatterTest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace ElmarHinz\TypoScriptParser\Tests\Unit;
+namespace ElmarHinz\TypoScriptParser\Tests\Unit\Formatters;
 
-use \ElmarHinz\TypoScriptParser\TypoScriptFormatter as Formatter;
-use \ElmarHinz\TypoScriptParser\AbstractTypoScriptParser as AP;
+use ElmarHinz\TypoScriptParser\Formatters\TypoScriptFormatter as Formatter;
+use ElmarHinz\TypoScriptParser\Parsers\AbstractTypoScriptParser as AP;
 
 class TypoScriptFormatterTest extends \PHPUnit_Framework_TestCase
 {

Tests/Unit/CoreTypoScriptParserAdapterTest.php → Tests/Unit/Main/CoreTypoScriptParserAdapterTest.php

@@ -1,19 +1,23 @@
 <?php
 
-namespace ElmarHinz\TypoScriptParser\Tests\Unit;
+namespace ElmarHinz\TypoScriptParser\Tests\Unit\Main;
 
-use \ElmarHinz\TypoScriptParser\Tests\Unit\Fixtures\TypoScriptExamples as Examples;
-use \ElmarHinz\TypoScriptParser\CoreTypoScriptParserAdapter as Adapter;
+use ElmarHinz\TypoScriptParser\Main\CoreTypoScriptParserAdapter
+    as Adapter;
+use TYPO3\CMS\Backend\Configuration\TypoScript\ConditionMatching
+    \ConditionMatcher as Matcher;
+use ElmarHinz\TypoScriptParser\Tests\Unit\Fixtures\TypoScriptExamples
+    as Examples;
 
-if(!defined("LF")) define("LF", "\n");
-if(!defined("TAB")) define("TAB", "\t");
+if (!defined("LF")) define("LF", "\n");
+if (!defined("TAB")) define("TAB", "\t");
 
 class CoreTypoScriptParserAdapterTest extends \PHPUnit_Framework_TestCase
 {
+
 	public function setup()
 	{
-		$matchClass = '\\TYPO3\\CMS\\Backend\\Configuration\\TypoScript\\ConditionMatching\\ConditionMatcher';
-		$matcher = $this->getMockBuilder($matchClass)->getMock();
+		$matcher = $this->getMockBuilder(Matcher::class)->getMock();
 		$matcher->method('match')->will($this->returnCallback(
 			function($condition) { return $condition == '[TRUE]'; }));
 		$this->matcher = $matcher;

Tests/Unit/AbstractTypoScriptSyntaxParserTest.php → Tests/Unit/Parsers/AbstractTypoScriptSyntaxParserTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace ElmarHinz\TypoScriptParser\Tests\Unit;
+namespace ElmarHinz\TypoScriptParser\Tests\Unit\Parsers;
 
-use ElmarHinz\TypoScriptParser\AbstractTypoScriptSyntaxParser
+use ElmarHinz\TypoScriptParser\Parsers\AbstractTypoScriptSyntaxParser
     as Parser;
-use ElmarHinz\TypoScriptParser\TypoScriptTokenTrackerPushInterface
-    as TokenTracker;
-use ElmarHinz\TypoScriptParser\TypoScriptPasetimeExceptionTrackerPushInterface
-    as ExceptionTracker;
+use ElmarHinz\TypoScriptParser\Interfaces
+    \TypoScriptTokenTrackerPushInterface as TokenTracker;
+use ElmarHinz\TypoScriptParser\Interfaces
+    \TypoScriptPasetimeExceptionTrackerPushInterface as ExceptionTracker;
 
 class AbstractTypoScriptSyntaxParserTest extends \PHPUnit_Framework_TestCase
 {

Tests/Unit/CoreTypoScriptParserTest.php → Tests/Unit/Parsers/CoreTypoScriptParserTest.php

@@ -1,8 +1,10 @@
 <?php
 
-namespace ElmarHinz\TypoScriptParser\Tests\Unit;
+namespace ElmarHinz\TypoScriptParser\Tests\Unit\Parsers;
 
-use \ElmarHinz\TypoScriptParser\Tests\Unit\Fixtures\TypoScriptExamples as Examples;
+use ElmarHinz\TypoScriptParser\Tests\Unit\Fixtures\TypoScriptExamples
+    as Examples;
+use	TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser as CoreParser;
 
 if(!defined("LF")) define("LF", "\n");
 if(!defined("TAB")) define("TAB", "\t");
@@ -11,7 +13,7 @@ class CoreTypoScriptParserTest extends \PHPUnit_Framework_TestCase
 {
 	public function setup()
 	{
-		$this->parser = new \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser;
+		$this->parser = new CoreParser();
 	}
 
 	public function tsProvider()

Tests/Unit/TypoScriptConditionsProcessorTest.php → Tests/Unit/Parsers/TypoScriptConditionsProcessorTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace ElmarHinz\TypoScriptParser\Tests\Unit;
+namespace ElmarHinz\TypoScriptParser\Tests\Unit\Parsers;
 
-use \ElmarHinz\TypoScriptParser\TypoScriptConditionsProcessor;
+use ElmarHinz\TypoScriptParser\Parsers\TypoScriptConditionsProcessor;
 
 class TypoScriptConditionsProcessorTest extends \PHPUnit_Framework_TestCase
 {

Tests/Unit/TypoScriptProductionParserTest.php → Tests/Unit/Parsers/TypoScriptProductionParserTest.php

@@ -1,10 +1,14 @@
 <?php
 
-namespace ElmarHinz\TypoScriptParser\Tests\Unit;
+namespace ElmarHinz\TypoScriptParser\Tests\Unit\Parsers;
+
+use ElmarHinz\TypoScriptParser\Parsers\TypoScriptProductionParser
+    as Parser;
+use ElmarHinz\TypoScriptParser\Interfaces\TypoScriptValueModifierInterface
+    as ValueModifier;
+use ElmarHinz\TypoScriptParser\Tests\Unit\Fixtures\TypoScriptExamples
+    as Examples;
 
-use \ElmarHinz\TypoScriptParser\Tests\Unit\Fixtures\TypoScriptExamples as Examples;
-use \ElmarHinz\TypoScriptParser\TypoScriptProductionParser as Parser;
-use \ElmarHinz\TypoScriptParser\ValueModifierInterface as ValueModifier;
 class TypoScriptProductionParserTest extends \PHPUnit_Framework_TestCase
 {
 

Tests/Unit/TypoScriptSyntaxParserTest.php → Tests/Unit/Parsers/TypoScriptSyntaxParserTest.php

@@ -1,11 +1,15 @@
 <?php
 
-namespace ElmarHinz\TypoScriptParser\Tests\Unit;
+namespace ElmarHinz\TypoScriptParser\Tests\Unit\Parsers;
 
-use \ElmarHinz\TypoScriptParser\Tests\Unit\Fixtures\TypoScriptExamples as Examples;
-use \ElmarHinz\TypoScriptParser\TypoScriptSyntaxParser as Parser;
-use \ElmarHinz\TypoScriptParser\AbstractTypoScriptParser as AP;
-use \ElmarHinz\TypoScriptParser\TypoScriptFormatterInterface as Formatter;
+use ElmarHinz\TypoScriptParser\Tests\Unit\Fixtures\TypoScriptExamples
+    as Examples;
+use ElmarHinz\TypoScriptParser\Parsers\TypoScriptSyntaxParser
+    as Parser;
+use ElmarHinz\TypoScriptParser\Parsers\AbstractTypoScriptParser
+    as AP;
+use ElmarHinz\TypoScriptParser\Interfaces\TypoScriptFormatterInterface
+    as Formatter;
 
 class TypoScriptSyntaxParserTest extends \PHPUnit_Framework_TestCase
 {

Tests/Unit/TypoScriptParsetimeExceptionTrackerTest.php → Tests/Unit/Trackers/TypoScriptParsetimeExceptionTrackerTest.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace ElmarHinz\TypoScriptParser\Tests\Unit;
+namespace ElmarHinz\TypoScriptParser\Tests\Unit\Trackers;
 
-use ElmarHinz\TypoScriptParser\TypoScriptParsetimeExceptionTracker as ExceptionTracker;
+use ElmarHinz\TypoScriptParser\Trackers\TypoScriptParsetimeExceptionTracker
+    as ExceptionTracker;
 use ElmarHinz\TypoScriptParser\Exceptions\TypoScriptParsetimeException;
 
 class TypoScriptParsetimeExceptionTrackerTest extends \PHPUnit_Framework_TestCase

Tests/Unit/TypoScriptTokenTrackerTest.php → Tests/Unit/Trackers/TypoScriptTokenTrackerTest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace ElmarHinz\TypoScriptParser\Tests\Unit;
+namespace ElmarHinz\TypoScriptParser\Tests\Unit\Trackers;
 
-use \ElmarHinz\TypoScriptParser\TypoScriptTokenTracker as Tracker;
-use \ElmarHinz\TypoScriptParser\Tokens\AbstractTypoScriptToken  as Token;
+use ElmarHinz\TypoScriptParser\Trackers\TypoScriptTokenTracker as Tracker;
+use ElmarHinz\TypoScriptParser\Tokens\AbstractTypoScriptToken  as Token;
 
 class TypoScriptTokenTrackerTest extends \PHPUnit_Framework_TestCase
 {