From d024acd1b7408eb7889075acce03f8e387e86f38 Mon Sep 17 00:00:00 2001 From: Netkas Date: Tue, 18 Oct 2022 21:07:38 -0400 Subject: [PATCH] Fixed namespace usages for polyfill packages --- src/ncc/ThirdParty/Symfony/polyfill-ctype/bootstrap.php | 2 +- src/ncc/ThirdParty/Symfony/polyfill-ctype/bootstrap80.php | 2 +- src/ncc/ThirdParty/Symfony/polyfill-mbstring/bootstrap.php | 2 +- src/ncc/ThirdParty/Symfony/polyfill-mbstring/bootstrap80.php | 2 +- src/ncc/ThirdParty/Symfony/polyfill-uuid/Uuid.php | 2 +- src/ncc/ThirdParty/Symfony/polyfill-uuid/bootstrap.php | 2 +- src/ncc/ThirdParty/Symfony/polyfill-uuid/bootstrap80.php | 2 +- src/ncc/autoload.php | 2 ++ 8 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/ncc/ThirdParty/Symfony/polyfill-ctype/bootstrap.php b/src/ncc/ThirdParty/Symfony/polyfill-ctype/bootstrap.php index 041bf98..ac40fdf 100644 --- a/src/ncc/ThirdParty/Symfony/polyfill-ctype/bootstrap.php +++ b/src/ncc/ThirdParty/Symfony/polyfill-ctype/bootstrap.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -use ncc\ThirdParty\Symfony\polyfill as p; +use ncc\ThirdParty\Symfony\ctype as p; if (\PHP_VERSION_ID >= 80000) { return require __DIR__.'/bootstrap80.php'; diff --git a/src/ncc/ThirdParty/Symfony/polyfill-ctype/bootstrap80.php b/src/ncc/ThirdParty/Symfony/polyfill-ctype/bootstrap80.php index 6d0136c..3b4c5dd 100644 --- a/src/ncc/ThirdParty/Symfony/polyfill-ctype/bootstrap80.php +++ b/src/ncc/ThirdParty/Symfony/polyfill-ctype/bootstrap80.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -use ncc\ThirdParty\Symfony\polyfill as p; +use ncc\ThirdParty\Symfony\ctype as p; if (!function_exists('ctype_alnum')) { function ctype_alnum(mixed $text): bool { return p\Ctype::ctype_alnum($text); } diff --git a/src/ncc/ThirdParty/Symfony/polyfill-mbstring/bootstrap.php b/src/ncc/ThirdParty/Symfony/polyfill-mbstring/bootstrap.php index 2bd02f0..9d186de 100644 --- a/src/ncc/ThirdParty/Symfony/polyfill-mbstring/bootstrap.php +++ b/src/ncc/ThirdParty/Symfony/polyfill-mbstring/bootstrap.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -use ncc\ThirdParty\Symfony\polyfill as p; +use ncc\ThirdParty\Symfony\mbstring as p; if (\PHP_VERSION_ID >= 80000) { return require __DIR__.'/bootstrap80.php'; diff --git a/src/ncc/ThirdParty/Symfony/polyfill-mbstring/bootstrap80.php b/src/ncc/ThirdParty/Symfony/polyfill-mbstring/bootstrap80.php index 1ac4d9d..9ec884a 100644 --- a/src/ncc/ThirdParty/Symfony/polyfill-mbstring/bootstrap80.php +++ b/src/ncc/ThirdParty/Symfony/polyfill-mbstring/bootstrap80.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -use ncc\ThirdParty\Symfony\polyfill as p; +use ncc\ThirdParty\Symfony\mbstring as p; if (!function_exists('mb_convert_encoding')) { function mb_convert_encoding(array|string|null $string, ?string $to_encoding, array|string|null $from_encoding = null): array|string|false { return p\Mbstring::mb_convert_encoding($string ?? '', (string) $to_encoding, $from_encoding); } diff --git a/src/ncc/ThirdParty/Symfony/polyfill-uuid/Uuid.php b/src/ncc/ThirdParty/Symfony/polyfill-uuid/Uuid.php index ab96407..8ff409e 100644 --- a/src/ncc/ThirdParty/Symfony/polyfill-uuid/Uuid.php +++ b/src/ncc/ThirdParty/Symfony/polyfill-uuid/Uuid.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Polyfill\Uuid; +namespace ncc\ThirdParty\Symfony\uuid; /** * @internal diff --git a/src/ncc/ThirdParty/Symfony/polyfill-uuid/bootstrap.php b/src/ncc/ThirdParty/Symfony/polyfill-uuid/bootstrap.php index 6d8545b..15d4673 100644 --- a/src/ncc/ThirdParty/Symfony/polyfill-uuid/bootstrap.php +++ b/src/ncc/ThirdParty/Symfony/polyfill-uuid/bootstrap.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -use Symfony\Polyfill\Uuid as p; +use ncc\ThirdParty\Symfony\uuid as p; if (extension_loaded('uuid')) { return; diff --git a/src/ncc/ThirdParty/Symfony/polyfill-uuid/bootstrap80.php b/src/ncc/ThirdParty/Symfony/polyfill-uuid/bootstrap80.php index d6c592f..ac0c544 100644 --- a/src/ncc/ThirdParty/Symfony/polyfill-uuid/bootstrap80.php +++ b/src/ncc/ThirdParty/Symfony/polyfill-uuid/bootstrap80.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -use Symfony\Polyfill\Uuid as p; +use ncc\ThirdParty\Symfony\uuid as p; if (!defined('UUID_VARIANT_NCS')) { define('UUID_VARIANT_NCS', 0); diff --git a/src/ncc/autoload.php b/src/ncc/autoload.php index 9fda522..40c2d48 100644 --- a/src/ncc/autoload.php +++ b/src/ncc/autoload.php @@ -19,6 +19,8 @@ $third_party_path . 'Symfony' . DIRECTORY_SEPARATOR . 'polyfill-ctype' . DIRECTORY_SEPARATOR . 'bootstrap.php', $third_party_path . 'Symfony' . DIRECTORY_SEPARATOR . 'polyfill-mbstring' . DIRECTORY_SEPARATOR . 'autoload_spl.php', $third_party_path . 'Symfony' . DIRECTORY_SEPARATOR . 'polyfill-mbstring' . DIRECTORY_SEPARATOR . 'bootstrap.php', + $third_party_path . 'Symfony' . DIRECTORY_SEPARATOR . 'polyfill-uuid' . DIRECTORY_SEPARATOR . 'autoload_spl.php', + $third_party_path . 'Symfony' . DIRECTORY_SEPARATOR . 'polyfill-uuid' . DIRECTORY_SEPARATOR . 'bootstrap.php', $third_party_path . 'Symfony' . DIRECTORY_SEPARATOR . 'Process' . DIRECTORY_SEPARATOR . 'autoload_spl.php', $third_party_path . 'Symfony' . DIRECTORY_SEPARATOR . 'Uid' . DIRECTORY_SEPARATOR . 'autoload_spl.php', $third_party_path . 'Symfony' . DIRECTORY_SEPARATOR . 'Filesystem' . DIRECTORY_SEPARATOR . 'autoload_spl.php',