Merge pull request #149 from gsteel/fix-autoloader-for-tests

Tests not running under 7.1
prismicio-community · Feb 14, 2018 · 5670c79 · 5670c79
2 parents 30b0fac + 80fdd50
commit 5670c79
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 33 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,7 @@ before_script:
   - composer install --dev --prefer-source
 
 script:
-  - phpunit
+  - ./vendor/bin/phpunit
   - ./vendor/bin/phpdoc
 
 deploy:

diff --git a/composer.json b/composer.json
@@ -3,7 +3,14 @@
     "description": "PHP development kit for prismic.io",
 
     "autoload": {
-        "psr-0": { "": "src/" }
+        "psr-4": {
+            "Prismic\\": "src/Prismic"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Prismic\\Test\\": "tests/Prismic"
+        }
     },
 
     "license": "Apache 2 license",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit bootstrap="./tests/bootstrap.php" colors="true">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true">
     <testsuites>
         <testsuite name="Prismic PHP SDK Test Suite">
             <directory suffix="Test.php">./tests/Prismic/</directory>

diff --git a/tests/autoload.php.dist b/tests/autoload.php.dist
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ before_script: @@
       - composer install --dev --prefer-source
     script:
-      - phpunit
+      - ./vendor/bin/phpunit
       - ./vendor/bin/phpdoc
     deploy:
@@ Expand Down @@