[TASK] Rename to typo3fluid/schemagenerator

TYPO3 · Jan 16, 2016 · 0fbec97 · 0fbec97
1 parent bd81a0f
commit 0fbec97
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 23 deletions.
diff --git a/bin/generateschema b/bin/generateschema
@@ -39,10 +39,7 @@ foreach ($namespaces as $namespace) {
 		exitWithError(sprintf('Directory "%s" does not exist but is declared in composer autoload entries', $classesPath));
 	}
 }
-#var_dump($prefixes);
-#var_dump($namespaces);
-var_dump($namespaceClassPathMap);
-$generator = new \TYPO3\Fluid\SchemaGenerator\SchemaGenerator();
+$generator = new \TYPO3Fluid\SchemaGenerator\SchemaGenerator();
 $xsd = $generator->generateXsd($namespaceClassPathMap);
 
 echo $xsd;
diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-	"name": "namelesscoder/fluid-schema-generator",
+	"name": "typo3fluid/schema-generator",
 	"description": "Generates XSD schemas for packages containing Fluid ViewHelpers",
 	"license": ["MIT"],
 	"require": {
@@ -12,7 +12,7 @@
 	},
 	"autoload": {
 		"psr-4": {
-			"TYPO3\\Fluid\\SchemaGenerator\\": "src/"
+			"TYPO3Fluid\\SchemaGenerator\\": "src/"
 		}
 	},
 	"bin": [

diff --git a/composer.lock b/composer.lock
diff --git a/src/DocCommentParser.php b/src/DocCommentParser.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\Fluid\SchemaGenerator;
+namespace TYPO3Fluid\SchemaGenerator;
 
 /**
  * A little parser which creates tag objects from doc comments

diff --git a/src/SchemaGenerator.php b/src/SchemaGenerator.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\Fluid\SchemaGenerator;
+namespace TYPO3Fluid\SchemaGenerator;
 
 use TYPO3\Fluid\Core\ViewHelper\ArgumentDefinition;
 use TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperInterface;
@@ -51,7 +51,7 @@ public function generateXsd(array $namespaceClassPathMap) {
 		foreach ($namespaceClassPathMap as $namespace => $classesPath) {
 			$classNames = array_replace($classNames, $this->getClassNamesInPackage($classesPath, $namespace));
 			if (count($classNames) === 0) {
-				throw new \RuntimeException(sprintf('No ViewHelpers found in path "%s"', $classesPathPath), 1330029328);
+				throw new \RuntimeException(sprintf('No ViewHelpers found in path "%s"', $classesPath), 1330029328);
 			}
 		}
 		foreach ($classNames as $className) {

diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
@@ -8,4 +8,4 @@
 
 /** @var Composer\Autoload\ClassLoader $autoloader */
 $autoloader = require __DIR__ . '/../vendor/autoload.php';
-$autoloader->addPsr4('TYPO3\\Fluid\\SchemaGenerator\\Tests\\Unit\\', __DIR__ . '/Unit/');
+$autoloader->addPsr4('TYPO3Fluid\\SchemaGenerator\\Tests\\Unit\\', __DIR__ . '/Unit/');
diff --git a/tests/Functional/SchemaGeneratorTest.php b/tests/Functional/SchemaGeneratorTest.php
@@ -1,6 +1,7 @@
 <?php
-namespace TYPO3\Fluid\SchemaGenerator\Tests\Functional;
-use TYPO3\Fluid\SchemaGenerator\SchemaGenerator;
+namespace TYPO3Fluid\SchemaGenerator\Tests\Functional;
+
+use TYPO3Fluid\SchemaGenerator\SchemaGenerator;
 
 /**
  * Class SchemaGeneratorTest
@@ -12,10 +13,7 @@ class SchemaGeneratorTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testGenerateSchema() {
 		$generator = new SchemaGenerator();
-		$xml = $generator->generateXsd(
-			'TYPO3\\Fluid\\ViewHelpers',
-			__DIR__ . '/../../vendor/namelesscoder/fluid/src/ViewHelpers'
-		);
+		$xml = $generator->generateXsd(array('TYPO3Fluid\\Fluid\\ViewHelpers\\' => __DIR__ . '/../../vendor/typo3fluid/fluid/src/ViewHelpers/'));
 		$this->assertStringStartsWith('<?xml', $xml);
 		$this->assertStringEndsWith('</xsd:schema>' . PHP_EOL, $xml);
 	}

diff --git a/tests/Unit/SchemaGeneratorTest.php b/tests/Unit/SchemaGeneratorTest.php
@@ -1,8 +1,9 @@
 <?php
-namespace TYPO3\Fluid\SchemaGenerator\Tests\Unit;
+namespace TYPO3Fluid\SchemaGenerator\Tests\Unit;
 
 use FluidTYPO3\Schemaker\Service\SchemaService;
-use TYPO3\Fluid\SchemaGenerator\SchemaGenerator;
+use TYPO3Fluid\SchemaGenerator\SchemaGenerator;
+use TYPO3Fluid\SchemaGenerator\DocCommentParser;
 
 /**
  * Class SchemaGeneratorTest
@@ -14,7 +15,7 @@ class SchemaGeneratorTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testPerformsInjections() {
 		$instance = new SchemaGenerator();
-		$this->assertAttributeInstanceOf('TYPO3\\Fluid\\SchemaGenerator\\DocCommentParser', 'docCommentParser', $instance);
+		$this->assertAttributeInstanceOf(DocCommentParser::class, 'docCommentParser', $instance);
 	}
 
 	/**
@@ -45,10 +46,10 @@ public function getTagNameForClassTestValues() {
 	 * @test
 	 */
 	public function testGenerateXsdErrorsWhenNoViewHelpersInPackage() {
-		$service = $this->getMock('TYPO3\\Fluid\\SchemaGenerator\\SchemaGenerator', array('getClassNamesInPackage'));
+		$service = $this->getMock(SchemaGenerator::class, array('getClassNamesInPackage'));
 		$service->expects($this->once())->method('getClassNamesInPackage')->willReturn(array());
 		$this->setExpectedException('RuntimeException');
-		$service->generateXsd('FluidTYPO3.Schemaker', 'test');
+		$service->generateXsd(array('TYPO3Fluid\\SchemaGenerator'));
 	}
 
 	/**