Skip to content

Commit d0a4013

Browse files
authored
Drop PHP < 8.2, and get tests working with PHP 8.4
* ticketid is a string, not an int * allow later versions of Symfony * fix php 8.4 deprecations * bump to php 8.2
1 parent 2fb0d86 commit d0a4013

File tree

6 files changed

+9
-8
lines changed

6 files changed

+9
-8
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
matrix:
1010
os: [ ubuntu-latest, macos-latest, windows-latest ]
1111
# All supported PHP versions https://www.php.net/supported-versions.php
12-
php: [ '7.3', '7.4', '8.0', '8.1' ]
12+
php: [ '8.2','8.3','8.4' ]
1313

1414
runs-on: ${{matrix.os}}
1515

composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"require": {
17-
"php": "^7.3 || ^8.0",
17+
"php": "^8.2",
1818
"ext-curl": "*",
1919
"ext-json": "*",
2020
"ext-libxml": "*",
@@ -26,8 +26,8 @@
2626
"squizlabs/php_codesniffer": "^3.0",
2727
"mediawiki/minus-x": "^0.3 || ^1.0",
2828
"phpunit/phpunit": "^9.5",
29-
"symfony/cache": "^5.4",
30-
"symfony/var-dumper": "^5.4",
29+
"symfony/cache": "^5.4|^6.4|^7.0",
30+
"symfony/var-dumper": "^5.4|^6.4|^7.0",
3131
"php-parallel-lint/php-parallel-lint": "^1.3",
3232
"phan/phan": "^5.4"
3333
},

src/Oauth/PhpFlickrService.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public function __construct(
2121
ClientInterface $httpClient,
2222
TokenStorageInterface $storage,
2323
SignatureInterface $signature,
24-
UriInterface $baseApiUri = null
24+
?UriInterface $baseApiUri = null
2525
) {
2626
if ($baseApiUri === null) {
2727
$baseApiUri = new Uri(static::$baseUrl . '/rest/');

src/PhotosApi.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -847,9 +847,9 @@ public function setContentType($photoId, $contentType)
847847
*/
848848
public function setDates(
849849
$photoId,
850-
DateTime $dateTaken = null,
850+
DateTime|null $dateTaken = null,
851851
$dateTakenGranularity = null,
852-
DateTime $datePosted = null
852+
DateTime|null $datePosted = null
853853
) {
854854
$args = ['photo_id' => $photoId];
855855
if (!empty($dateTaken)) {

src/PhpFlickr.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class PhpFlickr
8181
* @param string $apiKey
8282
* @param string|null $secret
8383
*/
84-
public function __construct(string $apiKey, string $secret = null)
84+
public function __construct(string $apiKey, string|null $secret = null)
8585
{
8686
$this->api_key = $apiKey;
8787
$this->secret = $secret;

src/Uploader.php

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ class Uploader
1212
/** @var PhpFlickr */
1313
protected $flickr;
1414

15+
protected $response;
1516
/** @var string */
1617
protected $uploadEndpoint = 'https://up.flickr.com/services/upload/';
1718

0 commit comments

Comments
 (0)