diff --git a/composer.json b/composer.json index 420c4a0..079f297 100644 --- a/composer.json +++ b/composer.json @@ -9,8 +9,7 @@ "plugin" ], "require": { - "acrosswp/acrosswp-about-us": "dev-main", - "acrosswp/acrosswp-buddypress-or-buddyboss-dependency": "dev-main" + "acrosswp/acrosswp-about-us": "dev-main" }, "minimum-stability": "dev", "support": { @@ -22,4 +21,4 @@ "email": "contant@acrosswp.com" } ] -} \ No newline at end of file +} diff --git a/composer.lock b/composer.lock index 0e08d48..2274aac 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "83b54dee11c5e3c7fc401beb88006e13", + "content-hash": "60e78c702de858d5e518f6d60d45a9c9", "packages": [ { "name": "acrosswp/acrosswp-about-us", @@ -12,12 +12,12 @@ "source": { "type": "git", "url": "https://github.com/acrosswp/acrosswp-about-us.git", - "reference": "231b8c1ebbc2b81e808025bf8ac5b2adc09795ee" + "reference": "faa010d693f1138c5ec7778c821601534087aadb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/acrosswp/acrosswp-about-us/zipball/231b8c1ebbc2b81e808025bf8ac5b2adc09795ee", - "reference": "231b8c1ebbc2b81e808025bf8ac5b2adc09795ee", + "url": "https://api.github.com/repos/acrosswp/acrosswp-about-us/zipball/faa010d693f1138c5ec7778c821601534087aadb", + "reference": "faa010d693f1138c5ec7778c821601534087aadb", "shasum": "" }, "default-branch": true, @@ -47,108 +47,18 @@ "issues": "https://github.com/acrosswp/acrosswp-about-us/issues", "source": "https://github.com/acrosswp/acrosswp-about-us/tree/main" }, - "time": "2024-05-15T08:18:41+00:00" - }, - { - "name": "acrosswp/acrosswp-buddypress-or-buddyboss-dependency", - "version": "dev-main", - "source": { - "type": "git", - "url": "https://github.com/acrosswp/acrosswp-buddypress-or-buddyboss-dependency.git", - "reference": "f8a59b7163f3475f9b35563f642aa5616519b1e8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/acrosswp/acrosswp-buddypress-or-buddyboss-dependency/zipball/f8a59b7163f3475f9b35563f642aa5616519b1e8", - "reference": "f8a59b7163f3475f9b35563f642aa5616519b1e8", - "shasum": "" - }, - "require": { - "acrosswp/acrosswp-dependency": "dev-main" - }, - "default-branch": true, - "type": "library", - "autoload": { - "files": [ - "dependency.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "acrosswp", - "email": "contant@acrosswp.com" - } - ], - "description": "Composer to autoload the AcrossWP Dependency Class", - "homepage": "https://acrosswp.com/", - "keywords": [ - "plugin", - "wordpress" - ], - "support": { - "issues": "https://github.com/acrosswp/acrosswp-buddypress-or-buddyboss-dependency/issues", - "source": "https://github.com/acrosswp/acrosswp-buddypress-or-buddyboss-dependency/tree/main" - }, - "time": "2023-11-12T21:14:12+00:00" - }, - { - "name": "acrosswp/acrosswp-dependency", - "version": "dev-main", - "source": { - "type": "git", - "url": "https://github.com/acrosswp/acrosswp-dependency.git", - "reference": "11c2cd9cfa097508d06b3b4718811107917ff2be" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/acrosswp/acrosswp-dependency/zipball/11c2cd9cfa097508d06b3b4718811107917ff2be", - "reference": "11c2cd9cfa097508d06b3b4718811107917ff2be", - "shasum": "" - }, - "default-branch": true, - "type": "library", - "autoload": { - "files": [ - "acrosswp-dependency.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "acrosswp", - "email": "contant@acrosswp.com" - } - ], - "description": "Composer to autoload the AcrossWP Dependency Class", - "homepage": "https://acrosswp.com/", - "keywords": [ - "plugin", - "wordpress" - ], - "support": { - "issues": "https://github.com/acrosswp/acrosswp-dependency/issues", - "source": "https://github.com/acrosswp/acrosswp-dependency/tree/main" - }, - "time": "2023-11-12T21:14:31+00:00" + "time": "2024-05-15T08:48:32+00:00" } ], "packages-dev": [], "aliases": [], "minimum-stability": "dev", "stability-flags": { - "acrosswp/acrosswp-about-us": 20, - "acrosswp/acrosswp-buddypress-or-buddyboss-dependency": 20 + "acrosswp/acrosswp-about-us": 20 }, "prefer-stable": false, "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/vendor/acrosswp/acrosswp-about-us/composer.json b/vendor/acrosswp/acrosswp-about-us/composer.json index 6494d5c..2102fc9 100644 --- a/vendor/acrosswp/acrosswp-about-us/composer.json +++ b/vendor/acrosswp/acrosswp-about-us/composer.json @@ -1,5 +1,5 @@ { - "name": "acrosswp/acrosswp-about-us", + "name": "acrosswp/acrosswp-woocommerce-dependency", "type": "library", "license": "GPL-2.0-or-later", "description": "Composer to autoload the AcrossWP Admin Dashboard Main Menu", diff --git a/vendor/acrosswp/acrosswp-buddypress-or-buddyboss-dependency/composer.json b/vendor/acrosswp/acrosswp-buddypress-or-buddyboss-dependency/composer.json deleted file mode 100644 index 0ed6288..0000000 --- a/vendor/acrosswp/acrosswp-buddypress-or-buddyboss-dependency/composer.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "acrosswp/acrosswp-buddypress-or-buddyboss-dependency", - "type": "library", - "license": "GPL-2.0-or-later", - "description": "Composer to autoload the AcrossWP Dependency Class", - "homepage": "https://acrosswp.com/", - "keywords": [ - "wordpress", - "plugin" - ], - "autoload": { - "files": ["dependency.php"] - }, - "support": { - "issues": "https://github.com/acrosswp/acrosswp-buddypress-or-buddyboss-dependency/issues" - }, - "require": { - "acrosswp/acrosswp-dependency": "dev-main" - }, - "authors": [ - { - "name": "acrosswp", - "email": "contant@acrosswp.com" - } - ] -} \ No newline at end of file diff --git a/vendor/acrosswp/acrosswp-buddypress-or-buddyboss-dependency/dependency.php b/vendor/acrosswp/acrosswp-buddypress-or-buddyboss-dependency/dependency.php deleted file mode 100644 index 214f460..0000000 --- a/vendor/acrosswp/acrosswp-buddypress-or-buddyboss-dependency/dependency.php +++ /dev/null @@ -1,137 +0,0 @@ -BuddyBoss Sorting Option In Network Search requires the BuddyBoss Platform plugin to work. Please install BuddyBoss Platform first.', 'sorting-option-in-network-search-for-buddyboss'); - */ - function constant_not_define_text(){ - printf( - __( - '%s requires the BuddyPress or BuddyBoss Platform plugin to work. Please install BuddyPress or install BuddyBoss Platform first.', - 'acrosswp' - ), - $this->get_plugin_name() - ); - } - - /** - * Load this function on plugin load hook - * Example: printf( __('BuddyBoss Sorting Option In Network Search requires BuddyBoss Platform plugin version %s or higher to work. Please update BuddyBoss Platform.', 'sorting-option-in-network-search-for-buddyboss'), $this->mini_version() ); - */ - function constant_mini_version_text() { - printf( - __( - '%s requires BuddyBoss Platform plugin version %s or higher to work. Please update BuddyBoss Platform.', - 'acrosswp' - ), - $this->get_plugin_name(), - $this->mini_version() - ); - } - - /** - * Load this function on plugin load hook - * Example: printf( __('BuddyBoss Sorting Option In Network Search requires BuddyBoss Platform plugin version %s or higher to work. Please update BuddyBoss Platform.', 'sorting-option-in-network-search-for-buddyboss'), $this->mini_version() ); - */ - function component_required_text() { - - $bb_components = bp_core_get_components(); - $component_required = $this->component_required(); - $active_components = apply_filters( 'bp_active_components', bp_get_option( 'bp-active-components' ) ); - $component_required_label = array(); - - foreach( $bb_components as $key => $bb_component ) { - if( in_array( $key, $component_required ) ) { - $component_required_label[] = '' . $bb_component['title'] . ''; - } - } - - if( count( $component_required_label ) > 1 ) { - $last = array_pop( $component_required_label ); - $component_required_label = implode( ', ', $component_required_label ) . ' and ' . $last; - } else { - $component_required_label = $component_required_label[0]; - } - - printf( - __( - '%s requires BuddyBoss Platform %s Component to work. Please Active the mentions Component.', - 'acrosswp' - ), - $this->get_plugin_name(), - $component_required_label - ); - } - - - /** - * Load this function on plugin load hook - */ - function constant_name(){ - return array( 'BP_VERSION', 'BP_PLATFORM_VERSION' ); - } - - /** - * Load this function on plugin load hook - */ - function mini_version() { - - if ( defined( 'BP_PLATFORM_VERSION' ) ) { - return '2.3.0'; - } - - return '11.3.1'; - } - - /** - * Load this function on plugin load hook - */ - public function component_required() { - return array(); - } - - /** - * Load this function on plugin load hook - * This was done to support BuddyPress and BuddyBoss Platform - */ - public function constant_define(){ - - $return = false; - $constants = $this->constant_name(); - foreach( $constants as $constant ) { - $constant = (string) $constant; - if ( defined( $constant ) ) { - $return = true; - } - } - - return $return; - } - - /** - * Load this function on plugin load hook - */ - public function constant_mini_version(){ - - $return = false; - - $constant_versions = $this->constant_name(); - foreach( $constant_versions as $constant_version ) { - - $constant = $this->constant_version( $constant_version ); - if ( ! empty( $constant ) && version_compare( $constant, $this->mini_version() , '>=' ) ) { - $return = true; - } - } - return $return; - } - } -} \ No newline at end of file diff --git a/vendor/acrosswp/acrosswp-dependency/acrosswp-dependency.php b/vendor/acrosswp/acrosswp-dependency/acrosswp-dependency.php deleted file mode 100644 index 0262ffd..0000000 --- a/vendor/acrosswp/acrosswp-dependency/acrosswp-dependency.php +++ /dev/null @@ -1,255 +0,0 @@ -plugin_name = $plugin_name; - - $this->plugin_files = $plugin_files; - - add_filter( $this->plugin_name . '-load', array( $this, 'boilerplate_load' ) ); - - } - - /** - * Get the currnet plugin paths - */ - public function get_plugin_name() { - - $plugin_data = get_plugin_data( $this->plugin_files ); - return $plugin_data['Name']; - } - - /** - * Load this function on plugin load hook - */ - public function boilerplate_load( $load ){ - - if( empty( $this->constant_define() ) ) { - $load = false; - - $this->constant_not_define_hook(); - - } elseif ( $this->constant_define() && empty( $this->constant_mini_version() ) ) { - $load = false; - - $this->constant_mini_version_hook(); - - } elseif ( - ! empty( $this->component_required() ) - && $this->constant_define() - && ! empty( $this->constant_mini_version() ) - && empty( $this->required_component_is_active() ) - ) { - $load = false; - - $this->component_required_hook(); - } - - return $load; - } - - /** - * Check if the Required Component is Active - */ - public function required_component_is_active() { - $is_active = false; - $component_required = $this->component_required(); - - // Active components. - $active_components = apply_filters( 'bp_active_components', bp_get_option( 'bp-active-components' ) ); - - foreach( $component_required as $component_require ) { - if( isset( $active_components[ $component_require ] ) ) { - $is_active = true; - } else { - $is_active = false; - break; - } - } - - return $is_active; - - } - - /** - * Load this function on plugin load hook - * Example: - array( - 'members', - 'xprofile', - 'settings', - 'notifications', - 'groups', - 'forums', - 'activity', - 'media', - 'document', - 'video', - 'messages', - 'friends', - 'invites', - 'moderation', - 'search', - 'blogs', - ); - */ - public function component_required() { - return array(); - } - - /** - * Load this function on plugin load hook - */ - public function constant_define(){ - $string = (string) $this->constant_name(); - if ( defined( $string ) ) { - return true; - } - return false; - } - - - /** - * Load this function on plugin load hook - */ - function constant_version( $constant_name = false ){ - - if ( empty( $constant_name ) ) { - $constant_name = $this->constant_name(); - } - - if ( defined( $constant_name ) ) { - return constant( $constant_name ); - } - - return false; - - } - - /** - * Load this function on plugin load hook - */ - public function constant_mini_version(){ - - if ( version_compare( $this->constant_version(), $this->mini_version() , '>=' ) ) { - return true; - } - return false; - } - - /** - * Load this function on plugin load hook - */ - public function error_message_hooks( $call ){ - if ( defined( 'WP_CLI' ) ) { - WP_CLI::warning( $this->$call() ); - } else { - add_action( 'admin_notices', array( $this, $call ) ); - add_action( 'network_admin_notices', array( $this, $call ) ); - } - } - - /** - * Load this function on plugin load hook - */ - public function component_required_hook(){ - $this->error_message_hooks( 'component_required_message' ); - } - - /** - * Load this function on plugin load hook - */ - public function constant_not_define_hook(){ - $this->error_message_hooks( 'constant_not_define_message' ); - } - - /** - * Load this function on plugin load hook - */ - public function constant_mini_version_hook(){ - $this->error_message_hooks( 'constant_mini_version_message' ); - } - - /** - * Load this function on plugin load hook - */ - public function error_message( $call ){ - echo '

'; - $this->$call(); - echo '

'; - } - - /** - * Load this function on plugin load hook - */ - public function constant_not_define_message(){ - $this->error_message( 'constant_not_define_text' ); - } - - /** - * Load this function on plugin load hook - */ - public function component_required_message(){ - $this->error_message( 'component_required_text' ); - } - - /** - * Load this function on plugin load hook - */ - public function constant_mini_version_message(){ - $this->error_message( 'constant_mini_version_text' ); - } - - /** - * Load this function on plugin load hook - * Example: _e('BuddyBoss Sorting Option In Network Search requires the BuddyBoss Platform plugin to work. Please install BuddyBoss Platform first.', 'buddyboss-sorting-option-in-network-search'); - */ - abstract function component_required_text(); - - /** - * Load this function on plugin load hook - * Example: _e('BuddyBoss Sorting Option In Network Search requires the BuddyBoss Platform plugin to work. Please install BuddyBoss Platform first.', 'buddyboss-sorting-option-in-network-search'); - */ - abstract function constant_not_define_text(); - - /** - * Load this function on plugin load hook - * Example: printf( __('BuddyBoss Sorting Option In Network Search requires BuddyBoss Platform plugin version %s or higher to work. Please update BuddyBoss Platform.', 'buddyboss-sorting-option-in-network-search'), BP_PLATFORM_VERSION_MINI_VERSION ); - */ - abstract function constant_mini_version_text(); - - /** - * Load this function on plugin load hook - */ - abstract function constant_name(); - - /** - * Load this function on plugin load hook - */ - abstract function mini_version(); - } -} \ No newline at end of file diff --git a/vendor/acrosswp/acrosswp-dependency/composer.json b/vendor/acrosswp/acrosswp-dependency/composer.json deleted file mode 100644 index 450020d..0000000 --- a/vendor/acrosswp/acrosswp-dependency/composer.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "acrosswp/acrosswp-dependency", - "type": "library", - "license": "GPL-2.0-or-later", - "description": "Composer to autoload the AcrossWP Dependency Class", - "homepage": "https://acrosswp.com/", - "keywords": [ - "wordpress", - "plugin" - ], - "autoload": { - "files": ["acrosswp-dependency.php"] - }, - "support": { - "issues": "https://github.com/acrosswp/acrosswp-dependency/issues" - }, - "authors": [ - { - "name": "acrosswp", - "email": "contant@acrosswp.com" - } - ] -} \ No newline at end of file diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php index a72151c..7824d8f 100644 --- a/vendor/composer/ClassLoader.php +++ b/vendor/composer/ClassLoader.php @@ -45,35 +45,34 @@ class ClassLoader /** @var \Closure(string):void */ private static $includeFile; - /** @var ?string */ + /** @var string|null */ private $vendorDir; // PSR-4 /** - * @var array[] - * @psalm-var array> + * @var array> */ private $prefixLengthsPsr4 = array(); /** - * @var array[] - * @psalm-var array> + * @var array> */ private $prefixDirsPsr4 = array(); /** - * @var array[] - * @psalm-var array + * @var list */ private $fallbackDirsPsr4 = array(); // PSR-0 /** - * @var array[] - * @psalm-var array> + * List of PSR-0 prefixes + * + * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2'))) + * + * @var array>> */ private $prefixesPsr0 = array(); /** - * @var array[] - * @psalm-var array + * @var list */ private $fallbackDirsPsr0 = array(); @@ -81,8 +80,7 @@ class ClassLoader private $useIncludePath = false; /** - * @var string[] - * @psalm-var array + * @var array */ private $classMap = array(); @@ -90,21 +88,20 @@ class ClassLoader private $classMapAuthoritative = false; /** - * @var bool[] - * @psalm-var array + * @var array */ private $missingClasses = array(); - /** @var ?string */ + /** @var string|null */ private $apcuPrefix; /** - * @var self[] + * @var array */ private static $registeredLoaders = array(); /** - * @param ?string $vendorDir + * @param string|null $vendorDir */ public function __construct($vendorDir = null) { @@ -113,7 +110,7 @@ public function __construct($vendorDir = null) } /** - * @return string[] + * @return array> */ public function getPrefixes() { @@ -125,8 +122,7 @@ public function getPrefixes() } /** - * @return array[] - * @psalm-return array> + * @return array> */ public function getPrefixesPsr4() { @@ -134,8 +130,7 @@ public function getPrefixesPsr4() } /** - * @return array[] - * @psalm-return array + * @return list */ public function getFallbackDirs() { @@ -143,8 +138,7 @@ public function getFallbackDirs() } /** - * @return array[] - * @psalm-return array + * @return list */ public function getFallbackDirsPsr4() { @@ -152,8 +146,7 @@ public function getFallbackDirsPsr4() } /** - * @return string[] Array of classname => path - * @psalm-return array + * @return array Array of classname => path */ public function getClassMap() { @@ -161,8 +154,7 @@ public function getClassMap() } /** - * @param string[] $classMap Class to filename map - * @psalm-param array $classMap + * @param array $classMap Class to filename map * * @return void */ @@ -179,24 +171,25 @@ public function addClassMap(array $classMap) * Registers a set of PSR-0 directories for a given prefix, either * appending or prepending to the ones previously set for this prefix. * - * @param string $prefix The prefix - * @param string[]|string $paths The PSR-0 root directories - * @param bool $prepend Whether to prepend the directories + * @param string $prefix The prefix + * @param list|string $paths The PSR-0 root directories + * @param bool $prepend Whether to prepend the directories * * @return void */ public function add($prefix, $paths, $prepend = false) { + $paths = (array) $paths; if (!$prefix) { if ($prepend) { $this->fallbackDirsPsr0 = array_merge( - (array) $paths, + $paths, $this->fallbackDirsPsr0 ); } else { $this->fallbackDirsPsr0 = array_merge( $this->fallbackDirsPsr0, - (array) $paths + $paths ); } @@ -205,19 +198,19 @@ public function add($prefix, $paths, $prepend = false) $first = $prefix[0]; if (!isset($this->prefixesPsr0[$first][$prefix])) { - $this->prefixesPsr0[$first][$prefix] = (array) $paths; + $this->prefixesPsr0[$first][$prefix] = $paths; return; } if ($prepend) { $this->prefixesPsr0[$first][$prefix] = array_merge( - (array) $paths, + $paths, $this->prefixesPsr0[$first][$prefix] ); } else { $this->prefixesPsr0[$first][$prefix] = array_merge( $this->prefixesPsr0[$first][$prefix], - (array) $paths + $paths ); } } @@ -226,9 +219,9 @@ public function add($prefix, $paths, $prepend = false) * Registers a set of PSR-4 directories for a given namespace, either * appending or prepending to the ones previously set for this namespace. * - * @param string $prefix The prefix/namespace, with trailing '\\' - * @param string[]|string $paths The PSR-4 base directories - * @param bool $prepend Whether to prepend the directories + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param list|string $paths The PSR-4 base directories + * @param bool $prepend Whether to prepend the directories * * @throws \InvalidArgumentException * @@ -236,17 +229,18 @@ public function add($prefix, $paths, $prepend = false) */ public function addPsr4($prefix, $paths, $prepend = false) { + $paths = (array) $paths; if (!$prefix) { // Register directories for the root namespace. if ($prepend) { $this->fallbackDirsPsr4 = array_merge( - (array) $paths, + $paths, $this->fallbackDirsPsr4 ); } else { $this->fallbackDirsPsr4 = array_merge( $this->fallbackDirsPsr4, - (array) $paths + $paths ); } } elseif (!isset($this->prefixDirsPsr4[$prefix])) { @@ -256,18 +250,18 @@ public function addPsr4($prefix, $paths, $prepend = false) throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); } $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; - $this->prefixDirsPsr4[$prefix] = (array) $paths; + $this->prefixDirsPsr4[$prefix] = $paths; } elseif ($prepend) { // Prepend directories for an already registered namespace. $this->prefixDirsPsr4[$prefix] = array_merge( - (array) $paths, + $paths, $this->prefixDirsPsr4[$prefix] ); } else { // Append directories for an already registered namespace. $this->prefixDirsPsr4[$prefix] = array_merge( $this->prefixDirsPsr4[$prefix], - (array) $paths + $paths ); } } @@ -276,8 +270,8 @@ public function addPsr4($prefix, $paths, $prepend = false) * Registers a set of PSR-0 directories for a given prefix, * replacing any others previously set for this prefix. * - * @param string $prefix The prefix - * @param string[]|string $paths The PSR-0 base directories + * @param string $prefix The prefix + * @param list|string $paths The PSR-0 base directories * * @return void */ @@ -294,8 +288,8 @@ public function set($prefix, $paths) * Registers a set of PSR-4 directories for a given namespace, * replacing any others previously set for this namespace. * - * @param string $prefix The prefix/namespace, with trailing '\\' - * @param string[]|string $paths The PSR-4 base directories + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param list|string $paths The PSR-4 base directories * * @throws \InvalidArgumentException * @@ -481,9 +475,9 @@ public function findFile($class) } /** - * Returns the currently registered loaders indexed by their corresponding vendor directories. + * Returns the currently registered loaders keyed by their corresponding vendor directories. * - * @return self[] + * @return array */ public static function getRegisteredLoaders() { diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php index c6b54af..51e734a 100644 --- a/vendor/composer/InstalledVersions.php +++ b/vendor/composer/InstalledVersions.php @@ -98,7 +98,7 @@ public static function isInstalled($packageName, $includeDevRequirements = true) { foreach (self::getInstalled() as $installed) { if (isset($installed['versions'][$packageName])) { - return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']); + return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false; } } @@ -119,7 +119,7 @@ public static function isInstalled($packageName, $includeDevRequirements = true) */ public static function satisfies(VersionParser $parser, $packageName, $constraint) { - $constraint = $parser->parseConstraints($constraint); + $constraint = $parser->parseConstraints((string) $constraint); $provided = $parser->parseConstraints(self::getVersionRanges($packageName)); return $provided->matches($constraint); @@ -328,7 +328,9 @@ private static function getInstalled() if (isset(self::$installedByVendor[$vendorDir])) { $installed[] = self::$installedByVendor[$vendorDir]; } elseif (is_file($vendorDir.'/composer/installed.php')) { - $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php'; + /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $required */ + $required = require $vendorDir.'/composer/installed.php'; + $installed[] = self::$installedByVendor[$vendorDir] = $required; if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) { self::$installed = $installed[count($installed) - 1]; } @@ -340,12 +342,17 @@ private static function getInstalled() // only require the installed.php file if this file is loaded from its dumped location, // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 if (substr(__DIR__, -8, 1) !== 'C') { - self::$installed = require __DIR__ . '/installed.php'; + /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $required */ + $required = require __DIR__ . '/installed.php'; + self::$installed = $required; } else { self::$installed = array(); } } - $installed[] = self::$installed; + + if (self::$installed !== array()) { + $installed[] = self::$installed; + } return $installed; } diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php index 06eb537..0c261c7 100644 --- a/vendor/composer/autoload_files.php +++ b/vendor/composer/autoload_files.php @@ -6,7 +6,5 @@ $baseDir = dirname($vendorDir); return array( - 'ba3e6311190fef6b803d614907261c88' => $vendorDir . '/acrosswp/acrosswp-dependency/acrosswp-dependency.php', 'b63f3776920c9d542d2eda719625843e' => $vendorDir . '/acrosswp/acrosswp-about-us/acrosswp-menu.php', - 'dc38373a0e8e9b61437f4120cca10acf' => $vendorDir . '/acrosswp/acrosswp-buddypress-or-buddyboss-dependency/dependency.php', ); diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 68863ad..2b96705 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -7,9 +7,7 @@ class ComposerStaticInit3f8437b7f8a049623acc129bd94ed35c { public static $files = array ( - 'ba3e6311190fef6b803d614907261c88' => __DIR__ . '/..' . '/acrosswp/acrosswp-dependency/acrosswp-dependency.php', 'b63f3776920c9d542d2eda719625843e' => __DIR__ . '/..' . '/acrosswp/acrosswp-about-us/acrosswp-menu.php', - 'dc38373a0e8e9b61437f4120cca10acf' => __DIR__ . '/..' . '/acrosswp/acrosswp-buddypress-or-buddyboss-dependency/dependency.php', ); public static $classMap = array ( diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index dccd0e4..fee7b9a 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -7,15 +7,15 @@ "source": { "type": "git", "url": "https://github.com/acrosswp/acrosswp-about-us.git", - "reference": "231b8c1ebbc2b81e808025bf8ac5b2adc09795ee" + "reference": "faa010d693f1138c5ec7778c821601534087aadb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/acrosswp/acrosswp-about-us/zipball/231b8c1ebbc2b81e808025bf8ac5b2adc09795ee", - "reference": "231b8c1ebbc2b81e808025bf8ac5b2adc09795ee", + "url": "https://api.github.com/repos/acrosswp/acrosswp-about-us/zipball/faa010d693f1138c5ec7778c821601534087aadb", + "reference": "faa010d693f1138c5ec7778c821601534087aadb", "shasum": "" }, - "time": "2024-05-15T08:18:41+00:00", + "time": "2024-05-15T08:48:32+00:00", "default-branch": true, "type": "library", "installation-source": "dist", @@ -45,101 +45,6 @@ "source": "https://github.com/acrosswp/acrosswp-about-us/tree/main" }, "install-path": "../acrosswp/acrosswp-about-us" - }, - { - "name": "acrosswp/acrosswp-buddypress-or-buddyboss-dependency", - "version": "dev-main", - "version_normalized": "dev-main", - "source": { - "type": "git", - "url": "https://github.com/acrosswp/acrosswp-buddypress-or-buddyboss-dependency.git", - "reference": "f8a59b7163f3475f9b35563f642aa5616519b1e8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/acrosswp/acrosswp-buddypress-or-buddyboss-dependency/zipball/f8a59b7163f3475f9b35563f642aa5616519b1e8", - "reference": "f8a59b7163f3475f9b35563f642aa5616519b1e8", - "shasum": "" - }, - "require": { - "acrosswp/acrosswp-dependency": "dev-main" - }, - "time": "2023-11-12T21:14:12+00:00", - "default-branch": true, - "type": "library", - "installation-source": "dist", - "autoload": { - "files": [ - "dependency.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "acrosswp", - "email": "contant@acrosswp.com" - } - ], - "description": "Composer to autoload the AcrossWP Dependency Class", - "homepage": "https://acrosswp.com/", - "keywords": [ - "plugin", - "wordpress" - ], - "support": { - "issues": "https://github.com/acrosswp/acrosswp-buddypress-or-buddyboss-dependency/issues", - "source": "https://github.com/acrosswp/acrosswp-buddypress-or-buddyboss-dependency/tree/main" - }, - "install-path": "../acrosswp/acrosswp-buddypress-or-buddyboss-dependency" - }, - { - "name": "acrosswp/acrosswp-dependency", - "version": "dev-main", - "version_normalized": "dev-main", - "source": { - "type": "git", - "url": "https://github.com/acrosswp/acrosswp-dependency.git", - "reference": "11c2cd9cfa097508d06b3b4718811107917ff2be" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/acrosswp/acrosswp-dependency/zipball/11c2cd9cfa097508d06b3b4718811107917ff2be", - "reference": "11c2cd9cfa097508d06b3b4718811107917ff2be", - "shasum": "" - }, - "time": "2023-11-12T21:14:31+00:00", - "default-branch": true, - "type": "library", - "installation-source": "dist", - "autoload": { - "files": [ - "acrosswp-dependency.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "acrosswp", - "email": "contant@acrosswp.com" - } - ], - "description": "Composer to autoload the AcrossWP Dependency Class", - "homepage": "https://acrosswp.com/", - "keywords": [ - "plugin", - "wordpress" - ], - "support": { - "issues": "https://github.com/acrosswp/acrosswp-dependency/issues", - "source": "https://github.com/acrosswp/acrosswp-dependency/tree/main" - }, - "install-path": "../acrosswp/acrosswp-dependency" } ], "dev": true, diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index b9bb851..dba3fa9 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => 'acrosswp/wordpress-plugin-boilerplate', 'pretty_version' => 'dev-main', 'version' => 'dev-main', - 'reference' => 'f4c2ea9cb65d4ac043c4571a8e3b6b59486f2f61', + 'reference' => 'f710713c1d0af67cf21f308cfdbd2f4317733be0', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -13,7 +13,7 @@ 'acrosswp/acrosswp-about-us' => array( 'pretty_version' => 'dev-main', 'version' => 'dev-main', - 'reference' => '231b8c1ebbc2b81e808025bf8ac5b2adc09795ee', + 'reference' => 'faa010d693f1138c5ec7778c821601534087aadb', 'type' => 'library', 'install_path' => __DIR__ . '/../acrosswp/acrosswp-about-us', 'aliases' => array( @@ -21,32 +21,10 @@ ), 'dev_requirement' => false, ), - 'acrosswp/acrosswp-buddypress-or-buddyboss-dependency' => array( - 'pretty_version' => 'dev-main', - 'version' => 'dev-main', - 'reference' => 'f8a59b7163f3475f9b35563f642aa5616519b1e8', - 'type' => 'library', - 'install_path' => __DIR__ . '/../acrosswp/acrosswp-buddypress-or-buddyboss-dependency', - 'aliases' => array( - 0 => '9999999-dev', - ), - 'dev_requirement' => false, - ), - 'acrosswp/acrosswp-dependency' => array( - 'pretty_version' => 'dev-main', - 'version' => 'dev-main', - 'reference' => '11c2cd9cfa097508d06b3b4718811107917ff2be', - 'type' => 'library', - 'install_path' => __DIR__ . '/../acrosswp/acrosswp-dependency', - 'aliases' => array( - 0 => '9999999-dev', - ), - 'dev_requirement' => false, - ), 'acrosswp/wordpress-plugin-boilerplate' => array( 'pretty_version' => 'dev-main', 'version' => 'dev-main', - 'reference' => 'f4c2ea9cb65d4ac043c4571a8e3b6b59486f2f61', + 'reference' => 'f710713c1d0af67cf21f308cfdbd2f4317733be0', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(),