updated composer and twig view

Author: Andrew Smith

Views/TwigView.php

@@ -82,9 +82,7 @@ public function render( $template ) {
      */
     public function getEnvironment() {
         if ( !$this->twigEnvironment ) {
-            /*
-             * Check for Composer Package Autoloader class loading
-             */
+            // Check for Composer Package Autoloader class loading
             if (!class_exists('Twig_Autoloader')) {
                 require_once self::$twigDirectory . '/Autoloader.php';
             }
@@ -96,9 +94,13 @@ public function getEnvironment() {
                 self::$twigOptions
             );
 
-            $extension_autoloader = dirname(__FILE__) . '/Extension/TwigAutoloader.php';
-            if (file_exists($extension_autoloader)) {
-                require_once $extension_autoloader;
+            // Check for Composer Package Autoloader class loading
+            if (!class_exists('Twig_Extensions_Autoloader')) {
+                $extension_autoloader = dirname(__FILE__) . '/Extension/TwigAutoloader.php';
+                if (file_exists($extension_autoloader)) require_once $extension_autoloader;
+            }
+
+            if (class_exists('Twig_Extensions_Autoloader')) {
                 Twig_Extensions_Autoloader::register();
 
                 foreach (self::$twigExtensions as $ext) {

composer.json

@@ -20,6 +20,6 @@
         "php": ">=5.2.0"
     },
     "autoload": {
-        "psr-0": { "Twig_Extensions_": "Extension/" }
+        "psr-0": { "Twig_Extensions_": "Views/Extension/" }
     }
 }