Drop old PHP versions (#26)

* Drop old PHP versions

* Add changelog

* Apply CS fixes

* Minors

.gitattributes

@@ -1,12 +1,9 @@
-.editorconfig     export-ignore
-.gitattributes    export-ignore
-/.github/         export-ignore
-.gitignore        export-ignore
-/.php_cs          export-ignore
-/.scrutinizer.yml export-ignore
-/.styleci.yml     export-ignore
-/.travis.yml      export-ignore
-/behat.yml.dist   export-ignore
-/features/        export-ignore
-/phpunit.xml.dist export-ignore
-/Tests/           export-ignore
+.editorconfig            export-ignore
+.gitattributes           export-ignore
+/.github/                export-ignore
+.gitignore               export-ignore
+/.php_cs                 export-ignore
+/phpstan.neon.dist       export-ignore
+/phpstan-baseline.neon   export-ignore
+/phpunit.xml.dist        export-ignore
+/tests/                  export-ignore

.github/workflows/checks.yml

@@ -0,0 +1,33 @@
+name: Static code analysis
+
+on: [pull_request]
+
+jobs:
+  phpstan:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Run PHPStan
+        uses: docker://jakzal/phpqa:php7.3-alpine
+        with:
+          args: phpstan analyze
+
+  php-cs-fixer:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Run PHP-CS-Fixer
+        uses: docker://jakzal/phpqa:php7.3-alpine
+        with:
+            args: php-cs-fixer fix --dry-run --diff-format udiff -vvv
+
+  roave-bc-check:
+    name: Roave BC Check
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Roave BC Check
+        uses: docker://nyholm/roave-bc-check-ga

.github/workflows/ci.yml

@@ -0,0 +1,37 @@
+name: CI
+
+on:
+  pull_request:
+
+jobs:
+  build:
+    name: Test
+    runs-on: Ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [ '7.2', '7.3', '7.4', '8.0' ]
+        strategy: [ 'highest' ]
+        include:
+            - php: 7.4
+              strategy: 'lowest'
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: none
+
+      - name: Download dependencies
+        uses: ramsey/composer-install@v1
+        with:
+          dependency-versions: ${{ matrix.strategy }}
+          composer-options: --no-interaction --prefer-dist --optimize-autoloader
+
+      - name: Run tests
+        run: ./vendor/bin/phpunit
+

.gitignore

@@ -1,6 +1,4 @@
-/behat.yml
-/build/
+/.php_cs.cache
 /composer.lock
-/phpspec.yml
 /phpunit.xml
 /vendor/

.php_cs

@@ -1,13 +1,17 @@
 <?php
 
-/*
- * In order to make it work, fabpot/php-cs-fixer and sllh/php-cs-fixer-styleci-bridge must be installed globally
- * with composer.
- *
- * @link https://github.com/Soullivaneuh/php-cs-fixer-styleci-bridge
- * @link https://github.com/FriendsOfPHP/PHP-CS-Fixer
- */
+$config = PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+    ])
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->in(__DIR__)
+            ->exclude(__DIR__.'/vendor')
+            ->name('*.php')
+    )
+;
 
-use SLLH\StyleCIBridge\ConfigBridge;
-
-return ConfigBridge::create();
+return $config;

Changelog.md

@@ -1,10 +1,20 @@
 # Change Log
 
-The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release. 
+The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
+
+## 1.2.0
+
+### Added
+
+- Support for PHP 8
+
+### Removed
+
+- Support for PHP < 7.2
 
 ## 1.1.0
 
-### Added 
+### Added
 
 - Bing Translator
 - Support for HTTPlug 2.0

Readme.md

@@ -2,9 +2,6 @@
 
 [![Latest Version](https://img.shields.io/github/release/php-translation/translator.svg?style=flat-square)](https://github.com/php-translation/translator/releases)
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)
-[![Build Status](https://img.shields.io/travis/php-translation/translator.svg?style=flat-square)](https://travis-ci.org/php-translation/translator)
-[![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/php-translation/translator.svg?style=flat-square)](https://scrutinizer-ci.com/g/php-translation/translator)
-[![Quality Score](https://img.shields.io/scrutinizer/g/php-translation/translator.svg?style=flat-square)](https://scrutinizer-ci.com/g/php-translation/translator)
 [![Total Downloads](https://img.shields.io/packagist/dt/php-translation/translator.svg?style=flat-square)](https://packagist.org/packages/php-translation/translator)
 
 **Services that can be used to translate strings**

composer.json

@@ -9,14 +9,14 @@
         }
     ],
     "require": {
-        "php": "^5.6 || ^7.0 || ^8.0",
+        "php": "^7.2 || ^8.0",
         "php-http/httplug": "^1.0 || ^2.0",
         "php-http/client-implementation": "^1.0",
         "php-http/discovery": "^1.7",
         "psr/log": "~1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.36 || ^5.5 || ^6.2 || ^7.5 || ^8.4 || ^9.5",
+        "phpunit/phpunit": "^8.4",
         "nyholm/nsa": "^1.1",
         "php-http/curl-client": "^1.0 || ^2.0",
         "php-http/message": "^1.8",

phpstan-baseline.neon

@@ -0,0 +1,32 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Method Translation\\\\Translator\\\\Service\\\\BingTranslator\\:\\:getUrl\\(\\) invoked with 4 parameters, 2 required\\.$#"
+			count: 1
+			path: src/Service/BingTranslator.php
+
+		-
+			message: "#^Method Translation\\\\Translator\\\\Service\\\\BingTranslator\\:\\:translate\\(\\) should return string but return statement is missing\\.$#"
+			count: 1
+			path: src/Service/BingTranslator.php
+
+		-
+			message: "#^Method Translation\\\\Translator\\\\Service\\\\GoogleTranslator\\:\\:translate\\(\\) should return string but return statement is missing\\.$#"
+			count: 1
+			path: src/Service/GoogleTranslator.php
+
+		-
+			message: "#^Method Translation\\\\Translator\\\\Service\\\\YandexTranslator\\:\\:translate\\(\\) should return string but return statement is missing\\.$#"
+			count: 1
+			path: src/Service/YandexTranslator.php
+
+		-
+			message: "#^Method Translation\\\\Translator\\\\Translator\\:\\:translate\\(\\) should return string\\|null but empty return statement found\\.$#"
+			count: 1
+			path: src/Translator.php
+
+		-
+			message: "#^PHPDoc tag @throws with type Translation\\\\Translator\\\\Exception is not subtype of Throwable$#"
+			count: 1
+			path: src/TranslatorService.php
+

phpstan.neon.dist

@@ -0,0 +1,9 @@
+includes:
+    - phpstan-baseline.neon
+
+parameters:
+    level: 3
+    paths:
+        - src
+    excludes_analyse:
+        - vendor

src/Service/BingTranslator.php

@@ -29,9 +29,7 @@ class BingTranslator extends HttpTranslator implements TranslatorService
     private $key;
 
     /**
-     * @param string              $key            Google API key
-     * @param HttpClient|null     $httpClient
-     * @param RequestFactory|null $requestFactory
+     * @param string $key Google API key
      */
     public function __construct($key, HttpClient $httpClient = null, RequestFactory $requestFactory = null)
     {
@@ -56,7 +54,7 @@ public function translate($string, $from, $to)
             ->withHeader('Ocp-Apim-Subscription-Key', $this->key)
             ->withHeader('Content-Type', 'application/json')
             ->withHeader('X-ClientTraceId', $this->createGuid())
-            ->withHeader('Content-length', strlen($body));
+            ->withHeader('Content-length', \strlen($body));
 
         /** @var ResponseInterface $response */
         $response = $this->getHttpClient()->sendRequest($request);
@@ -68,7 +66,7 @@ public function translate($string, $from, $to)
         $responseBody = $response->getBody()->__toString();
         $data = json_decode($responseBody, true);
 
-        if (!is_array($data)) {
+        if (!\is_array($data)) {
             throw ResponseException::createUnexpectedResponse($url, $responseBody);
         }