diff --git a/.gitignore b/.gitignore index f592830..fe9a474 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,5 @@ *# composer.lock -composer-psalm.lock -composer.phar /vendor .idea diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a8d49ff..0000000 --- a/.travis.yml +++ /dev/null @@ -1,34 +0,0 @@ -language: php -matrix: - include: - - php: 5.3 - dist: precise - env: - - TEST_SUITE='no_psalm' - - php: 5.4 - env: - - TEST_SUITE='no_psalm' - - php: 5.5 - env: - - TEST_SUITE='no_psalm' - - php: 5.6 - env: - - TEST_SUITE='with_psalm' - - COMPOSER='composer-psalm.json' - - php: 7.0 - env: - - TEST_SUITE='with_psalm' - - COMPOSER='composer-psalm.json' - - php: 7.1 - env: - - TEST_SUITE='with_psalm' - - COMPOSER='composer-psalm.json' -install: composer install -script: make $TEST_SUITE -dist: trusty -notifications: - email: false - slack: - rooms: - secure: Lt+vBT6MMM0MQSmkdBRlr0LqhA6ZB+sJJm0AkwOMWCIWNa3GSTnPztOvy3+G/mEnpQaXFHwctu4vuDNi/tXaIGndKgFjrmfkNS+ZMGWoQrxe3hjY4jZUSPhOJldoD0StER7ka0tf0frPQKd3baRV5JBr2KH1O8sZ3JlP/RCO3HKXL50VSYNA0oXJQmJocazqQQT0BWO4oQLHz2XtNLNQMJBG+zhN8tDvnqkDlUhuO0INHkBvRvmqiQ5dN25IR5OemRgrVrYWZzejfoxzTONXB+9SlBU9zwphvqTEwiHw9xE1VQDIoCv9o13y9qsS7xt2ojIMScWWJioaq03uPy/vI+tnT98Oaa1tJGDQkdbN83Am28KDAY5BA6445RSuyNPGoQXoHtzqFLBpPV+xzwMb+gBYPxQ71U3YFkFavwlHvEPUU/wslTdFkTHbRXXEuRgYeVpH7O3ZbxW3xRnWwzWPB7SXcb6CkMmX+ByuyS5x4The59Y5AvYjp5fGlHZgv8aqhqOPWz8PdEj5qqK6+2VCsVuwU55hmS4zATZjPGyZLqFnOpSBw5raQq0iSeSKoq683p4iCGWoiUYdaXi+DcWjfJCo4UbbGvWSbTzLeRkEA44bdY3Noeg8dkccfaOqZQF/FoVMhD04WNkmn2int4gvlRHF9RbHjrah+gaRAxLSFvk= - on_pull_requests: false diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f67ba38..d879ba3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,21 +8,10 @@ * Ensure your code is nicely formatted in the [PSR-2](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md) style and that all tests pass. * Send the pull request. -* Check that the Travis CI build passed. If not, rinse and repeat. **Note:** This repo uses [Psalm](https://github.com/vimeo/psalm) to statically analyze all the code. Psalm runs on all the builds for PHP 5.5+. - -**NOTE:** This repo requires pull-request reviews for all changes on branches bound for production in accordance with Vimeo policy. ## Testing locally To install Psalm and run the full test suite locally, download [Composer](https://getcomposer.org/) into the repository and then run: ``` -make install -make -``` - -If you use PHP 5.3 or 5.4 locally (which are not supported by the latest version of Psalm), you can skip Psalm by running: - -``` -make install_no_psalm -make no_psalm +make test ``` diff --git a/Makefile b/Makefile index 511cb81..4f4337d 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,3 @@ -# Test - -all: with_psalm - -no_psalm: style test - -with_psalm: style psalm test - style: vendor/bin/phpcs --standard=PSR2 src && vendor/bin/phpcs --standard=PSR2 --error-severity=1 --warning-severity=6 tests @@ -14,23 +6,3 @@ test: psalm: vendor/bin/psalm - -# Install - -install: install_with_psalm - -install_with_psalm: - COMPOSER=composer-psalm.json php composer.phar install - -install_no_psalm: - php composer.phar install - -# Update - -update: update_with_psalm - -update_with_psalm: - COMPOSER=composer-psalm.json php composer.phar update - -update_no_psalm: - php composer.phar update diff --git a/README.md b/README.md index 04d54ba..94fa754 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@ **Vindicia driver for the Omnipay PHP payment processing library** -[![Build Status](https://travis-ci.org/vimeo/omnipay-vindicia.png?branch=master)](https://travis-ci.org/vimeo/omnipay-vindicia) [![Latest Stable Version](https://poser.pugx.org/vimeo/omnipay-vindicia/version.png)](https://packagist.org/packages/vimeo/omnipay-vindicia) [![Total Downloads](https://poser.pugx.org/vimeo/omnipay-vindicia/d/total.png)](https://packagist.org/packages/vimeo/omnipay-vindicia) diff --git a/composer-psalm.json b/composer-psalm.json deleted file mode 100644 index b25143a..0000000 --- a/composer-psalm.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "name": "vimeo/omnipay-vindicia", - "type": "library", - "description": "Vindicia driver for the Omnipay payment processing library", - "keywords": [ - "gateway", - "merchant", - "omnipay", - "pay", - "payment", - "vindicia" - ], - "homepage": "https://github.com/vimeo/omnipay-vindicia", - "license": "MIT", - "authors": [ - { - "name": "Nicky Robinson", - "email": "nickr@vimeo.com" - } - ], - "autoload": { - "psr-4": { - "Omnipay\\Vindicia\\" : "src/" - } - }, - "require": { - "omnipay/common": "~2.0", - "vimeo/payment-gateway-logger": "^1.0", - "composer/ca-bundle": "^1.1", - "ext-soap": "*" - }, - "require-dev": { - "omnipay/tests": "~2.0", - "vimeo/psalm": "0.3.*" - } -}