Merge pull request #8 from studservis/php-8.0

Php 8.0+

Author: samizdam

.github/workflows/ci.yml

@@ -0,0 +1,42 @@
+name: CI
+
+on: push
+
+jobs:
+  php-tests:
+
+    strategy:
+      matrix:
+        php: [ '7.4', '8.0', '8.1', '8.2', '8.3' ]
+        prefer: [ 'lowest', 'stable' ]
+
+    name: Test on PHP ${{ matrix.php }} with ${{ matrix.prefer }} composer prefer option
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Install PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+
+      - name: Check PHP Version
+        run: php -v
+
+      - name: Cache Composer packages
+        id: composer-cache
+        uses: actions/cache@v4
+        with:
+          path: vendor
+          key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}-${{ matrix.prefer }}-
+          restore-keys: |
+            ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ matrix.prefer }}-
+
+      - name: Install dependencies
+        if: steps.composer-cache.outputs.cache-hit != 'true'
+        run: composer update --prefer-${{ matrix.prefer }} --prefer-dist --no-progress
+
+      - name: Run tests
+        run: vendor/bin/phpunit

.gitignore

@@ -1,2 +1,7 @@
-/vendor
-composer.lock
+/.idea/
+
+/.phpunit.result.cache
+/phpunit-coverage/
+
+/composer.lock
+/vendor/

Dockerfile

@@ -1,8 +1,18 @@
-FROM php:7.4-cli
-RUN apt-get update -yqq
-RUN apt-get install -yqq git libmcrypt-dev libpq-dev libcurl4-gnutls-dev libicu-dev libvpx-dev libjpeg-dev libpng-dev libxpm-dev zlib1g-dev libfreetype6-dev libxml2-dev libexpat1-dev libbz2-dev libgmp3-dev libldap2-dev unixodbc-dev libsqlite3-dev libaspell-dev libsnmp-dev libpcre3-dev libtidy-dev
-# Install PHP extensions
-RUN docker-php-ext-install curl json opcache
-COPY ./ /var/www/html/
-WORKDIR /var/www/html/
+FROM php:8.1-cli
+
+RUN apt-get update -y \
+    && apt-get install -y \
+    zip
+
+RUN pecl channel-update pecl.php.net \
+    && pecl install xdebug-3.1.6 \
+    && docker-php-ext-enable xdebug \
+    && echo "xdebug.mode=coverage" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+
+# trigger all errors in dev env
+RUN echo "error_reporting = E_ALL" >> $PHP_INI_DIR/php.ini
+
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+
+WORKDIR /var/www/
 

Makefile

@@ -0,0 +1,6 @@
+install:
+	docker build -t php-dreamkas .
+	./bin/composer install
+
+test:
+	./bin/php vendor/bin/phpunit

bin/composer

@@ -0,0 +1,11 @@
+#!/bin/env bash
+
+test -t 1 && USE_TTY="--tty"
+
+docker run --rm --interactive ${USE_TTY} \
+    --init \
+    --user `id -u`:`id -g` \
+    --volume $PWD:/var/www \
+    --volume $HOME/.composer:/tmp/.composer \
+    --env COMPOSER_HOME=/tmp/.composer \
+    php-dreamkas composer "$@"

bin/php

@@ -0,0 +1,9 @@
+#!/bin/env bash
+
+test -t 1 && USE_TTY="--tty"
+
+docker run --rm --interactive ${USE_TTY} \
+    --init \
+    --user `id -u`:`id -g` \
+    --volume $PWD:/var/www \
+    php-dreamkas php "$@"

composer.json

@@ -3,11 +3,10 @@
     "description": "Фискализация чека для Дримкас-Ф на php",
     "type": "library",
     "require": {
-        "php": "~7.0",
+        "php": "^7.0 || ^8.0",
         "guzzlehttp/guzzle": "^7.8"
     },
     "require-dev": {
-        "ext-json": "*",
         "phpunit/phpunit": "^9.6"
     },
     "license": "MIT",

phpunit.xml.dist

@@ -1,13 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./tests/bootstrap.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage>
-    <include>
-      <directory suffix=".php">src</directory>
-    </include>
-  </coverage>
-  <testsuites>
-    <testsuite name="default">
-      <directory>./tests</directory>
-    </testsuite>
-  </testsuites>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         stopOnFailure="false"
+>
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+        <report>
+            <html outputDirectory="phpunit-coverage"/>
+        </report>
+    </coverage>
+    <testsuites>
+        <testsuite name="default">
+            <directory>./tests</directory>
+        </testsuite>
+    </testsuites>
 </phpunit>

src/Api.php

@@ -4,6 +4,7 @@
 
 use GuzzleHttp\Client;
 use GuzzleHttp\ClientInterface;
+use GuzzleHttp\Utils;
 
 /**
  * Class Api
@@ -42,7 +43,7 @@ public function json(string $method, string $uri = '', array $options = [])
     {
 
         $response = $this->request($method, $uri, $options);
-        return \GuzzleHttp\json_decode($response->getBody(), true);
+        return Utils::jsonDecode($response->getBody(), true);
     }
 
     public function postReceipt(Receipt $receipt)
@@ -54,4 +55,4 @@ public function postReceipt(Receipt $receipt)
             'json' => $data,
         ]);
     }
-}
+}