Replaced git submodule with composer dependency

shyim · Apr 23, 2016 · 942674b · 942674b
1 parent 5b20d71
commit 942674b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+/composer.lock
+/vendor
diff --git a/.gitmodules b/.gitmodules
diff --git a/Bootstrap.php b/Bootstrap.php
@@ -42,7 +42,10 @@ public function onShopwareStartDispatch(Enlight_Event_EventArgs $args)
 
         if ($subject->getParam('noErrorHandler')) {
             $requestUri = $subject->Request()->getRequestUri();
-            spl_autoload_register(array($this, 'loader'));
+
+            if (file_exists($this->Path() . 'vendor/autoload.php')) {
+                require_once $this->Path() . 'vendor/autoload.php';
+            }
 
             $whoops = new Run;
 
@@ -56,13 +59,4 @@ public function onShopwareStartDispatch(Enlight_Event_EventArgs $args)
             restore_error_handler();
         }
     }
-
-    public function loader($className)
-    {
-        if (!strstr($className, 'Whoops')) {
-            return;
-        }
-        $className = str_replace('\\', '/', $className);
-        require_once($this->Path() . '/vendor/filp/whoops/src/' . $className . '.php');
-    }
 }
diff --git a/composer.json b/composer.json
@@ -9,6 +9,7 @@
   },
   "require": {
     "php": ">=5.5.9",
-    "composer/installers": "^1.0"
+    "composer/installers": "^1.0",
+    "filp/whoops": "^2.1"
   }
-}
+}