Nette\Utils\PhpGenerator renamed to Nette\PhpGenerator (BC break)

dg · dg · commit 4a76916fd0d9 · 2012-09-05T02:09:00.000+02:00
diff --git a/src/PhpGenerator/ClassType.php b/src/PhpGenerator/ClassType.php
@@ -9,7 +9,7 @@
  * the file license.txt that was distributed with this source code.
  */
 
-namespace Nette\Utils\PhpGenerator;
+namespace Nette\PhpGenerator;
 
 use Nette,
 	Nette\Utils\Strings;
diff --git a/src/PhpGenerator/Helpers.php b/src/PhpGenerator/Helpers.php
@@ -9,7 +9,7 @@
  * the file license.txt that was distributed with this source code.
  */
 
-namespace Nette\Utils\PhpGenerator;
+namespace Nette\PhpGenerator;
 
 use Nette;
 
diff --git a/src/PhpGenerator/Method.php b/src/PhpGenerator/Method.php
@@ -9,7 +9,7 @@
  * the file license.txt that was distributed with this source code.
  */
 
-namespace Nette\Utils\PhpGenerator;
+namespace Nette\PhpGenerator;
 
 use Nette;
 
diff --git a/src/PhpGenerator/Parameter.php b/src/PhpGenerator/Parameter.php
@@ -9,7 +9,7 @@
  * the file license.txt that was distributed with this source code.
  */
 
-namespace Nette\Utils\PhpGenerator;
+namespace Nette\PhpGenerator;
 
 use Nette;
 
diff --git a/src/PhpGenerator/PhpLiteral.php b/src/PhpGenerator/PhpLiteral.php
@@ -9,7 +9,7 @@
  * the file license.txt that was distributed with this source code.
  */
 
-namespace Nette\Utils\PhpGenerator;
+namespace Nette\PhpGenerator;
 
 use Nette;
 
diff --git a/src/PhpGenerator/Property.php b/src/PhpGenerator/Property.php
@@ -9,7 +9,7 @@
  * the file license.txt that was distributed with this source code.
  */
 
-namespace Nette\Utils\PhpGenerator;
+namespace Nette\PhpGenerator;
 
 use Nette;
 
diff --git a/tests/PhpGenerator/class.expect b/tests/PhpGenerator/class.expect
diff --git a/tests/PhpGenerator/class.phpt b/tests/PhpGenerator/class.phpt
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * Test: Nette\Utils\PhpGenerator for classes.
+ * Test: Nette\PhpGenerator for classes.
  *
  * @author     David Grudl
  * @package    Nette\Utils
  */
 
-use Nette\Utils\PhpGenerator\ClassType,
-	Nette\Utils\PhpGenerator\PhpLiteral;
+use Nette\PhpGenerator\ClassType,
+	Nette\PhpGenerator\PhpLiteral;
 
 
 
@@ -64,4 +64,4 @@ $method->addParameter('res', NULL)
 		->setReference(TRUE)
 		->setTypeHint('array');
 
-Assert::match(file_get_contents(__DIR__ . '/PhpGenerator.class.expect'), (string) $class);
+Assert::match(file_get_contents(__DIR__ . '/class.expect'), (string) $class);
diff --git a/tests/PhpGenerator/closure.expect b/tests/PhpGenerator/closure.expect
diff --git a/tests/PhpGenerator/closure.phpt b/tests/PhpGenerator/closure.phpt
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * Test: Nette\Utils\PhpGenerator & closure.
+ * Test: Nette\PhpGenerator & closure.
  *
  * @author     David Grudl
  * @package    Nette\Utils
  */
 
-use Nette\Utils\PhpGenerator\Method;
+use Nette\PhpGenerator\Method;
 
 
 
@@ -26,4 +26,4 @@ $function->addUse('this');
 $function->addUse('vars')
 	->setReference(TRUE);
 
-Assert::match(file_get_contents(__DIR__ . '/PhpGenerator.closure.expect'), (string) $function);
+Assert::match(file_get_contents(__DIR__ . '/closure.expect'), (string) $function);
diff --git a/tests/PhpGenerator/dump.phpt b/tests/PhpGenerator/dump.phpt
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * Test: Nette\Utils\PhpGenerator\Helpers::dump()
+ * Test: Nette\PhpGenerator\Helpers::dump()
  *
  * @author     David Grudl
  * @package    Nette\Utils
  */
 
-use Nette\Utils\PhpGenerator\Helpers,
-	Nette\Utils\PhpGenerator\PhpLiteral;
+use Nette\PhpGenerator\Helpers,
+	Nette\PhpGenerator\PhpLiteral;
 
 
 
@@ -43,4 +43,4 @@ Assert::same( "array(\n\t'a' => 1,\n\tarray(\n\t\t\"\\r\" => \"\\r\",\n\t\t2,\n\
 
 Assert::same( "(object) array(\n\t'a' => 1,\n\t'b' => 2,\n)", Helpers::dump((object) array('a' => 1, 'b' => 2)) );
 Assert::same( "(object) array(\n\t'a' => (object) array(\n\t\t'b' => 2,\n\t),\n)" , Helpers::dump((object) array('a' => (object) array('b' => 2))) );
-Assert::same( "Nette\\Utils\\PhpGenerator\\Helpers::createObject('Test', array(\n\t'a' => 1,\n\t'b' => 2,\n\t'c' => 3,\n))", Helpers::dump(new Test) );
+Assert::same( "Nette\\PhpGenerator\\Helpers::createObject('Test', array(\n\t'a' => 1,\n\t'b' => 2,\n\t'c' => 3,\n))", Helpers::dump(new Test) );
diff --git a/tests/PhpGenerator/format.phpt b/tests/PhpGenerator/format.phpt
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * Test: Nette\Utils\PhpGenerator\Helpers::format() & formatArgs()
+ * Test: Nette\PhpGenerator\Helpers::format() & formatArgs()
  *
  * @author     David Grudl
  * @package    Nette\Utils
  */
 
-use Nette\Utils\PhpGenerator\Helpers;
+use Nette\PhpGenerator\Helpers;
 
 
 
diff --git a/tests/PhpGenerator/interface.expect b/tests/PhpGenerator/interface.expect
diff --git a/tests/PhpGenerator/interface.phpt b/tests/PhpGenerator/interface.phpt
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * Test: Nette\Utils\PhpGenerator for interfaces.
+ * Test: Nette\PhpGenerator for interfaces.
  *
  * @author     David Grudl
  * @package    Nette\Utils
  */
 
-use Nette\Utils\PhpGenerator\ClassType;
+use Nette\PhpGenerator\ClassType;
 
 
 
@@ -24,4 +24,4 @@ $interface
 
 $interface->addMethod('getForm');
 
-Assert::match(file_get_contents(__DIR__ . '/PhpGenerator.interface.expect'), (string) $interface);
+Assert::match(file_get_contents(__DIR__ . '/interface.expect'), (string) $interface);
diff --git a/tests/PhpGenerator/reflection.expect b/tests/PhpGenerator/reflection.expect
diff --git a/tests/PhpGenerator/reflection.phpt b/tests/PhpGenerator/reflection.phpt
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Test: Nette\Utils\PhpGenerator generator.
+ * Test: Nette\PhpGenerator generator.
  *
  * @author     David Grudl
  * @package    Nette\Utils
@@ -10,7 +10,7 @@
 
 namespace Abc;
 
-use Nette\Utils\PhpGenerator\ClassType,
+use Nette\PhpGenerator\ClassType,
 	Assert,
 	ReflectionClass;
 
@@ -73,4 +73,4 @@ $res[] = ClassType::from('Abc\Interface2');
 $res[] = ClassType::from('Abc\Class1');
 $res[] = ClassType::from(new ReflectionClass('Abc\Class2'));
 
-Assert::match(file_get_contents(__DIR__ . '/PhpGenerator.reflection.expect'), implode("\n", $res));
+Assert::match(file_get_contents(__DIR__ . '/reflection.expect'), implode("\n", $res));
diff --git a/tests/PhpGenerator/reflection.trait.expect b/tests/PhpGenerator/reflection.trait.expect
diff --git a/tests/PhpGenerator/reflection.trait.phpt b/tests/PhpGenerator/reflection.trait.phpt
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * Test: Nette\Utils\PhpGenerator generator.
+ * Test: Nette\PhpGenerator generator.
  *
  * @author     David Grudl
  * @package    Nette\Utils
  * @phpversion 5.4
  */
 
-use Nette\Utils\PhpGenerator\ClassType;
+use Nette\PhpGenerator\ClassType;
 
 
 
@@ -45,4 +45,4 @@ $res[] = ClassType::from(new ReflectionClass('Trait2'));
 $res[] = ClassType::from(new ReflectionClass('Class1'));
 $res[] = ClassType::from(new ReflectionClass('Class2'));
 
-Assert::match(file_get_contents(__DIR__ . '/PhpGenerator.reflection.trait.expect'), implode("\n", $res));
+Assert::match(file_get_contents(__DIR__ . '/reflection.trait.expect'), implode("\n", $res));
