Update dependencies and autoload handling

Author: theseer

.gitignore

@@ -7,7 +7,6 @@
 /phpdoc
 /sample
 /vendor
-/composer.lock
 /tests/data/*/xml
 /tests/data/*/docs
-
+/tools

composer.json

@@ -20,11 +20,11 @@
     "ext-iconv" : "*",
     "ext-fileinfo": "*",
     "ext-mbstring": "*",
-    "theseer/fdomdocument": ">=1.6.1",
-    "theseer/directoryscanner" : ">=1.3.0",
-    "theseer/fxsl" : ">=1.1",
-    "phpunit/php-timer" : ">=1.0.6",
-    "nikic/php-parser" : "3.0.2"
+    "theseer/fdomdocument": "^1.6",
+    "theseer/directoryscanner" : "^1.3.0",
+    "theseer/fxsl" : "^1.1",
+    "phpunit/php-timer" : "^1.0",
+    "nikic/php-parser" : "^3.0"
   },
   "autoload": {
     "classmap": [

composer.lock

@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 /*
- * Copyright (c) 2010-2016 Arne Blankerts <[email protected]>
+ * Copyright (c) 2010-2017 Arne Blankerts <[email protected]>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -59,15 +59,14 @@ $found = false;
 foreach(array(__DIR__ . '/vendor', __DIR__ . '/../..') as $vendor) {
     if (file_exists($vendor . '/autoload.php')) {
         $found = true;
-        require __DIR__ . '/src/vendor.php';
+        require $vendor . '/autoload.php';
+        break;
     }
 }
 
 if (!$found) {
     fwrite(STDERR,
-        'You need to set up the project dependencies using the following commands:' . PHP_EOL .
-        'wget http://getcomposer.org/composer.phar' . PHP_EOL .
-        'php composer.phar install' . PHP_EOL
+        "The vendor directory was not found at the expected locations.\nDid you run composer install?\n\n"
     );
     exit(1);
 }