Update Autoload

CodeMommy · Sep 7, 2017 · d774a73 · d774a73
1 parent b103e5f
commit d774a73
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 6 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,12 @@
+root=true
+
+[*]
+charset=utf-8
+end_of_line=crlf
+indent_style=space
+indent_size=2
+insert_final_newline=false
+trim_trailing_whitespace=true
+
+[*.php]
+indent_size=4
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,12 @@
+language: php
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+  - 7.1
+before_script:
+  - composer install
+script:
+  - vendor/bin/phpunit -v
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "codemommy/webphp",
-    "version": "0.0.17",
+    "version": "0.0.18",
     "description": "Web MVC framework of light and fast",
     "keywords": [
         "CodeMommy",

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,4 +1,4 @@
-<phpunit>
+<phpunit bootstrap="vendor/autoload.php">
     <testsuites>
         <testsuite name="CodeMommy WebPHP">
             <directory>test</directory>

diff --git a/system/core/Application.php b/system/core/Application.php
@@ -70,9 +70,9 @@ public static function start($path)
             }
         }
         // Other
-        Autoload::load(APPLICATION_ROOT . '/controller', 'Controller');
-        Autoload::load(APPLICATION_ROOT . '/model', 'Model');
-        Autoload::load(APPLICATION_ROOT, '');
+        Autoload::directory(APPLICATION_ROOT . '/controller', 'Controller');
+        Autoload::directory(APPLICATION_ROOT . '/model', 'Model');
+        Autoload::directory(APPLICATION_ROOT, '');
         Cache::setConfig(Config::get('cache'));
         Route::start();
         return true;

diff --git a/test/DateTimeTest.php b/test/DateTimeTest.php
@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-require_once(__DIR__ . '/../vendor/autoload.php');
+namespace Test;
 
 use PHPUnit\Framework\TestCase;
 use CodeMommy\WebPHP\DateTime;