Merge branch 'hotfix/cs'

Fixes failing php-cs-fixer notices.
zendframework · Sep 21, 2012 · 8d23ab7 · 8d23ab7
commit 8d23ab7
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 10 deletions.
diff --git a/test/ConfigTest.php b/test/ConfigTest.php
@@ -632,4 +632,3 @@ public function testZF2_186_mergeReplacingUnnamedConfigSettings()
         $this->assertEquals($mergeResult, $configA->toArray());
     }
 }
-
diff --git a/test/FactoryTest.php b/test/FactoryTest.php
@@ -140,4 +140,3 @@ public function testFactoryCanRegisterCustomReaderPlugn()
 
 
 }
-
diff --git a/test/ProcessorTest.php b/test/ProcessorTest.php
@@ -492,4 +492,3 @@ public function testQueuePriorities()
     }
 
 }
-
diff --git a/test/Reader/TestAssets/Xml/array.xml b/test/Reader/TestAssets/Xml/array.xml
@@ -28,4 +28,3 @@
         </seven>
     </six>
 </config>
-
diff --git a/test/Reader/TestAssets/Xml/include-base.xml b/test/Reader/TestAssets/Xml/include-base.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config xmlns:xi="http://www.w3.org/2001/XInclude">
     <xi:include href="include-target.xml"/>
-</config>
+</config>
diff --git a/test/Reader/TestAssets/Xml/include-target.xml b/test/Reader/TestAssets/Xml/include-target.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<foo>foo</foo>
+<foo>foo</foo>
diff --git a/test/Reader/TestAssets/Xml/invalid.xml b/test/Reader/TestAssets/Xml/invalid.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <foo>
     <bar>value</baz>
-</foo>
+</foo>
diff --git a/test/TestAssets/Xml/include-base.xml b/test/TestAssets/Xml/include-base.xml
@@ -3,4 +3,4 @@
     <base>
         <foo>bar</foo>
     </base>
-</zend-config>
+</zend-config>
diff --git a/test/TestAssets/Xml/include-base2.xml b/test/TestAssets/Xml/include-base2.xml
@@ -3,4 +3,4 @@
     <test>
         <bar>baz</bar>
     </test>
-</zend-config>
+</zend-config>
diff --git a/test/Writer/_files/allsections.xml b/test/Writer/_files/allsections.xml
@@ -32,4 +32,4 @@
     </other_staging>
 
 
-</config>
+</config>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -632,4 +632,3 @@ public function testZF2_186_mergeReplacingUnnamedConfigSettings()
		$this->assertEquals($mergeResult, $configA->toArray());
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -140,4 +140,3 @@ public function testFactoryCanRegisterCustomReaderPlugn()


		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -492,4 +492,3 @@ public function testQueuePriorities()
		}

		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,4 +32,4 @@
		</other_staging>


		</config>
		</config>