Merge branch 'fix/improved_url_resolving' into HEAD

Author: SMillerDev

.gitignore

@@ -8,6 +8,8 @@
 /tests/statics/index.*
 src/Michelf/*
 src/.gitignore
+vendor/**
+composer.lock
 
 # JIRA plugin
 atlassian-ide-plugin.xml

.travis.yml

@@ -3,17 +3,12 @@ php:
 - '5.6'
 - '7.0'
 before_script:
-- if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.6" ]]; then wget https://phar.phpunit.de/phpunit-5.7.phar; fi
-- if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.6" ]]; then mv phpunit-5.7.phar phpunit; fi
-- if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.6" ]]; then chmod +x phpunit; fi
+- composer -n install
 - if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.6" ]]; then pecl install runkit; fi
 - if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.6" ]]; then echo "runkit.internal_override=1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi
 - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.0" ]]; then pecl install uopz; fi
-- wget --content-disposition "https://github.com/theseer/Autoload/releases/download/1.22.0/phpab-1.22.0.phar"
-- mv phpab-1.22.0.phar phpab
-- chmod +x phpab
 - export PATH=$PATH:$PWD
-script: phpunit --configuration tests/phpunit.xml
+script: vendor/bin/phpunit --configuration tests/phpunit.xml
 before_deploy:
 - ant phar-nightly
 deploy:

build.xml

@@ -61,11 +61,17 @@
                 <include name="**/*.js*"/>
                 <include name="**/*.css*"/>
             </fileset>
+            <fileset dir="vendor/michelf/php-markdown/">
+                <include name="**/*.php"/>
+            </fileset>
+            <fileset dir="vendor/ql/uri-template/src">
+                <include name="**/*.php"/>
+            </fileset>
         </copy>
         <copy todir="${basedir}/build/phar/phpdraft">
             <fileset dir="${basedir}">
-                <include name="**/*.json*"/>
                 <include name="**/index.php"/>
+                <exclude name="vendor/**"/>
             </fileset>
         </copy>
 
@@ -74,7 +80,7 @@
             <arg value="${type}"/>
         </exec>
 
-        <exec executable="phpab" taskname="phpab">
+        <exec executable="${basedir}vendor/bin/phpab" taskname="phpab">
             <arg value="--all"/>
             <arg value="--static"/>
             <arg value="--once"/>
@@ -88,7 +94,7 @@
             <arg path="${basedir}/build/phar"/>
         </exec>
 
-        <exec executable="phpab" taskname="phpab">
+        <exec executable="${basedir}vendor/bin/phpab" taskname="phpab">
             <arg value="--all"/>
             <arg value="--nolower"/>
             <arg value="--static"/>

composer.json

@@ -16,9 +16,21 @@
     }
   ],
   "require": {
-    "php": ">=5.4.0"
+    "php": ">=5.4.0",
+    "composer/installers": "~1.0",
+    "ql/uri-template": "1.*",
+    "michelf/php-markdown": "1.*"
   },
   "require-dev": {
-    "theseer/autoload": "^1.22"
+    "theseer/autoload": "^1.22",
+    "phpunit/phpunit": "5.7.*"
+  },
+  "autoload": {
+    "psr-4": { "PHPDraft\\": "src/PHPDraft" }
+  },
+  "autoload-dev": {
+    "classmap": [
+      "tests/"
+    ]
   }
 }

index.php

@@ -7,7 +7,8 @@
 /**
  * Set up required classes (with the autoloader)
  */
-require_once 'PHPDraft/Core/Autoloader.php';
+//require_once 'PHPDraft/Core/Autoloader.php';
+require_once 'vendor/autoload.php';
 use PHPDraft\In\ApibFileParser;
 use PHPDraft\Out\UI;
 use PHPDraft\Parse\Drafter;