Merge pull request #5 from Larium/feature/upgrade-php81

Refactor to php 8.1

.docker/Dockerfile

@@ -1,12 +1,27 @@
-FROM php:7.4-cli
+FROM php:8.1-cli
 WORKDIR "/opt/php"
 
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update && \
-    pecl channel-update pecl.php.net && \
+    apt-get install -y \
+    unzip \
+    git && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN pecl channel-update pecl.php.net && \
     pecl install xdebug && \
     docker-php-source delete && \
     rm -r /tmp/* /var/cache/*
 
-COPY ./.docker/php-ini-overrides.ini /usr/local/etc/php/conf.d/99-overrides.ini
+COPY ./.docker/php-ini-overrides.ini /usr/local/etc/php/conf.d/99-overrides.ini
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
+    && php composer-setup.php \
+    && php -r "unlink('composer-setup.php');" \
+    && chmod +x composer.phar \
+    && mv composer.phar /usr/local/bin/composer
+
+RUN curl -L https://cs.symfony.com/download/php-cs-fixer-v3.phar -o php-cs-fixer \
+    && chmod a+x php-cs-fixer \
+    && mv php-cs-fixer /usr/bin/php-cs-fixer

.github/workflows/php.yml

@@ -15,7 +15,7 @@ jobs:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.4'
+        php-version: '8.1'
         coverage: xdebug
     - name: Checkout code
       uses: actions/checkout@v2

.gitignore

@@ -1,4 +1,7 @@
 composer.lock
 /vendor
 /build
-.phpunit.result.cache
+.phpunit.result.cache
+/.phpunit.cache
+.vscode
+.DS_Store

.php-cs-fixer.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__)
+;
+
+return (new PhpCsFixer\Config())
+    ->setUsingCache(false)
+    ->setRules([
+        '@PSR12' => true,
+        'ordered_imports' => ['sort_algorithm' => 'alpha', 'imports_order' => ['const', 'class', 'function']],
+        'array_syntax' => ['syntax' => 'short'],
+        'concat_space' => ['spacing' => 'one'],
+        'blank_line_between_import_groups' => true,
+    ])->setFinder($finder)
+;

.scrutinizer.yml

@@ -1,18 +1,28 @@
 filter:
-    excluded_paths: [vendor/*, tests/*]
+    excluded_paths: [vendor/*, tests/*, .php-cs-fixer.php]
 checks:
     php:
         code_rating: true
         duplication: true
 tools:
     php_code_sniffer:
         config:
-            standard: "PSR2"
+            standard: "PSR12"
 build:
-    environment:
-        php:
-            version: 7.4
-    tests:
-        override:
-            -
-                command: './vendor/bin/phpunit --configuration code-coverage.xml tests/'
+  nodes:
+    analysis:
+        dependencies:
+            override:
+                - composer install --ignore-platform-reqs --no-interaction
+        environment:
+            php:
+                version: 8.1
+                ini:
+                    xdebug.mode: coverage
+        tests:
+            override:
+                - php-scrutinizer-run
+                - command: './vendor/bin/phpunit tests/'
+                  coverage:
+                    file: build/logs/clover.xml
+                    format: clover

composer.json

@@ -11,7 +11,7 @@
         }
     ],
     "require": {
-        "php": ">=7.4"
+        "php": ">=8.1"
     },
     "minimum-stability": "stable",
     "autoload": {
@@ -25,11 +25,11 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.0"
+        "phpunit/phpunit": "^10.0"
     },
     "scripts": {
         "docker-build": "docker build -f .docker/Dockerfile -t larium-creditcard .",
-        "docker-tests": "docker run -v $(pwd):/opt/php larium-creditcard sh -c './vendor/bin/phpunit --configuration code-coverage.xml tests/'",
-        "tests": "./vendor/bin/phpunit --configuration code-coverage.xml tests/"
+        "docker-tests": "docker run -v $(pwd):/opt/php larium-creditcard sh -c './vendor/bin/phpunit tests/'",
+        "tests": "./vendor/bin/phpunit tests/"
     }
 }

docker-compose.yml

@@ -0,0 +1,11 @@
+version: "3.1"
+services:
+  php-cli:
+    build: .docker
+    container_name: larium-creditcard
+    image: larium-creditcard:latest
+    working_dir: /opt/php
+    tty: true
+    stdin_open: true
+    volumes:
+      - .:/opt/php

phpunit.xml

@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- http://www.phpunit.de/manual/current/en/appendixes.configuration.html -->
-<phpunit
-    backupGlobals               = "false"
-    backupStaticAttributes      = "false"
-    colors                      = "true"
-    bootstrap                   = "vendor/autoload.php">
-
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  backupGlobals="false"
+  colors="true"
+  processIsolation="false"
+  stopOnFailure="false"
+  bootstrap="vendor/autoload.php"
+  xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
+  cacheDirectory=".phpunit.cache"
+  backupStaticProperties="false">
+  <coverage>
+    <report>
+      <clover outputFile="build/logs/clover.xml"/>
+      <html outputDirectory="build/coverage"/>
+      <text outputFile="build/coverage.txt"/>
+    </report>
+  </coverage>
+  <logging>
+    <junit outputFile="build/report.junit.xml"/>
+  </logging>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
 </phpunit>