Merge pull request #20 from Divergence/develop

v2.1.0

Author: hparadiz

.gitignore

@@ -8,4 +8,5 @@ phpDocumentor.phar
 docs
 .vscode
 composer.lock
-.phpunit.result.cache
+.phpunit.result.cache
+clover.xml

.scrutinizer.yml

@@ -23,6 +23,7 @@ build:
       dependencies:
         before:
           - mysql -u root -e "CREATE DATABASE IF NOT EXISTS test CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;"
+          - sudo apt install -y ffmpeg exiftool
       tests:
         override:
           - command: ./vendor/bin/phpunit --coverage-clover=build/coverage/clover.xml  # Or "./vendor/bin/phpunit --coverage-clover=build/coverage/clover.xml"

src/App.php

@@ -35,7 +35,7 @@ public function init($Path)
     {
         $this->ApplicationPath = $Path;
 
-        if (php_sapi_name()!=='cli') {
+        if (php_sapi_name()!=='cli' || defined('PHPUNIT_TESTSUITE')) {
             $this->Path = new Path($_SERVER['REQUEST_URI']);
         }