Merge pull request #36 from j0k3r/github-actions

j0k3r · web-flow · commit f1dab939409b · 2020-12-07T21:51:30.000+01:00
Ditch Travis and use GitHub Actions
diff --git a/.gitattributes b/.gitattributes
@@ -2,7 +2,7 @@
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /.scrutinizer.yml export-ignore
-/.travis.yml export-ignore
 /.php_cs export-ignore
 /phpunit.xml.dist export-ignore
 /tests export-ignore
+/.github export-ignore
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -0,0 +1,39 @@
+name: "CS"
+
+on:
+  pull_request:
+    branches:
+      - master
+  push:
+    branches:
+      - master
+
+jobs:
+  coding-standards:
+    name: "CS Fixer (PHP ${{ matrix.php }})"
+    runs-on: "ubuntu-20.04"
+
+    strategy:
+      matrix:
+        php:
+          - "7.3"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          php-version: "${{ matrix.php }}"
+          tools: cs2pr, composer:v1
+          ini-values: "date.timezone=Europe/Paris"
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: "Install dependencies with Composer"
+        uses: "ramsey/composer-install@v1"
+
+      - name: "Run PHP CS Fixer"
+        run: "vendor/bin/php-cs-fixer fix --verbose --dry-run --format=checkstyle | cs2pr"
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -0,0 +1,91 @@
+name: "CI"
+
+on:
+  pull_request:
+    branches:
+      - "master"
+  push:
+    branches:
+      - "master"
+
+env:
+  fail-fast: true
+
+jobs:
+  phpunit:
+    name: "PHPUnit (PHP ${{ matrix.php }})"
+    runs-on: "ubuntu-20.04"
+
+    strategy:
+      matrix:
+        php:
+          - "5.6"
+          - "7.0"
+          - "7.1"
+          - "7.2"
+          - "7.3"
+          - "7.4"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+        with:
+          fetch-depth: 2
+
+      - name: "Install PHP with PCOV"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "${{ matrix.php }}"
+          coverage: "none"
+          tools: composer:v1
+          extensions: curl
+          ini-values: "date.timezone=Europe/Paris"
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: "Install dependencies with Composer"
+        uses: "ramsey/composer-install@v1"
+
+      - name: "Run PHPUnit"
+        run: "php vendor/bin/simple-phpunit -v"
+
+  phpunit-coverage:
+    name: "PHPUnit with coverage (PHP ${{ matrix.php }})"
+    runs-on: "ubuntu-20.04"
+
+    strategy:
+      matrix:
+        php:
+          - "7.4"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+        with:
+          fetch-depth: 2
+
+      - name: "Install PHP with PCOV"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "${{ matrix.php }}"
+          coverage: "pcov"
+          tools: composer:v1
+          extensions: curl
+          ini-values: "date.timezone=Europe/Paris"
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: "Install dependencies with Composer"
+        uses: "ramsey/composer-install@v1"
+
+      - name: "Run PHPUnit (with coverage)"
+        run: "php vendor/bin/simple-phpunit -v --coverage-clover=coverage.clover"
+
+      - name: "Retrieve ocular.phar"
+        run: "wget https://scrutinizer-ci.com/ocular.phar"
+
+      - name: "Enable ocular.phar"
+        run: "chmod +x ocular.phar"
+
+      - name: "Upload coverage"
+        run: "php ocular.phar code-coverage:upload --format=php-clover coverage.clover"
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ vendor
 coverage
 build
 .php_cs.cache
+.phpunit.result.cache
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -8,3 +8,10 @@ tools:
 filter:
     excluded_paths:
         - tests/*
+
+build:
+    nodes:
+        analysis:
+            tests:
+                override:
+                    - php-scrutinizer-run
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # PHP Imgur API Client
 
-[![Build Status](https://travis-ci.org/j0k3r/php-imgur-api-client.svg?branch=3.x)](https://travis-ci.org/j0k3r/php-imgur-api-client)
-[![Code Coverage](https://scrutinizer-ci.com/g/j0k3r/php-imgur-api-client/badges/coverage.png?branch=3.x)](https://scrutinizer-ci.com/g/j0k3r/php-imgur-api-client/?branch=3.x)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/j0k3r/php-imgur-api-client/badges/quality-score.png?branch=3.x)](https://scrutinizer-ci.com/g/j0k3r/php-imgur-api-client/?branch=3.x)
+![CI](https://github.com/j0k3r/php-imgur-api-client/workflows/CI/badge.svg)
+[![Code Coverage](https://scrutinizer-ci.com/g/j0k3r/php-imgur-api-client/badges/coverage.png?branch=master)](https://scrutinizer-ci.com/g/j0k3r/php-imgur-api-client/?branch=master)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/j0k3r/php-imgur-api-client/badges/quality-score.png?branch=master)](https://scrutinizer-ci.com/g/j0k3r/php-imgur-api-client/?branch=master)
 [![Total Downloads](https://poser.pugx.org/j0k3r/php-imgur-api-client/downloads)](https://packagist.org/packages/j0k3r/php-imgur-api-client)
 [![License](https://poser.pugx.org/j0k3r/php-imgur-api-client/license)](https://packagist.org/packages/j0k3r/php-imgur-api-client)
 
@@ -13,8 +13,8 @@ Uses [Imgur API v3](https://api.imgur.com/).
 ## Information
 
 * Branch [1.x](https://github.com/j0k3r/php-imgur-api-client/tree/1.x) use Guzzle 3 (but is not maintained)
-* Branch [2.x](https://github.com/j0k3r/php-imgur-api-client/tree/2.x) use Guzzle 5
-* Branch [3.x](https://github.com/j0k3r/php-imgur-api-client/tree/3.x) use Guzzle 6
+* Branch [2.x](https://github.com/j0k3r/php-imgur-api-client/tree/2.x) use Guzzle 5 (but is not maintained)
+* Branch [master](https://github.com/j0k3r/php-imgur-api-client/tree/master) use Guzzle 6
 
 All actives branches required PHP >= 5.6
 
diff --git a/composer.json b/composer.json
@@ -40,11 +40,6 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.0",
-        "symfony/phpunit-bridge": "^4.0"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.0.x-dev"
-        }
+        "symfony/phpunit-bridge": "^5.0"
     }
 }
diff --git a/lib/Imgur/Auth/OAuth2.php b/lib/Imgur/Auth/OAuth2.php
@@ -99,7 +99,7 @@ public function getAuthenticationURL($responseType = 'code', $state = null)
      * @param string $code
      * @param string $requestType
      *
-     * @return string
+     * @return array
      */
     public function requestAccessToken($code, $requestType)
     {
@@ -157,7 +157,7 @@ public function refreshToken()
             $response = $this->httpClient->post(
                 self::ACCESS_TOKEN_ENDPOINT,
                 [
-                    'refresh_token' => $token['refresh_token'],
+                    'refresh_token' => \is_array($token) ? $token['refresh_token'] : null,
                     'client_id' => $this->clientId,
                     'client_secret' => $this->clientSecret,
                     'grant_type' => 'refresh_token',
@@ -207,7 +207,7 @@ public function setAccessToken($token)
     /**
      * Getter for the current access token.
      *
-     * @return array
+     * @return array|null
      */
     public function getAccessToken()
     {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -7,7 +7,6 @@
     convertWarningsToExceptions="true"
     processIsolation="false"
     stopOnFailure="false"
-    syntaxCheck="false"
     bootstrap="vendor/autoload.php"
     >
 
@@ -25,8 +24,4 @@
             </exclude>
         </whitelist>
     </filter>
-
-    <logging>
-        <log type="coverage-html" target="coverage" title="php-imgur-api-client" charset="UTF-8" yui="true" highlight="true" lowUpperBound="35" highLowerBound="70"/>
-    </logging>
 </phpunit>

Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,6 @@`
`40`	`40`	`},`
`41`	`41`	`"require-dev": {`
`42`	`42`	`"friendsofphp/php-cs-fixer": "^2.0",`
`43`		`- "symfony/phpunit-bridge": "^4.0"`
`44`		`- },`
`45`		`- "extra": {`
`46`		`- "branch-alias": {`
`47`		`- "dev-master": "3.0.x-dev"`
`48`		`- }`
	`43`	`+ "symfony/phpunit-bridge": "^5.0"`
`49`	`44`	`}`
`50`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public function getAuthenticationURL($responseType = 'code', $state = null)`
`99`	`99`	`* @param string $code`
`100`	`100`	`* @param string $requestType`
`101`	`101`	`*`
`102`		`- * @return string`
	`102`	`+ * @return array`
`103`	`103`	`*/`
`104`	`104`	`public function requestAccessToken($code, $requestType)`
`105`	`105`	`{`
`@@ -157,7 +157,7 @@ public function refreshToken()`
`157`	`157`	`$response = $this->httpClient->post(`
`158`	`158`	`self::ACCESS_TOKEN_ENDPOINT,`
`159`	`159`	`[`
`160`		`- 'refresh_token' => $token['refresh_token'],`
	`160`	`+ 'refresh_token' => \is_array($token) ? $token['refresh_token'] : null,`
`161`	`161`	`'client_id' => $this->clientId,`
`162`	`162`	`'client_secret' => $this->clientSecret,`
`163`	`163`	`'grant_type' => 'refresh_token',`
`@@ -207,7 +207,7 @@ public function setAccessToken($token)`
`207`	`207`	`/**`
`208`	`208`	`* Getter for the current access token.`
`209`	`209`	`*`
`210`		`- * @return array`
	`210`	`+ * @return array\|null`
`211`	`211`	`*/`
`212`	`212`	`public function getAccessToken()`
`213`	`213`	`{`