From f478379ed7ec25832e1382b1e466b0a581762ab3 Mon Sep 17 00:00:00 2001 From: Yahnis Elsts Date: Thu, 21 Jul 2022 12:28:39 +0300 Subject: [PATCH] Replace defined('__NAMESPACE__') conditions with PHP version checks. --- Puc/v4p11/Autoloader.php | 2 +- Puc/v4p11/Factory.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Puc/v4p11/Autoloader.php b/Puc/v4p11/Autoloader.php index 3f62972..24aa745 100644 --- a/Puc/v4p11/Autoloader.php +++ b/Puc/v4p11/Autoloader.php @@ -12,7 +12,7 @@ if ( !class_exists('Puc_v4p11_Autoloader', false) ): public function __construct() { $this->rootDir = dirname(__FILE__) . '/'; - if ( defined('__NAMESPACE__') && __NAMESPACE__ ) { + if ( version_compare(PHP_VERSION, '5.3', '>=') && __NAMESPACE__ ) { $namespaceWithSlash = __NAMESPACE__ . '\\'; } else { $namespaceWithSlash = ''; diff --git a/Puc/v4p11/Factory.php b/Puc/v4p11/Factory.php index c0141b9..c2aac5b 100644 --- a/Puc/v4p11/Factory.php +++ b/Puc/v4p11/Factory.php @@ -337,7 +337,7 @@ if ( !class_exists('Puc_v4p11_Factory', false) ): */ public static function addVersion($generalClass, $versionedClass, $version) { if ( empty(self::$myMajorVersion) ) { - $className = (defined('__NAMESPACE__') && __NAMESPACE__) + $className = (version_compare(PHP_VERSION, '5.3', '>=') && __NAMESPACE__) ? substr(__CLASS__, strlen(__NAMESPACE__) + 1) : __CLASS__;