Skip to content

Commit

Permalink
Merge pull request #17 from Textalk/v0.3
Browse files Browse the repository at this point in the history
Version 0.3.0
  • Loading branch information
Sören Jensen authored Jul 5, 2021
2 parents 954802c + 14643e2 commit 0dcde52
Show file tree
Hide file tree
Showing 34 changed files with 780 additions and 2,378 deletions.
2 changes: 0 additions & 2 deletions .coveralls.yml

This file was deleted.

7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/build/
/vendor/
.DS_Store
.phpunit.result.cache
build/
composer.lock
composer.phar
vendor/
17 changes: 9 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
language: php

php:
- 5.6
- 5.5
- 5.4
- 5.3
- 8.0
- 7.4
- 7.3
- 7.2

script:
- make update test
before_script:
- make install build

after_script:
- php vendor/bin/coveralls -v
script:
- make coverage
- make cs-check
15 changes: 12 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,24 @@ install: composer.phar
./composer.phar install

update: composer.phar
./composer.phar self-update
./composer.phar update

test: vendor/bin/phpunit build
./vendor/bin/phpunit --strict
test: composer.lock
./vendor/bin/phpunit

cs-check: composer.lock
./vendor/bin/phpcs --standard=PSR1,PSR12 lib tests examples

coverage: composer.lock build
XDEBUG_MODE=coverage ./vendor/bin/phpunit --coverage-clover build/logs/clover.xml
./vendor/bin/php-coveralls -v

composer.phar:
curl -s http://getcomposer.org/installer | php

vendor/bin/phpunit: install
composer.lock: composer.phar
./composer.phar --no-interaction install

build:
mkdir build
Expand Down
13 changes: 9 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Textalk Webshop API-client
Abicart (Textalk Webshop) API-client
==========================

[![Build Status](https://travis-ci.org/Textalk/textalk-webshopclient-php.png)](https://travis-ci.org/Textalk/textalk-webshopclient-php)
[![Build Status](https://travis-ci.com/Textalk/textalk-webshopclient-php.png)](https://travis-ci.com/Textalk/textalk-webshopclient-php)
[![Coverage Status](https://coveralls.io/repos/Textalk/textalk-webshopclient-php/badge.png)](https://coveralls.io/r/Textalk/textalk-webshopclient-php)

A library to simplify API-usage on Textalk Webshop API.
A library to simplify API-usage on Abicart API.


Examples:
Expand Down Expand Up @@ -124,7 +124,7 @@ Preferred way to install is with [Composer](https://getcomposer.org/).
Just add

"require": {
"textalk/webshop-client": "0.2.*"
"textalk/webshop-client": "0.3.*"
}

in your projects composer.json.
Expand All @@ -133,6 +133,11 @@ in your projects composer.json.
Changelog
---------

0.3.0

* Adding support for php ^7.2 and php ^8.0 versions
* Dropping support for older php versions

0.2.6

* Adding support for http(s) connections (wss as default)
Expand Down
16 changes: 9 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,25 @@
"license": "MIT",
"authors": [
{
"name": "Fredrik Liljegren",
"email": "fredrik.liljegren@textalk.se"
"name": "Fredrik Liljegren"
},
{
"name": "Sören Jensen",
"email": "soren.jensen@textalk.se"
"email": "soren@abicart.se"
}
],
"autoload": {
"psr-4": {"Textalk\\WebshopClient\\": "lib"}
"psr-4": {
"Textalk\\WebshopClient\\": "lib"
}
},
"require": {
"php": ">=5.3",
"php": "^7.2|^8.0",
"tivoka/tivoka": "3.5.*"
},
"require-dev": {
"phpunit/phpunit": "4.8.*",
"satooshi/php-coveralls": "1.0.*"
"phpunit/phpunit": "^8.0|^9.0",
"php-coveralls/php-coveralls": "^2.0",
"squizlabs/php_codesniffer": "^3.5"
}
}
Loading

0 comments on commit 0dcde52

Please # to comment.