Merge pull request #8 from zfegg/develop

增加PHP8支持

.github/workflows/qa.yml

@@ -0,0 +1,54 @@
+name: qa
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+jobs:
+  qa:
+    name: QA (PHP ${{ matrix.php-versions }} on ${{ matrix.operating-system }})
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ubuntu-latest]
+        php-versions: ['7.3', '7.4', '8.0', '8.1']
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: mbstring, xml
+          coverage: xdebug #optional
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - name: Cache composer dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          # Use composer.json for key, if composer.lock is not committed.
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+#          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install Composer dependencies
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
+
+      - name: CS Check
+        if: ${{ matrix.php-versions == '8.0' }}
+        run: ./vendor/bin/phpcs
+
+      - name: Run Tests
+        run: ./vendor/bin/phpunit --coverage-text
+
+      - name: Upload coverage to coveralls.io
+        if: ${{ matrix.php-versions == '8.0' }}
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          composer require php-coveralls/php-coveralls --dev -W -q
+          ./vendor/bin/phpunit --coverage-clover build/logs/clover.xml
+          ./vendor/bin/php-coveralls -v

README.md

@@ -1,9 +1,15 @@
 短信发送抽象接口
 ==============
 
-[![Build Status](https://travis-ci.org/zfegg/sms-sender.png)](https://travis-ci.org/zfegg/sms-sender)
+
+[![GitHub Actions: Run tests](https://github.com/zfegg/sms-sender/workflows/qa/badge.svg)](https://github.com/zfegg/sms-sender/actions?query=workflow%3A%22qa%22)
+[![Coverage Status](https://coveralls.io/repos/github/zfegg/sms-sender/badge.svg?branch=master)](https://coveralls.io/github/zfegg/sms-sender?branch=master)
 [![Coverage Status](https://coveralls.io/repos/github/zfegg/sms-sender/badge.svg?branch=master)](https://coveralls.io/github/zfegg/sms-sender?branch=master)
-[![Latest Stable Version](https://poser.pugx.org/zfegg/sms-sender/v/stable.png)](https://packagist.org/packages/zfegg/sms-sender)
+[![Latest Stable Version](http://poser.pugx.org/zfegg/sms-sender/v)](https://packagist.org/packages/zfegg/sms-sender)
+[![Total Downloads](http://poser.pugx.org/zfegg/sms-sender/downloads)](https://packagist.org/packages/zfegg/sms-sender)
+[![License](http://poser.pugx.org/zfegg/sms-sender/license)](https://packagist.org/packages/zfegg/sms-sender)
+[![PHP Version Require](http://poser.pugx.org/zfegg/sms-sender/require/php)](https://packagist.org/packages/zfegg/sms-sender)
+
 
 抽象常用短信业务:
 

composer.json

@@ -12,16 +12,16 @@
         "handler"
     ],
     "require": {
-        "php": "^7.2",
-        "psr/simple-cache": "^1.0",
-        "psr/log": "^1.0",
+        "php": ">=7.3",
+        "psr/simple-cache": "^1.0 | ^2.0 | ^3.0",
+        "psr/log": "^1.0 | ^2.0 | ^3.0",
         "psr/event-dispatcher": "^1.0"
     },
     "require-dev": {
         "cache/array-adapter": "^1.0",
         "psr/http-server-handler": "^1.0",
-        "phpunit/phpunit": "^7.0",
-        "squizlabs/php_codesniffer": "^2.5",
+        "phpunit/phpunit": "^9.0",
+        "squizlabs/php_codesniffer": "^3.7.1",
         "laminas/laminas-diactoros": "^2.1",
         "laminas/laminas-inputfilter": "^2.7",
         "laminas/laminas-i18n": "^2.7",

phpunit.xml

@@ -1,15 +1,16 @@
-<phpunit bootstrap="./vendor/autoload.php" colors="true">
-    <testsuites>
-        <testsuite name="Sms Sender Tests">
-            <directory>./test</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
-    <php>
-        <env name="APPLICATION_ENV" value="development" />
-    </php>
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage includeUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Sms Sender Tests">
+      <directory>./test</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <env name="APPLICATION_ENV" value="development"/>
+  </php>
 </phpunit>

test/Handler/PostSmsCaptchaHandlerTest.php

@@ -30,13 +30,12 @@ public function testHandle()
 
     public function testProviderSendError()
     {
-        $provider = $this->prophesize(ProviderInterface::class);
+        $provider = $this->createMock(ProviderInterface::class);
 
-        $provider->send('15000000000', Argument::type('string'))
-            ->willReturn(new Result(false, 'test error'))
-            ->shouldBeCalled();
+        $provider->method('send')->with('15000000000', $this->isType("string"))
+            ->willReturn(new Result(false, 'test error'));
 
-        $this->container->setService(ProviderInterface::class, $provider->reveal());
+        $this->container->setService(ProviderInterface::class, $provider);
         /** @var PostSmsCaptchaHandler $handler */
         $handler = $this->container->get(PostSmsCaptchaHandler::class);
 

test/SetUpContainer.php

@@ -21,7 +21,7 @@ abstract class SetUpContainer extends TestCase
     /** @var ServiceManager */
     protected $container;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $config = (new ConfigProvider())();
         $config = ArrayUtils::merge($config, (new \Laminas\Validator\ConfigProvider())());