diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0075d4f..8cdfafb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,9 +7,13 @@ jobs: strategy: matrix: - os: [ ubuntu-latest, macos-latest, windows-latest ] - # All supported PHP versions https://www.php.net/supported-versions.php - php: [ '7.3', '7.4', '8.0', '8.1' ] + os: [ ubuntu-latest ] + php: [ '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ] + include: + - os: macos-latest + php: '8.3' + - os: windows-latest + php: '8.3' runs-on: ${{matrix.os}} diff --git a/.phan/baseline.php b/.phan/baseline.php index 383541a..2f6269f 100644 --- a/.phan/baseline.php +++ b/.phan/baseline.php @@ -2,8 +2,6 @@ return [ 'file_suppressions' => [ - 'src/ActivityApi.php' => ['PhanUnextractableAnnotation'], - 'src/BlogsApi.php' => ['PhanUnextractableAnnotation'], 'src/CamerasApi.php' => ['PhanUnextractableAnnotation'], 'src/CollectionsApi.php' => ['PhanUnextractableAnnotation'], 'src/CommonsApi.php' => ['PhanUnextractableAnnotation'], diff --git a/composer.json b/composer.json index c510538..6b82189 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,7 @@ "minus-x check . -q", "phpcs -sp", "@phan", - "phpunit", + "phpunit --exclude-group auth", "git status | grep 'nothing to commit, working tree clean'" ] } diff --git a/src/ActivityApi.php b/src/ActivityApi.php index 5fdad1b..3239be7 100644 --- a/src/ActivityApi.php +++ b/src/ActivityApi.php @@ -15,7 +15,7 @@ class ActivityApi extends ApiMethodGroup * omitted, it defaults to 10. The maximum allowed value is 50. * @param string $page The page of results to return. If this argument is omitted, * it defaults to 1. - * @return + * @return array */ public function userComments($perPage = null, $page = null) { @@ -41,7 +41,7 @@ public function userComments($perPage = null, $page = null) * omitted, it defaults to 10. The maximum allowed value is 50. * @param string $page The page of results to return. If this argument is omitted, * it defaults to 1. - * @return + * @return array */ public function userPhotos($timeframe = null, $perPage = null, $page = null) { diff --git a/src/BlogsApi.php b/src/BlogsApi.php index e4c3b3f..830474d 100644 --- a/src/BlogsApi.php +++ b/src/BlogsApi.php @@ -13,7 +13,7 @@ class BlogsApi extends ApiMethodGroup * @param string $service Optionally only return blogs for a given service id. You * can get a list of from flickr.blogs.getServices(). - * @return + * @return array */ public function getList($service = null) { @@ -30,7 +30,7 @@ public function getList($service = null) * * @link https://www.flickr.com/services/api/flickr.blogs.getServices.html * - * @return + * @return array */ public function getServices() { @@ -50,7 +50,7 @@ public function getServices() * a blog id you can pass a service id and we'll post to the first blog of that * service we find. * @param string $blogId The id of the blog to post to. - * @return + * @return array */ public function postPhoto($photoId, $title, $description, $blogPassword = null, $service = null, $blogId = null) { diff --git a/tests/ApiMethodGroup/PhotosApiTest.php b/tests/ApiMethodGroup/PhotosApiTest.php index 795c5ed..faab1ba 100644 --- a/tests/ApiMethodGroup/PhotosApiTest.php +++ b/tests/ApiMethodGroup/PhotosApiTest.php @@ -7,6 +7,9 @@ use Samwilson\PhpFlickr\Tests\TestCase; use Samwilson\PhpFlickr\Util; +/** + * @group auth + */ class PhotosApiTest extends TestCase { /** @var int */ @@ -23,9 +26,6 @@ protected function getTestPhotoId(PhpFlickr $flickr) return $this->testPhotoId; } - /** - * @group auth - */ public function testAddTags() { $flickr = $this->getFlickr(true); diff --git a/tests/ApiMethodGroup/PhotosetsApiTest.php b/tests/ApiMethodGroup/PhotosetsApiTest.php index f266526..b004c9c 100644 --- a/tests/ApiMethodGroup/PhotosetsApiTest.php +++ b/tests/ApiMethodGroup/PhotosetsApiTest.php @@ -4,6 +4,9 @@ use Samwilson\PhpFlickr\Tests\TestCase; +/** + * @group auth + */ class PhotosetsApiTest extends TestCase { protected $testPhotoId;