Merge remote-tracking branch 'weierophinney/feature/error-suppression…

…-removal'
weierophinney · Jul 13, 2012 · dd3288d · dd3288d
2 parents 342f1d2 + 3f88435
commit dd3288d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/library/ZendPdf/BinaryParser/DataSource/File.php b/library/ZendPdf/BinaryParser/DataSource/File.php
@@ -12,6 +12,7 @@
 
 use Zend\Pdf;
 use Zend\Pdf\Exception;
+use Zend\Stdlib\ErrorHandler;
 
 /**
  * Concrete subclass of {@link \Zend\Pdf\BinaryParser\DataSource\AbstractDataSource}
@@ -84,7 +85,9 @@ public function __construct($filePath)
     public function __destruct()
     {
         if (is_resource($this->_fileResource)) {
-            @fclose($this->_fileResource);
+            ErrorHandler::start(E_WARNING);
+            fclose($this->_fileResource);
+            ErrorHandler::stop();
         }
     }
 

diff --git a/library/ZendPdf/composer.json b/library/ZendPdf/composer.json
@@ -13,6 +13,7 @@
     },
     "target-dir": "Zend/Pdf",
     "require": {
-        "php": ">=5.3.3"
+        "php": ">=5.3.3",
+        "zendframework/zend-stdlib": "self.version"
     }
-}
+}