Merge remote-tracking branch 'upstream/master'

webnazakazku · Apr 3, 2023 · 52884f7 · 52884f7
2 parents 1445863 + 013600c
commit 52884f7
Show file tree

Hide file tree

Showing 16 changed files with 611 additions and 437 deletions.
diff --git a/.github/workflows/main.yaml → .github/workflows/phpunit.yaml b/.github/workflows/main.yaml → .github/workflows/phpunit.yaml
@@ -11,17 +11,16 @@ jobs:
     strategy:
       matrix:
         php:
-          - '7.2'
-          - '7.3'
-          - '7.4'
-          - '8.0'
+          - 7.4
+          - 8.0
+          - 8.1
 
       fail-fast: false
 
     name: PHP ${{ matrix.php }} tests
     steps:
       - uses: actions/checkout@v2
-      - uses: shivammathur/setup-php@v1
+      - uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           extensions: json, mbstring, xml, tokenizer
@@ -35,9 +34,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: shivammathur/setup-php@v1
+      - uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.2
+          php-version: 7.4
           extensions: json, mbstring, xml, tokenizer
           coverage: none
 

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /bin
 /vendor
 composer.lock
+.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -1,15 +1,18 @@
 # ARES 
 
-[![Build Status](https://badgen.net/github/checks/webnazakazku/ares/master?cache=300)](https://github.com/webnazakazku/ares/actions)
-[![Downloads](https://badgen.net/packagist/dm/webnazakazku/ares)](https://packagist.org/packages/webnazakazku/ares)
-[![Latest stable](https://badgen.net/packagist/v/webnazakazku/ares)](https://packagist.org/packages/webnazakazku/ares)
+[![Build Status](https://img.shields.io/travis/dfridrich/Ares.svg?style=flat-square)](https://travis-ci.org/dfridrich/Ares)
+[![Quality Score](https://img.shields.io/scrutinizer/g/dfridrich/Ares.svg?style=flat-square)](https://scrutinizer-ci.com/g/dfridrich/Ares)
+[![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/dfridrich/Ares.svg?style=flat-square)](https://scrutinizer-ci.com/g/dfridrich/Ares)
+[![Downloads](https://img.shields.io/packagist/dt/dfridrich/ares.svg?style=flat-square)](https://packagist.org/packages/dfridrich/ares)
+[![Latest stable](https://img.shields.io/packagist/v/dfridrich/ares.svg?style=flat-square)](https://packagist.org/packages/dfridrich/ares)
+
 
 Communication with ARES & Justice (Czech business registers).
 
 ## Installation
 
 ```sh
-composer require webnazakazku/ares
+composer require dfridrich/ares
 ```
 
 ## Usage
@@ -18,7 +21,7 @@ composer require webnazakazku/ares
 <?php
 require __DIR__.'/vendor/autoload.php';
 
-use Webnazakazku\Ares;
+use Defr\Ares;
 
 $ares = new Ares();
 
@@ -38,12 +41,36 @@ $ares = new Ares();
 $ares->setBalancer('http://some.loadbalancer.domain');
 ```
 
+## Develop
+
+### Running tests suite in local docker environment
+```php
+docker run -v `pwd`:/app -i -t php:7.2-fpm /bin/bash -c "/app/vendor/phpunit/phpunit/phpunit --colors --configuration /app/phpunit.xml /app/tests/"
+```
+
+
+## Coding standard
+
+### Check
+
+```
+vendor/bin/symplify-cs check src tests
+```
+
+### Fix
+
+```
+vendor/bin/symplify-cs fix src tests
+```
+
 ## Contributors
 
 The list of people who contributed to this library.
 
- - Dennis Fridrich - @dfridrich
- - Tomáš Votruba - @TomasVotruba
- - Martin Zeman - @Zemistr
- - Jan Kuchař - @jkuchar
- - Petr Parolek - @petrparolek
+ - @dfridrich
+ - @TomasVotruba
+ - @filipmelik
+ - @Zemistr
+ - @jkuchar
+ - @petrparolek
+ - @tlapi
diff --git a/composer.json b/composer.json
@@ -9,29 +9,29 @@
         {
             "name": "Dennis Fridrich",
             "email": "[email protected]"
-        },
-        {
-            "name": "Petr Parolek",
-            "homepage": "https://www.webnazakazku.cz/"
         }
     ],
     "require": {
-        "php": ">=7.2.0",
+        "php": "^7.4|^8.0",
         "beberlei/assert": "^2.4|^3.0",
-        "dfridrich/library": "^1.0",
-        "fabpot/goutte": "^2.0|^3.0|^4.0",
-        "guzzlehttp/guzzle": "^6.5|^7.0"
+        "dfridrich/library": "^1.37.14",
+        "ext-simplexml": "*",
+        "fabpot/goutte": "^4.0",
+        "symfony/string": "^4|^5|^6"
     },
     "require-dev": {
-        "symplify/coding-standard": "^8.3",
-        "phpunit/phpunit": "^8.5"
+        "symplify/coding-standard": "^8",
+        "phpunit/phpunit": "^9"
     },
     "autoload": {
         "psr-4": {
             "Webnazakazku\\": "src/"
         }
     },
     "config": {
-        "platform": { "php": "7.2" }
+        "bin-dir": "bin",
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="vendor/autoload.php">
+    <testsuites>
+        <testsuite name="all">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>