From ff8a265462df418e9aa35da3cef34b6b8e66101b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonino=20Scarf=C3=AC?= Date: Tue, 15 Oct 2024 10:42:52 +0200 Subject: [PATCH] fixup! chore: upgrade common dependencies to fix deprecated warnings --- src/modules/common/composer.json | 1 - .../common/includes/vendor/composer/ClassLoader.php | 4 ++-- .../common/includes/vendor/composer/autoload_real.php | 8 ++++---- .../common/includes/vendor/composer/autoload_static.php | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/modules/common/composer.json b/src/modules/common/composer.json index d6ac4b68d8..3b247fb010 100644 --- a/src/modules/common/composer.json +++ b/src/modules/common/composer.json @@ -96,7 +96,6 @@ "@composer dump-autoload --working-dir ./includes --no-dev --classmap-authoritative", "sed -i'.bak' -e 's/Composer\\\\Autoload/Wordlift_Modules_Common_Composer\\\\Autoload/' includes/vendor/composer/*.php && rm -rf includes/vendor/composer/*.php.bak", "mv vendor/composer/autoload_files.php third-party/vendor/composer", - "@composer dump-autoload --working-dir ./includes --no-dev --classmap-authoritative", "rm -rf vendor" ] } diff --git a/src/modules/common/includes/vendor/composer/ClassLoader.php b/src/modules/common/includes/vendor/composer/ClassLoader.php index 7824d8f7ea..9bf82f4fc3 100644 --- a/src/modules/common/includes/vendor/composer/ClassLoader.php +++ b/src/modules/common/includes/vendor/composer/ClassLoader.php @@ -10,12 +10,12 @@ * file that was distributed with this source code. */ -namespace Composer\Autoload; +namespace Wordlift_Modules_Common_Composer\Autoload; /** * ClassLoader implements a PSR-0, PSR-4 and classmap class loader. * - * $loader = new \Composer\Autoload\ClassLoader(); + * $loader = new \Wordlift_Modules_Common_Composer\Autoload\ClassLoader(); * * // register classes with namespaces * $loader->add('Symfony\Component', __DIR__.'/component'); diff --git a/src/modules/common/includes/vendor/composer/autoload_real.php b/src/modules/common/includes/vendor/composer/autoload_real.php index d7835ed4d6..0930b62255 100644 --- a/src/modules/common/includes/vendor/composer/autoload_real.php +++ b/src/modules/common/includes/vendor/composer/autoload_real.php @@ -8,13 +8,13 @@ class ComposerAutoloaderInit8bd2b6d4ccd6b50e0809e5ba62169420 public static function loadClassLoader($class) { - if ('Composer\Autoload\ClassLoader' === $class) { + if ('Wordlift_Modules_Common_Composer\Autoload\ClassLoader' === $class) { require __DIR__ . '/ClassLoader.php'; } } /** - * @return \Composer\Autoload\ClassLoader + * @return \Wordlift_Modules_Common_Composer\Autoload\ClassLoader */ public static function getLoader() { @@ -23,11 +23,11 @@ public static function getLoader() } spl_autoload_register(array('ComposerAutoloaderInit8bd2b6d4ccd6b50e0809e5ba62169420', 'loadClassLoader'), true, true); - self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); + self::$loader = $loader = new \Wordlift_Modules_Common_Composer\Autoload\ClassLoader(\dirname(__DIR__)); spl_autoload_unregister(array('ComposerAutoloaderInit8bd2b6d4ccd6b50e0809e5ba62169420', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit8bd2b6d4ccd6b50e0809e5ba62169420::getInitializer($loader)); + call_user_func(\Wordlift_Modules_Common_Composer\Autoload\ComposerStaticInit8bd2b6d4ccd6b50e0809e5ba62169420::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); diff --git a/src/modules/common/includes/vendor/composer/autoload_static.php b/src/modules/common/includes/vendor/composer/autoload_static.php index b9cfab539a..b0f3abfade 100644 --- a/src/modules/common/includes/vendor/composer/autoload_static.php +++ b/src/modules/common/includes/vendor/composer/autoload_static.php @@ -2,7 +2,7 @@ // autoload_static.php @generated by Composer -namespace Composer\Autoload; +namespace Wordlift_Modules_Common_Composer\Autoload; class ComposerStaticInit8bd2b6d4ccd6b50e0809e5ba62169420 {