Merge branch 'cs/zendframework/zendframework#6969-dead-code-removal' …

…into develop Close zendframework/zendframework#6969
zendframework · Dec 8, 2014 · 1cb6d55 · 1cb6d55
3 parents 1caf4ec + abd0925 + 8bd60a3
commit 1cb6d55
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/Reader/Ini.php b/src/Reader/Ini.php
@@ -72,7 +72,7 @@ public function fromFile($filename)
         $this->directory = dirname($filename);
 
         set_error_handler(
-            function ($error, $message = '', $file = '', $line = 0) use ($filename) {
+            function ($error, $message = '') use ($filename) {
                 throw new Exception\RuntimeException(
                     sprintf('Error reading INI file "%s": %s', $filename, $message),
                     $error
@@ -101,7 +101,7 @@ public function fromString($string)
         $this->directory = null;
 
         set_error_handler(
-            function ($error, $message = '', $file = '', $line = 0) {
+            function ($error, $message = '') {
                 throw new Exception\RuntimeException(
                     sprintf('Error reading INI string: %s', $message),
                     $error

diff --git a/src/Reader/Xml.php b/src/Reader/Xml.php
@@ -66,7 +66,7 @@ public function fromFile($filename)
         $this->directory = dirname($filename);
 
         set_error_handler(
-            function ($error, $message = '', $file = '', $line = 0) use ($filename) {
+            function ($error, $message = '') use ($filename) {
                 throw new Exception\RuntimeException(
                     sprintf('Error reading XML file "%s": %s', $filename, $message),
                     $error
@@ -100,7 +100,7 @@ public function fromString($string)
         $this->directory = null;
 
         set_error_handler(
-            function ($error, $message = '', $file = '', $line = 0) {
+            function ($error, $message = '') {
                 throw new Exception\RuntimeException(
                     sprintf('Error reading XML string: %s', $message),
                     $error

diff --git a/src/Writer/AbstractWriter.php b/src/Writer/AbstractWriter.php
@@ -38,7 +38,7 @@ public function toFile($filename, $config, $exclusiveLock = true)
         }
 
         set_error_handler(
-            function ($error, $message = '', $file = '', $line = 0) use ($filename) {
+            function ($error, $message = '') use ($filename) {
                 throw new Exception\RuntimeException(
                     sprintf('Error writing to "%s": %s', $filename, $message),
                     $error

diff --git a/src/Writer/PhpArray.php b/src/Writer/PhpArray.php
@@ -76,7 +76,7 @@ public function toFile($filename, $config, $exclusiveLock = true)
         }
 
         set_error_handler(
-            function ($error, $message = '', $file = '', $line = 0) use ($filename) {
+            function ($error, $message = '') use ($filename) {
                 throw new Exception\RuntimeException(
                     sprintf('Error writing to "%s": %s', $filename, $message),
                     $error