tests: cs fixes, some classes moved to /fixtures.* (doesn't suit CS)

nette · Jul 21, 2017 · 2ca111e · 2ca111e
1 parent 62bbd4f
commit 2ca111e
Show file tree

Hide file tree

Showing 28 changed files with 96 additions and 97 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,7 @@ matrix:
 
 script:
     - vendor/bin/tester tests -s -c tests/php-unix.ini $coverageArgs
-    - php temp/code-checker/src/code-checker.php --short-arrays --strict-types -i tests/Utils/files
+    - php temp/code-checker/src/code-checker.php --short-arrays --strict-types -i tests/Utils/fixtures.reflection
 
 after_failure:
     # Print *.actual content

diff --git a/tests/Utils/Image.alpha2.phpt b/tests/Utils/Image.alpha2.phpt
@@ -14,36 +14,36 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-$image = Image::fromFile(__DIR__ . '/images/alpha1.png');
-$image->place(Image::fromFile(__DIR__ . '/images/alpha2.png'), 0, 0, 100);
+$image = Image::fromFile(__DIR__ . '/fixtures.images/alpha1.png');
+$image->place(Image::fromFile(__DIR__ . '/fixtures.images/alpha2.png'), 0, 0, 100);
 Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha2.100.png'), $image->toString(Image::PNG, 0));
 
 
-$image = Image::fromFile(__DIR__ . '/images/alpha1.png');
-$image->place(Image::fromFile(__DIR__ . '/images/alpha2.png'), 0, 0, 99);
+$image = Image::fromFile(__DIR__ . '/fixtures.images/alpha1.png');
+$image->place(Image::fromFile(__DIR__ . '/fixtures.images/alpha2.png'), 0, 0, 99);
 Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha2.99.png'), $image->toString(Image::PNG, 0));
 
 
-$image = Image::fromFile(__DIR__ . '/images/alpha1.png');
-$image->place(Image::fromFile(__DIR__ . '/images/alpha2.png'), 0, 0, 50);
+$image = Image::fromFile(__DIR__ . '/fixtures.images/alpha1.png');
+$image->place(Image::fromFile(__DIR__ . '/fixtures.images/alpha2.png'), 0, 0, 50);
 Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha2.50.png'), $image->toString(Image::PNG, 0));
 
 
-$image = Image::fromFile(__DIR__ . '/images/alpha1.png');
-$image->place(Image::fromFile(__DIR__ . '/images/alpha2.png'), 0, 0, 1);
+$image = Image::fromFile(__DIR__ . '/fixtures.images/alpha1.png');
+$image->place(Image::fromFile(__DIR__ . '/fixtures.images/alpha2.png'), 0, 0, 1);
 Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha2.1.png'), $image->toString(Image::PNG, 0));
 
 
-$image = Image::fromFile(__DIR__ . '/images/alpha1.png');
-$image->place(Image::fromFile(__DIR__ . '/images/alpha2.png'), 0, 0, 0);
+$image = Image::fromFile(__DIR__ . '/fixtures.images/alpha1.png');
+$image->place(Image::fromFile(__DIR__ . '/fixtures.images/alpha2.png'), 0, 0, 0);
 Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha2.0.png'), $image->toString(Image::PNG, 0));
 
 
-$image = Image::fromFile(__DIR__ . '/images/alpha1.png');
-$image->place(Image::fromFile(__DIR__ . '/images/alpha3.gif'), 0, 0, 100);
+$image = Image::fromFile(__DIR__ . '/fixtures.images/alpha1.png');
+$image->place(Image::fromFile(__DIR__ . '/fixtures.images/alpha3.gif'), 0, 0, 100);
 Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha2.100b.png'), $image->toString(Image::PNG, 0));
 
 
-$image = Image::fromFile(__DIR__ . '/images/alpha1.png');
-$image->place(Image::fromFile(__DIR__ . '/images/alpha3.gif'), 0, 0, 50);
+$image = Image::fromFile(__DIR__ . '/fixtures.images/alpha1.png');
+$image->place(Image::fromFile(__DIR__ . '/fixtures.images/alpha3.gif'), 0, 0, 50);
 Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha2.50b.png'), $image->toString(Image::PNG, 0));
diff --git a/tests/Utils/Image.clone.phpt b/tests/Utils/Image.clone.phpt
@@ -14,7 +14,7 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-$original = Image::fromFile(__DIR__ . '/images/logo.gif');
+$original = Image::fromFile(__DIR__ . '/fixtures.images/logo.gif');
 
 $dolly = clone $original;
 Assert::notSame($dolly->getImageResource(), $original->getImageResource());

diff --git a/tests/Utils/Image.drawing.phpt b/tests/Utils/Image.drawing.phpt
@@ -32,7 +32,7 @@ Assert::same(file_get_contents(__DIR__ . '/expected/Image.drawing.1.png'), $imag
 
 
 // palette-based image
-$image = Image::fromFile(__DIR__ . '/images/logo.gif');
+$image = Image::fromFile(__DIR__ . '/fixtures.images/logo.gif');
 $image->filledEllipse(100, 50, 50, 50, Image::rgb(255, 255, 0, 75));
 $image->filledEllipse(100, 150, 50, 50, Image::rgb(255, 255, 0, 75));
 Assert::same(file_get_contents(__DIR__ . '/expected/Image.drawing.2.png'), $image->toString(Image::PNG, 0));
diff --git a/tests/Utils/Image.factories.phpt b/tests/Utils/Image.factories.phpt
@@ -15,7 +15,7 @@ require __DIR__ . '/../bootstrap.php';
 
 
 test(function () {
-	$image = Image::fromFile(__DIR__ . '/images/logo.gif', $format);
+	$image = Image::fromFile(__DIR__ . '/fixtures.images/logo.gif', $format);
 	Assert::same(176, $image->getWidth());
 	Assert::same(104, $image->getHeight());
 	Assert::same(Image::GIF, $format);
@@ -26,25 +26,25 @@ test(function () {
 	if (!function_exists('imagecreatefromwebp')) {
 		return;
 	}
-	$image = Image::fromFile(__DIR__ . '/images/logo.webp', $format);
+	$image = Image::fromFile(__DIR__ . '/fixtures.images/logo.webp', $format);
 	Assert::same(176, $image->getWidth());
 	Assert::same(104, $image->getHeight());
 	Assert::same(Image::WEBP, $format);
 });
 
 
 Assert::exception(function () {
-	Image::fromFile('images/missing.png');
-}, Nette\Utils\UnknownImageFileException::class, "File 'images/missing.png' not found.");
+	Image::fromFile('fixtures.images/missing.png');
+}, Nette\Utils\UnknownImageFileException::class, "File 'fixtures.images/missing.png' not found.");
 
 
 Assert::exception(function () {
-	Image::fromFile(__DIR__ . '/images/logo.tiff');
-}, Nette\Utils\UnknownImageFileException::class, "Unknown type of file '%a%images/logo.tiff'.");
+	Image::fromFile(__DIR__ . '/fixtures.images/logo.tiff');
+}, Nette\Utils\UnknownImageFileException::class, "Unknown type of file '%a%fixtures.images/logo.tiff'.");
 
 
 Assert::exception(function () {
-	Image::fromFile(__DIR__ . '/images/bad.gif');
+	Image::fromFile(__DIR__ . '/fixtures.images/bad.gif');
 }, Nette\Utils\ImageException::class, '%a% not a valid GIF file');
 
 

diff --git a/tests/Utils/Image.resize.phpt b/tests/Utils/Image.resize.phpt
@@ -14,7 +14,7 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-$main = Image::fromFile(__DIR__ . '/images/logo.gif');
+$main = Image::fromFile(__DIR__ . '/fixtures.images/logo.gif');
 
 
 test(function () use ($main) { // cropping...
@@ -133,21 +133,21 @@ test(function () use ($main) { // rotate
 
 
 test(function () use ($main) { // alpha resize
-	$image = Image::fromFile(__DIR__ . '/images/alpha1.png');
+	$image = Image::fromFile(__DIR__ . '/fixtures.images/alpha1.png');
 	$image->resize(20, 20);
 	Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha.resize1.png'), $image->toString(Image::PNG, 0));
 });
 
 
 test(function () use ($main) { // alpha flip
-	$image = Image::fromFile(__DIR__ . '/images/alpha1.png');
+	$image = Image::fromFile(__DIR__ . '/fixtures.images/alpha1.png');
 	$image->resize(-10, -10);
 	Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha.flip1.png'), $image->toString(Image::PNG, 0));
 });
 
 
 test(function () use ($main) { // palette alpha resize
-	$image = Image::fromFile(__DIR__ . '/images/alpha3.gif');
+	$image = Image::fromFile(__DIR__ . '/fixtures.images/alpha3.gif');
 	$image->resize(20, 20);
 	Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha.resize2.png'), $image->toString(Image::PNG, 0));
 });
diff --git a/tests/Utils/Image.save.phpt b/tests/Utils/Image.save.phpt
@@ -14,7 +14,7 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-$main = Image::fromFile(__DIR__ . '/images/alpha1.png');
+$main = Image::fromFile(__DIR__ . '/fixtures.images/alpha1.png');
 
 
 test(function () use ($main) {

diff --git a/tests/Utils/Image.send.phpt b/tests/Utils/Image.send.phpt
@@ -14,7 +14,7 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-$main = Image::fromFile(__DIR__ . '/images/alpha1.png');
+$main = Image::fromFile(__DIR__ . '/fixtures.images/alpha1.png');
 
 
 test(function () use ($main) {

diff --git a/tests/Utils/Json.decode().phpt b/tests/Utils/Json.decode().phpt
@@ -65,11 +65,11 @@ Assert::exception(function () {
 // default JSON_BIGINT_AS_STRING
 if (defined('JSON_C_VERSION')) {
 	if (PHP_INT_SIZE > 4) {
-		# 64-bit
-		Assert::same([9223372036854775807], Json::decode('[12345678901234567890]'));   # trimmed to max 64-bit integer
+		// 64-bit
+		Assert::same([9223372036854775807], Json::decode('[12345678901234567890]'));   // trimmed to max 64-bit integer
 	} else {
-		# 32-bit
-		Assert::same(['9223372036854775807'], Json::decode('[12345678901234567890]'));  # trimmed to max 64-bit integer
+		// 32-bit
+		Assert::same(['9223372036854775807'], Json::decode('[12345678901234567890]'));  // trimmed to max 64-bit integer
 	}
 
 } else {

diff --git a/tests/Utils/Reflection.expandClassName.phpt b/tests/Utils/Reflection.expandClassName.phpt
@@ -12,9 +12,9 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-require __DIR__ . '/files/expandClass.noNamespace.php';
-require __DIR__ . '/files/expandClass.inBracketedNamespace.php';
-require __DIR__ . '/files/expandClass.inNamespace.php';
+require __DIR__ . '/fixtures.reflection/expandClass.noNamespace.php';
+require __DIR__ . '/fixtures.reflection/expandClass.inBracketedNamespace.php';
+require __DIR__ . '/fixtures.reflection/expandClass.inNamespace.php';
 
 $rcTest = new \ReflectionClass(Test::class);
 $rcBTest = new \ReflectionClass(BTest::class);

diff --git a/tests/Utils/Reflection.getParameterDefaultValue.phpt b/tests/Utils/Reflection.getParameterDefaultValue.phpt
@@ -6,69 +6,37 @@
 
 declare(strict_types=1);
 
-namespace NS {
-	define('DEFINED', 123);
-	define('NS_DEFINED', 'xxx');
-	const NS_DEFINED = 456;
+use Nette\Utils\Reflection;
+use Tester\Assert;
 
-	interface Bar
-	{
-		const DEFINED = 'xyz';
-	}
+require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/fixtures.reflection/defaultValue.php';
 
-	class Foo
-	{
-		const DEFINED = 'abc';
 
+Assert::exception(function () {
+	Reflection::getParameterDefaultValue(new ReflectionParameter(['NS\Foo', 'method'], 'a'));
+}, ReflectionException::class);
 
-		public function method(
-			$a,
-			$b = self::DEFINED,
-			$c = Foo::DEFINED,
-			$d = SELF::DEFINED,
-			$e = bar::DEFINED,
-			$f = self::UNDEFINED,
-			$g = Undefined::ANY,
-			$h = DEFINED,
-			$i = UNDEFINED,
-			$j = NS_DEFINED
-		) {
-		}
-	}
-}
+Assert::same(NS\Foo::DEFINED, Reflection::getParameterDefaultValue(new ReflectionParameter(['NS\Foo', 'method'], 'b')));
 
-namespace {
-	use Nette\Utils\Reflection;
-	use Tester\Assert;
+Assert::same(NS\Foo::DEFINED, Reflection::getParameterDefaultValue(new ReflectionParameter(['NS\Foo', 'method'], 'c')));
 
-	require __DIR__ . '/../bootstrap.php';
+Assert::same(NS\Foo::DEFINED, Reflection::getParameterDefaultValue(new ReflectionParameter(['NS\Foo', 'method'], 'd')));
 
+Assert::same(NS\Bar::DEFINED, Reflection::getParameterDefaultValue(new ReflectionParameter(['NS\Foo', 'method'], 'e')));
 
-	Assert::exception(function () {
-		Reflection::getParameterDefaultValue(new ReflectionParameter(['NS\Foo', 'method'], 'a'));
-	}, ReflectionException::class);
+Assert::exception(function () {
+	Reflection::getParameterDefaultValue(new ReflectionParameter(['NS\Foo', 'method'], 'f'));
+}, ReflectionException::class, 'Unable to resolve constant self::UNDEFINED used as default value of $f in NS\Foo::method().');
 
-	Assert::same(NS\Foo::DEFINED, Reflection::getParameterDefaultValue(new ReflectionParameter(['NS\Foo', 'method'], 'b')));
+Assert::exception(function () {
+	Reflection::getParameterDefaultValue(new ReflectionParameter(['NS\Foo', 'method'], 'g'));
+}, ReflectionException::class, 'Unable to resolve constant NS\Undefined::ANY used as default value of $g in NS\Foo::method().');
 
-	Assert::same(NS\Foo::DEFINED, Reflection::getParameterDefaultValue(new ReflectionParameter(['NS\Foo', 'method'], 'c')));
+Assert::same(DEFINED, Reflection::getParameterDefaultValue(new ReflectionParameter(['NS\Foo', 'method'], 'h')));
 
-	Assert::same(NS\Foo::DEFINED, Reflection::getParameterDefaultValue(new ReflectionParameter(['NS\Foo', 'method'], 'd')));
+Assert::exception(function () {
+	Reflection::getParameterDefaultValue(new ReflectionParameter(['NS\Foo', 'method'], 'i'));
+}, ReflectionException::class, 'Unable to resolve constant NS\UNDEFINED used as default value of $i in NS\Foo::method().');
 
-	Assert::same(NS\Bar::DEFINED, Reflection::getParameterDefaultValue(new ReflectionParameter(['NS\Foo', 'method'], 'e')));
-
-	Assert::exception(function () {
-		Reflection::getParameterDefaultValue(new ReflectionParameter(['NS\Foo', 'method'], 'f'));
-	}, ReflectionException::class, 'Unable to resolve constant self::UNDEFINED used as default value of $f in NS\Foo::method().');
-
-	Assert::exception(function () {
-		Reflection::getParameterDefaultValue(new ReflectionParameter(['NS\Foo', 'method'], 'g'));
-	}, ReflectionException::class, 'Unable to resolve constant NS\Undefined::ANY used as default value of $g in NS\Foo::method().');
-
-	Assert::same(DEFINED, Reflection::getParameterDefaultValue(new ReflectionParameter(['NS\Foo', 'method'], 'h')));
-
-	Assert::exception(function () {
-		Reflection::getParameterDefaultValue(new ReflectionParameter(['NS\Foo', 'method'], 'i'));
-	}, ReflectionException::class, 'Unable to resolve constant NS\UNDEFINED used as default value of $i in NS\Foo::method().');
-
-	Assert::same(NS\NS_DEFINED, Reflection::getParameterDefaultValue(new ReflectionParameter(['NS\Foo', 'method'], 'j')));
-}
+Assert::same(NS\NS_DEFINED, Reflection::getParameterDefaultValue(new ReflectionParameter(['NS\Foo', 'method'], 'j')));
diff --git a/tests/Utils/Reflection.getParameterType.php71.phpt b/tests/Utils/Reflection.getParameterType.php71.phpt
@@ -8,14 +8,13 @@
 declare(strict_types=1);
 
 use Nette\Utils\Reflection;
+use Test\B; // for testing purposes
 use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
 
 
-use Test\B; // for testing purposes
-
 class A
 {
 	public function method(Undeclared $undeclared, B $b, array $array, callable $callable, $none, ?B $nullable)

diff --git a/tests/Utils/Reflection.getParameterType.phpt b/tests/Utils/Reflection.getParameterType.phpt
@@ -7,14 +7,13 @@
 declare(strict_types=1);
 
 use Nette\Utils\Reflection;
+use Test\B; // for testing purposes
 use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
 
 
-use Test\B; // for testing purposes
-
 class A
 {
 	public function method(Undeclared $undeclared, B $b, array $array, callable $callable, self $self, $none)

diff --git a/tests/Utils/Reflection.groupUseStatements.phpt b/tests/Utils/Reflection.groupUseStatements.phpt
@@ -12,7 +12,7 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-require __DIR__ . '/files/expandClass.groupUse.php';
+require __DIR__ . '/fixtures.reflection/expandClass.groupUse.php';
 
 Assert::same(
 	['A' => 'A\B\A', 'C' => 'A\B\B\C', 'D' => 'A\B\C', 'E' => 'D\E'],

diff --git a/tests/Utils/Reflection.nonClassUseStatements.phpt b/tests/Utils/Reflection.nonClassUseStatements.phpt
@@ -12,7 +12,7 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-require __DIR__ . '/files/expandClass.nonClassUse.php';
+require __DIR__ . '/fixtures.reflection/expandClass.nonClassUse.php';
 
 Assert::same(
 	[],

diff --git a/tests/Utils/images/alpha1.png → tests/Utils/fixtures.images/alpha1.png b/tests/Utils/images/alpha1.png → tests/Utils/fixtures.images/alpha1.png
diff --git a/tests/Utils/images/alpha2.png → tests/Utils/fixtures.images/alpha2.png b/tests/Utils/images/alpha2.png → tests/Utils/fixtures.images/alpha2.png
diff --git a/tests/Utils/images/alpha3.gif → tests/Utils/fixtures.images/alpha3.gif b/tests/Utils/images/alpha3.gif → tests/Utils/fixtures.images/alpha3.gif
diff --git a/tests/Utils/images/bad.gif → tests/Utils/fixtures.images/bad.gif b/tests/Utils/images/bad.gif → tests/Utils/fixtures.images/bad.gif
diff --git a/tests/Utils/images/logo.gif → tests/Utils/fixtures.images/logo.gif b/tests/Utils/images/logo.gif → tests/Utils/fixtures.images/logo.gif
diff --git a/tests/Utils/images/logo.tiff → tests/Utils/fixtures.images/logo.tiff b/tests/Utils/images/logo.tiff → tests/Utils/fixtures.images/logo.tiff
diff --git a/tests/Utils/images/logo.webp → tests/Utils/fixtures.images/logo.webp b/tests/Utils/images/logo.webp → tests/Utils/fixtures.images/logo.webp
diff --git a/tests/Utils/fixtures.reflection/defaultValue.php b/tests/Utils/fixtures.reflection/defaultValue.php
@@ -0,0 +1,33 @@
+<?php
+declare(strict_types=1);
+
+namespace NS;
+
+define('DEFINED', 123);
+define('NS_DEFINED', 'xxx');
+const NS_DEFINED = 456;
+
+interface Bar
+{
+	const DEFINED = 'xyz';
+}
+
+class Foo
+{
+	const DEFINED = 'abc';
+
+
+	public function method(
+		$a,
+		$b = self::DEFINED,
+		$c = Foo::DEFINED,
+		$d = SELF::DEFINED,
+		$e = bar::DEFINED,
+		$f = self::UNDEFINED,
+		$g = Undefined::ANY,
+		$h = DEFINED,
+		$i = UNDEFINED,
+		$j = NS_DEFINED
+	) {
+	}
+}
diff --git a/tests/Utils/files/expandClass.groupUse.php → ...tures.reflection/expandClass.groupUse.php b/tests/Utils/files/expandClass.groupUse.php → ...tures.reflection/expandClass.groupUse.php
diff --git a/...iles/expandClass.inBracketedNamespace.php → ...tion/expandClass.inBracketedNamespace.php b/...iles/expandClass.inBracketedNamespace.php → ...tion/expandClass.inBracketedNamespace.php
diff --git a/...s/Utils/files/expandClass.inNamespace.php → ...es.reflection/expandClass.inNamespace.php b/...s/Utils/files/expandClass.inNamespace.php → ...es.reflection/expandClass.inNamespace.php
diff --git a/...s/Utils/files/expandClass.noNamespace.php → ...es.reflection/expandClass.noNamespace.php b/...s/Utils/files/expandClass.noNamespace.php → ...es.reflection/expandClass.noNamespace.php
diff --git a/...s/Utils/files/expandClass.nonClassUse.php → ...es.reflection/expandClass.nonClassUse.php b/...s/Utils/files/expandClass.nonClassUse.php → ...es.reflection/expandClass.nonClassUse.php