Merge pull request #857 from acelaya-forks/feature/php8

Feature/php8

.travis.yml

@@ -44,7 +44,7 @@ before_install:
   - phpenv config-rm xdebug.ini || return 0
   - sudo ./data/infra/ci/install-ms-odbc.sh
   - docker-compose -f docker-compose.yml -f docker-compose.ci.yml up -d shlink_db_ms shlink_db shlink_db_postgres shlink_db_maria
-  - yes | pecl install pdo_sqlsrv swoole-4.5.2 pcov
+  - yes | pecl install pdo_sqlsrv-5.9.0preview1 swoole-4.5.5 pcov
 
 install:
   - composer self-update

CHANGELOG.md

@@ -31,6 +31,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 
 * [#836](https://github.com/shlinkio/shlink/issues/836) Added support for the `<field>-<dir>` notation while determining how to order the short URLs list, as in `?orderBy=shortCode-DESC`. This effectively deprecates the array notation (`?orderBy[shortCode]=DESC`), that will be removed in Shlink 3.0.0
 * [#782](https://github.com/shlinkio/shlink/issues/782) Added code coverage to API tests.
+* [#858](https://github.com/shlinkio/shlink/issues/858) Updated to latest infection version. Updated docker images to PHP 7.4.11 and swoole 4.5.5
 
 #### Deprecated
 

Dockerfile

@@ -1,8 +1,8 @@
-FROM php:7.4.9-alpine3.12 as base
+FROM php:7.4.11-alpine3.12 as base
 
 ARG SHLINK_VERSION=2.3.0
 ENV SHLINK_VERSION ${SHLINK_VERSION}
-ENV SWOOLE_VERSION 4.5.2
+ENV SWOOLE_VERSION 4.5.5
 ENV LC_ALL "C"
 
 WORKDIR /etc/shlink

composer.json

@@ -66,14 +66,14 @@
         "devster/ubench": "^2.0",
         "dms/phpunit-arraysubset-asserts": "^0.2.0",
         "eaglewu/swoole-ide-helper": "dev-master",
-        "infection/infection": "^0.16.1",
-        "phpstan/phpstan": "^0.12.18",
+        "infection/infection": "^0.17.7",
+        "phpstan/phpstan": "^0.12.50",
         "phpunit/php-code-coverage": "^8.0",
         "phpunit/phpunit": "~9.0.1",
         "roave/security-advisories": "dev-master",
         "shlinkio/php-coding-standard": "~2.1.0",
         "shlinkio/shlink-test-utils": "^1.5",
-        "symfony/var-dumper": "^5.0"
+        "symfony/var-dumper": "^5.1"
     },
     "autoload": {
         "psr-4": {

config/config.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink;
 
 use Laminas\ConfigAggregator;
+use Laminas\Diactoros;
 use Mezzio;
 use Mezzio\ProblemDetails;
 
@@ -17,6 +18,7 @@ return (new ConfigAggregator\ConfigAggregator([
     Mezzio\Plates\ConfigProvider::class,
     Mezzio\Swoole\ConfigProvider::class,
     ProblemDetails\ConfigProvider::class,
+    Diactoros\ConfigProvider::class,
     Common\ConfigProvider::class,
     Config\ConfigProvider::class,
     IpGeolocation\ConfigProvider::class,

data/infra/php.Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.4.9-alpine3.12
+FROM php:7.4.11-alpine3.12
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
 
 ENV APCU_VERSION 5.1.18

data/infra/swoole.Dockerfile

@@ -1,10 +1,10 @@
-FROM php:7.4.9-alpine3.12
+FROM php:7.4.11-alpine3.12
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
 
 ENV APCU_VERSION 5.1.18
 ENV APCU_BC_VERSION 1.0.5
 ENV INOTIFY_VERSION 2.0.0
-ENV SWOOLE_VERSION 4.5.2
+ENV SWOOLE_VERSION 4.5.5
 
 RUN apk update
 

phpstan.neon

@@ -2,7 +2,5 @@ parameters:
 	checkMissingIterableValueType: false
 	checkGenericClassInNonGenericObjectType: false
 	ignoreErrors:
-		- '#AbstractQuery::setParameters\(\)#'
 		- '#mustRun\(\)#'
-		- '#AssociationBuilder::setOrderBy#'
 		- '#If condition is always false#'