Merge branch '2.3' into 2.7

stof · stof · commit 2becb03b52b4 · 2015-12-05T18:37:09.000+01:00
* 2.3:
  [Process] Fix stopping a process on Windows
  Added a test case for the Logger class.
  CS: general fixes
diff --git a/Tests/Generator/Dumper/PhpGeneratorDumperTest.php b/Tests/Generator/Dumper/PhpGeneratorDumperTest.php
@@ -86,7 +86,7 @@ public function testDumpWithRoutes()
     public function testDumpWithTooManyRoutes()
     {
         $this->routeCollection->add('Test', new Route('/testing/{foo}'));
-        for ( $i = 0; $i < 32769; ++$i ) {
+        for ($i = 0; $i < 32769; ++$i) {
             $this->routeCollection->add('route_'.$i, new Route('/route_'.$i));
         }
         $this->routeCollection->add('Test2', new Route('/testing2'));

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public function testDumpWithRoutes()`
`86`	`86`	`public function testDumpWithTooManyRoutes()`
`87`	`87`	`{`
`88`	`88`	`$this->routeCollection->add('Test', new Route('/testing/{foo}'));`
`89`		`- for ( $i = 0; $i < 32769; ++$i ) {`
	`89`	`+ for ($i = 0; $i < 32769; ++$i) {`
`90`	`90`	`$this->routeCollection->add('route_'.$i, new Route('/route_'.$i));`
`91`	`91`	`}`
`92`	`92`	`$this->routeCollection->add('Test2', new Route('/testing2'));`