Model: Fix transitions replacing URL variables wrong

Author: SMillerDev

.gitignore

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

.travis.yml

@@ -3,6 +3,8 @@ php:
 - '5.6'
 - '7.0'
 before_script:
+- flags="--prefer-dist"
+- composer install $flags
 - 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

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>
 

composer.json

@@ -16,9 +16,20 @@
     }
   ],
   "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"
+  },
+  "autoload": {
+    "psr-4": { "PHPDraft\\": "src/PHPDraft" }
+  },
+  "autoload-dev": {
+    "classmap": [
+      "tests/"
+    ]
   }
 }