Merge pull request laravel#5720 from GrahamCampbell/4.2-windows

[4.2] Fixed Tests On Windows
JeroenDeDauw · Sep 30, 2014 · 8615680 · 8615680
2 parents b67c734 + 3ad954c
commit 8615680
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/tests/Support/SupportSerializableClosureTest.php b/tests/Support/SupportSerializableClosureTest.php
@@ -41,9 +41,9 @@ public function testCanGetCodeAndVariablesFromObject()
 		});
 
 		$expectedVars = array('a' => 1, 'b' => 2);
-		$expectedCode = 'function ($i) use($a, $b) {'.PHP_EOL.
-'    return $a + $b + $i;'.PHP_EOL.
-'};';
+		$expectedCode = 'function ($i) use($a, $b) {
+    return $a + $b + $i;
+};';
 		$this->assertEquals($expectedVars, $f->getVariables());
 		$this->assertEquals($expectedCode, $f->getCode());
 	}

diff --git a/tests/View/ViewCompilerEngineTest.php b/tests/View/ViewCompilerEngineTest.php
@@ -19,7 +19,7 @@ public function testViewsMayBeRecompiledAndRendered()
 		$engine->getCompiler()->shouldReceive('compile')->once()->with(__DIR__.'/fixtures/foo.php');
 		$results = $engine->get(__DIR__.'/fixtures/foo.php');
 
-		$this->assertEquals('Hello World'.PHP_EOL, $results);
+		$this->assertEquals("Hello World\n", $results);
 	}
 
 
@@ -31,7 +31,7 @@ public function testViewsAreNotRecompiledIfTheyAreNotExpired()
 		$engine->getCompiler()->shouldReceive('compile')->never();
 		$results = $engine->get(__DIR__.'/fixtures/foo.php');
 
-		$this->assertEquals('Hello World'.PHP_EOL, $results);
+		$this->assertEquals("Hello World\n", $results);
 	}
 
 

diff --git a/tests/View/ViewPhpEngineTest.php b/tests/View/ViewPhpEngineTest.php
@@ -14,7 +14,7 @@ public function tearDown()
 	public function testViewsMayBeProperlyRendered()
 	{
 		$engine = new PhpEngine;
-		$this->assertEquals('Hello World'.PHP_EOL, $engine->get(__DIR__.'/fixtures/basic.php'));
+		$this->assertEquals("Hello World\n", $engine->get(__DIR__.'/fixtures/basic.php'));
 	}
 
 }
diff --git a/tests/View/fixtures/section-exception-layout.php b/tests/View/fixtures/section-exception-layout.php
@@ -1 +1 @@
-<?php echo $__env->yieldContent('content'); ?>
+<?php echo $__env->yieldContent('content'); ?>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php echo $__env->yieldContent('content'); ?>
		<?php echo $__env->yieldContent('content'); ?>