Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix initial php 8.4 compatibility #2714

Merged
merged 12 commits into from
Dec 9, 2024
Merged

Fix initial php 8.4 compatibility #2714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1994480
Explicitly mark parameter types as nullable
mikkamp Dec 5, 2024
b6ba522
Pass parameters to str_getcsv
mikkamp Dec 5, 2024
3758300
Explicitly mark parameter types as nullable in tools
mikkamp Dec 5, 2024
ad729fd
Update guzzle package and direct replacements
mikkamp Dec 5, 2024
c843d6f
Update phpunit packages
mikkamp Dec 5, 2024
0850d23
Update jetpack connection package
mikkamp Dec 5, 2024
d1d1f58
Update validator packages
mikkamp Dec 5, 2024
cd860f3
Use pattern which accepts only some unicode characters
mikkamp Dec 5, 2024
e4efa7a
Update league/container
mikkamp Dec 5, 2024
0d2955d
Add support for league container v4
mikkamp Dec 5, 2024
0cbe3a4
Add support for league container v4 in tests
mikkamp Dec 5, 2024
a0e163d
Fix for PHP 7.4
mikkamp Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions bin/GoogleAdsCleanupServices.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class GoogleAdsCleanupServices {
* @param Event|null $event Composer event.
* @param string|null $path Path of the Ads library.
*/
public function __construct( Event $event = null, string $path = null ) {
public function __construct( ?Event $event = null, ?string $path = null ) {
puntope marked this conversation as resolved.
Show resolved Hide resolved
$this->event = $event;
$this->path = $path ?: dirname( __DIR__ ) . '/vendor/googleads/google-ads-php';
$this->code_path = dirname( __DIR__ ) . '/src';
Expand All @@ -70,9 +70,9 @@ public function __construct( Event $event = null, string $path = null ) {
/**
* Remove unused classes from the library.
*
* @param Event $event Event context provided by Composer
* @param Event|null $event Event context provided by Composer
*/
public static function remove( Event $event = null ) {
public static function remove( ?Event $event = null ) {
$cleanup = new GoogleAdsCleanupServices( $event );
$cleanup->remove_services();
$cleanup->remove_enums();
Expand Down Expand Up @@ -263,7 +263,7 @@ protected function find_used_pattern( string $pattern ): array {
*
* @return array List of matched names.
*/
protected function find_library_file_pattern( string $pattern, string $suffix = null ): array {
protected function find_library_file_pattern( string $pattern, ?string $suffix = null ): array {
$output = glob( "{$pattern}/*.php" );

if ( empty( $output ) ) {
Expand Down
6 changes: 3 additions & 3 deletions bin/SymfonyPolyfillCleanup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class SymfonyPolyfillCleanup {
* @param Event|null $event Composer event.
* @param string|null $path Path of the Symfony library.
*/
public function __construct( Event $event = null, string $path = null ) {
public function __construct( ?Event $event = null, ?string $path = null ) {
$this->event = $event;
$this->path = $path ?: dirname( __DIR__ ) . '/vendor/symfony/';
}
Expand All @@ -62,9 +62,9 @@ protected function get_list_of_polyfills(): array {
/**
* Remove PHP 8.0 specific code of Symfony polyfills
*
* @param Event $event Event context provided by Composer
* @param Event|null $event Event context provided by Composer
*/
public static function remove( Event $event = null ) {
public static function remove( ?Event $event = null ) {
$cleanup = new SymfonyPolyfillCleanup( $event );
$cleanup->remove_bootstraps80();
}
Expand Down
3 changes: 1 addition & 2 deletions bin/prefix-vendor-namespace.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,9 @@
'GuzzleHttp\ClientInterface::VERSION',
'GuzzleHttp\describe_type',
'GuzzleHttp\HandlerStack::create',
'GuzzleHttp\Message\ResponseInterface)',
'GuzzleHttp\Psr7\Message::bodySummary',
'GuzzleHttp\Psr7\Utils::streamFor',
'GuzzleHttp\Psr7\Utils::tryFopen',
'GuzzleHttp\Psr7\Utils::redactUserInfo',
],
];

Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"google/apiclient": "^2.16",
"google/apiclient-services": "^0.350.0",
"googleads/google-ads-php": "dev-legacy-v22.1.0",
"league/container": "^3.4",
"league/container": "^4.2",
"league/iso3166": "^4.1",
"phpseclib/bcmath_compat": "^2.0",
"psr/container": "^1.1",
Expand Down
Loading
Loading