remove phpunit from vendors, and cleanup other stuff

researchgate · Oct 16, 2014 · 92878d3 · 92878d3
1 parent 5119338
commit 92878d3
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 35 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-vendor
-build
-.idea
-composer.lock
+/vendor/
+/build/
+/composer.lock
diff --git a/.travis.yml b/.travis.yml
@@ -8,4 +8,4 @@ php:
   - hhvm
 
 install:
-  - composer --prefer-source --dev install
+  - composer --prefer-source install
diff --git a/build.xml b/build.xml
diff --git a/composer.json b/composer.json
@@ -13,9 +13,6 @@
         "nikic/php-parser" : "~1.0",
         "phpunit/php-timer": "~1.0"
     },
-    "require-dev" : {
-        "phpunit/phpunit" : "~3.7|~4.0"
-    },
     "autoload" : {
         "psr-0" : {
             "rg\\tools\\phpnsc" : "src/"

diff --git a/phpunit.xml → phpunit.xml.dist b/phpunit.xml → phpunit.xml.dist
@@ -6,10 +6,7 @@
          colors="true">
   <testsuites>
     <testsuite name="phpnsc">
-      <directory>test/rg/tools/phpnsc</directory>
+      <directory>test</directory>
     </testsuite>
   </testsuites>
-  <logging>
-    <log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
-  </logging>
 </phpunit>