throw exception instead of fatal error

Author: remicollet

src/functions.php

@@ -21,7 +21,11 @@
  */
 function requireFile($file)
 {
-    require_once $file;
+    if (file_exists($file)) {
+        require_once $file;
+    } else {
+        throw new \RuntimeException("File not found '$file'");
+    }
 }
 
 /**

tests/AutoloadTest.php

@@ -15,7 +15,6 @@ class AutoloadTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @group psr4
-     * @covers Fedora::Autoloader::Autoload::addPsr4
      **/
     public function testAddPsr4()
     {
@@ -26,7 +25,6 @@ public function testAddPsr4()
 
     /**
      * @group psr4
-     * @covers Fedora::Autoloader::Autoload::addPsr4
      **/
     public function testAddPsr4Order()
     {
@@ -40,7 +38,6 @@ public function testAddPsr4Order()
 
     /**
      * @group classmap
-     * @covers Fedora::Autoloader::Autoload::addClassMap
      **/
     public function testAddClassMap()
     {
@@ -56,7 +53,6 @@ public function testAddClassMap()
 
     /**
      * @group classmap
-     * @covers Fedora::Autoloader::Autoload::addClassMap
      **/
     public function testAddClassMapTemplate()
     {
@@ -67,7 +63,6 @@ public function testAddClassMapTemplate()
 
     /**
      * @group classmap
-     * @covers Fedora::Autoloader::Autoload::addClassMap
      **/
     public function testAddClassMapLowerCase()
     {
@@ -78,7 +73,6 @@ public function testAddClassMapLowerCase()
 
     /**
      * @group classmap
-     * @covers Fedora::Autoloader::Autoload::addClassMap
      **/
     public function testAddClassMapTemplateOrder()
     {
@@ -92,7 +86,6 @@ public function testAddClassMapTemplateOrder()
 
     /**
      * @group classmap
-     * @covers Fedora::Autoloader::Autoload::addClassMap
      **/
     public function testAddClassMapTemplateOrderBis()
     {
@@ -112,7 +105,6 @@ public function testAddClassMapTemplateOrderBis()
 
     /**
      * @group psr0
-     * @covers Fedora::Autoloader::Autoload::addIncludePath
      **/
     public function testAddIncludePath()
     {
@@ -138,7 +130,6 @@ public function testAddIncludePath()
 
     /**
      * @group psr0
-     * @covers Fedora::Autoloader::Autoload::addPsr0
      **/
     public function testAddPsr0Simple()
     {
@@ -157,7 +148,6 @@ public function testAddPsr0Simple()
 
     /**
      * @group psr0
-     * @covers Fedora::Autoloader::Autoload::addPsr0
      **/
     public function testAddPsr0ns1()
     {
@@ -170,7 +160,6 @@ public function testAddPsr0ns1()
 
     /**
      * @group psr0
-     * @covers Fedora::Autoloader::Autoload::addPsr0
      **/
     public function testAddPsr0ns2()
     {

tests/DependenciesTest.php

@@ -27,10 +27,26 @@ public function testRequiredExists()
         $this->assertTrue(class_exists('Foo\\Bar\\Baz'));
     }
 
+    /**
+     * @expectedException RuntimeException
+     * @expectedExceptionMessageRegex /File Not Found.*AlsoNotExist/
+     **/
+    public function testRequiredNotExistsLast()
+    {
+        Dependencies::required(array(
+            array(
+                __DIR__.'/fixtures/DoesNotExist.php',
+                __DIR__.'/fixtures/AlsoNotExist.php',
+        ), ));
+    }
+
+    /**
+     * @expectedException RuntimeException
+     * @expectedExceptionMessageRegex /File Not Found.*DoesNotExist/
+     **/
     public function testRequiredNotExists()
     {
-        $this->markTestSkipped('Skipping until we can get this test to pass');
-        //Dependencies::required(array(__DIR__.'/fixtures/DoesNotExist.php'));
+        Dependencies::required(array(__DIR__.'/fixtures/DoesNotExist.php'));
     }
 
     public function testRequiredFirstExists()