include import

Author: brianium

composer.json

@@ -16,6 +16,6 @@
 	"php": ">=5.4"
     },
     "autoload": {
-        "psr-0": { "Brianium": ["src/", "test/"] }
+        "files": ["src/Brianium/Phunc/import.php"]
     }
 }

src/Brianium/Phunc/Functions.php

@@ -1,6 +1,5 @@
 <?php
 namespace Brianium\Phunc\Functions;
-require_once __DIR__ . DIRECTORY_SEPARATOR . 'Arrays.php';
 
 use Brianium\Phunc\Arrays as _array;
 
@@ -124,4 +123,4 @@ function compose(/** functions */) {
             $result = [call_user_func_array($fn, $result)];
         return $result[0];
     };
-}
+}

src/Brianium/Phunc/import.php

@@ -0,0 +1,6 @@
+<?php
+if (!defined('DS')) {
+    define('DS', DIRECTORY_SEPARATOR);
+}
+require_once __DIR__ . DS . 'Functions.php';
+require_once __DIR__ . DS . 'Arrays.php';

test/Brianium/Phunc/Functions/ComposeTest.php

@@ -1,6 +1,5 @@
 <?php
 namespace Brianium\Phunc\Functions;
-loadModule('Functions');
 
 class ComposeTest extends \PHPUnit_Framework_TestCase
 {
@@ -14,4 +13,4 @@ public function test_compose_passes_results_from_end_to_first()
         $result = $findNameAndMakeItCool($subject);
         $this->assertEquals('Brian is cool.', $result);
     }
-}
+}

test/Brianium/Phunc/Functions/CurryTest.php

@@ -1,6 +1,5 @@
 <?php
 namespace Brianium\Phunc\Functions;
-loadModule('Functions');
 
 class CurryTest extends \PHPUnit_Framework_TestCase
 {
@@ -65,4 +64,4 @@ public function test_curryRight_function_with_arity_arg()
         $this->assertEquals('brian', $strstrBeforeNeedle($subject, ':'));
         $this->assertEquals('456', $arrayToString($testValues));
     }
-} 
+} 

test/Brianium/Phunc/Functions/PartialTest.php

@@ -1,11 +1,6 @@
 <?php
 namespace Brianium\Phunc\Functions;
 
-/**
- * Require the functions module
- */
-loadModule('Functions');
-
 class PartialTest extends \PHPUnit_Framework_TestCase
 {
     protected $testValue = 'test';
@@ -89,4 +84,4 @@ public function sayHello($name)
     {
         return 'hello!' . $name;
     }
-}
+}

test/bootstrap.php

@@ -8,7 +8,3 @@
 
 define('SRC', dirname(__DIR__) . DS . 'src');
 
-function loadModule($name) {
-    $path = SRC . DS . 'Brianium' . DS . 'Phunc' . DS . "$name.php";
-    require_once $path;
-}