Merge branch 'develop' of https://github.com/PHPOffice/PHPPowerPoint …

…into develop

Conflicts:
	.gitignore
	tests/bootstrap.php

.gitignore

@@ -5,13 +5,13 @@
 Thumbs.db
 Desktop.ini
 .idea
-_build
+build/
 phpunit.xml
 composer.lock
 composer.phar
 vendor
 *.settings
 *.project
 *.buildpath
-Tests/results
+
 /samples/results

.travis.yml

@@ -37,12 +37,13 @@ before_script:
 
 script:
   ## PHP_CodeSniffer
-  - ./vendor/bin/phpcs src/ tests/ --standard=PSR2 -n
+  ## Custom xml is used until namespaces implemented. Use PSR2 after that
+  - ./vendor/bin/phpcs src/ tests/ --standard=phpcs.xml -n
   ## PHPUnit
   - phpunit -c ./ --coverage-text
   ## PHP Copy/Paste Detector
   # - php phpcpd.phar src/
   ## PHP Mess Detector
-  # - phpmd Classes/ text codesize,unusedcode,naming,design
+  # - phpmd src/ text codesize,unusedcode,naming,design
   ## PHPLOC
   - php phploc.phar src/

tests/bootstrap.php

@@ -17,22 +17,20 @@
 
 date_default_timezone_set('UTC');
 
-// defining base dir for tests
-if (!defined('PHPPOWERPOINT_TESTS_BASE_DIR')) {
-	define('PHPPOWERPOINT_TESTS_BASE_DIR', realpath(__DIR__));
-}
+// Define path to application directory
+defined('APPLICATION_PATH')
+    || define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/../src'));
 
-$vendor = realpath(__DIR__ . '/../vendor');
+// Define path to application tests directory
+defined('APPLICATION_TESTS_PATH')
+    || define('APPLICATION_TESTS_PATH', realpath(dirname(__FILE__)));
 
-if (file_exists($vendor . "/autoload.php")) {
-	require $vendor . "/autoload.php";
-} else {
-	$vendor = realpath(__DIR__ . '/../../../');
-	if (file_exists($vendor . "/autoload.php")) {
-		require $vendor . "/autoload.php";
-	} else {
-		throw new Exception("Unable to load dependencies");
-	}
+// Define application environment
+defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'ci');
+
+// Register autoloader
+if (!defined('PHPPOWERPOINT_ROOT')) {
+    define('PHPPOWERPOINT_ROOT', APPLICATION_PATH . '/');
 }
 
 spl_autoload_register(function ($class) {