Move to fully Composer-based installation

.travis.yml

@@ -11,7 +11,7 @@ env:
 before_script:
   - ./tests/travis_${MIDGARD}.sh
 
-script: phpunit -c tests/phpunit.xml.dist
+script: phpunit
 
 notifications:
     irc: "irc.freenode.org#midgard"

composer.json

@@ -3,8 +3,7 @@
     "type": "library",
     "description": "Content-oriented Model-View-Controller library for PHP",
     "keywords": ["mvc", "midgard", "framework"],
-    "homepage": "http://new.midgard-project.org/midgardmvc/",
-    "version": "10.05.2",
+    "homepage": "http://midgard-project.org/midgardmvc/",
     "license": "LGPL",
     "authors": [
         {
@@ -19,5 +18,8 @@
     },
     "suggest": {
         "ext-midgard2": ">=10.05.5"
+    },
+    "autoload": {
+        "classmap": ["."]
     }
 }

framework.php

@@ -53,5 +53,4 @@
 require(__DIR__ . '/interface.php');
 
 // Register autoloader so we get all Midgard MVC classes loaded automatically
-spl_autoload_register(array('midgardmvc_core', 'autoload'));
-?>
+require(__DIR__ . '/vendor/autoload.php');

interface.php

@@ -175,25 +175,6 @@ public function __get($key)
         return $this->$key;
     }
 
-    /**
-     * Automatically load missing class files
-     *
-     * @param string $class_name Name of a missing PHP class
-     */
-    public static function autoload($class_name)
-    {
-        $components = self::find_components();
-        foreach ($components as $component => $component_path)
-        {
-            $component_length = strlen($component);
-            if (substr($class_name, 0, $component_length) != $component)
-            {
-                continue;
-            }
-            return self::autoload_from_component($component, substr($class_name, $component_length));
-        }
-    }
-
     private static function find_components()
     {
         static $components = null;
@@ -246,25 +227,6 @@ public static function get_component_path($component)
         }
     }
 
-    private static function autoload_from_component($component, $class_name)
-    {
-        if (empty($class_name))
-        {
-            $path = self::get_component_path($component) . '/interface.php';
-        }
-        else
-        {
-            $path = self::get_component_path($component) . str_replace('_', '/', $class_name) . '.php';
-        }
-
-        if (!file_exists($path))
-        {
-            return;
-        }
-
-        require($path);
-    }
-
     /**
      * Process the current request, loading the node's component and dispatching the request to it
      */

phpunit.xml.dist

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit
+         colors="true"
+         bootstrap="framework.php"
+>
+    <testsuites>
+        <testsuite name="Midgard MVC Test Suite">
+            <directory>./tests</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>

services/i18n/gettext.php

@@ -5,7 +5,6 @@
  * @copyright The Midgard Project, http://www.midgard-project.org
  * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
  */
-require_once(midgardmvc_core::get_component_path('midgardmvc_core') . '/phptal_include.php');
 
 /**
  * Gettext localization service for Midgard MVC

services/templating/midgardmvc.php

@@ -279,12 +279,6 @@ public function display(midgardmvc_core_request $request, $return_output = false
 
     private function display_tal(midgardmvc_core_request $request, $content, array $data)
     {
-        // We use the PHPTAL class
-        if (!class_exists('PHPTAL'))
-        {
-            require_once(midgardmvc_core::get_component_path('midgardmvc_core') . '/phptal_include.php');
-        }
-
         $tal = new PHPTAL($request->get_template_identifier());
         $tal->setPhpCodeDestination($this->midgardmvc->cache->template->get_cache_directory());
 

tests/core.php → tests/coreTest.php

@@ -9,7 +9,7 @@
 /**
  * Test to see if midgardmvc_core is working
  */
-class midgardmvc_core_tests_core extends PHPUnit_Framework_TestCase
+class midgardmvc_core_tests_coreTest extends PHPUnit_Framework_TestCase
 {
     private $configuration = array
     (

tests/exceptionhandler.php → tests/exceptionhandlerTest.php

@@ -11,7 +11,7 @@
  *
  * @package midgardmvc_core
  */
-class midgardmvc_core_tests_exceptionhandler extends midgardmvc_core_tests_testcase
+class midgardmvc_core_tests_exceptionhandlerTest extends midgardmvc_core_tests_testcase
 {
     public function test_handle()
     {

tests/helpers/context.php → tests/helpers/contextTest.php

@@ -11,7 +11,7 @@
  *
  * @package midgardmvc_core
  */
-class midgardmvc_core_tests_helpers_context extends midgardmvc_core_tests_testcase
+class midgardmvc_core_tests_helpers_contextTest extends midgardmvc_core_tests_testcase
 {
     public function test_create()
     { 

tests/helpers/head.php → tests/helpers/headTest.php

@@ -11,7 +11,7 @@
  *
  * @package midgardmvc_core
  */
-class midgardmvc_core_tests_helpers_head extends midgardmvc_core_tests_testcase
+class midgardmvc_core_tests_helpers_headTest extends midgardmvc_core_tests_testcase
 {
     public function test_jquery()
     {

tests/providers/component.php → tests/providers/componentTest.php

@@ -11,7 +11,7 @@
  *
  * @package midgardmvc_core
  */
-class midgardmvc_core_tests_providers_component extends midgardmvc_core_tests_testcase
+class midgardmvc_core_tests_providers_componentTest extends midgardmvc_core_tests_testcase
 {
     /**
      * @expectedException InvalidArgumentException

tests/providers/hierarchy.php → tests/providers/hierarchyTest.php

@@ -11,7 +11,7 @@
  *
  * @package midgardmvc_core
  */
-class midgardmvc_core_tests_providers_hierarchy extends midgardmvc_core_tests_testcase
+class midgardmvc_core_tests_providers_hierarchyTest extends midgardmvc_core_tests_testcase
 {
     public function test_get_node_by_path()
     {

tests/request.php → tests/requestTest.php

@@ -11,7 +11,7 @@
  *
  * @package midgardmvc_core
  */
-class midgardmvc_core_tests_request extends midgardmvc_core_tests_testcase
+class midgardmvc_core_tests_requestTest extends midgardmvc_core_tests_testcase
 {
     public function test_resolve_node_root()
     {

tests/route.php → tests/routeTest.php

@@ -11,7 +11,7 @@
  *
  * @package midgardmvc_core
  */
-class midgardmvc_core_tests_route extends PHPUnit_Framework_TestCase
+class midgardmvc_core_tests_routeTest extends PHPUnit_Framework_TestCase
 {
     public function test_default_templates()
     {

tests/services/authentication.php → tests/services/authenticationTest.php

@@ -11,7 +11,7 @@
  *
  * @package midgardmvc_core
  */
-class midgardmvc_core_tests_services_authentication extends midgardmvc_core_tests_testcase
+class midgardmvc_core_tests_services_authenticationTest extends midgardmvc_core_tests_testcase
 {
     public function test_user_anonymous()
     {

tests/services/configuration.php → tests/services/configurationTest.php

@@ -11,7 +11,7 @@
  *
  * @package midgardmvc_core
  */
-class midgardmvc_core_tests_services_configuration extends midgardmvc_core_tests_testcase
+class midgardmvc_core_tests_services_configurationTest extends midgardmvc_core_tests_testcase
 {
     public function setUp()
     {

tests/services/dispatcher.php → tests/services/dispatcherTest.php

@@ -11,7 +11,7 @@
  *
  * @package midgardmvc_core
  */
-class midgardmvc_core_tests_services_dispatcher extends midgardmvc_core_tests_testcase
+class midgardmvc_core_tests_services_dispatcherTest extends midgardmvc_core_tests_testcase
 {
     public function test_generate_url()
     {

tests/services/observation.php → tests/services/observationTest.php

@@ -11,7 +11,7 @@
  *
  * @package midgardmvc_core
  */
-class midgardmvc_core_tests_services_observation extends midgardmvc_core_tests_testcase
+class midgardmvc_core_tests_services_observationTest extends midgardmvc_core_tests_testcase
 {
     public function test_update_node()
     {

tests/services/templating.php → tests/services/templatingTest.php

@@ -11,7 +11,7 @@
  *
  * @package midgardmvc_core
  */
-class midgardmvc_core_tests_services_templating extends midgardmvc_core_tests_testcase
+class midgardmvc_core_tests_services_templatingTest extends midgardmvc_core_tests_testcase
 {
     public function setUp()
     {

tests/services/uimessages.php → tests/services/uimessagesTest.php

@@ -11,7 +11,7 @@
  *
  * @package midgardmvc_core
  */
-class midgardmvc_core_tests_services_uimessages extends midgardmvc_core_tests_testcase
+class midgardmvc_core_tests_services_uimessagesTest extends midgardmvc_core_tests_testcase
 {
     public function test_has_remove()
     {