Merge pull request #56 from guzzle/improve_package

Improve package

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true

.gitattributes

@@ -0,0 +1,7 @@
+.editorconfig     export-ignore
+.gitattributes    export-ignore
+/.github/         export-ignore
+.gitignore        export-ignore
+/.travis.yml      export-ignore
+/phpunit.xml.dist export-ignore
+/tests/           export-ignore

.travis.yml

@@ -1,20 +1,37 @@
 language: php
 
-php:
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - hhvm
-
 sudo: false
 
-install:
-  - travis_retry composer install --no-interaction --prefer-source
+cache:
+    directories:
+        - $HOME/.composer/cache/files
+
+php:
+    - 5.5
+    - 5.6
+    - 7.0
+    - 7.1
+    - hhvm
 
-script: make test
+env:
+    global:
+        - TEST_COMMAND="composer test"
 
 matrix:
-  allow_failures:
-    - php: hhvm
-  fast_finish: true
+    allow_failures:
+        - php: hhvm
+    fast_finish: true
+    include:
+        - php: 5.5
+          env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
+
+before_install:
+    - if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi
+
+install:
+    # To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355
+    - if [[ "$COMPOSER_FLAGS" == *"--prefer-lowest"* ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-stable --quiet; fi
+    - travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
+
+script:
+    - $TEST_COMMAND

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015 Michael Dowling, https://github.com/mtdowling <[email protected]>
+Copyright (c) 2015-2016 Michael Dowling, https://github.com/mtdowling <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

composer.json

@@ -1,6 +1,5 @@
 {
     "name": "guzzlehttp/promises",
-    "type": "library",
     "description": "Guzzle promises library",
     "keywords": ["promise"],
     "license": "MIT",
@@ -15,17 +14,21 @@
         "php": ">=5.5.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0"
+        "phpunit/phpunit": "^4.0"
     },
     "autoload": {
         "psr-4": {
             "GuzzleHttp\\Promise\\": "src/"
         },
         "files": ["src/functions_include.php"]
     },
+    "scripts": {
+        "test": "vendor/bin/phpunit",
+        "test-ci": "vendor/bin/phpunit --coverage-text"
+    },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "1.4-dev"
         }
     }
 }

phpunit.xml.dist

@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./tests/bootstrap.php"
-         colors="true">
-  <testsuites>
-    <testsuite>
-      <directory>tests</directory>
-    </testsuite>
-  </testsuites>
-  <filter>
-    <whitelist>
-      <directory suffix=".php">src</directory>
-      <exclude>
-        <directory suffix="Interface.php">src/</directory>
-      </exclude>
-    </whitelist>
-  </filter>
+<phpunit colors="true" bootstrap="tests/bootstrap.php">
+    <testsuites>
+        <testsuite name="GuzzleHttp Promise Test Suite">
+            <directory>tests/</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">src/</directory>
+            <exclude>
+                <directory suffix="Interface.php">src/</directory>
+            </exclude>
+        </whitelist>
+    </filter>
 </phpunit>