diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index a01f3c4..36cbac3 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -21,9 +21,6 @@ jobs: strategy: matrix: php: - - "5.6" - - "7.0" - - "7.1" - "7.2" - "7.3" - "7.4" @@ -122,7 +119,7 @@ jobs: strategy: matrix: php: - - "7.2" + - "7.4" steps: - name: "Checkout" @@ -155,43 +152,3 @@ jobs: - name: "Run PHPUnit" run: "php vendor/bin/simple-phpunit -v" - - phpunit-composerv2: - name: "PHPUnit with Composer v1 (PHP ${{ matrix.php }})" - runs-on: "ubuntu-latest" - - strategy: - matrix: - php: - - "7.4" - - steps: - - name: "Checkout" - uses: "actions/checkout@v2" - with: - fetch-depth: 2 - - - name: "Install PHP" - uses: "shivammathur/setup-php@v2" - with: - php-version: "${{ matrix.php }}" - coverage: "none" - tools: composer:v1 - extensions: tidy - ini-values: "date.timezone=Europe/Paris" - env: - COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: "Remove useless deps" - run: "composer remove friendsofphp/php-cs-fixer --dev --no-progress --no-update" - - - name: "Install dependencies with Composer" - uses: "ramsey/composer-install@v1" - with: - composer-options: "--optimize-autoloader --prefer-dist" - - - name: "Setup logs" - run: "mkdir -p build/logs" - - - name: "Run PHPUnit" - run: "php vendor/bin/simple-phpunit -v" diff --git a/composer.json b/composer.json index b3116b7..8a3a5ba 100644 --- a/composer.json +++ b/composer.json @@ -24,14 +24,14 @@ "role": "Developer (original JS version)" }], "require": { - "php": ">=5.6.0", + "php": ">=7.2", "ext-mbstring": "*", - "psr/log": "^1.0", + "psr/log": "^1.0.1 || ^2.0 || ^3.0", "masterminds/html5": "^2.7" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.14", - "monolog/monolog": "^1.24|^2.1", + "monolog/monolog": "^1.24|^2.1|^3.0", "symfony/phpunit-bridge": "^4.4|^5.3|^6.0|^7.0" }, "suggest": { diff --git a/src/Readability.php b/src/Readability.php index d6fcbe2..bb9e9f6 100644 --- a/src/Readability.php +++ b/src/Readability.php @@ -183,10 +183,7 @@ class Readability implements LoggerAwareInterface $this->loadHtml(); } - /** - * @return void - */ - public function setLogger(LoggerInterface $logger) + public function setLogger(LoggerInterface $logger): void { $this->logger = $logger; }