Context Navigation

← Previous Changeset
Next Changeset →

Changeset 2967574

Timestamp:

09/15/2023 04:11:55 PM (3 years ago)

Author:

heymehedi

Message:

version update v1.0.0

Location:

Files:

: 1142 added
: 58 edited

Legend:

: Unmodified
: Added
: Removed

login-me-now/trunk/README.md

r2874668	r2967574
1		Login Me Now – A simple and user-friendly plugin to Login Directly to Dashboard from [Login Me Now Chrome Extension](https://chrome.google.com/webstore/detail/login-me-now/kkkofomlfhbepmpiplggmfpomdnkljoh)
	1	# login me now

login-me-now/trunk/composer.json

-                      r2933044
+                      r2967574
+{
+    "name": "halalbrains/login-me-now",
+    "autoload": {
+        "psr-4": {
+            "LoginMeNow\\": "App",
+            "LoginMeNow\\Abstracts\\": "App/Common/Abstracts",
+            "LoginMeNow\\Traits\\": "App/Common/Traits",
+            "LoginMeNow\\Model\\": "App/Models",
+            "LoginMeNow\\Routes\\": "App/Routes",
+            "LoginMeNow\\GoogleLogin\\": "App/Modules/GoogleLogin",
+            "LoginMeNow\\FacebookLogin\\": "App/Modules/FacebookLogin",
+            "LoginMeNow\\OnetimeNumber\\": "App/Modules/OnetimeNumber",
+            "LoginMeNow\\UserSwitching\\": "App/Modules/UserSwitching",
+            "LoginMeNow\\LoginLink\\": "App/Modules/LoginLink",
+            "LoginMeNow\\BrowserToken\\": "App/Modules/BrowserToken",
+            "LoginMeNow\\AdvanceSharing\\": "App/Modules/AdvanceSharing"
+        }
+    },
+    "authors": [
+        {
+            "name": "yes"
+        }
+    ],
     "require": {
+        "php": ">=7.4",
         "firebase/php-jwt": "^6.3",
         "google/apiclient": "^2.12.1"

login-me-now/trunk/composer.lock

-                      r2933044
+                      r2967574
         "This file is @generated automatically"
     ],
     "content-hash": "b49adda719510d060821aeed0ab443de",
+    "content-hash": "0f37e6464d87f2e169dcbdc4db831d61",
     "packages": [
+        {
             "name": "firebase/php-jwt",
             "version": "v6.5.0",
+            "version": "v6.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/firebase/php-jwt.git",
                 "reference": "e94e7353302b0c11ec3cfff7180cd0b1743975d2"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/firebase/php-jwt/zipball/e94e7353302b0c11ec3cfff7180cd0b1743975d2",
                 "reference": "e94e7353302b0c11ec3cfff7180cd0b1743975d2",
+                "reference": "5dbc8959427416b8ee09a100d7a8588c00fb2e26"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/5dbc8959427416b8ee09a100d7a8588c00fb2e26",
+                "reference": "5dbc8959427416b8ee09a100d7a8588c00fb2e26",
                 "shasum": ""
             },
 …
             "support": {
                 "issues": "https://github.com/firebase/php-jwt/issues",
                 "source": "https://github.com/firebase/php-jwt/tree/v6.5.0"
             },
             "time": "2023-05-12T15:47:07+00:00"
+                "source": "https://github.com/firebase/php-jwt/tree/v6.8.1"
+            },
+            "time": "2023-07-14T18:33:00+00:00"
         },
+        {
 …
+        {
             "name": "google/apiclient-services",
             "version": "v0.303.0",
+            "version": "v0.312.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/googleapis/google-api-php-client-services.git",
                 "reference": "b9c143453a94d5e6ed7257d065dcc5662619eaf4"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/b9c143453a94d5e6ed7257d065dcc5662619eaf4",
                 "reference": "b9c143453a94d5e6ed7257d065dcc5662619eaf4",
+                "reference": "45d47fed73b28254c511882bc743b1690a99558d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/45d47fed73b28254c511882bc743b1690a99558d",
+                "reference": "45d47fed73b28254c511882bc743b1690a99558d",
                 "shasum": ""
             },
 …
             "support": {
                 "issues": "https://github.com/googleapis/google-api-php-client-services/issues",
                 "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.303.0"
             },
             "time": "2023-06-04T01:12:12+00:00"
+                "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.312.0"
+            },
+            "time": "2023-08-14T00:56:12+00:00"
         },
+        {
 …
+        {
             "name": "guzzlehttp/promises",
             "version": "2.0.0",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
                 "reference": "3a494dc7dc1d7d12e511890177ae2d0e6c107da6"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/guzzle/promises/zipball/3a494dc7dc1d7d12e511890177ae2d0e6c107da6",
                 "reference": "3a494dc7dc1d7d12e511890177ae2d0e6c107da6",
+                "reference": "111166291a0f8130081195ac4556a5587d7f1b5d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/111166291a0f8130081195ac4556a5587d7f1b5d",
+                "reference": "111166291a0f8130081195ac4556a5587d7f1b5d",
                 "shasum": ""
             },
 …
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
                 "source": "https://github.com/guzzle/promises/tree/2.0.0"
+                "source": "https://github.com/guzzle/promises/tree/2.0.1"
             },
             "funding": [
 …
+                }
             ],
             "time": "2023-05-21T13:50:22+00:00"
+            "time": "2023-08-03T15:11:55+00:00"
         },
+        {
             "name": "guzzlehttp/psr7",
             "version": "2.5.0",
+            "version": "2.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
                 "reference": "b635f279edd83fc275f822a1188157ffea568ff6"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6",
                 "reference": "b635f279edd83fc275f822a1188157ffea568ff6",
+                "reference": "8bd7c33a0734ae1c5d074360512beb716bef3f77"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/8bd7c33a0734ae1c5d074360512beb716bef3f77",
+                "reference": "8bd7c33a0734ae1c5d074360512beb716bef3f77",
                 "shasum": ""
             },
 …
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
                 "source": "https://github.com/guzzle/psr7/tree/2.5.0"
+                "source": "https://github.com/guzzle/psr7/tree/2.6.0"
             },
             "funding": [
 …
+                }
             ],
             "time": "2023-04-17T16:11:26+00:00"
+            "time": "2023-08-03T15:06:02+00:00"
         },
+        {
 …
+        {
             "name": "phpseclib/phpseclib",
             "version": "3.0.19",
+            "version": "3.0.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
                 "reference": "cc181005cf548bfd8a4896383bb825d859259f95"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/cc181005cf548bfd8a4896383bb825d859259f95",
                 "reference": "cc181005cf548bfd8a4896383bb825d859259f95",
+                "reference": "4580645d3fc05c189024eb3b834c6c1e4f0f30a1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/4580645d3fc05c189024eb3b834c6c1e4f0f30a1",
+                "reference": "4580645d3fc05c189024eb3b834c6c1e4f0f30a1",
                 "shasum": ""
             },
 …
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
                 "source": "https://github.com/phpseclib/phpseclib/tree/3.0.19"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.21"
             },
             "funding": [
 …
+                }
             ],
             "time": "2023-03-05T17:13:09+00:00"
+            "time": "2023-07-09T15:24:48+00:00"
         },
+        {
 …
     "prefer-stable": false,
     "prefer-lowest": false,
+    "platform": [],
+    "platform": {
+        "php": ">=7.4"
+    },
     "platform-dev": [],
     "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.1.0"
+}

login-me-now/trunk/login-me-now.php

-                      r2933044
+                      r2967574
 <?php
+/*
+Plugin Name: Login Me Now
+Plugin URI: https://wordpress.org/plugins/login-me-now/
+Description: Simple and Timer Saver One Click Login WordPress Plugin for Chrome Extension
+Author: Login Me Now
+Author URI: https://loginmenow.com/
+Text Domain: login-me-now
+Requires PHP: 7.4
+Domain Path: /languages
+Version: 0.99
+/**
+ * Plugin Name: Login Me Now
+ * Description: 1 click passwordless login, social login & user switching
+ * Author: Login Me Now
+ * Author URI: https://loginmenow.com/
+ * Version: 1.0.0
+ * Requires PHP: 7.4
+ * License: GPL2
+ * Text Domain: login-me-now
+ *
+ * Released under the GPL license
+ * http://www.opensource.org/licenses/gpl-license.php
+ *
+ * This is an add-on for WordPress
+ * http://wordpress.org/
+ *
+ * **********************************************************************
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * **********************************************************************
  */
 defined( 'ABSPATH' ) || die( 'No direct script access allowed!' );
+use LoginMeNow\App;
+if ( defined( 'LOGIN_ME_NOW_VERSION' ) ) {
+    return;
+// don't call the file directly
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+/**
+ * LoginMeNow class
+ *
+ * This class holds the entire LoginMeNow plugin
+ */
+final class LoginMeNow {
+    public string $version  = '1.0.0';
+    private string $min_php = '7.4';
+    public object $app;
+    private static $instance;
+define( 'LOGIN_ME_NOW_VERSION', '0.99' );
+define( 'LOGIN_ME_NOW_PRO_UPGRADE_URL', 'https://loginmenow.com/' );
+    /**
+     * Initializes the LoginMeNow() class
+     * Checks for an existing LoginMeNow() instance
+     * and if it doesn't find one, creates it.
+     */
+    public static function init(): object {
+        if ( ! isset( self::$instance ) && ! ( self::$instance instanceof LoginMeNow ) ) {
+            self::$instance = new LoginMeNow();
+            self::$instance->setup();
+        }
+define( 'LOGIN_ME_NOW_BASE_DIR', plugin_dir_path( __FILE__ ) );
+define( 'LOGIN_ME_NOW_BASE_URL', plugin_dir_url( __FILE__ ) );
+define( 'LOGIN_ME_NOW_MODULES', plugin_dir_path( __FILE__ ) . 'modules/' );
+        return self::$instance;
+    }
+    /**
+     * Setup the plugin
+     *
+     * Sets up all the appropriate hooks and actions within our plugin.
+     */
+    private function setup(): void {
+        // dry check on older PHP versions, if found deactivate itself with an error
+        register_activation_hook( __FILE__, [$this, 'auto_deactivate'] );
+        if ( ! $this->is_supported_php() ) {
+            return;
+        }
+        $this->define_constants();
+        $this->includes();
+        $this->app = App::init();
+        do_action( 'login_me_now_loaded' );
+    }
+    /**
+     * Check if the PHP version is supported
+     */
+    public function is_supported_php(): bool {
+        if ( version_compare( PHP_VERSION, $this->min_php, '<' ) ) {
+            return false;
+        }
+        return true;
+    }
+    /**
+     * Bail out if the php version is lower than
+     */
+    public function auto_deactivate(): void {
+        if ( $this->is_supported_php() ) {
+            return;
+        }
+        deactivate_plugins( basename( __FILE__ ) );
+        $error = __( '<h1>An Error Occurred</h1>', 'login-me-now' );
+        $error .= __( '<h2>Your installed PHP Version is: ', 'login-me-now' ) . PHP_VERSION . '</h2>';
+        $error .= __( '<p>The <strong>Login Me Now</strong> plugin requires PHP version <strong>', 'login-me-now' ) . $this->min_php . __( '</strong> or greater', 'login-me-now' );
+        $error .= __( '<p>The version of your PHP is ', 'login-me-now' ) . '<a href="http://php.net/supported-versions.php" target="_blank"><strong>' . __( 'unsupported and old', 'login-me-now' ) . '</strong></a>.';
+        $error .= __( 'You should update your PHP software or contact your host regarding this matter.</p>', 'login-me-now' );
+        wp_die(
+            wp_kses_post( $error ),
+            esc_html__( 'Plugin Activation Error', 'login-me-now' ),
+            [
+                'response'  => 200,
+                'back_link' => true,
+            ]
+        );
+    }
+    /**
+     * Define the constants
+     */
+    private function define_constants(): void {
+        define( 'LOGIN_ME_NOW_VERSION', $this->version );
+        define( 'LOGIN_ME_NOW_FILE', __FILE__ );
+        define( 'LOGIN_ME_NOW_URL', plugins_url( '', LOGIN_ME_NOW_FILE ) );
+        define( 'LOGIN_ME_NOW_PATH', dirname( LOGIN_ME_NOW_FILE ) );
+        define( 'LOGIN_ME_NOW_APP_PATH', LOGIN_ME_NOW_PATH . '/App/' );
+        define( 'LOGIN_ME_NOW_APP_URL', LOGIN_ME_NOW_URL . '/App/' );
+        define( 'LOGIN_ME_NOW_INCLUDES', LOGIN_ME_NOW_APP_PATH . 'Common' );
+        define( 'LOGIN_ME_NOW_MODULES', LOGIN_ME_NOW_APP_PATH . 'Modules' );
+        define( 'LOGIN_ME_NOW_ASSETS', LOGIN_ME_NOW_APP_URL . 'Assets' );
+        define( 'LOGIN_ME_NOW_ADMIN_URL', LOGIN_ME_NOW_APP_URL . 'Admin' );
+        define( 'LOGIN_ME_NOW_ADMIN_PATH', LOGIN_ME_NOW_APP_PATH . 'Admin' );
+        define( 'LOGIN_ME_NOW_MENU_SLUG', apply_filters( 'login_me_now_menu_slug', 'login-me-now' ) );
+        define( 'LOGIN_ME_NOW_MENU_CAPABILITY', apply_filters( 'login_me_now_menu_capability', 'manage_options' ) );
+        define( 'LOGIN_ME_NOW_PRO_UPGRADE_URL', 'https://loginmenow.com/' );
+    }
+    private function includes(): void {
+        include __DIR__ . '/vendor/autoload.php';
+    }
+}
 /**
  * Load dependencies managed by composer
+ * Init the LoginMeNow plugin
  */
+require_once LOGIN_ME_NOW_BASE_DIR . 'vendor/autoload.php';
+function LoginMeNow() {
+    return LoginMeNow::init();
+}
+/**
+ * Load necessary classes
+ */
+require_once LOGIN_ME_NOW_BASE_DIR . 'includes/init.php';
+require_once LOGIN_ME_NOW_BASE_DIR . 'modules/init.php';
+require_once LOGIN_ME_NOW_BASE_DIR . 'admin/class-login-me-now-admin-loader.php';
+require_once LOGIN_ME_NOW_BASE_DIR . 'routes/init.php';
+// kick it off
+LoginMeNow();
+// include __DIR__ . '/Tests/init.php';

login-me-now/trunk/readme.txt

-                      r2933044
+                      r2967574
 === Login Me Now - 1 click login without password ===
 Contributors: HeyMehedi, HalalBrains, HiMrFaruk
 Tags: login, password, password-less, wp-login, secure login
+=== Login Me Now – 1 click passwordless login, social login & user switching ===
+Contributors: HalalBrains
+Tags: login, password, secure-login, wp-login, social-login
 Requires at least: 5.6
 Tested up to: 6.2
 Requires PHP: 7.4
 Stable tag: 0.99
+Stable tag: 1.0.0
 License: GPLv3 or Any Later Version
 Login Me Now - A simple and user-friendly plugin to Login Directly to the Dashboard from Chrome Extension
+Login Me Now – 1 click passwordless login, social login & user switching
 == Description ==

login-me-now/trunk/vendor/autoload.php

-                      r2911753
+                      r2967574
 // autoload.php @generated by Composer
-if (PHP_VERSION_ID < 50600) {
-    if (!headers_sent()) {
-        header('HTTP/1.1 500 Internal Server Error');
+    }
-    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
-    if (!ini_get('display_errors')) {
-        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
-            fwrite(STDERR, $err);
-        } elseif (!headers_sent()) {
-            echo $err;
+        }
+    }
-    trigger_error(
-        $err,
-        E_USER_ERROR
-    );
+}
 require_once __DIR__ . '/composer/autoload_real.php';
 return ComposerAutoloaderInit026869af995aef16fea57d1e5ee46649::getLoader();
+return ComposerAutoloaderInita52b64522988d5ee0e431730396c184f::getLoader();

login-me-now/trunk/vendor/composer/ClassLoader.php

-                      r2911753
+                      r2967574
 class ClassLoader
+{
-    /** @var \Closure(string):void */
-    private static $includeFile;
-    /** @var ?string */
     private $vendorDir;
     // PSR-4
-    /**
-     * @var array[]
-     * @psalm-var array<string, array<string, int>>
-     */
     private $prefixLengthsPsr4 = array();
-    /**
-     * @var array[]
-     * @psalm-var array<string, array<int, string>>
-     */
     private $prefixDirsPsr4 = array();
-    /**
-     * @var array[]
-     * @psalm-var array<string, string>
-     */
     private $fallbackDirsPsr4 = array();
     // PSR-0
-    /**
-     * @var array[]
-     * @psalm-var array<string, array<string, string[]>>
-     */
     private $prefixesPsr0 = array();
-    /**
-     * @var array[]
-     * @psalm-var array<string, string>
-     */
     private $fallbackDirsPsr0 = array();
-    /** @var bool */
     private $useIncludePath = false;
-    /**
-     * @var string[]
-     * @psalm-var array<string, string>
-     */
     private $classMap = array();
-    /** @var bool */
     private $classMapAuthoritative = false;
-    /**
-     * @var bool[]
-     * @psalm-var array<string, bool>
-     */
     private $missingClasses = array();
-    /** @var ?string */
     private $apcuPrefix;
-    /**
-     * @var self[]
-     */
     private static $registeredLoaders = array();
-    /**
-     * @param ?string $vendorDir
-     */
     public function __construct($vendorDir = null)
+    {
         $this->vendorDir = $vendorDir;
+        self::initializeIncludeClosure();
+    }
+    /**
+     * @return string[]
+     */
+    }
     public function getPrefixes()
+    {
 …
+    }
-    /**
-     * @return array[]
-     * @psalm-return array<string, array<int, string>>
-     */
     public function getPrefixesPsr4()
+    {
 …
+    }
-    /**
-     * @return array[]
-     * @psalm-return array<string, string>
-     */
     public function getFallbackDirs()
+    {
 …
+    }
-    /**
-     * @return array[]
-     * @psalm-return array<string, string>
-     */
     public function getFallbackDirsPsr4()
+    {
 …
+    }
-    /**
-     * @return string[] Array of classname => path
-     * @psalm-return array<string, string>
-     */
     public function getClassMap()
+    {
 …
     /**
+     * @param string[] $classMap Class to filename map
+     * @psalm-param array<string, string> $classMap
+     *
+     * @return void
+     * @param array $classMap Class to filename map
      */
     public function addClassMap(array $classMap)
 …
      * 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
+     *
+     * @return void
+     * @param string       $prefix  The prefix
+     * @param array|string $paths   The PSR-0 root directories
+     * @param bool         $prepend Whether to prepend the directories
      */
     public function add($prefix, $paths, $prepend = false)
 …
      * 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 array|string $paths   The PSR-4 base directories
+     * @param bool         $prepend Whether to prepend the directories
+     *
      * @throws \InvalidArgumentException
+     *
-     * @return void
      */
     public function addPsr4($prefix, $paths, $prepend = false)
 …
      * replacing any others previously set for this prefix.
+     *
+     * @param string          $prefix The prefix
+     * @param string[]|string $paths  The PSR-0 base directories
+     *
+     * @return void
+     * @param string       $prefix The prefix
+     * @param array|string $paths  The PSR-0 base directories
      */
     public function set($prefix, $paths)
 …
      * 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 array|string $paths  The PSR-4 base directories
+     *
      * @throws \InvalidArgumentException
+     *
-     * @return void
      */
     public function setPsr4($prefix, $paths)
 …
+     *
      * @param bool $useIncludePath
+     *
-     * @return void
      */
     public function setUseIncludePath($useIncludePath)
 …
+     *
      * @param bool $classMapAuthoritative
+     *
-     * @return void
      */
     public function setClassMapAuthoritative($classMapAuthoritative)
 …
+     *
      * @param string|null $apcuPrefix
+     *
-     * @return void
      */
     public function setApcuPrefix($apcuPrefix)
 …
+     *
      * @param bool $prepend Whether to prepend the autoloader or not
+     *
-     * @return void
      */
     public function register($prepend = false)
 …
     /**
      * Unregisters this instance as an autoloader.
+     *
-     * @return void
      */
     public function unregister()
 …
+    {
         if ($file = $this->findFile($class)) {
+            $includeFile = self::$includeFile;
+            $includeFile($file);
+            includeFile($file);
             return true;
 …
+    }
-    /**
-     * @param  string       $class
-     * @param  string       $ext
-     * @return string|false
-     */
     private function findFileWithExtension($class, $ext)
+    {
 …
         return false;
+    }
-    /**
-     * @return void
-     */
-    private static function initializeIncludeClosure()
+    {
-        if (self::$includeFile !== null) {
-            return;
+        }
-        /**
-         * Scope isolated include.
+         *
-         * Prevents access to $this/self from included files.
+         *
-         * @param  string $file
-         * @return void
-         */
-        self::$includeFile = \Closure::bind(static function($file) {
-            include $file;
-        }, null, null);
+    }
+}
+/**
+ * Scope isolated include.
+ *
+ * Prevents access to $this/self from included files.
+ */
+function includeFile($file)
+{
+    include $file;
+}

login-me-now/trunk/vendor/composer/InstalledVersions.php

-                      r2911753
+                      r2967574
  * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
+ *
+ * To require its presence, you can require `composer-runtime-api ^2.0`
+ *
+ * @final
+ * To require it's presence, you can require `composer-runtime-api ^2.0`
  */
 class InstalledVersions
+{
-    /**
-     * @var mixed[]|null
-     * @psalm-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<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
-     */
     private static $installed;
-    /**
-     * @var bool|null
-     */
     private static $canGetVendors;
-    /**
-     * @var array[]
-     * @psalm-var array<string, array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
-     */
     private static $installedByVendor = array();
 …
         foreach (self::getInstalled() as $installed) {
             if (isset($installed['versions'][$packageName])) {
                 return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
+                return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
+            }
+        }
 …
     public static function satisfies(VersionParser $parser, $packageName, $constraint)
+    {
         $constraint = $parser->parseConstraints((string) $constraint);
+        $constraint = $parser->parseConstraints($constraint);
         $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
 …
     /**
      * @return array
      * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}
+     * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}
      */
     public static function getRootPackage()
 …
      * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
      * @return array[]
      * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}
+     * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>}
      */
     public static function getRawData()
 …
+     *
      * @return array[]
      * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>}>
      */
     public static function getAllRawData()
 …
      * @return void
+     *
      * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $data
+     * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>} $data
      */
     public static function reload($data)
 …
     /**
      * @return array[]
      * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>}>
      */
     private static function getInstalled()
 …
                     $installed[] = self::$installedByVendor[$vendorDir];
                 } elseif (is_file($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<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                    $required = require $vendorDir.'/composer/installed.php';
+                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
+                    $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
                     if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
                         self::$installed = $installed[count($installed) - 1];
 …
             // 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') {
+                /** @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<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                $required = require __DIR__ . '/installed.php';
+                self::$installed = $required;
+                self::$installed = require __DIR__ . '/installed.php';
             } else {
                 self::$installed = array();
+            }
+        }
+        if (self::$installed !== array()) {
+            $installed[] = self::$installed;
+        }
+        $installed[] = self::$installed;
         return $installed;

login-me-now/trunk/vendor/composer/autoload_classmap.php

r2933044	r2967574
3	3	// autoload_classmap.php @generated by Composer
4	4
5		$vendorDir = dirname(~~__DIR__~~);
	5	$vendorDir = dirname(dirname(__FILE__));
6	6	$baseDir = dirname($vendorDir);
7	7

login-me-now/trunk/vendor/composer/autoload_files.php

-                      r2933044
+                      r2967574
 // autoload_files.php @generated by Composer
 $vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 …
     '6e3fae29631ef280660b3cdad06f25a8' => $vendorDir . '/symfony/deprecation-contracts/function.php',
     '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
+    'decc78cc4436b1292c6c0d151b19445c' => $vendorDir . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
     '1f87db08236948d07391152dccb70f04' => $vendorDir . '/google/apiclient-services/autoload.php',
-    'decc78cc4436b1292c6c0d151b19445c' => $vendorDir . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
     'a8d3953fd9959404dd22d3dfcd0a79f0' => $vendorDir . '/google/apiclient/src/aliases.php',
 );

login-me-now/trunk/vendor/composer/autoload_namespaces.php

r2852355	r2967574
3	3	// autoload_namespaces.php @generated by Composer
4	4
5		$vendorDir = dirname(~~__DIR__~~);
	5	$vendorDir = dirname(dirname(__FILE__));
6	6	$baseDir = dirname($vendorDir);
7	7

login-me-now/trunk/vendor/composer/autoload_psr4.php

-                      r2911753
+                      r2967574
 // autoload_psr4.php @generated by Composer
 $vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 …
     'phpseclib3\\' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
     'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
     'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-factory/src', $vendorDir . '/psr/http-message/src'),
+    'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-message/src', $vendorDir . '/psr/http-factory/src'),
     'Psr\\Http\\Client\\' => array($vendorDir . '/psr/http-client/src'),
     'Psr\\Cache\\' => array($vendorDir . '/psr/cache/src'),
     'ParagonIE\\ConstantTime\\' => array($vendorDir . '/paragonie/constant_time_encoding/src'),
     'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
+    'LoginMeNow\\UserSwitching\\' => array($baseDir . '/App/Modules/UserSwitching'),
+    'LoginMeNow\\Traits\\' => array($baseDir . '/App/Common/Traits'),
+    'LoginMeNow\\Routes\\' => array($baseDir . '/App/Routes'),
+    'LoginMeNow\\OnetimeNumber\\' => array($baseDir . '/App/Modules/OnetimeNumber'),
+    'LoginMeNow\\Model\\' => array($baseDir . '/App/Models'),
+    'LoginMeNow\\LoginLink\\' => array($baseDir . '/App/Modules/LoginLink'),
+    'LoginMeNow\\GoogleLogin\\' => array($baseDir . '/App/Modules/GoogleLogin'),
+    'LoginMeNow\\FacebookLogin\\' => array($baseDir . '/App/Modules/FacebookLogin'),
+    'LoginMeNow\\BrowserToken\\' => array($baseDir . '/App/Modules/BrowserToken'),
+    'LoginMeNow\\AdvanceSharing\\' => array($baseDir . '/App/Modules/AdvanceSharing'),
+    'LoginMeNow\\Abstracts\\' => array($baseDir . '/App/Common/Abstracts'),
+    'LoginMeNow\\' => array($baseDir . '/App'),
     'GuzzleHttp\\Psr7\\' => array($vendorDir . '/guzzlehttp/psr7/src'),
     'GuzzleHttp\\Promise\\' => array($vendorDir . '/guzzlehttp/promises/src'),

login-me-now/trunk/vendor/composer/autoload_real.php

-                      r2911753
+                      r2967574
 // autoload_real.php @generated by Composer
 class ComposerAutoloaderInit026869af995aef16fea57d1e5ee46649
+class ComposerAutoloaderInita52b64522988d5ee0e431730396c184f
+{
     private static $loader;
 …
         require __DIR__ . '/platform_check.php';
         spl_autoload_register(array('ComposerAutoloaderInit026869af995aef16fea57d1e5ee46649', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
         spl_autoload_unregister(array('ComposerAutoloaderInit026869af995aef16fea57d1e5ee46649', 'loadClassLoader'));
+        spl_autoload_register(array('ComposerAutoloaderInita52b64522988d5ee0e431730396c184f', 'loadClassLoader'), true, true);
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
+        spl_autoload_unregister(array('ComposerAutoloaderInita52b64522988d5ee0e431730396c184f', 'loadClassLoader'));
+        require __DIR__ . '/autoload_static.php';
+        call_user_func(\Composer\Autoload\ComposerStaticInit026869af995aef16fea57d1e5ee46649::getInitializer($loader));
+        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
+        if ($useStaticLoader) {
+            require __DIR__ . '/autoload_static.php';
+            call_user_func(\Composer\Autoload\ComposerStaticInita52b64522988d5ee0e431730396c184f::getInitializer($loader));
+        } else {
+            $map = require __DIR__ . '/autoload_namespaces.php';
+            foreach ($map as $namespace => $path) {
+                $loader->set($namespace, $path);
+            }
+            $map = require __DIR__ . '/autoload_psr4.php';
+            foreach ($map as $namespace => $path) {
+                $loader->setPsr4($namespace, $path);
+            }
+            $classMap = require __DIR__ . '/autoload_classmap.php';
+            if ($classMap) {
+                $loader->addClassMap($classMap);
+            }
+        }
         $loader->register(true);
+        $filesToLoad = \Composer\Autoload\ComposerStaticInit026869af995aef16fea57d1e5ee46649::$files;
+        $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
+            if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
+                $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
+                require $file;
+            }
+        }, null, null);
+        foreach ($filesToLoad as $fileIdentifier => $file) {
+            $requireFile($fileIdentifier, $file);
+        if ($useStaticLoader) {
+            $includeFiles = Composer\Autoload\ComposerStaticInita52b64522988d5ee0e431730396c184f::$files;
+        } else {
+            $includeFiles = require __DIR__ . '/autoload_files.php';
+        }
+        foreach ($includeFiles as $fileIdentifier => $file) {
+            composerRequirea52b64522988d5ee0e431730396c184f($fileIdentifier, $file);
+        }
 …
+    }
+}
+function composerRequirea52b64522988d5ee0e431730396c184f($fileIdentifier, $file)
+{
+    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
+        require $file;
+        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
+    }
+}

login-me-now/trunk/vendor/composer/autoload_static.php

-                      r2933044
+                      r2967574
 namespace Composer\Autoload;
 class ComposerStaticInit026869af995aef16fea57d1e5ee46649
+class ComposerStaticInita52b64522988d5ee0e431730396c184f
+{
     public static $files = array (
 …
         '6e3fae29631ef280660b3cdad06f25a8' => __DIR__ . '/..' . '/symfony/deprecation-contracts/function.php',
         '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
+        'decc78cc4436b1292c6c0d151b19445c' => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
         '1f87db08236948d07391152dccb70f04' => __DIR__ . '/..' . '/google/apiclient-services/autoload.php',
-        'decc78cc4436b1292c6c0d151b19445c' => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
         'a8d3953fd9959404dd22d3dfcd0a79f0' => __DIR__ . '/..' . '/google/apiclient/src/aliases.php',
     );
 …
         array (
             'Monolog\\' => 8,
+        ),
+        'L' =>
+        array (
+            'LoginMeNow\\UserSwitching\\' => 25,
+            'LoginMeNow\\Traits\\' => 18,
+            'LoginMeNow\\Routes\\' => 18,
+            'LoginMeNow\\OnetimeNumber\\' => 25,
+            'LoginMeNow\\Model\\' => 17,
+            'LoginMeNow\\LoginLink\\' => 21,
+            'LoginMeNow\\GoogleLogin\\' => 23,
+            'LoginMeNow\\FacebookLogin\\' => 25,
+            'LoginMeNow\\BrowserToken\\' => 24,
+            'LoginMeNow\\AdvanceSharing\\' => 26,
+            'LoginMeNow\\Abstracts\\' => 21,
+            'LoginMeNow\\' => 11,
         ),
         'G' =>
 …
         'Psr\\Http\\Message\\' =>
         array (
 => __DIR__ . '/..' . '/psr/http-factory/src',
 => __DIR__ . '/..' . '/psr/http-message/src',
+=> __DIR__ . '/..' . '/psr/http-message/src',
+=> __DIR__ . '/..' . '/psr/http-factory/src',
         ),
         'Psr\\Http\\Client\\' =>
 …
         array (
 => __DIR__ . '/..' . '/monolog/monolog/src/Monolog',
+        ),
+        'LoginMeNow\\UserSwitching\\' =>
+        array (
+=> __DIR__ . '/../..' . '/App/Modules/UserSwitching',
+        ),
+        'LoginMeNow\\Traits\\' =>
+        array (
+=> __DIR__ . '/../..' . '/App/Common/Traits',
+        ),
+        'LoginMeNow\\Routes\\' =>
+        array (
+=> __DIR__ . '/../..' . '/App/Routes',
+        ),
+        'LoginMeNow\\OnetimeNumber\\' =>
+        array (
+=> __DIR__ . '/../..' . '/App/Modules/OnetimeNumber',
+        ),
+        'LoginMeNow\\Model\\' =>
+        array (
+=> __DIR__ . '/../..' . '/App/Models',
+        ),
+        'LoginMeNow\\LoginLink\\' =>
+        array (
+=> __DIR__ . '/../..' . '/App/Modules/LoginLink',
+        ),
+        'LoginMeNow\\GoogleLogin\\' =>
+        array (
+=> __DIR__ . '/../..' . '/App/Modules/GoogleLogin',
+        ),
+        'LoginMeNow\\FacebookLogin\\' =>
+        array (
+=> __DIR__ . '/../..' . '/App/Modules/FacebookLogin',
+        ),
+        'LoginMeNow\\BrowserToken\\' =>
+        array (
+=> __DIR__ . '/../..' . '/App/Modules/BrowserToken',
+        ),
+        'LoginMeNow\\AdvanceSharing\\' =>
+        array (
+=> __DIR__ . '/../..' . '/App/Modules/AdvanceSharing',
+        ),
+        'LoginMeNow\\Abstracts\\' =>
+        array (
+=> __DIR__ . '/../..' . '/App/Common/Abstracts',
+        ),
+        'LoginMeNow\\' =>
+        array (
+=> __DIR__ . '/../..' . '/App',
         ),
         'GuzzleHttp\\Psr7\\' =>
 …
+    {
         return \Closure::bind(function () use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInit026869af995aef16fea57d1e5ee46649::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInit026869af995aef16fea57d1e5ee46649::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInit026869af995aef16fea57d1e5ee46649::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInita52b64522988d5ee0e431730396c184f::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInita52b64522988d5ee0e431730396c184f::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInita52b64522988d5ee0e431730396c184f::$classMap;
         }, null, ClassLoader::class);

login-me-now/trunk/vendor/composer/installed.json

-                      r2933044
+                      r2967574
+        {
             "name": "firebase/php-jwt",
             "version": "v6.5.0",
             "version_normalized": "6.5.0.0",
+            "version": "v6.8.1",
+            "version_normalized": "6.8.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/firebase/php-jwt.git",
                 "reference": "e94e7353302b0c11ec3cfff7180cd0b1743975d2"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/firebase/php-jwt/zipball/e94e7353302b0c11ec3cfff7180cd0b1743975d2",
                 "reference": "e94e7353302b0c11ec3cfff7180cd0b1743975d2",
+                "reference": "5dbc8959427416b8ee09a100d7a8588c00fb2e26"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/5dbc8959427416b8ee09a100d7a8588c00fb2e26",
+                "reference": "5dbc8959427416b8ee09a100d7a8588c00fb2e26",
                 "shasum": ""
             },
 …
                 "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present"
             },
             "time": "2023-05-12T15:47:07+00:00",
+            "time": "2023-07-14T18:33:00+00:00",
             "type": "library",
             "installation-source": "dist",
 …
             "support": {
                 "issues": "https://github.com/firebase/php-jwt/issues",
                 "source": "https://github.com/firebase/php-jwt/tree/v6.5.0"
+                "source": "https://github.com/firebase/php-jwt/tree/v6.8.1"
             },
             "install-path": "../firebase/php-jwt"
 …
+        {
             "name": "google/apiclient-services",
             "version": "v0.303.0",
             "version_normalized": "0.303.0.0",
+            "version": "v0.312.0",
+            "version_normalized": "0.312.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/googleapis/google-api-php-client-services.git",
                 "reference": "b9c143453a94d5e6ed7257d065dcc5662619eaf4"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/b9c143453a94d5e6ed7257d065dcc5662619eaf4",
                 "reference": "b9c143453a94d5e6ed7257d065dcc5662619eaf4",
+                "reference": "45d47fed73b28254c511882bc743b1690a99558d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/45d47fed73b28254c511882bc743b1690a99558d",
+                "reference": "45d47fed73b28254c511882bc743b1690a99558d",
                 "shasum": ""
             },
 …
                 "phpunit/phpunit": "^5.7||^8.5.13"
             },
             "time": "2023-06-04T01:12:12+00:00",
+            "time": "2023-08-14T00:56:12+00:00",
             "type": "library",
             "installation-source": "dist",
 …
             "support": {
                 "issues": "https://github.com/googleapis/google-api-php-client-services/issues",
                 "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.303.0"
+                "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.312.0"
             },
             "install-path": "../google/apiclient-services"
 …
+        {
             "name": "guzzlehttp/promises",
             "version": "2.0.0",
             "version_normalized": "2.0.0.0",
+            "version": "2.0.1",
+            "version_normalized": "2.0.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
                 "reference": "3a494dc7dc1d7d12e511890177ae2d0e6c107da6"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/guzzle/promises/zipball/3a494dc7dc1d7d12e511890177ae2d0e6c107da6",
                 "reference": "3a494dc7dc1d7d12e511890177ae2d0e6c107da6",
+                "reference": "111166291a0f8130081195ac4556a5587d7f1b5d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/111166291a0f8130081195ac4556a5587d7f1b5d",
+                "reference": "111166291a0f8130081195ac4556a5587d7f1b5d",
                 "shasum": ""
             },
 …
                 "phpunit/phpunit": "^8.5.29 || ^9.5.23"
             },
             "time": "2023-05-21T13:50:22+00:00",
+            "time": "2023-08-03T15:11:55+00:00",
             "type": "library",
             "extra": {
 …
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
                 "source": "https://github.com/guzzle/promises/tree/2.0.0"
+                "source": "https://github.com/guzzle/promises/tree/2.0.1"
             },
             "funding": [
 …
+        {
             "name": "guzzlehttp/psr7",
             "version": "2.5.0",
             "version_normalized": "2.5.0.0",
+            "version": "2.6.0",
+            "version_normalized": "2.6.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
                 "reference": "b635f279edd83fc275f822a1188157ffea568ff6"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6",
                 "reference": "b635f279edd83fc275f822a1188157ffea568ff6",
+                "reference": "8bd7c33a0734ae1c5d074360512beb716bef3f77"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/8bd7c33a0734ae1c5d074360512beb716bef3f77",
+                "reference": "8bd7c33a0734ae1c5d074360512beb716bef3f77",
                 "shasum": ""
             },
 …
                 "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
             },
             "time": "2023-04-17T16:11:26+00:00",
+            "time": "2023-08-03T15:06:02+00:00",
             "type": "library",
             "extra": {
 …
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
                 "source": "https://github.com/guzzle/psr7/tree/2.5.0"
+                "source": "https://github.com/guzzle/psr7/tree/2.6.0"
             },
             "funding": [
 …
+        {
             "name": "phpseclib/phpseclib",
             "version": "3.0.19",
             "version_normalized": "3.0.19.0",
+            "version": "3.0.21",
+            "version_normalized": "3.0.21.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
                 "reference": "cc181005cf548bfd8a4896383bb825d859259f95"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/cc181005cf548bfd8a4896383bb825d859259f95",
                 "reference": "cc181005cf548bfd8a4896383bb825d859259f95",
+                "reference": "4580645d3fc05c189024eb3b834c6c1e4f0f30a1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/4580645d3fc05c189024eb3b834c6c1e4f0f30a1",
+                "reference": "4580645d3fc05c189024eb3b834c6c1e4f0f30a1",
                 "shasum": ""
             },
 …
                 "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
             },
             "time": "2023-03-05T17:13:09+00:00",
+            "time": "2023-07-09T15:24:48+00:00",
             "type": "library",
             "installation-source": "dist",
 …
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
                 "source": "https://github.com/phpseclib/phpseclib/tree/3.0.19"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.21"
             },
             "funding": [

login-me-now/trunk/vendor/composer/installed.php

-                      r2933044
+                      r2967574
 <?php return array(
     'root' => array(
-        'name' => '__root__',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '67ab278990cf6ea914610b24342ebfa80a2f54eb',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
+        'reference' => '2dbb85dd82352433c4b6befcc78484084dcff081',
+        'name' => 'halalbrains/login-me-now',
         'dev' => true,
     ),
     'versions' => array(
-        '__root__' => array(
-            'pretty_version' => 'dev-master',
-            'version' => 'dev-master',
-            'reference' => '67ab278990cf6ea914610b24342ebfa80a2f54eb',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../../',
-            'aliases' => array(),
-            'dev_requirement' => false,
-        ),
         'firebase/php-jwt' => array(
+            'pretty_version' => 'v6.5.0',
+            'version' => '6.5.0.0',
+            'reference' => 'e94e7353302b0c11ec3cfff7180cd0b1743975d2',
+            'pretty_version' => 'v6.8.1',
+            'version' => '6.8.1.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../firebase/php-jwt',
             'aliases' => array(),
+            'reference' => '5dbc8959427416b8ee09a100d7a8588c00fb2e26',
             'dev_requirement' => false,
         ),
 …
             'pretty_version' => 'v2.15.0',
             'version' => '2.15.0.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../google/apiclient',
+            'aliases' => array(),
             'reference' => '49787fa30b8d8313146a61efbf77ed1fede723c2',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../google/apiclient',
-            'aliases' => array(),
             'dev_requirement' => false,
         ),
         'google/apiclient-services' => array(
+            'pretty_version' => 'v0.303.0',
+            'version' => '0.303.0.0',
+            'reference' => 'b9c143453a94d5e6ed7257d065dcc5662619eaf4',
+            'pretty_version' => 'v0.312.0',
+            'version' => '0.312.0.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../google/apiclient-services',
             'aliases' => array(),
+            'reference' => '45d47fed73b28254c511882bc743b1690a99558d',
             'dev_requirement' => false,
         ),
 …
             'pretty_version' => 'v1.28.0',
             'version' => '1.28.0.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../google/auth',
+            'aliases' => array(),
             'reference' => '07f7f6305f1b7df32b2acf6e101c1225c839c7ac',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../google/auth',
-            'aliases' => array(),
             'dev_requirement' => false,
         ),
 …
             'pretty_version' => '7.7.0',
             'version' => '7.7.0.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../guzzlehttp/guzzle',
+            'aliases' => array(),
             'reference' => 'fb7566caccf22d74d1ab270de3551f72a58399f5',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../guzzlehttp/guzzle',
-            'aliases' => array(),
             'dev_requirement' => false,
         ),
         'guzzlehttp/promises' => array(
+            'pretty_version' => '2.0.0',
+            'version' => '2.0.0.0',
+            'reference' => '3a494dc7dc1d7d12e511890177ae2d0e6c107da6',
+            'pretty_version' => '2.0.1',
+            'version' => '2.0.1.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../guzzlehttp/promises',
             'aliases' => array(),
+            'reference' => '111166291a0f8130081195ac4556a5587d7f1b5d',
             'dev_requirement' => false,
         ),
         'guzzlehttp/psr7' => array(
+            'pretty_version' => '2.5.0',
+            'version' => '2.5.0.0',
+            'reference' => 'b635f279edd83fc275f822a1188157ffea568ff6',
+            'pretty_version' => '2.6.0',
+            'version' => '2.6.0.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../guzzlehttp/psr7',
             'aliases' => array(),
+            'reference' => '8bd7c33a0734ae1c5d074360512beb716bef3f77',
+            'dev_requirement' => false,
+        ),
+        'halalbrains/login-me-now' => array(
+            'pretty_version' => 'dev-master',
+            'version' => 'dev-master',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../../',
+            'aliases' => array(),
+            'reference' => '2dbb85dd82352433c4b6befcc78484084dcff081',
             'dev_requirement' => false,
         ),
 …
             'pretty_version' => '2.9.1',
             'version' => '2.9.1.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../monolog/monolog',
+            'aliases' => array(),
             'reference' => 'f259e2b15fb95494c83f52d3caad003bbf5ffaa1',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../monolog/monolog',
-            'aliases' => array(),
             'dev_requirement' => false,
         ),
 …
             'pretty_version' => 'v2.6.3',
             'version' => '2.6.3.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../paragonie/constant_time_encoding',
+            'aliases' => array(),
             'reference' => '58c3f47f650c94ec05a151692652a868995d2938',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../paragonie/constant_time_encoding',
-            'aliases' => array(),
             'dev_requirement' => false,
         ),
 …
             'pretty_version' => 'v9.99.100',
             'version' => '9.99.100.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../paragonie/random_compat',
+            'aliases' => array(),
             'reference' => '996434e5492cb4c3edcb9168db6fbb1359ef965a',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../paragonie/random_compat',
-            'aliases' => array(),
             'dev_requirement' => false,
         ),
         'phpseclib/phpseclib' => array(
+            'pretty_version' => '3.0.19',
+            'version' => '3.0.19.0',
+            'reference' => 'cc181005cf548bfd8a4896383bb825d859259f95',
+            'pretty_version' => '3.0.21',
+            'version' => '3.0.21.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpseclib/phpseclib',
             'aliases' => array(),
+            'reference' => '4580645d3fc05c189024eb3b834c6c1e4f0f30a1',
             'dev_requirement' => false,
         ),
 …
             'pretty_version' => '1.0.1',
             'version' => '1.0.1.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/cache',
+            'aliases' => array(),
             'reference' => 'd11b50ad223250cf17b86e38383413f5a6764bf8',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../psr/cache',
-            'aliases' => array(),
             'dev_requirement' => false,
         ),
 …
             'pretty_version' => '1.0.2',
             'version' => '1.0.2.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/http-client',
+            'aliases' => array(),
             'reference' => '0955afe48220520692d2d09f7ab7e0f93ffd6a31',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../psr/http-client',
-            'aliases' => array(),
             'dev_requirement' => false,
         ),
 …
             'pretty_version' => '1.0.2',
             'version' => '1.0.2.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/http-factory',
+            'aliases' => array(),
             'reference' => 'e616d01114759c4c489f93b099585439f795fe35',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../psr/http-factory',
-            'aliases' => array(),
             'dev_requirement' => false,
         ),
 …
             'pretty_version' => '2.0',
             'version' => '2.0.0.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/http-message',
+            'aliases' => array(),
             'reference' => '402d35bcb92c70c026d1a6a9883f06b2ead23d71',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../psr/http-message',
-            'aliases' => array(),
             'dev_requirement' => false,
         ),
 …
             'pretty_version' => '1.1.4',
             'version' => '1.1.4.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/log',
+            'aliases' => array(),
             'reference' => 'd49695b909c3b7628b6289db5479a1c204601f11',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../psr/log',
-            'aliases' => array(),
             'dev_requirement' => false,
         ),
 …
             'pretty_version' => '3.0.3',
             'version' => '3.0.3.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../ralouphie/getallheaders',
+            'aliases' => array(),
             'reference' => '120b605dfeb996808c31b6477290a714d356e822',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../ralouphie/getallheaders',
-            'aliases' => array(),
             'dev_requirement' => false,
         ),
 …
             'pretty_version' => 'v2.5.2',
             'version' => '2.5.2.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/deprecation-contracts',
+            'aliases' => array(),
             'reference' => 'e8b495ea28c1d97b5e0c121748d6f9b53d075c66',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../symfony/deprecation-contracts',
-            'aliases' => array(),
             'dev_requirement' => false,
         ),

login-me-now/trunk/vendor/firebase/php-jwt/CHANGELOG.md

-                      r2933044
+                      r2967574
 # Changelog
+## [6.8.1](https://github.com/firebase/php-jwt/compare/v6.8.0...v6.8.1) (2023-07-14)
+### Bug Fixes
+* accept float claims but round down to ignore them ([#492](https://github.com/firebase/php-jwt/issues/492)) ([3936842](https://github.com/firebase/php-jwt/commit/39368423beeaacb3002afa7dcb75baebf204fe7e))
+* different BeforeValidException messages for nbf and iat ([#526](https://github.com/firebase/php-jwt/issues/526)) ([0a53cf2](https://github.com/firebase/php-jwt/commit/0a53cf2986e45c2bcbf1a269f313ebf56a154ee4))
+## [6.8.0](https://github.com/firebase/php-jwt/compare/v6.7.0...v6.8.0) (2023-06-14)
+### Features
+* add support for P-384 curve ([#515](https://github.com/firebase/php-jwt/issues/515)) ([5de4323](https://github.com/firebase/php-jwt/commit/5de4323f4baf4d70bca8663bd87682a69c656c3d))
+### Bug Fixes
+* handle invalid http responses ([#508](https://github.com/firebase/php-jwt/issues/508)) ([91c39c7](https://github.com/firebase/php-jwt/commit/91c39c72b22fc3e1191e574089552c1f2041c718))
+## [6.7.0](https://github.com/firebase/php-jwt/compare/v6.6.0...v6.7.0) (2023-06-14)
+### Features
+* add ed25519 support to JWK (public keys) ([#452](https://github.com/firebase/php-jwt/issues/452)) ([e53979a](https://github.com/firebase/php-jwt/commit/e53979abae927de916a75b9d239cfda8ce32be2a))
+## [6.6.0](https://github.com/firebase/php-jwt/compare/v6.5.0...v6.6.0) (2023-06-13)
+### Features
+* allow get headers when decoding token ([#442](https://github.com/firebase/php-jwt/issues/442)) ([fb85f47](https://github.com/firebase/php-jwt/commit/fb85f47cfaeffdd94faf8defdf07164abcdad6c3))
+### Bug Fixes
+* only check iat if nbf is not used ([#493](https://github.com/firebase/php-jwt/issues/493)) ([398ccd2](https://github.com/firebase/php-jwt/commit/398ccd25ea12fa84b9e4f1085d5ff448c21ec797))
 ## [6.5.0](https://github.com/firebase/php-jwt/compare/v6.4.0...v6.5.0) (2023-05-12)

login-me-now/trunk/vendor/firebase/php-jwt/README.md

-                      r2933044
+                      r2967574
 $jwt = JWT::encode($payload, $key, 'HS256');
 $decoded = JWT::decode($jwt, new Key($key, 'HS256'));
 print_r($decoded);
+// Pass a stdClass in as the third parameter to get the decoded header values
+$decoded = JWT::decode($jwt, new Key($key, 'HS256'), $headers = new stdClass());
+print_r($headers);
 /*
 …
 this library. This is because without verifying the JWT, the header values could have been tampered with.
 Any value pulled from an unverified header should be treated as if it could be any string sent in from an
 attacker.  If this is something you still want to do in your application for whatever reason, it's possible to
 decode the header values manually simply by calling `json_decode` and `base64_decode` on the JWT
+attacker.  If this is something you still want to do in your application for whatever reason, it's possible to
+decode the header values manually simply by calling `json_decode` and `base64_decode` on the JWT
 header part:
 ```php
 …
 ```php
+use Firebase\JWT\JWT;
+use UnexpectedValueException;
 try {
     $decoded = JWT::decode($payload, $keys);

login-me-now/trunk/vendor/firebase/php-jwt/src/CachedKeySet.php

-                      r2911753
+                      r2967574
             $request = $this->httpFactory->createRequest('GET', $this->jwksUri);
             $jwksResponse = $this->httpClient->sendRequest($request);
+            if ($jwksResponse->getStatusCode() !== 200) {
+                throw new UnexpectedValueException(
+                    sprintf('HTTP Error: %d %s for URI "%s"',
+                        $jwksResponse->getStatusCode(),
+                        $jwksResponse->getReasonPhrase(),
+                        $this->jwksUri,
+                    ),
+                    $jwksResponse->getStatusCode()
+                );
+            }
             $this->keySet = $this->formatJwksForCache((string) $jwksResponse->getBody());

login-me-now/trunk/vendor/firebase/php-jwt/src/JWK.php

-                      r2911753
+                      r2967574
         'P-256' => '1.2.840.10045.3.1.7', // Len: 64
         'secp256k1' => '1.3.132.0.10', // Len: 64
         // 'P-384' => '1.3.132.0.34', // Len: 96 (not yet supported)
+        'P-384' => '1.3.132.0.34', // Len: 96
         // 'P-521' => '1.3.132.0.35', // Len: 132 (not supported)
+    ];
+    // For keys with "kty" equal to "OKP" (Octet Key Pair), the "crv" parameter must contain the key subtype.
+    // This library supports the following subtypes:
+    private const OKP_SUBTYPES = [
+        'Ed25519' => true, // RFC 8037
     ];
 …
                 $publicKey = self::createPemFromCrvAndXYCoordinates($jwk['crv'], $jwk['x'], $jwk['y']);
                 return new Key($publicKey, $jwk['alg']);
+            case 'OKP':
+                if (isset($jwk['d'])) {
+                    // The key is actually a private key
+                    throw new UnexpectedValueException('Key data must be for a public key');
+                }
+                if (!isset($jwk['crv'])) {
+                    throw new UnexpectedValueException('crv not set');
+                }
+                if (empty(self::OKP_SUBTYPES[$jwk['crv']])) {
+                    throw new DomainException('Unrecognised or unsupported OKP key subtype');
+                }
+                if (empty($jwk['x'])) {
+                    throw new UnexpectedValueException('x not set');
+                }
+                // This library works internally with EdDSA keys (Ed25519) encoded in standard base64.
+                $publicKey = JWT::convertBase64urlToBase64($jwk['x']);
+                return new Key($publicKey, $jwk['alg']);
             default:
-                // Currently only RSA is supported
                 break;
+        }
 …
      * Converts the EC JWK values to pem format.
+     *
      * @param   string  $crv The EC curve (only P-256 is supported)
+     * @param   string  $crv The EC curve (only P-256 & P-384 is supported)
      * @param   string  $x   The EC x-coordinate
      * @param   string  $y   The EC y-coordinate

login-me-now/trunk/vendor/firebase/php-jwt/src/JWT.php

-                      r2933044
+                      r2967574
      *                                                                      'HS256', 'HS384', 'HS512', 'RS256', 'RS384'
      *                                                                      and 'RS512'.
+     * @param stdClass               $headers                               Optional. Populates stdClass with headers.
+     *
      * @return stdClass The JWT's payload as a PHP object
 …
     public static function decode(
         string $jwt,
+        $keyOrKeyArray
+        $keyOrKeyArray,
+        stdClass &$headers = null
     ): stdClass {
         // Validate JWT
 …
             throw new UnexpectedValueException('Invalid header encoding');
+        }
+        if ($headers !== null) {
+            $headers = $header;
+        }
         $payloadRaw = static::urlsafeB64Decode($bodyb64);
         if (null === ($payload = static::jsonDecode($payloadRaw))) {
 …
         // Check the nbf if it is defined. This is the time that the
         // token can actually be used. If it's not yet that time, abort.
         if (isset($payload->nbf) && $payload->nbf > ($timestamp + static::$leeway)) {
+        if (isset($payload->nbf) && floor($payload->nbf) > ($timestamp + static::$leeway)) {
             throw new BeforeValidException(
                 'Cannot handle token prior to ' . \date(DateTime::ISO8601, $payload->nbf)
+                'Cannot handle token with nbf prior to ' . \date(DateTime::ISO8601, (int) $payload->nbf)
             );
+        }
 …
         // using tokens that have been created for later use (and haven't
         // correctly used the nbf claim).
         if (isset($payload->iat) && $payload->iat > ($timestamp + static::$leeway)) {
+        if (!isset($payload->nbf) && isset($payload->iat) && floor($payload->iat) > ($timestamp + static::$leeway)) {
             throw new BeforeValidException(
                 'Cannot handle token prior to ' . \date(DateTime::ISO8601, $payload->iat)
+                'Cannot handle token with iat prior to ' . \date(DateTime::ISO8601, (int) $payload->iat)
             );
+        }
 …
      * @param string $msg  The message to sign
      * @param string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate  $key  The secret key.
      * @param string $alg  Supported algorithms are 'ES384','ES256', 'ES256K', 'HS256',
+     * @param string $alg  Supported algorithms are 'EdDSA', 'ES384', 'ES256', 'ES256K', 'HS256',
      *                    'HS384', 'HS512', 'RS256', 'RS384', and 'RS512'
+     *
 …
      * @param string $msg         The original message (header and body)
      * @param string $signature   The original signature
      * @param string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate  $keyMaterial For HS*, a string key works. for RS*, must be an instance of OpenSSLAsymmetricKey
+     * @param string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate  $keyMaterial For Ed*, ES*, HS*, a string key works. for RS*, must be an instance of OpenSSLAsymmetricKey
      * @param string $alg         The algorithm
+     *
 …
     public static function urlsafeB64Decode(string $input): string
+    {
+        return \base64_decode(self::convertBase64UrlToBase64($input));
+    }
+    /**
+     * Convert a string in the base64url (URL-safe Base64) encoding to standard base64.
+     *
+     * @param string $input A Base64 encoded string with URL-safe characters (-_ and no padding)
+     *
+     * @return string A Base64 encoded string with standard characters (+/) and padding (=), when
+     * needed.
+     *
+     * @see https://www.rfc-editor.org/rfc/rfc4648
+     */
+    public static function convertBase64UrlToBase64(string $input): string
+    {
         $remainder = \strlen($input) % 4;
         if ($remainder) {
 …
             $input .= \str_repeat('=', $padlen);
+        }
         return \base64_decode(\strtr($input, '-_', '+/'));
+        return \strtr($input, '-_', '+/');
+    }

login-me-now/trunk/vendor/google/apiclient-services/src/Oauth2/Resource/UserinfoV2Me.php

r2911753	r2967574
34	34	*
35	35	* @param array $optParams Optional parameters.
36		* @return Userinfo
	36	* @return UserinfoModel
37	37	*/
38	38	public function get($optParams = [])

login-me-now/trunk/vendor/guzzlehttp/promises/CHANGELOG.md

-                      r2933044
+                      r2967574
+## 2.0.0 - TBC
+## 2.0.1 - 2023-08-03
+### Changed
+- PHP 8.3 support
+## 2.0.0 - 2023-05-21
 ### Added

login-me-now/trunk/vendor/guzzlehttp/promises/README.md

r2933044	r2967574
42	42	\|---------\|------------------------\|--------------\|
43	43	\| 1.x \| Bug and security fixes \| >=5.5,<8.3 \|
44		\| 2.x \| Latest \| >=7.2.5,<8.3 \|
	44	\| 2.x \| Latest \| >=7.2.5,<8.4 \|
45	45
46	46

login-me-now/trunk/vendor/guzzlehttp/promises/src/RejectionException.php

r2933044	r2967574
19	19	* @param string\|null $description Optional description.
20	20	*/
21		public function __construct($reason, $description = null)
	21	public function __construct($reason, ?string $description = null)
22	22	{
23	23	$this->reason = $reason;

login-me-now/trunk/vendor/guzzlehttp/psr7/CHANGELOG.md

-                      r2911753
+                      r2967574
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## Unreleased
+## 2.6.0 - 2023-08-03
+### Changed
+- Updated the mime type map to add some new entries, fix a couple of invalid entries, and remove an invalid entry
+- Fallback to `application/octet-stream` if we are unable to guess the content type for a multipart file upload
+## 2.5.1 - 2023-08-03
+### Fixed
+- Corrected mime type for `.acc` files to `audio/aac`
+### Changed
+- PHP 8.3 support
 ## 2.5.0 - 2023-04-17

login-me-now/trunk/vendor/guzzlehttp/psr7/README.md

-                      r2911753
+                      r2967574
+# Installation
+## Features
+This package comes with a number of stream implementations and stream
+decorators.
+## Installation
 ```shell
 …
 ```
+# Stream implementation
+This package comes with a number of stream implementations and stream
+decorators.
+## Version Guidance
+| Version | Status              | PHP Version  |
+|---------|---------------------|--------------|
+| 1.x     | Security fixes only | >=5.4,<8.1   |
+| 2.x     | Latest              | >=7.2.5,<8.4 |
 …
-## Version Guidance
-| Version | Status         | PHP Version      |
-|---------|----------------|------------------|
-| 1.x     | Security fixes | >=5.4,<8.1       |
-| 2.x     | Latest         | ^7.2.5 \|\| ^8.0 |
 ## Security

login-me-now/trunk/vendor/guzzlehttp/psr7/src/AppendStream.php

r2911753	r2967574
41	41	try {
42	42	$this->rewind();
	43
43	44	return $this->getContents();
44	45	} catch (\Throwable $e) {
…	…
47	48	}
48	49	trigger_error(sprintf('%s::__toString exception: %s', self::class, (string) $e), E_USER_ERROR);
	50
49	51	return '';
50	52	}
…	…
168	170	} catch (\Exception $e) {
169	171	throw new \RuntimeException('Unable to seek stream '
170		. ~~$i .~~ ' of the AppendStream', 0, $e);
	172	.$i.' of the AppendStream', 0, $e);
171	173	}
172	174	}
…	…
198	200	break;
199	201	}
200		~~$this->current++~~;
	202	++$this->current;
201	203	}
202	204

login-me-now/trunk/vendor/guzzlehttp/psr7/src/FnStream.php

r2911753	r2967574
19	19	'__toString', 'close', 'detach', 'rewind',
20	20	'getSize', 'tell', 'eof', 'isSeekable', 'seek', 'isWritable', 'write',
21		'isReadable', 'read', 'getContents', 'getMetadata'
	21	'isReadable', 'read', 'getContents', 'getMetadata',
22	22	];
23	23
…	…
34	34	// Create the functions on the class
35	35	foreach ($methods as $name => $fn) {
36		$this->{'_fn_' . $name} = $fn;
	36	$this->{'_fn_'.$name} = $fn;
37	37	}
38	38	}
…	…
46	46	{
47	47	throw new \BadMethodCallException(str_replace('_fn_', '', $name)
48		. '() is not implemented in the FnStream');
	48	.'() is not implemented in the FnStream');
49	49	}
50	50
…	…
100	100	}
101	101	trigger_error(sprintf('%s::__toString exception: %s', self::class, (string) $e), E_USER_ERROR);
	102
102	103	return '';
103	104	}

login-me-now/trunk/vendor/guzzlehttp/psr7/src/Header.php

r2911753	r2967574
90	90	$isQuoted = false;
91	91	$isEscaped = false;
92		for ($i = 0, $max = \strlen($value); $i < $max; ~~$i++~~) {
	92	for ($i = 0, $max = \strlen($value); $i < $max; ++$i) {
93	93	if ($isEscaped) {
94	94	$v .= $value[$i];

login-me-now/trunk/vendor/guzzlehttp/psr7/src/HttpFactory.php

-                      r2911753
+                      r2967574
  * and inject the instance of this class multiple times.
  */
+final class HttpFactory implements
+    RequestFactoryInterface,
+    ResponseFactoryInterface,
+    ServerRequestFactoryInterface,
+    StreamFactoryInterface,
+    UploadedFileFactoryInterface,
+    UriFactoryInterface
+final class HttpFactory implements RequestFactoryInterface, ResponseFactoryInterface, ServerRequestFactoryInterface, StreamFactoryInterface, UploadedFileFactoryInterface, UriFactoryInterface
+{
     public function createUploadedFile(

login-me-now/trunk/vendor/guzzlehttp/psr7/src/InflateStream.php

-                      r2911753
+                      r2967574
  * to a Guzzle stream resource to be used as a Guzzle stream.
+ *
  * @link http://tools.ietf.org/html/rfc1950
  * @link http://tools.ietf.org/html/rfc1952
  * @link http://php.net/manual/en/filters.compression.php
+ * @see http://tools.ietf.org/html/rfc1950
+ * @see http://tools.ietf.org/html/rfc1952
+ * @see http://php.net/manual/en/filters.compression.php
  */
 final class InflateStream implements StreamInterface

login-me-now/trunk/vendor/guzzlehttp/psr7/src/Message.php

-                      r2911753
+                      r2967574
+    {
         if ($message instanceof RequestInterface) {
             $msg = trim($message->getMethod() . ' '
                     . $message->getRequestTarget())
                 . ' HTTP/' . $message->getProtocolVersion();
+            $msg = trim($message->getMethod().' '
+                    .$message->getRequestTarget())
+                .' HTTP/'.$message->getProtocolVersion();
             if (!$message->hasHeader('host')) {
                 $msg .= "\r\nHost: " . $message->getUri()->getHost();
+                $msg .= "\r\nHost: ".$message->getUri()->getHost();
+            }
         } elseif ($message instanceof ResponseInterface) {
             $msg = 'HTTP/' . $message->getProtocolVersion() . ' '
                 . $message->getStatusCode() . ' '
                 . $message->getReasonPhrase();
+            $msg = 'HTTP/'.$message->getProtocolVersion().' '
+                .$message->getStatusCode().' '
+                .$message->getReasonPhrase();
         } else {
             throw new \InvalidArgumentException('Unknown message type');
 …
             if (strtolower($name) === 'set-cookie') {
                 foreach ($values as $value) {
                     $msg .= "\r\n{$name}: " . $value;
+                    $msg .= "\r\n{$name}: ".$value;
+                }
             } else {
                 $msg .= "\r\n{$name}: " . implode(', ', $values);
+                $msg .= "\r\n{$name}: ".implode(', ', $values);
+            }
+        }
         return "{$msg}\r\n\r\n" . $message->getBody();
+        return "{$msg}\r\n\r\n".$message->getBody();
+    }
 …
         $scheme = substr($host, -4) === ':443' ? 'https' : 'http';
         return $scheme . '://' . $host . '/' . ltrim($path, '/');
+        return $scheme.'://'.$host.'/'.ltrim($path, '/');
+    }
 …
         // responses without space and reason as well.
         if (!preg_match('/^HTTP\/.* [0-9]{3}( .*|$)/', $data['start-line'])) {
             throw new \InvalidArgumentException('Invalid response string: ' . $data['start-line']);
+            throw new \InvalidArgumentException('Invalid response string: '.$data['start-line']);
+        }
         $parts = explode(' ', $data['start-line'], 3);

login-me-now/trunk/vendor/guzzlehttp/psr7/src/MessageTrait.php

-                      r2911753
+                      r2967574
     /** @var array<string, string> Map of lowercase header name => original name at registration */
     private $headerNames  = [];
+    private $headerNames = [];
     /** @var string */
 …
         $new = clone $this;
         $new->protocol = $version;
         return $new;
+    }
 …
         $new = clone $this;
         $new->stream = $body;
         return $new;
+    }
 …
+        }
         if (! preg_match('/^[a-zA-Z0-9\'`#$%&*+.^_|~!-]+$/D', $header)) {
+        if (!preg_match('/^[a-zA-Z0-9\'`#$%&*+.^_|~!-]+$/D', $header)) {
             throw new \InvalidArgumentException(
                 sprintf('"%s" is not valid header name.', $header)
 …
         // likely very rare. Line folding is a fairly obscure feature of HTTP/1.1 and thus not accepting
         // folding is not likely to break any legitimate use case.
         if (! preg_match('/^[\x20\x09\x21-\x7E\x80-\xFF]*$/D', $value)) {
+        if (!preg_match('/^[\x20\x09\x21-\x7E\x80-\xFF]*$/D', $value)) {
             throw new \InvalidArgumentException(
                 sprintf('"%s" is not valid header value.', $value)

login-me-now/trunk/vendor/guzzlehttp/psr7/src/MimeType.php

-                      r2911753
+                      r2967574
         '123' => 'application/vnd.lotus-1-2-3',
         'aab' => 'application/x-authorware-bin',
         'aac' => 'audio/x-acc',
+        'aac' => 'audio/aac',
         'aam' => 'application/x-authorware-map',
         'aas' => 'application/x-authorware-seg',
 …
         'acutc' => 'application/vnd.acucorp',
         'adp' => 'audio/adpcm',
+        'adts' => 'audio/aac',
         'aep' => 'application/vnd.audiograph',
         'afm' => 'application/x-font-type1',
 …
         'ait' => 'application/vnd.dvb.ait',
         'ami' => 'application/vnd.amiga.ami',
+        'aml' => 'application/automationml-aml+xml',
+        'amlx' => 'application/automationml-amlx+zip',
         'amr' => 'audio/amr',
         'apk' => 'application/vnd.android.package-archive',
         'apng' => 'image/apng',
         'appcache' => 'text/cache-manifest',
+        'appinstaller' => 'application/appinstaller',
         'application' => 'application/x-ms-application',
+        'appx' => 'application/appx',
+        'appxbundle' => 'application/appxbundle',
         'apr' => 'application/vnd.lotus-approach',
         'arc' => 'application/x-freearc',
 …
         'bpmn' => 'application/octet-stream',
         'bsp' => 'model/vnd.valve.source.compiled-map',
+        'btf' => 'image/prs.btif',
         'btif' => 'image/prs.btif',
         'buffer' => 'application/octet-stream',
 …
         'cla' => 'application/vnd.claymore',
         'class' => 'application/octet-stream',
+        'cld' => 'model/vnd.cld',
         'clkk' => 'application/vnd.crick.clicker.keyboard',
         'clkp' => 'application/vnd.crick.clicker.palette',
 …
         'cu' => 'application/cu-seeme',
         'curl' => 'text/vnd.curl',
+        'cwl' => 'application/cwl',
         'cww' => 'application/prs.cww',
         'cxt' => 'application/x-director',
 …
         'dfac' => 'application/vnd.dreamfactory',
         'dgc' => 'application/x-dgc-compressed',
+        'dib' => 'image/bmp',
         'dic' => 'text/x-c',
         'dir' => 'application/x-director',
 …
         'dp' => 'application/vnd.osgi.dp',
         'dpg' => 'application/vnd.dpgraph',
+        'dpx' => 'image/dpx',
         'dra' => 'audio/vnd.dra',
         'drle' => 'image/dicom-rle',
 …
         'eps' => 'application/postscript',
         'epub' => 'application/epub+zip',
-        'es' => 'application/ecmascript',
         'es3' => 'application/vnd.eszigno3+xml',
         'esa' => 'application/vnd.osgi.subsystem',
 …
         'jsonml' => 'application/jsonml+json',
         'jsx' => 'text/jsx',
+        'jt' => 'model/jt',
         'jxr' => 'image/jxr',
         'jxra' => 'image/jxra',
 …
         'mj2' => 'video/mj2',
         'mjp2' => 'video/mj2',
         'mjs' => 'application/javascript',
+        'mjs' => 'text/javascript',
         'mk3d' => 'video/x-matroska',
         'mka' => 'audio/x-matroska',
 …
         'msh' => 'model/mesh',
         'msi' => 'application/x-msdownload',
+        'msix' => 'application/msix',
+        'msixbundle' => 'application/msixbundle',
         'msl' => 'application/vnd.mobius.msl',
         'msm' => 'application/octet-stream',
 …
         'pwn' => 'application/vnd.3m.post-it-notes',
         'pya' => 'audio/vnd.ms-playready.media.pya',
+        'pyo' => 'model/vnd.pytha.pyox',
+        'pyox' => 'model/vnd.pytha.pyox',
         'pyv' => 'video/vnd.ms-playready.media.pyv',
         'qam' => 'application/vnd.epson.quickanime',
 …
         'stc' => 'application/vnd.sun.xml.calc.template',
         'std' => 'application/vnd.sun.xml.draw.template',
+        'step' => 'application/STEP',
         'stf' => 'application/vnd.wt.stf',
         'sti' => 'application/vnd.sun.xml.impress.template',
         'stk' => 'application/hyperstudio',
         'stl' => 'model/stl',
+        'stp' => 'application/STEP',
         'stpx' => 'model/step+xml',
         'stpxz' => 'model/step-xml+zip',
 …
         'umj' => 'application/vnd.umajin',
         'unityweb' => 'application/vnd.unity',
+        'uo' => 'application/vnd.uoml+xml',
         'uoml' => 'application/vnd.uoml+xml',
         'uri' => 'text/uri-list',
         'uris' => 'text/uri-list',
         'urls' => 'text/uri-list',
+        'usda' => 'model/vnd.usda',
         'usdz' => 'model/vnd.usdz+zip',
         'ustar' => 'application/x-ustar',
 …
         'webp' => 'image/webp',
         'wg' => 'application/vnd.pmi.widget',
+        'wgsl' => 'text/wgsl',
         'wgt' => 'application/widget',
         'wif' => 'application/watcherinfo+xml',
 …
         'xenc' => 'application/xenc+xml',
         'xer' => 'application/patch-ops-error+xml',
         'xfdf' => 'application/vnd.adobe.xfdf',
+        'xfdf' => 'application/xfdf',
         'xfdl' => 'application/vnd.xfdl',
         'xht' => 'application/xhtml+xml',
+        'xhtm' => 'application/vnd.pwg-xhtml-print+xml',
         'xhtml' => 'application/xhtml+xml',
         'xhvml' => 'application/xv+xml',
 …
         'xpx' => 'application/vnd.intercon.formnet',
         'xsd' => 'application/xml',
+        'xsf' => 'application/prs.xsf+xml',
         'xsl' => 'application/xml',
         'xslt' => 'application/xslt+xml',
 …
      * Determines the mimetype of a file by looking at its extension.
+     *
      * @link https://raw.githubusercontent.com/jshttp/mime-db/master/db.json
+     * @see https://raw.githubusercontent.com/jshttp/mime-db/master/db.json
      */
     public static function fromFilename(string $filename): ?string
 …
      * Maps a file extensions to a mimetype.
+     *
      * @link https://raw.githubusercontent.com/jshttp/mime-db/master/db.json
+     * @see https://raw.githubusercontent.com/jshttp/mime-db/master/db.json
      */
     public static function fromExtension(string $extension): ?string

login-me-now/trunk/vendor/guzzlehttp/psr7/src/MultipartStream.php

-                      r2911753
+                      r2967574
+        }
         return "--{$this->boundary}\r\n" . trim($str) . "\r\n\r\n";
+        return "--{$this->boundary}\r\n".trim($str)."\r\n\r\n";
+    }
 …
         foreach ($elements as $element) {
             if (!is_array($element)) {
                 throw new \UnexpectedValueException("An array is expected");
+                throw new \UnexpectedValueException('An array is expected');
+            }
             $this->addElement($stream, $element);
 …
         $type = $this->getHeader($headers, 'content-type');
         if (!$type && ($filename === '0' || $filename)) {
+            if ($type = MimeType::fromFilename($filename)) {
+                $headers['Content-Type'] = $type;
+            }
+            $headers['Content-Type'] = MimeType::fromFilename($filename) ?? 'application/octet-stream';
+        }

login-me-now/trunk/vendor/guzzlehttp/psr7/src/PumpStream.php

r2911753	r2967574
61	61	}
62	62	trigger_error(sprintf('%s::__toString exception: %s', self::class, (string) $e), E_USER_ERROR);
	63
63	64	return '';
64	65	}
…	…
170	171	if ($data === false \|\| $data === null) {
171	172	$this->source = null;
	173
172	174	return;
173	175	}

login-me-now/trunk/vendor/guzzlehttp/psr7/src/Query.php

-                      r2911753
+                      r2967574
                 $v = is_bool($v) ? (int) $v : $v;
                 if ($v !== null) {
                     $qs .= '=' . $encoder((string) $v);
+                    $qs .= '='.$encoder((string) $v);
+                }
                 $qs .= '&';
 …
                     $vv = is_bool($vv) ? (int) $vv : $vv;
                     if ($vv !== null) {
                         $qs .= '=' . $encoder((string) $vv);
+                        $qs .= '='.$encoder((string) $vv);
+                    }
                     $qs .= '&';

login-me-now/trunk/vendor/guzzlehttp/psr7/src/Request.php

r2911753	r2967574
70	70	}
71	71	if ($this->uri->getQuery() != '') {
72		$target .= '?' . $this->uri->getQuery();
	72	$target .= '?'.$this->uri->getQuery();
73	73	}
74	74
…	…
86	86	$new = clone $this;
87	87	$new->requestTarget = $requestTarget;
	88
88	89	return $new;
89	90	}
…	…
99	100	$new = clone $this;
100	101	$new->method = strtoupper($method);
	102
101	103	return $new;
102	104	}
…	…
132	134
133	135	if (($port = $this->uri->getPort()) !== null) {
134		$host .= ':' . $port;
	136	$host .= ':'.$port;
135	137	}
136	138

login-me-now/trunk/vendor/guzzlehttp/psr7/src/Response.php

r2911753	r2967574
139	139	}
140	140	$new->reasonPhrase = (string) $reasonPhrase;
	141
141	142	return $new;
142	143	}

login-me-now/trunk/vendor/guzzlehttp/psr7/src/Rfc7230.php

r2911753	r2967574
15	15	* Note: header delimiter (\r\n) is modified to \r?\n to accept line feed only delimiters for BC reasons.
16	16	*
17		* @~~link~~ https://github.com/amphp/http/blob/v1.0.1/src/Rfc7230.php#L12-L15
	17	* @see https://github.com/amphp/http/blob/v1.0.1/src/Rfc7230.php#L12-L15
18	18	*
19	19	* @license https://github.com/amphp/http/blob/v1.0.1/LICENSE

login-me-now/trunk/vendor/guzzlehttp/psr7/src/ServerRequest.php

-                      r2911753
+                      r2967574
             $spec = [
                 'tmp_name' => $files['tmp_name'][$key],
                 'size'     => $files['size'][$key] ?? null,
                 'error'    => $files['error'][$key] ?? null,
                 'name'     => $files['name'][$key] ?? null,
                 'type'     => $files['type'][$key] ?? null,
+                'size' => $files['size'][$key] ?? null,
+                'error' => $files['error'][$key] ?? null,
+                'name' => $files['name'][$key] ?? null,
+                'type' => $files['type'][$key] ?? null,
             ];
             $normalizedFiles[$key] = self::createUploadedFileFromSpec($spec);
 …
     private static function extractHostAndPortFromAuthority(string $authority): array
+    {
         $uri = 'http://' . $authority;
+        $uri = 'http://'.$authority;
         $parts = parse_url($uri);
         if (false === $parts) {

login-me-now/trunk/vendor/guzzlehttp/psr7/src/Stream.php

r2911753	r2967574
62	62	$meta = stream_get_meta_data($this->stream);
63	63	$this->seekable = $meta['seekable'];
64		$this->readable = (bool)preg_match(self::READABLE_MODES, $meta['mode']);
65		$this->writable = (bool)preg_match(self::WRITABLE_MODES, $meta['mode']);
	64	$this->readable = (bool) preg_match(self::READABLE_MODES, $meta['mode']);
	65	$this->writable = (bool) preg_match(self::WRITABLE_MODES, $meta['mode']);
66	66	$this->uri = $this->getMetadata('uri');
67	67	}
…	…
81	81	$this->seek(0);
82	82	}
	83
83	84	return $this->getContents();
84	85	} catch (\Throwable $e) {
…	…
87	88	}
88	89	trigger_error(sprintf('%s::__toString exception: %s', self::class, (string) $e), E_USER_ERROR);
	90
89	91	return '';
90	92	}
…	…
146	148	if (is_array($stats) && isset($stats['size'])) {
147	149	$this->size = $stats['size'];
	150
148	151	return $this->size;
149	152	}
…	…
208	211	if (fseek($this->stream, $offset, $whence) === -1) {
209	212	throw new \RuntimeException('Unable to seek to stream position '
210		. ~~$offset . ' with whence ' .~~ var_export($whence, true));
	213	.$offset.' with whence '.var_export($whence, true));
211	214	}
212	215	}

login-me-now/trunk/vendor/guzzlehttp/psr7/src/StreamDecoratorTrait.php

r2911753	r2967574
32	32	if ($name === 'stream') {
33	33	$this->stream = $this->createStream();
	34
34	35	return $this->stream;
35	36	}
…	…
44	45	$this->seek(0);
45	46	}
	47
46	48	return $this->getContents();
47	49	} catch (\Throwable $e) {
…	…
50	52	}
51	53	trigger_error(sprintf('%s::__toString exception: %s', self::class, (string) $e), E_USER_ERROR);
	54
52	55	return '';
53	56	}

login-me-now/trunk/vendor/guzzlehttp/psr7/src/StreamWrapper.php

-                      r2911753
+                      r2967574
         } else {
             throw new \InvalidArgumentException('The stream must be readable, '
                 . 'writable, or both.');
+                .'writable, or both.');
+        }
 …
+    {
         return stream_context_create([
             'guzzle' => ['stream' => $stream]
+            'guzzle' => ['stream' => $stream],
         ]);
+    }
 …
     public function stream_cast(int $cast_as)
+    {
         $stream = clone($this->stream);
+        $stream = clone $this->stream;
         $resource = $stream->detach();
 …
+    {
         static $modeMap = [
             'r'  => 33060,
+            'r' => 33060,
             'rb' => 33060,
             'r+' => 33206,
             'w'  => 33188,
             'wb' => 33188
+            'w' => 33188,
+            'wb' => 33188,
         ];
         return [
             'dev'     => 0,
             'ino'     => 0,
             'mode'    => $modeMap[$this->mode],
             'nlink'   => 0,
             'uid'     => 0,
             'gid'     => 0,
             'rdev'    => 0,
             'size'    => $this->stream->getSize() ?: 0,
             'atime'   => 0,
             'mtime'   => 0,
             'ctime'   => 0,
+            'dev' => 0,
+            'ino' => 0,
+            'mode' => $modeMap[$this->mode],
+            'nlink' => 0,
+            'uid' => 0,
+            'gid' => 0,
+            'rdev' => 0,
+            'size' => $this->stream->getSize() ?: 0,
+            'atime' => 0,
+            'mtime' => 0,
+            'ctime' => 0,
             'blksize' => 0,
             'blocks'  => 0
+            'blocks' => 0,
         ];
+    }
 …
+    {
         return [
             'dev'     => 0,
             'ino'     => 0,
             'mode'    => 0,
             'nlink'   => 0,
             'uid'     => 0,
             'gid'     => 0,
             'rdev'    => 0,
             'size'    => 0,
             'atime'   => 0,
             'mtime'   => 0,
             'ctime'   => 0,
+            'dev' => 0,
+            'ino' => 0,
+            'mode' => 0,
+            'nlink' => 0,
+            'uid' => 0,
+            'gid' => 0,
+            'rdev' => 0,
+            'size' => 0,
+            'atime' => 0,
+            'mtime' => 0,
+            'ctime' => 0,
             'blksize' => 0,
             'blocks'  => 0
+            'blocks' => 0,
         ];
+    }

login-me-now/trunk/vendor/guzzlehttp/psr7/src/Uri.php

-                      r2911753
+                      r2967574
     private const DEFAULT_PORTS = [
         'http'  => 80,
+        'http' => 80,
         'https' => 443,
         'ftp' => 21,
 …
      * Unreserved characters for use in a regex.
+     *
      * @link https://tools.ietf.org/html/rfc3986#section-2.3
+     * @see https://tools.ietf.org/html/rfc3986#section-2.3
      */
     private const CHAR_UNRESERVED = 'a-zA-Z0-9_\-\.~';
 …
      * Sub-delims for use in a regex.
+     *
      * @link https://tools.ietf.org/html/rfc3986#section-2.2
+     * @see https://tools.ietf.org/html/rfc3986#section-2.2
      */
     private const CHAR_SUB_DELIMS = '!\$&\'\(\)\*\+,;=';
 …
+        }
+    }
     /**
      * UTF-8 aware \parse_url() replacement.
 …
         );
         $result = parse_url($prefix . $encodedUrl);
+        $result = parse_url($prefix.$encodedUrl);
         if ($result === false) {
 …
      * that format).
+     *
      * @link https://tools.ietf.org/html/rfc3986#section-5.3
+     * @see https://tools.ietf.org/html/rfc3986#section-5.3
      */
     public static function composeComponents(?string $scheme, ?string $authority, string $path, ?string $query, ?string $fragment): string
 …
         // weak type checks to also accept null until we can add scalar type hints
         if ($scheme != '') {
             $uri .= $scheme . ':';
+            $uri .= $scheme.':';
+        }
         if ($authority != '' || $scheme === 'file') {
             $uri .= '//' . $authority;
+            $uri .= '//'.$authority;
+        }
         if ($authority != '' && $path != '' && $path[0] != '/') {
             $path = '/' . $path;
+            $path = '/'.$path;
+        }
 …
         if ($query != '') {
             $uri .= '?' . $query;
+            $uri .= '?'.$query;
+        }
         if ($fragment != '') {
             $uri .= '#' . $fragment;
+            $uri .= '#'.$fragment;
+        }
 …
      * @see Uri::isAbsolutePathReference
      * @see Uri::isRelativePathReference
      * @link https://tools.ietf.org/html/rfc3986#section-4
+     * @see https://tools.ietf.org/html/rfc3986#section-4
      */
     public static function isAbsolute(UriInterface $uri): bool
 …
      * A relative reference that begins with two slash characters is termed an network-path reference.
+     *
      * @link https://tools.ietf.org/html/rfc3986#section-4.2
+     * @see https://tools.ietf.org/html/rfc3986#section-4.2
      */
     public static function isNetworkPathReference(UriInterface $uri): bool
 …
      * A relative reference that begins with a single slash character is termed an absolute-path reference.
+     *
      * @link https://tools.ietf.org/html/rfc3986#section-4.2
+     * @see https://tools.ietf.org/html/rfc3986#section-4.2
      */
     public static function isAbsolutePathReference(UriInterface $uri): bool
 …
      * A relative reference that does not begin with a slash character is termed a relative-path reference.
+     *
      * @link https://tools.ietf.org/html/rfc3986#section-4.2
+     * @see https://tools.ietf.org/html/rfc3986#section-4.2
      */
     public static function isRelativePathReference(UriInterface $uri): bool
 …
      * @param UriInterface|null $base An optional base URI to compare against
+     *
      * @link https://tools.ietf.org/html/rfc3986#section-4.4
+     * @see https://tools.ietf.org/html/rfc3986#section-4.4
      */
     public static function isSameDocumentReference(UriInterface $uri, UriInterface $base = null): bool
 …
      * Creates a URI from a hash of `parse_url` components.
+     *
      * @link http://php.net/manual/en/function.parse-url.php
+     * @see http://php.net/manual/en/function.parse-url.php
+     *
      * @throws MalformedUriException If the components do not form a valid URI.
 …
         $authority = $this->host;
         if ($this->userInfo !== '') {
             $authority = $this->userInfo . '@' . $authority;
+            $authority = $this->userInfo.'@'.$authority;
+        }
         if ($this->port !== null) {
             $authority .= ':' . $this->port;
+            $authority .= ':'.$this->port;
+        }
 …
         $info = $this->filterUserInfoComponent($user);
         if ($password !== null) {
             $info .= ':' . $this->filterUserInfoComponent($password);
+            $info .= ':'.$this->filterUserInfoComponent($password);
+        }
 …
             : '';
         if (isset($parts['pass'])) {
             $this->userInfo .= ':' . $this->filterUserInfoComponent($parts['pass']);
+            $this->userInfo .= ':'.$this->filterUserInfoComponent($parts['pass']);
+        }
 …
         return preg_replace_callback(
             '/(?:[^%' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . ']+|%(?![A-Fa-f0-9]{2}))/',
+            '/(?:[^%'.self::CHAR_UNRESERVED.self::CHAR_SUB_DELIMS.']+|%(?![A-Fa-f0-9]{2}))/',
             [$this, 'rawurlencodeMatchZero'],
             $component
 …
         $port = (int) $port;
         if (0 > $port || 0xffff < $port) {
+        if (0 > $port || 0xFFFF < $port) {
             throw new \InvalidArgumentException(
                 sprintf('Invalid port: %d. Must be between 0 and 65535', $port)
 …
         if ($value !== null) {
             $queryString .= '=' . strtr($value, self::QUERY_SEPARATORS_REPLACEMENT);
+            $queryString .= '='.strtr($value, self::QUERY_SEPARATORS_REPLACEMENT);
+        }
 …
         return preg_replace_callback(
             '/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\/]++|%(?![A-Fa-f0-9]{2}))/',
+            '/(?:[^'.self::CHAR_UNRESERVED.self::CHAR_SUB_DELIMS.'%:@\/]++|%(?![A-Fa-f0-9]{2}))/',
             [$this, 'rawurlencodeMatchZero'],
             $path
 …
         return preg_replace_callback(
             '/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\/\?]++|%(?![A-Fa-f0-9]{2}))/',
+            '/(?:[^'.self::CHAR_UNRESERVED.self::CHAR_SUB_DELIMS.'%:@\/\?]++|%(?![A-Fa-f0-9]{2}))/',
             [$this, 'rawurlencodeMatchZero'],
             $str

login-me-now/trunk/vendor/guzzlehttp/psr7/src/UriNormalizer.php

-                      r2911753
+                      r2967574
  * @author Tobias Schultze
+ *
  * @link https://tools.ietf.org/html/rfc3986#section-6
+ * @see https://tools.ietf.org/html/rfc3986#section-6
  */
 final class UriNormalizer
 …
      * @param int          $flags A bitmask of normalizations to apply, see constants
+     *
      * @link https://tools.ietf.org/html/rfc3986#section-6.2
+     * @see https://tools.ietf.org/html/rfc3986#section-6.2
      */
     public static function normalize(UriInterface $uri, int $flags = self::PRESERVING_NORMALIZATIONS): UriInterface
 …
      * @param int          $normalizations A bitmask of normalizations to apply, see constants
+     *
      * @link https://tools.ietf.org/html/rfc3986#section-6.1
+     * @see https://tools.ietf.org/html/rfc3986#section-6.1
      */
     public static function isEquivalent(UriInterface $uri1, UriInterface $uri2, int $normalizations = self::PRESERVING_NORMALIZATIONS): bool

login-me-now/trunk/vendor/guzzlehttp/psr7/src/UriResolver.php

-                      r2911753
+                      r2967574
  * @author Tobias Schultze
+ *
  * @link https://tools.ietf.org/html/rfc3986#section-5
+ * @see https://tools.ietf.org/html/rfc3986#section-5
  */
 final class UriResolver
 …
      * Removes dot segments from a path and returns the new path.
+     *
      * @link http://tools.ietf.org/html/rfc3986#section-5.2.4
+     * @see http://tools.ietf.org/html/rfc3986#section-5.2.4
      */
     public static function removeDotSegments(string $path): string
 …
         if ($path[0] === '/' && (!isset($newPath[0]) || $newPath[0] !== '/')) {
             // Re-add the leading slash if necessary for cases like "/.."
             $newPath = '/' . $newPath;
+            $newPath = '/'.$newPath;
         } elseif ($newPath !== '' && ($segment === '.' || $segment === '..')) {
             // Add the trailing slash if necessary
 …
      * Converts the relative URI into a new URI that is resolved against the base URI.
+     *
      * @link http://tools.ietf.org/html/rfc3986#section-5.2
+     * @see http://tools.ietf.org/html/rfc3986#section-5.2
      */
     public static function resolve(UriInterface $base, UriInterface $rel): UriInterface
 …
                 } else {
                     if ($targetAuthority != '' && $base->getPath() === '') {
                         $targetPath = '/' . $rel->getPath();
+                        $targetPath = '/'.$rel->getPath();
                     } else {
                         $lastSlashPos = strrpos($base->getPath(), '/');
 …
                             $targetPath = $rel->getPath();
                         } else {
                             $targetPath = substr($base->getPath(), 0, $lastSlashPos + 1) . $rel->getPath();
+                            $targetPath = substr($base->getPath(), 0, $lastSlashPos + 1).$rel->getPath();
+                        }
+                    }
 …
+        }
         $targetSegments[] = $targetLastSegment;
         $relativePath = str_repeat('../', count($sourceSegments)) . implode('/', $targetSegments);
+        $relativePath = str_repeat('../', count($sourceSegments)).implode('/', $targetSegments);
         // A reference to am empty last segment or an empty first sub-segment must be prefixed with "./".

login-me-now/trunk/vendor/guzzlehttp/psr7/src/Utils.php

r2911753	r2967574
91	91	$buffer .= $buf;
92	92	}
	93
93	94	return $buffer;
94	95	}
…	…
175	176	$scheme = $changes['uri']->getScheme();
176	177	if (isset($standardPorts[$scheme]) && $port != $standardPorts[$scheme]) {
177		$changes['set_headers']['Host'] .= ':' . $port;
	178	$changes['set_headers']['Host'] .= ':'.$port;
178	179	}
179	180	}
…	…
292	293	fseek($stream, 0);
293	294	}
	295
294	296	return new Stream($stream, $options);
295	297	}
…	…
309	311	$resource = $stream;
310	312	}
	313
311	314	return new Stream($resource, $options);
312	315	case 'object':
…	…
321	324	$result = $resource->current();
322	325	$resource->next();
	326
323	327	return $result;
324	328	}, $options);
…	…
335	339	}
336	340
337		throw new \InvalidArgumentException('Invalid resource type: ' . gettype($resource));
	341	throw new \InvalidArgumentException('Invalid resource type: '.gettype($resource));
338	342	}
339	343

login-me-now/trunk/vendor/phpseclib/phpseclib/BACKERS.md

r2911753	r2967574
14	14	- Tharyrok
15	15	- [cjhaas](https://github.com/cjhaas)
	16	- [istiak-tridip](https://github.com/istiak-tridip)

login-me-now/trunk/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/SymmetricKey.php

r2911753	r2967574
918	918	* @param string $password
919	919	* @param string $method
920		* @param ~~string[]~~ ...$func_args
	920	* @param int\|string ...$func_args
921	921	* @throws \LengthException if pbkdf1 is being used and the derived key length exceeds the hash length
922	922	* @throws \RuntimeException if bcrypt is being used and a salt isn't provided

login-me-now/trunk/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA.php

-                      r2911753
+                      r2967574
             self::ENCRYPTION_NONE
         ];
         $numSelected = 0;
+        $encryptedCount = 0;
         $selected = 0;
         foreach ($masks as $mask) {
             if ($padding & $mask) {
                 $selected = $mask;
                 $numSelected++;
+                $encryptedCount++;
+            }
+        }
         if ($numSelected > 1) {
+        if ($encryptedCount > 1) {
             throw new InconsistentSetupException('Multiple encryption padding modes have been selected; at most only one should be selected');
+        }
 …
             self::SIGNATURE_PKCS1
         ];
         $numSelected = 0;
+        $signatureCount = 0;
         $selected = 0;
         foreach ($masks as $mask) {
             if ($padding & $mask) {
                 $selected = $mask;
                 $numSelected++;
+                $signatureCount++;
+            }
+        }
         if ($numSelected > 1) {
+        if ($signatureCount > 1) {
             throw new InconsistentSetupException('Multiple signature padding modes have been selected; at most only one should be selected');
+        }
 …
         $new = clone $this;
+        $new->encryptionPadding = $encryptionPadding;
+        $new->signaturePadding = $signaturePadding;
+        if ($encryptedCount) {
+            $new->encryptionPadding = $encryptionPadding;
+        }
+        if ($signatureCount) {
+            $new->signaturePadding = $signaturePadding;
+        }
         return $new;
+    }

login-me-now/trunk/vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php

-                      r2911753
+                      r2967574
 namespace phpseclib3\File;
-use DateTime;
 use phpseclib3\Common\Functions\Strings;
 use phpseclib3\File\ASN1\Element;
 …
+        }
         return [self::decode_ber($encoded)];
+        return [$decoded];
+    }

login-me-now/trunk/vendor/phpseclib/phpseclib/phpseclib/File/X509.php

-                      r2911753
+                      r2967574
      * @var array
      */
     private $CAs;
+    private $CAs = [];
     /**
 …
                 'id-at-role' => '2.5.4.72',
                 'id-at-postalAddress' => '2.5.4.16',
+                'jurisdictionOfIncorporationCountryName' => '1.3.6.1.4.1.311.60.2.1.3',
+                'jurisdictionOfIncorporationStateOrProvinceName' => '1.3.6.1.4.1.311.60.2.1.2',
+                'jurisdictionLocalityName' => '1.3.6.1.4.1.311.60.2.1.1',
+                'id-at-businessCategory' => '2.5.4.15',
                 //'id-domainComponent' => '0.9.2342.19200300.100.1.25',
 …
+    {
         switch (strtolower($propName)) {
+            case 'jurisdictionofincorporationcountryname':
+            case 'jurisdictioncountryname':
+            case 'jurisdictionc':
+                return 'jurisdictionOfIncorporationCountryName';
+            case 'jurisdictionofincorporationstateorprovincename':
+            case 'jurisdictionstateorprovincename':
+            case 'jurisdictionst':
+                return 'jurisdictionOfIncorporationStateOrProvinceName';
+            case 'jurisdictionlocalityname':
+            case 'jurisdictionl':
+                return 'jurisdictionLocalityName';
+            case 'id-at-businesscategory':
+            case 'businesscategory':
+                return 'id-at-businessCategory';
             case 'id-at-countryname':
             case 'countryname':
 …
             return false;
+        }
-        if (empty($this->CAs)) {
-            return $chain;
+        }
         while (true) {
             $currentCert = $chain[count($chain) - 1];

login-me-now/trunk/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php

-                      r2911753
+                      r2967574
         self::$mainEngine = $fqmain;
-        if (!in_array('Default', $modexps)) {
-            $modexps[] = 'DefaultEngine';
+        }
         $found = false;
         foreach ($modexps as $modexp) {
 …
                 ['PHP64', ['OpenSSL']],
                 ['BCMath', ['OpenSSL']],
+                ['PHP32', ['OpenSSL']]
+                ['PHP32', ['OpenSSL']],
+                ['PHP64', ['DefaultEngine']],
+                ['PHP32', ['DefaultEngine']]
             ];
             foreach ($engines as $engine) {

login-me-now/trunk/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/Engine.php

r2911753	r2967574
645	645	}
646	646
	647	if ($this->compare($n) > 0) {
	648	list(, $temp) = $this->divide($n);
	649	return $temp->powModInner($e, $n);
	650	}
	651
647	652	return $this->powModInner($e, $n);
648	653	}

login-me-now/trunk/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP.php

-                      r2911753
+                      r2967574
      * @access private
      */
     private $packet_types = [];
+    private static $packet_types = [];
     /**
 …
      * @access private
      */
     private $status_codes = [];
+    private static $status_codes = [];
     /** @var array<int, string> */
     private $attributes;
+    private static $attributes;
     /** @var array<int, string> */
     private $open_flags;
+    private static $open_flags;
     /** @var array<int, string> */
     private $open_flags5;
+    private static $open_flags5;
     /** @var array<int, string> */
     private $file_types;
+    private static $file_types;
     /**
 …
      * Connects to an SFTP server
+     *
+     * @param string $host
+     * $host can either be a string, representing the host, or a stream resource.
+     *
+     * @param mixed $host
      * @param int $port
      * @param int $timeout
 …
         $this->max_sftp_packet = 1 << 15;
+        $this->packet_types = [
+  => 'NET_SFTP_INIT',
+  => 'NET_SFTP_VERSION',
+  => 'NET_SFTP_OPEN',
+  => 'NET_SFTP_CLOSE',
+  => 'NET_SFTP_READ',
+  => 'NET_SFTP_WRITE',
+  => 'NET_SFTP_LSTAT',
+  => 'NET_SFTP_SETSTAT',
+=> 'NET_SFTP_FSETSTAT',
+=> 'NET_SFTP_OPENDIR',
+=> 'NET_SFTP_READDIR',
+=> 'NET_SFTP_REMOVE',
+=> 'NET_SFTP_MKDIR',
+=> 'NET_SFTP_RMDIR',
+=> 'NET_SFTP_REALPATH',
+=> 'NET_SFTP_STAT',
+=> 'NET_SFTP_RENAME',
+=> 'NET_SFTP_READLINK',
+=> 'NET_SFTP_SYMLINK',
+=> 'NET_SFTP_LINK',
+=> 'NET_SFTP_STATUS',
+=> 'NET_SFTP_HANDLE',
+=> 'NET_SFTP_DATA',
+=> 'NET_SFTP_NAME',
+=> 'NET_SFTP_ATTRS',
+=> 'NET_SFTP_EXTENDED'
+        ];
+        $this->status_codes = [
+=> 'NET_SFTP_STATUS_OK',
+=> 'NET_SFTP_STATUS_EOF',
+=> 'NET_SFTP_STATUS_NO_SUCH_FILE',
+=> 'NET_SFTP_STATUS_PERMISSION_DENIED',
+=> 'NET_SFTP_STATUS_FAILURE',
+=> 'NET_SFTP_STATUS_BAD_MESSAGE',
+=> 'NET_SFTP_STATUS_NO_CONNECTION',
+=> 'NET_SFTP_STATUS_CONNECTION_LOST',
+=> 'NET_SFTP_STATUS_OP_UNSUPPORTED',
+=> 'NET_SFTP_STATUS_INVALID_HANDLE',
+=> 'NET_SFTP_STATUS_NO_SUCH_PATH',
+=> 'NET_SFTP_STATUS_FILE_ALREADY_EXISTS',
+=> 'NET_SFTP_STATUS_WRITE_PROTECT',
+=> 'NET_SFTP_STATUS_NO_MEDIA',
+=> 'NET_SFTP_STATUS_NO_SPACE_ON_FILESYSTEM',
+=> 'NET_SFTP_STATUS_QUOTA_EXCEEDED',
+=> 'NET_SFTP_STATUS_UNKNOWN_PRINCIPAL',
+=> 'NET_SFTP_STATUS_LOCK_CONFLICT',
+=> 'NET_SFTP_STATUS_DIR_NOT_EMPTY',
+=> 'NET_SFTP_STATUS_NOT_A_DIRECTORY',
+=> 'NET_SFTP_STATUS_INVALID_FILENAME',
+=> 'NET_SFTP_STATUS_LINK_LOOP',
+=> 'NET_SFTP_STATUS_CANNOT_DELETE',
+=> 'NET_SFTP_STATUS_INVALID_PARAMETER',
+=> 'NET_SFTP_STATUS_FILE_IS_A_DIRECTORY',
+=> 'NET_SFTP_STATUS_BYTE_RANGE_LOCK_CONFLICT',
+=> 'NET_SFTP_STATUS_BYTE_RANGE_LOCK_REFUSED',
+=> 'NET_SFTP_STATUS_DELETE_PENDING',
+=> 'NET_SFTP_STATUS_FILE_CORRUPT',
+=> 'NET_SFTP_STATUS_OWNER_INVALID',
+=> 'NET_SFTP_STATUS_GROUP_INVALID',
+=> 'NET_SFTP_STATUS_NO_MATCHING_BYTE_RANGE_LOCK'
+        ];
+        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-7.1
+        // the order, in this case, matters quite a lot - see \phpseclib3\Net\SFTP::_parseAttributes() to understand why
+        $this->attributes = [
+x00000001 => 'NET_SFTP_ATTR_SIZE',
+x00000002 => 'NET_SFTP_ATTR_UIDGID',          // defined in SFTPv3, removed in SFTPv4+
+x00000080 => 'NET_SFTP_ATTR_OWNERGROUP',      // defined in SFTPv4+
+x00000004 => 'NET_SFTP_ATTR_PERMISSIONS',
+x00000008 => 'NET_SFTP_ATTR_ACCESSTIME',
+x00000010 => 'NET_SFTP_ATTR_CREATETIME',      // SFTPv4+
+x00000020 => 'NET_SFTP_ATTR_MODIFYTIME',
+x00000040 => 'NET_SFTP_ATTR_ACL',
+x00000100 => 'NET_SFTP_ATTR_SUBSECOND_TIMES',
+x00000200 => 'NET_SFTP_ATTR_BITS',            // SFTPv5+
+x00000400 => 'NET_SFTP_ATTR_ALLOCATION_SIZE', // SFTPv6+
+x00000800 => 'NET_SFTP_ATTR_TEXT_HINT',
+x00001000 => 'NET_SFTP_ATTR_MIME_TYPE',
+x00002000 => 'NET_SFTP_ATTR_LINK_COUNT',
+x00004000 => 'NET_SFTP_ATTR_UNTRANSLATED_NAME',
+x00008000 => 'NET_SFTP_ATTR_CTIME',
+            // 0x80000000 will yield a floating point on 32-bit systems and converting floating points to integers
+            // yields inconsistent behavior depending on how php is compiled.  so we left shift -1 (which, in
+            // two's compliment, consists of all 1 bits) by 31.  on 64-bit systems this'll yield 0xFFFFFFFF80000000.
+            // that's not a problem, however, and 'anded' and a 32-bit number, as all the leading 1 bits are ignored.
+            (PHP_INT_SIZE == 4 ? -1 : 0xFFFFFFFF) => 'NET_SFTP_ATTR_EXTENDED'
+        ];
+        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-6.3
+        // the flag definitions change somewhat in SFTPv5+.  if SFTPv5+ support is added to this library, maybe name
+        // the array for that $this->open5_flags and similarly alter the constant names.
+        $this->open_flags = [
+x00000001 => 'NET_SFTP_OPEN_READ',
+x00000002 => 'NET_SFTP_OPEN_WRITE',
+x00000004 => 'NET_SFTP_OPEN_APPEND',
+x00000008 => 'NET_SFTP_OPEN_CREATE',
+x00000010 => 'NET_SFTP_OPEN_TRUNCATE',
+x00000020 => 'NET_SFTP_OPEN_EXCL',
+x00000040 => 'NET_SFTP_OPEN_TEXT' // defined in SFTPv4
+        ];
+        // SFTPv5+ changed the flags up:
+        // https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-8.1.1.3
+        $this->open_flags5 = [
+            // when SSH_FXF_ACCESS_DISPOSITION is a 3 bit field that controls how the file is opened
+x00000000 => 'NET_SFTP_OPEN_CREATE_NEW',
+x00000001 => 'NET_SFTP_OPEN_CREATE_TRUNCATE',
+x00000002 => 'NET_SFTP_OPEN_OPEN_EXISTING',
+x00000003 => 'NET_SFTP_OPEN_OPEN_OR_CREATE',
+x00000004 => 'NET_SFTP_OPEN_TRUNCATE_EXISTING',
+            // the rest of the flags are not supported
+x00000008 => 'NET_SFTP_OPEN_APPEND_DATA', // "the offset field of SS_FXP_WRITE requests is ignored"
+x00000010 => 'NET_SFTP_OPEN_APPEND_DATA_ATOMIC',
+x00000020 => 'NET_SFTP_OPEN_TEXT_MODE',
+x00000040 => 'NET_SFTP_OPEN_BLOCK_READ',
+x00000080 => 'NET_SFTP_OPEN_BLOCK_WRITE',
+x00000100 => 'NET_SFTP_OPEN_BLOCK_DELETE',
+x00000200 => 'NET_SFTP_OPEN_BLOCK_ADVISORY',
+x00000400 => 'NET_SFTP_OPEN_NOFOLLOW',
+x00000800 => 'NET_SFTP_OPEN_DELETE_ON_CLOSE',
+x00001000 => 'NET_SFTP_OPEN_ACCESS_AUDIT_ALARM_INFO',
+x00002000 => 'NET_SFTP_OPEN_ACCESS_BACKUP',
+x00004000 => 'NET_SFTP_OPEN_BACKUP_STREAM',
+x00008000 => 'NET_SFTP_OPEN_OVERRIDE_OWNER',
+        ];
+        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-5.2
+        // see \phpseclib3\Net\SFTP::_parseLongname() for an explanation
+        $this->file_types = [
+=> 'NET_SFTP_TYPE_REGULAR',
+=> 'NET_SFTP_TYPE_DIRECTORY',
+=> 'NET_SFTP_TYPE_SYMLINK',
+=> 'NET_SFTP_TYPE_SPECIAL',
+=> 'NET_SFTP_TYPE_UNKNOWN',
+            // the following types were first defined for use in SFTPv5+
+            // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-05#section-5.2
+=> 'NET_SFTP_TYPE_SOCKET',
+=> 'NET_SFTP_TYPE_CHAR_DEVICE',
+=> 'NET_SFTP_TYPE_BLOCK_DEVICE',
+=> 'NET_SFTP_TYPE_FIFO'
+        ];
+        $this->define_array(
+            $this->packet_types,
+            $this->status_codes,
+            $this->attributes,
+            $this->open_flags,
+            $this->open_flags5,
+            $this->file_types
+        );
+        if (empty(self::$packet_types)) {
+            self::$packet_types = [
+  => 'NET_SFTP_INIT',
+  => 'NET_SFTP_VERSION',
+  => 'NET_SFTP_OPEN',
+  => 'NET_SFTP_CLOSE',
+  => 'NET_SFTP_READ',
+  => 'NET_SFTP_WRITE',
+  => 'NET_SFTP_LSTAT',
+  => 'NET_SFTP_SETSTAT',
+=> 'NET_SFTP_FSETSTAT',
+=> 'NET_SFTP_OPENDIR',
+=> 'NET_SFTP_READDIR',
+=> 'NET_SFTP_REMOVE',
+=> 'NET_SFTP_MKDIR',
+=> 'NET_SFTP_RMDIR',
+=> 'NET_SFTP_REALPATH',
+=> 'NET_SFTP_STAT',
+=> 'NET_SFTP_RENAME',
+=> 'NET_SFTP_READLINK',
+=> 'NET_SFTP_SYMLINK',
+=> 'NET_SFTP_LINK',
+=> 'NET_SFTP_STATUS',
+=> 'NET_SFTP_HANDLE',
+=> 'NET_SFTP_DATA',
+=> 'NET_SFTP_NAME',
+=> 'NET_SFTP_ATTRS',
+=> 'NET_SFTP_EXTENDED'
+            ];
+            self::$status_codes = [
+=> 'NET_SFTP_STATUS_OK',
+=> 'NET_SFTP_STATUS_EOF',
+=> 'NET_SFTP_STATUS_NO_SUCH_FILE',
+=> 'NET_SFTP_STATUS_PERMISSION_DENIED',
+=> 'NET_SFTP_STATUS_FAILURE',
+=> 'NET_SFTP_STATUS_BAD_MESSAGE',
+=> 'NET_SFTP_STATUS_NO_CONNECTION',
+=> 'NET_SFTP_STATUS_CONNECTION_LOST',
+=> 'NET_SFTP_STATUS_OP_UNSUPPORTED',
+=> 'NET_SFTP_STATUS_INVALID_HANDLE',
+=> 'NET_SFTP_STATUS_NO_SUCH_PATH',
+=> 'NET_SFTP_STATUS_FILE_ALREADY_EXISTS',
+=> 'NET_SFTP_STATUS_WRITE_PROTECT',
+=> 'NET_SFTP_STATUS_NO_MEDIA',
+=> 'NET_SFTP_STATUS_NO_SPACE_ON_FILESYSTEM',
+=> 'NET_SFTP_STATUS_QUOTA_EXCEEDED',
+=> 'NET_SFTP_STATUS_UNKNOWN_PRINCIPAL',
+=> 'NET_SFTP_STATUS_LOCK_CONFLICT',
+=> 'NET_SFTP_STATUS_DIR_NOT_EMPTY',
+=> 'NET_SFTP_STATUS_NOT_A_DIRECTORY',
+=> 'NET_SFTP_STATUS_INVALID_FILENAME',
+=> 'NET_SFTP_STATUS_LINK_LOOP',
+=> 'NET_SFTP_STATUS_CANNOT_DELETE',
+=> 'NET_SFTP_STATUS_INVALID_PARAMETER',
+=> 'NET_SFTP_STATUS_FILE_IS_A_DIRECTORY',
+=> 'NET_SFTP_STATUS_BYTE_RANGE_LOCK_CONFLICT',
+=> 'NET_SFTP_STATUS_BYTE_RANGE_LOCK_REFUSED',
+=> 'NET_SFTP_STATUS_DELETE_PENDING',
+=> 'NET_SFTP_STATUS_FILE_CORRUPT',
+=> 'NET_SFTP_STATUS_OWNER_INVALID',
+=> 'NET_SFTP_STATUS_GROUP_INVALID',
+=> 'NET_SFTP_STATUS_NO_MATCHING_BYTE_RANGE_LOCK'
+            ];
+            // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-7.1
+            // the order, in this case, matters quite a lot - see \phpseclib3\Net\SFTP::_parseAttributes() to understand why
+            self::$attributes = [
+x00000001 => 'NET_SFTP_ATTR_SIZE',
+x00000002 => 'NET_SFTP_ATTR_UIDGID',          // defined in SFTPv3, removed in SFTPv4+
+x00000080 => 'NET_SFTP_ATTR_OWNERGROUP',      // defined in SFTPv4+
+x00000004 => 'NET_SFTP_ATTR_PERMISSIONS',
+x00000008 => 'NET_SFTP_ATTR_ACCESSTIME',
+x00000010 => 'NET_SFTP_ATTR_CREATETIME',      // SFTPv4+
+x00000020 => 'NET_SFTP_ATTR_MODIFYTIME',
+x00000040 => 'NET_SFTP_ATTR_ACL',
+x00000100 => 'NET_SFTP_ATTR_SUBSECOND_TIMES',
+x00000200 => 'NET_SFTP_ATTR_BITS',            // SFTPv5+
+x00000400 => 'NET_SFTP_ATTR_ALLOCATION_SIZE', // SFTPv6+
+x00000800 => 'NET_SFTP_ATTR_TEXT_HINT',
+x00001000 => 'NET_SFTP_ATTR_MIME_TYPE',
+x00002000 => 'NET_SFTP_ATTR_LINK_COUNT',
+x00004000 => 'NET_SFTP_ATTR_UNTRANSLATED_NAME',
+x00008000 => 'NET_SFTP_ATTR_CTIME',
+                // 0x80000000 will yield a floating point on 32-bit systems and converting floating points to integers
+                // yields inconsistent behavior depending on how php is compiled.  so we left shift -1 (which, in
+                // two's compliment, consists of all 1 bits) by 31.  on 64-bit systems this'll yield 0xFFFFFFFF80000000.
+                // that's not a problem, however, and 'anded' and a 32-bit number, as all the leading 1 bits are ignored.
+                (PHP_INT_SIZE == 4 ? (-1 << 31) : 0x80000000) => 'NET_SFTP_ATTR_EXTENDED'
+            ];
+            // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-6.3
+            // the flag definitions change somewhat in SFTPv5+.  if SFTPv5+ support is added to this library, maybe name
+            // the array for that $this->open5_flags and similarly alter the constant names.
+            self::$open_flags = [
+x00000001 => 'NET_SFTP_OPEN_READ',
+x00000002 => 'NET_SFTP_OPEN_WRITE',
+x00000004 => 'NET_SFTP_OPEN_APPEND',
+x00000008 => 'NET_SFTP_OPEN_CREATE',
+x00000010 => 'NET_SFTP_OPEN_TRUNCATE',
+x00000020 => 'NET_SFTP_OPEN_EXCL',
+x00000040 => 'NET_SFTP_OPEN_TEXT' // defined in SFTPv4
+            ];
+            // SFTPv5+ changed the flags up:
+            // https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-8.1.1.3
+            self::$open_flags5 = [
+                // when SSH_FXF_ACCESS_DISPOSITION is a 3 bit field that controls how the file is opened
+x00000000 => 'NET_SFTP_OPEN_CREATE_NEW',
+x00000001 => 'NET_SFTP_OPEN_CREATE_TRUNCATE',
+x00000002 => 'NET_SFTP_OPEN_OPEN_EXISTING',
+x00000003 => 'NET_SFTP_OPEN_OPEN_OR_CREATE',
+x00000004 => 'NET_SFTP_OPEN_TRUNCATE_EXISTING',
+                // the rest of the flags are not supported
+x00000008 => 'NET_SFTP_OPEN_APPEND_DATA', // "the offset field of SS_FXP_WRITE requests is ignored"
+x00000010 => 'NET_SFTP_OPEN_APPEND_DATA_ATOMIC',
+x00000020 => 'NET_SFTP_OPEN_TEXT_MODE',
+x00000040 => 'NET_SFTP_OPEN_BLOCK_READ',
+x00000080 => 'NET_SFTP_OPEN_BLOCK_WRITE',
+x00000100 => 'NET_SFTP_OPEN_BLOCK_DELETE',
+x00000200 => 'NET_SFTP_OPEN_BLOCK_ADVISORY',
+x00000400 => 'NET_SFTP_OPEN_NOFOLLOW',
+x00000800 => 'NET_SFTP_OPEN_DELETE_ON_CLOSE',
+x00001000 => 'NET_SFTP_OPEN_ACCESS_AUDIT_ALARM_INFO',
+x00002000 => 'NET_SFTP_OPEN_ACCESS_BACKUP',
+x00004000 => 'NET_SFTP_OPEN_BACKUP_STREAM',
+x00008000 => 'NET_SFTP_OPEN_OVERRIDE_OWNER',
+            ];
+            // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-5.2
+            // see \phpseclib3\Net\SFTP::_parseLongname() for an explanation
+            self::$file_types = [
+=> 'NET_SFTP_TYPE_REGULAR',
+=> 'NET_SFTP_TYPE_DIRECTORY',
+=> 'NET_SFTP_TYPE_SYMLINK',
+=> 'NET_SFTP_TYPE_SPECIAL',
+=> 'NET_SFTP_TYPE_UNKNOWN',
+                // the following types were first defined for use in SFTPv5+
+                // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-05#section-5.2
+=> 'NET_SFTP_TYPE_SOCKET',
+=> 'NET_SFTP_TYPE_CHAR_DEVICE',
+=> 'NET_SFTP_TYPE_BLOCK_DEVICE',
+=> 'NET_SFTP_TYPE_FIFO'
+            ];
+            self::define_array(
+                self::$packet_types,
+                self::$status_codes,
+                self::$attributes,
+                self::$open_flags,
+                self::$open_flags5,
+                self::$file_types
+            );
+        }
         if (!defined('NET_SFTP_QUEUE_SIZE')) {
 …
     private function partial_init_sftp_connection()
+    {
+        $this->window_size_server_to_client[self::CHANNEL] = $this->window_size;
+        $packet = Strings::packSSH2(
+            'CsN3',
+            NET_SSH2_MSG_CHANNEL_OPEN,
+            'session',
+            self::CHANNEL,
+            $this->window_size,
+x4000
+        );
+        $this->send_binary_packet($packet);
+        $this->channel_status[self::CHANNEL] = NET_SSH2_MSG_CHANNEL_OPEN;
+        $response = $this->get_channel_packet(self::CHANNEL, true);
+        $response = $this->openChannel(self::CHANNEL, true);
         if ($response === true && $this->isTimeout()) {
             return false;
 …
+        }
         $error = $this->status_codes[$status];
+        $error = self::$status_codes[$status];
         if ($this->version > 2) {
 …
         if ($start >= 0) {
             $offset = $start;
         } elseif ($mode & self::RESUME) {
+        } elseif ($mode & (self::RESUME | self::RESUME_START)) {
             // if NET_SFTP_OPEN_APPEND worked as it should _size() wouldn't need to be called
             $size = $this->stat($remote_file)['size'];
 …
                 fseek($fp, $local_start);
                 $size -= $local_start;
+            } elseif ($mode & self::RESUME) {
+                fseek($fp, $offset);
+                $size -= $offset;
+            }
         } elseif ($dataCallback) {
 …
     /**
+     * Recursively go through rawlist() output to get the total filesize
+     *
+     * @return int
+     */
+    private static function recursiveFilesize(array $files)
+    {
+        $size = 0;
+        foreach ($files as $name => $file) {
+            if ($name == '.' || $name == '..') {
+                continue;
+            }
+            $size += is_array($file) ?
+                self::recursiveFilesize($file) :
+                $file->size;
+        }
+        return $size;
+    }
+    /**
      * Gets file size
+     *
      * @param string $path
+     * @param bool $recursive
      * @return mixed
      */
+    public function filesize($path)
+    {
+        return $this->get_stat_cache_prop($path, 'size');
+    public function filesize($path, $recursive = false)
+    {
+        return !$recursive || $this->filetype($path) != 'dir' ?
+            $this->get_stat_cache_prop($path, 'size') :
+            self::recursiveFilesize($this->rawlist($path, true));
+    }
 …
+        }
         foreach ($this->attributes as $key => $value) {
+        foreach (self::$attributes as $key => $value) {
             switch ($flags & $key) {
                 case NET_SFTP_ATTR_UIDGID:
 …
         if (defined('NET_SFTP_LOGGING')) {
             $packet_type = '-> ' . $this->packet_types[$type] .
+            $packet_type = '-> ' . self::$packet_types[$type] .
                            ' (' . round($stop - $start, 4) . 's)';
             $this->append_log($packet_type, $data);
 …
         if (defined('NET_SFTP_LOGGING')) {
             $packet_type = '<- ' . $this->packet_types[$this->packet_type] .
+            $packet_type = '<- ' . self::$packet_types[$this->packet_type] .
                            ' (' . round($stop - $start, 4) . 's)';
             $this->append_log($packet_type, $packet);
 …
      * Returns a string if NET_SFTP_LOGGING == self::LOG_COMPLEX, an array if NET_SFTP_LOGGING == self::LOG_SIMPLE and false if !defined('NET_SFTP_LOGGING')
+     *
      * @return array|string
+     * @return array|string|false
      */
     public function getSFTPLog()

login-me-now/trunk/vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php

-                      r2911753
+                      r2967574
      * @access private
      */
     private $message_numbers = [];
+    private static $message_numbers = [];
     /**
 …
      * @access private
      */
     private $disconnect_reasons = [];
+    private static $disconnect_reasons = [];
     /**
 …
      * @access private
      */
     private $channel_open_failure_reasons = [];
+    private static $channel_open_failure_reasons = [];
     /**
 …
      * @access private
      */
     private $terminal_modes = [];
+    private static $terminal_modes = [];
     /**
 …
      * @access private
      */
     private $channel_extended_data_type_codes = [];
+    private static $channel_extended_data_type_codes = [];
     /**
 …
     /**
+     * The identifier of the interactive channel which was opened most recently
+     *
+     * @see self::getInteractiveChannelId()
+     * @var int
+     */
+    private $channel_id_last_interactive = 0;
+    /**
      * Packet Size
+     *
 …
      */
     private $request_pty = false;
-    /**
-     * Flag set while exec() is running when using enablePTY()
+     *
-     * @var bool
-     */
-    private $in_request_pty_exec = false;
-    /**
-     * Flag set after startSubsystem() is called
+     *
-     * @var bool
-     */
-    private $in_subsystem;
     /**
 …
     /**
+     * How many channels are currently opened
+     *
+     * @var int
+     */
+    private $channelCount = 0;
+    /**
+     * Does the server support multiple channels? If not then error out
+     * when multiple channels are attempted to be opened
+     *
+     * @var bool
+     */
+    private $errorOnMultipleChannels;
+    /**
      * Default Constructor.
+     *
 …
     public function __construct($host, $port = 22, $timeout = 10)
+    {
+        $this->message_numbers = [
+=> 'NET_SSH2_MSG_DISCONNECT',
+=> 'NET_SSH2_MSG_IGNORE',
+=> 'NET_SSH2_MSG_UNIMPLEMENTED',
+=> 'NET_SSH2_MSG_DEBUG',
+=> 'NET_SSH2_MSG_SERVICE_REQUEST',
+=> 'NET_SSH2_MSG_SERVICE_ACCEPT',
+=> 'NET_SSH2_MSG_KEXINIT',
+=> 'NET_SSH2_MSG_NEWKEYS',
+=> 'NET_SSH2_MSG_KEXDH_INIT',
+=> 'NET_SSH2_MSG_KEXDH_REPLY',
+=> 'NET_SSH2_MSG_USERAUTH_REQUEST',
+=> 'NET_SSH2_MSG_USERAUTH_FAILURE',
+=> 'NET_SSH2_MSG_USERAUTH_SUCCESS',
+=> 'NET_SSH2_MSG_USERAUTH_BANNER',
+=> 'NET_SSH2_MSG_GLOBAL_REQUEST',
+=> 'NET_SSH2_MSG_REQUEST_SUCCESS',
+=> 'NET_SSH2_MSG_REQUEST_FAILURE',
+=> 'NET_SSH2_MSG_CHANNEL_OPEN',
+=> 'NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION',
+=> 'NET_SSH2_MSG_CHANNEL_OPEN_FAILURE',
+=> 'NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST',
+=> 'NET_SSH2_MSG_CHANNEL_DATA',
+=> 'NET_SSH2_MSG_CHANNEL_EXTENDED_DATA',
+=> 'NET_SSH2_MSG_CHANNEL_EOF',
+=> 'NET_SSH2_MSG_CHANNEL_CLOSE',
+=> 'NET_SSH2_MSG_CHANNEL_REQUEST',
+=> 'NET_SSH2_MSG_CHANNEL_SUCCESS',
+=> 'NET_SSH2_MSG_CHANNEL_FAILURE'
+        ];
+        $this->disconnect_reasons = [
+=> 'NET_SSH2_DISCONNECT_HOST_NOT_ALLOWED_TO_CONNECT',
+=> 'NET_SSH2_DISCONNECT_PROTOCOL_ERROR',
+=> 'NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED',
+=> 'NET_SSH2_DISCONNECT_RESERVED',
+=> 'NET_SSH2_DISCONNECT_MAC_ERROR',
+=> 'NET_SSH2_DISCONNECT_COMPRESSION_ERROR',
+=> 'NET_SSH2_DISCONNECT_SERVICE_NOT_AVAILABLE',
+=> 'NET_SSH2_DISCONNECT_PROTOCOL_VERSION_NOT_SUPPORTED',
+=> 'NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE',
+=> 'NET_SSH2_DISCONNECT_CONNECTION_LOST',
+=> 'NET_SSH2_DISCONNECT_BY_APPLICATION',
+=> 'NET_SSH2_DISCONNECT_TOO_MANY_CONNECTIONS',
+=> 'NET_SSH2_DISCONNECT_AUTH_CANCELLED_BY_USER',
+=> 'NET_SSH2_DISCONNECT_NO_MORE_AUTH_METHODS_AVAILABLE',
+=> 'NET_SSH2_DISCONNECT_ILLEGAL_USER_NAME'
+        ];
+        $this->channel_open_failure_reasons = [
+=> 'NET_SSH2_OPEN_ADMINISTRATIVELY_PROHIBITED'
+        ];
+        $this->terminal_modes = [
+=> 'NET_SSH2_TTY_OP_END'
+        ];
+        $this->channel_extended_data_type_codes = [
+=> 'NET_SSH2_EXTENDED_DATA_STDERR'
+        ];
+        $this->define_array(
+            $this->message_numbers,
+            $this->disconnect_reasons,
+            $this->channel_open_failure_reasons,
+            $this->terminal_modes,
+            $this->channel_extended_data_type_codes,
+            [60 => 'NET_SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ'],
+            [60 => 'NET_SSH2_MSG_USERAUTH_PK_OK'],
+            [60 => 'NET_SSH2_MSG_USERAUTH_INFO_REQUEST',
+=> 'NET_SSH2_MSG_USERAUTH_INFO_RESPONSE'],
+            // RFC 4419 - diffie-hellman-group-exchange-sha{1,256}
+            [30 => 'NET_SSH2_MSG_KEXDH_GEX_REQUEST_OLD',
+=> 'NET_SSH2_MSG_KEXDH_GEX_GROUP',
+=> 'NET_SSH2_MSG_KEXDH_GEX_INIT',
+=> 'NET_SSH2_MSG_KEXDH_GEX_REPLY',
+=> 'NET_SSH2_MSG_KEXDH_GEX_REQUEST'],
+            // RFC 5656 - Elliptic Curves (for [email protected])
+            [30 => 'NET_SSH2_MSG_KEX_ECDH_INIT',
+=> 'NET_SSH2_MSG_KEX_ECDH_REPLY']
+        );
+        if (empty(self::$message_numbers)) {
+            self::$message_numbers = [
+=> 'NET_SSH2_MSG_DISCONNECT',
+=> 'NET_SSH2_MSG_IGNORE',
+=> 'NET_SSH2_MSG_UNIMPLEMENTED',
+=> 'NET_SSH2_MSG_DEBUG',
+=> 'NET_SSH2_MSG_SERVICE_REQUEST',
+=> 'NET_SSH2_MSG_SERVICE_ACCEPT',
+=> 'NET_SSH2_MSG_KEXINIT',
+=> 'NET_SSH2_MSG_NEWKEYS',
+=> 'NET_SSH2_MSG_KEXDH_INIT',
+=> 'NET_SSH2_MSG_KEXDH_REPLY',
+=> 'NET_SSH2_MSG_USERAUTH_REQUEST',
+=> 'NET_SSH2_MSG_USERAUTH_FAILURE',
+=> 'NET_SSH2_MSG_USERAUTH_SUCCESS',
+=> 'NET_SSH2_MSG_USERAUTH_BANNER',
+=> 'NET_SSH2_MSG_GLOBAL_REQUEST',
+=> 'NET_SSH2_MSG_REQUEST_SUCCESS',
+=> 'NET_SSH2_MSG_REQUEST_FAILURE',
+=> 'NET_SSH2_MSG_CHANNEL_OPEN',
+=> 'NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION',
+=> 'NET_SSH2_MSG_CHANNEL_OPEN_FAILURE',
+=> 'NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST',
+=> 'NET_SSH2_MSG_CHANNEL_DATA',
+=> 'NET_SSH2_MSG_CHANNEL_EXTENDED_DATA',
+=> 'NET_SSH2_MSG_CHANNEL_EOF',
+=> 'NET_SSH2_MSG_CHANNEL_CLOSE',
+=> 'NET_SSH2_MSG_CHANNEL_REQUEST',
+=> 'NET_SSH2_MSG_CHANNEL_SUCCESS',
+=> 'NET_SSH2_MSG_CHANNEL_FAILURE'
+            ];
+            self::$disconnect_reasons = [
+=> 'NET_SSH2_DISCONNECT_HOST_NOT_ALLOWED_TO_CONNECT',
+=> 'NET_SSH2_DISCONNECT_PROTOCOL_ERROR',
+=> 'NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED',
+=> 'NET_SSH2_DISCONNECT_RESERVED',
+=> 'NET_SSH2_DISCONNECT_MAC_ERROR',
+=> 'NET_SSH2_DISCONNECT_COMPRESSION_ERROR',
+=> 'NET_SSH2_DISCONNECT_SERVICE_NOT_AVAILABLE',
+=> 'NET_SSH2_DISCONNECT_PROTOCOL_VERSION_NOT_SUPPORTED',
+=> 'NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE',
+=> 'NET_SSH2_DISCONNECT_CONNECTION_LOST',
+=> 'NET_SSH2_DISCONNECT_BY_APPLICATION',
+=> 'NET_SSH2_DISCONNECT_TOO_MANY_CONNECTIONS',
+=> 'NET_SSH2_DISCONNECT_AUTH_CANCELLED_BY_USER',
+=> 'NET_SSH2_DISCONNECT_NO_MORE_AUTH_METHODS_AVAILABLE',
+=> 'NET_SSH2_DISCONNECT_ILLEGAL_USER_NAME'
+            ];
+            self::$channel_open_failure_reasons = [
+=> 'NET_SSH2_OPEN_ADMINISTRATIVELY_PROHIBITED'
+            ];
+            self::$terminal_modes = [
+=> 'NET_SSH2_TTY_OP_END'
+            ];
+            self::$channel_extended_data_type_codes = [
+=> 'NET_SSH2_EXTENDED_DATA_STDERR'
+            ];
+            self::define_array(
+                self::$message_numbers,
+                self::$disconnect_reasons,
+                self::$channel_open_failure_reasons,
+                self::$terminal_modes,
+                self::$channel_extended_data_type_codes,
+                [60 => 'NET_SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ'],
+                [60 => 'NET_SSH2_MSG_USERAUTH_PK_OK'],
+                [60 => 'NET_SSH2_MSG_USERAUTH_INFO_REQUEST',
+=> 'NET_SSH2_MSG_USERAUTH_INFO_RESPONSE'],
+                // RFC 4419 - diffie-hellman-group-exchange-sha{1,256}
+                [30 => 'NET_SSH2_MSG_KEXDH_GEX_REQUEST_OLD',
+=> 'NET_SSH2_MSG_KEXDH_GEX_GROUP',
+=> 'NET_SSH2_MSG_KEXDH_GEX_INIT',
+=> 'NET_SSH2_MSG_KEXDH_GEX_REPLY',
+=> 'NET_SSH2_MSG_KEXDH_GEX_REQUEST'],
+                // RFC 5656 - Elliptic Curves (for [email protected])
+                [30 => 'NET_SSH2_MSG_KEX_ECDH_INIT',
+=> 'NET_SSH2_MSG_KEX_ECDH_REPLY']
+            );
+        }
         /**
 …
+    {
         $this->send_kex_first = false;
+    }
+    /**
+     * stream_select wrapper
+     *
+     * Quoting https://stackoverflow.com/a/14262151/569976,
+     * "The general approach to `EINTR` is to simply handle the error and retry the operation again"
+     *
+     * This wrapper does that loop
+     */
+    private static function stream_select(&$read, &$write, &$except, $seconds, $microseconds = null)
+    {
+        $remaining = $seconds + $microseconds / 1000000;
+        $start = microtime(true);
+        while (true) {
+            $result = @stream_select($read, $write, $except, $seconds, $microseconds);
+            if ($result !== false) {
+                return $result;
+            }
+            $elapsed = microtime(true) - $start;
+            $seconds = (int) ($remaining - floor($elapsed));
+            $microseconds = (int) (1000000 * ($remaining - $seconds));
+            if ($elapsed >= $remaining) {
+                return false;
+            }
+        }
+    }
 …
                     $sec = (int) floor($this->curTimeout);
                     $usec = (int) (1000000 * ($this->curTimeout - $sec));
                     if (@stream_select($read, $write, $except, $sec, $usec) === false) {
+                    if (static::stream_select($read, $write, $except, $sec, $usec) === false) {
                         throw new \RuntimeException('Connection timed out whilst receiving server identification string');
+                    }
 …
             throw new UnableToConnectException("Cannot connect to SSH $matches[3] servers");
+        }
+        // Ubuntu's OpenSSH from 5.8 to 6.9 didn't work with multiple channels. see
+        // https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/1334916 for more info.
+        // https://lists.ubuntu.com/archives/oneiric-changes/2011-July/005772.html discusses
+        // when consolekit was incorporated.
+        // https://marc.info/?l=openssh-unix-dev&m=163409903417589&w=2 discusses some of the
+        // issues with how Ubuntu incorporated consolekit
+        $pattern = '#^SSH-2\.0-OpenSSH_([\d.]+)[^ ]* Ubuntu-.*$#';
+        $match = preg_match($pattern, $this->server_identifier, $matches);
+        $match = $match && version_compare('5.8', $matches[1], '<=');
+        $match = $match && version_compare('6.9', $matches[1], '>=');
+        $this->errorOnMultipleChannels = $match;
         if (!$this->send_id_string_first) {
 …
+     *
      * @param string $username
      * @param string|AsymmetricKey|array[]|Agent|null ...$args
+     * @param string|PrivateKey|array[]|Agent|null ...$args
      * @return bool
      * @see self::_login()
 …
+     *
      * @param string $username
      * @param string ...$args
+     * @param string|PrivateKey|array[]|Agent|null ...$args
      * @return bool
      * @see self::_login_helper()
 …
+        }
+        if ($this->in_request_pty_exec) {
+            throw new \RuntimeException('If you want to run multiple exec()\'s you will need to disable (and re-enable if appropriate) a PTY for each one.');
+        }
+        // RFC4254 defines the (client) window size as "bytes the other party can send before it must wait for the window to
+        // be adjusted".  0x7FFFFFFF is, at 2GB, the max size.  technically, it should probably be decremented, but,
+        // honestly, if you're transferring more than 2GB, you probably shouldn't be using phpseclib, anyway.
+        // see http://tools.ietf.org/html/rfc4254#section-5.2 for more info
+        $this->window_size_server_to_client[self::CHANNEL_EXEC] = $this->window_size;
+        // 0x8000 is the maximum max packet size, per http://tools.ietf.org/html/rfc4253#section-6.1, although since PuTTy
+        // uses 0x4000, that's what will be used here, as well.
+        $packet_size = 0x4000;
+        $packet = Strings::packSSH2(
+            'CsN3',
+            NET_SSH2_MSG_CHANNEL_OPEN,
+            'session',
+            self::CHANNEL_EXEC,
+            $this->window_size_server_to_client[self::CHANNEL_EXEC],
+            $packet_size
+        );
+        $this->send_binary_packet($packet);
+        $this->channel_status[self::CHANNEL_EXEC] = NET_SSH2_MSG_CHANNEL_OPEN;
+        $this->get_channel_packet(self::CHANNEL_EXEC);
+        //if ($this->isPTYOpen()) {
+        //    throw new \RuntimeException('If you want to run multiple exec()\'s you will need to disable (and re-enable if appropriate) a PTY for each one.');
+        //}
+        $this->openChannel(self::CHANNEL_EXEC);
         if ($this->request_pty === true) {
 …
                 throw new \RuntimeException('Unable to request pseudo-terminal');
+            }
-            $this->in_request_pty_exec = true;
+        }
 …
         $this->channel_status[self::CHANNEL_EXEC] = NET_SSH2_MSG_CHANNEL_DATA;
+        if ($this->in_request_pty_exec) {
+        if ($this->request_pty === true) {
+            $this->channel_id_last_interactive = self::CHANNEL_EXEC;
             return true;
+        }
 …
     /**
+     * Creates an interactive shell
+     *
+     * @see self::read()
+     * @see self::write()
+     * How many channels are currently open?
+     *
+     * @return int
+     */
+    public function getOpenChannelCount()
+    {
+        return $this->channelCount;
+    }
+    /**
+     * Opens a channel
+     *
+     * @param string $channel
+     * @param bool $skip_extended
      * @return bool
+     * @throws \UnexpectedValueException on receipt of unexpected packets
+     * @throws \RuntimeException on other errors
+     */
+    private function initShell()
+    {
+        if ($this->in_request_pty_exec === true) {
+            return true;
+        }
+        $this->window_size_server_to_client[self::CHANNEL_SHELL] = $this->window_size;
+     */
+    protected function openChannel($channel, $skip_extended = false)
+    {
+        if (isset($this->channel_status[$channel]) && $this->channel_status[$channel] != NET_SSH2_MSG_CHANNEL_CLOSE) {
+            throw new \RuntimeException('Please close the channel (' . $channel . ') before trying to open it again');
+        }
+        $this->channelCount++;
+        if ($this->channelCount > 1 && $this->errorOnMultipleChannels) {
+            throw new \RuntimeException("Ubuntu's OpenSSH from 5.8 to 6.9 doesn't work with multiple channels");
+        }
+        // RFC4254 defines the (client) window size as "bytes the other party can send before it must wait for the window to
+        // be adjusted".  0x7FFFFFFF is, at 2GB, the max size.  technically, it should probably be decremented, but,
+        // honestly, if you're transferring more than 2GB, you probably shouldn't be using phpseclib, anyway.
+        // see http://tools.ietf.org/html/rfc4254#section-5.2 for more info
+        $this->window_size_server_to_client[$channel] = $this->window_size;
+        // 0x8000 is the maximum max packet size, per http://tools.ietf.org/html/rfc4253#section-6.1, although since PuTTy
+        // uses 0x4000, that's what will be used here, as well.
         $packet_size = 0x4000;
 …
             NET_SSH2_MSG_CHANNEL_OPEN,
             'session',
             self::CHANNEL_SHELL,
             $this->window_size_server_to_client[self::CHANNEL_SHELL],
+            $channel,
+            $this->window_size_server_to_client[$channel],
             $packet_size
         );
 …
         $this->send_binary_packet($packet);
+        $this->channel_status[self::CHANNEL_SHELL] = NET_SSH2_MSG_CHANNEL_OPEN;
+        $this->get_channel_packet(self::CHANNEL_SHELL);
+        $this->channel_status[$channel] = NET_SSH2_MSG_CHANNEL_OPEN;
+        return $this->get_channel_packet($channel, $skip_extended);
+    }
+    /**
+     * Creates an interactive shell
+     *
+     * Returns bool(true) if the shell was opened.
+     * Returns bool(false) if the shell was already open.
+     *
+     * @see self::isShellOpen()
+     * @see self::read()
+     * @see self::write()
+     * @return bool
+     * @throws InsufficientSetupException if not authenticated
+     * @throws \UnexpectedValueException on receipt of unexpected packets
+     * @throws \RuntimeException on other errors
+     */
+    public function openShell()
+    {
+        if (!$this->isAuthenticated()) {
+            throw new InsufficientSetupException('Operation disallowed prior to login()');
+        }
+        $this->openChannel(self::CHANNEL_SHELL);
         $terminal_modes = pack('C', NET_SSH2_TTY_OP_END);
 …
         $this->channel_status[self::CHANNEL_SHELL] = NET_SSH2_MSG_CHANNEL_DATA;
+        $this->channel_id_last_interactive = self::CHANNEL_SHELL;
         $this->bitmap |= self::MASK_SHELL;
 …
     /**
+     * Return the channel to be used with read() / write()
+     *
+     * Return the channel to be used with read(), write(), and reset(), if none were specified
+     * @deprecated for lack of transparency in intended channel target, to be potentially replaced
+     *             with method which guarantees open-ness of all yielded channels and throws
+     *             error for multiple open channels
      * @see self::read()
      * @see self::write()
 …
+    {
         switch (true) {
             case $this->in_subsystem:
+            case $this->is_channel_status_data(self::CHANNEL_SUBSYSTEM):
                 return self::CHANNEL_SUBSYSTEM;
             case $this->in_request_pty_exec:
+            case $this->is_channel_status_data(self::CHANNEL_EXEC):
                 return self::CHANNEL_EXEC;
             default:
                 return self::CHANNEL_SHELL;
+        }
+    }
+    /**
+     * Indicates the DATA status on the given channel
+     *
+     * @param int $channel The channel number to evaluate
+     * @return bool
+     */
+    private function is_channel_status_data($channel)
+    {
+        return isset($this->channel_status[$channel]) && $this->channel_status[$channel] == NET_SSH2_MSG_CHANNEL_DATA;
+    }
 …
      * if $mode == self::READ_REGEX, a regular expression.
+     *
+     * If not specifying a channel, an open interactive channel will be selected, or, if there are
+     * no open channels, an interactive shell will be created. If there are multiple open
+     * interactive channels, a legacy behavior will apply in which channel selection prioritizes
+     * an active subsystem, the exec pty, and, lastly, the shell. If using multiple interactive
+     * channels, callers are discouraged from relying on this legacy behavior and should specify
+     * the intended channel.
+     *
      * @see self::write()
      * @param string $expect
+     * @param int $mode
+     * @param int $mode One of the self::READ_* constants
+     * @param int|null $channel Channel id returned by self::getInteractiveChannelId()
      * @return string|bool|null
      * @throws \RuntimeException on connection error
+     */
+    public function read($expect = '', $mode = self::READ_SIMPLE)
+    {
+     * @throws InsufficientSetupException on unexpected channel status, possibly due to closure
+     */
+    public function read($expect = '', $mode = self::READ_SIMPLE, $channel = null)
+    {
+        if (!$this->isAuthenticated()) {
+            throw new InsufficientSetupException('Operation disallowed prior to login()');
+        }
         $this->curTimeout = $this->timeout;
         $this->is_timeout = false;
+        if (!$this->isAuthenticated()) {
+            throw new InsufficientSetupException('Operation disallowed prior to login()');
+        }
+        if (!($this->bitmap & self::MASK_SHELL) && !$this->initShell()) {
+            throw new \RuntimeException('Unable to initiate an interactive shell session');
+        }
+        $channel = $this->get_interactive_channel();
+        if ($channel === null) {
+            $channel = $this->get_interactive_channel();
+        }
+        if (!$this->is_channel_status_data($channel) && empty($this->channel_buffers[$channel])) {
+            if ($channel != self::CHANNEL_SHELL) {
+                throw new InsufficientSetupException('Data is not available on channel');
+            } elseif (!$this->openShell()) {
+                throw new \RuntimeException('Unable to initiate an interactive shell session');
+            }
+        }
         if ($mode == self::READ_NEXT) {
 …
             $response = $this->get_channel_packet($channel);
             if ($response === true) {
-                $this->in_request_pty_exec = false;
                 return Strings::shift($this->interactiveBuffer, strlen($this->interactiveBuffer));
+            }
 …
     /**
      * Inputs a command into an interactive shell.
+     *
+     * If not specifying a channel, an open interactive channel will be selected, or, if there are
+     * no open channels, an interactive shell will be created. If there are multiple open
+     * interactive channels, a legacy behavior will apply in which channel selection prioritizes
+     * an active subsystem, the exec pty, and, lastly, the shell. If using multiple interactive
+     * channels, callers are discouraged from relying on this legacy behavior and should specify
+     * the intended channel.
+     *
      * @see SSH2::read()
      * @param string $cmd
+     * @param int|null $channel Channel id returned by self::getInteractiveChannelId()
      * @return void
      * @throws \RuntimeException on connection error
+     */
+    public function write($cmd)
+     * @throws InsufficientSetupException on unexpected channel status, possibly due to closure
+     */
+    public function write($cmd, $channel = null)
+    {
         if (!$this->isAuthenticated()) {
 …
+        }
+        if (!($this->bitmap & self::MASK_SHELL) && !$this->initShell()) {
+            throw new \RuntimeException('Unable to initiate an interactive shell session');
+        }
+        $this->send_channel_packet($this->get_interactive_channel(), $cmd);
+        if ($channel === null) {
+            $channel = $this->get_interactive_channel();
+        }
+        if (!$this->is_channel_status_data($channel)) {
+            if ($channel != self::CHANNEL_SHELL) {
+                throw new InsufficientSetupException('Data is not available on channel');
+            } elseif (!$this->openShell()) {
+                throw new \RuntimeException('Unable to initiate an interactive shell session');
+            }
+        }
+        $this->send_channel_packet($channel, $cmd);
+    }
 …
     public function startSubsystem($subsystem)
+    {
+        $this->window_size_server_to_client[self::CHANNEL_SUBSYSTEM] = $this->window_size;
+        $packet = Strings::packSSH2(
+            'CsN3',
+            NET_SSH2_MSG_CHANNEL_OPEN,
+            'session',
+            self::CHANNEL_SUBSYSTEM,
+            $this->window_size,
+x4000
+        );
+        $this->send_binary_packet($packet);
+        $this->channel_status[self::CHANNEL_SUBSYSTEM] = NET_SSH2_MSG_CHANNEL_OPEN;
+        $this->get_channel_packet(self::CHANNEL_SUBSYSTEM);
+        $this->openChannel(self::CHANNEL_SUBSYSTEM);
         $packet = Strings::packSSH2(
 …
         $this->channel_status[self::CHANNEL_SUBSYSTEM] = NET_SSH2_MSG_CHANNEL_DATA;
+        $this->bitmap |= self::MASK_SHELL;
+        $this->in_subsystem = true;
+        $this->channel_id_last_interactive = self::CHANNEL_SUBSYSTEM;
         return true;
 …
     public function stopSubsystem()
+    {
+        $this->in_subsystem = false;
+        $this->close_channel(self::CHANNEL_SUBSYSTEM);
+        if ($this->isInteractiveChannelOpen(self::CHANNEL_SUBSYSTEM)) {
+            $this->close_channel(self::CHANNEL_SUBSYSTEM);
+        }
         return true;
+    }
 …
      * If read() timed out you might want to just close the channel and have it auto-restart on the next read() call
+     *
+     */
+    public function reset()
+    {
+        $this->close_channel($this->get_interactive_channel());
+     * If not specifying a channel, an open interactive channel will be selected. If there are
+     * multiple open interactive channels, a legacy behavior will apply in which channel selection
+     * prioritizes an active subsystem, the exec pty, and, lastly, the shell. If using multiple
+     * interactive channels, callers are discouraged from relying on this legacy behavior and
+     * should specify the intended channel.
+     *
+     * @param int|null $channel Channel id returned by self::getInteractiveChannelId()
+     * @return void
+     */
+    public function reset($channel = null)
+    {
+        if ($channel === null) {
+            $channel = $this->get_interactive_channel();
+        }
+        if ($this->isInteractiveChannelOpen($channel)) {
+            $this->close_channel($channel);
+        }
+    }
 …
     public function isConnected()
+    {
         return (bool) ($this->bitmap & self::MASK_CONNECTED);
+        return ($this->bitmap & self::MASK_CONNECTED) && is_resource($this->fsock) && !feof($this->fsock);
+    }
 …
+    {
         return (bool) ($this->bitmap & self::MASK_LOGIN);
+    }
+    /**
+     * Is the interactive shell active?
+     *
+     * @return bool
+     */
+    public function isShellOpen()
+    {
+        return $this->isInteractiveChannelOpen(self::CHANNEL_SHELL);
+    }
+    /**
+     * Is the exec pty active?
+     *
+     * @return bool
+     */
+    public function isPTYOpen()
+    {
+        return $this->isInteractiveChannelOpen(self::CHANNEL_EXEC);
+    }
+    /**
+     * Is the given interactive channel active?
+     *
+     * @param int $channel Channel id returned by self::getInteractiveChannelId()
+     * @return bool
+     */
+    public function isInteractiveChannelOpen($channel)
+    {
+        return $this->isAuthenticated() && $this->is_channel_status_data($channel);
+    }
+    /**
+     * Returns a channel identifier, presently of the last interactive channel opened, regardless of current status.
+     * Returns 0 if no interactive channel has been opened.
+     *
+     * @see self::isInteractiveChannelOpen()
+     * @return int
+     */
+    public function getInteractiveChannelId()
+    {
+        return $this->channel_id_last_interactive;
+    }
 …
+        }
-        $this->window_size_server_to_client[self::CHANNEL_KEEP_ALIVE] = $this->window_size;
-        $packet_size = 0x4000;
-        $packet = Strings::packSSH2(
-            'CsN3',
-            NET_SSH2_MSG_CHANNEL_OPEN,
-            'session',
-            self::CHANNEL_KEEP_ALIVE,
-            $this->window_size_server_to_client[self::CHANNEL_KEEP_ALIVE],
-            $packet_size
-        );
         try {
+            $this->send_binary_packet($packet);
+            $this->channel_status[self::CHANNEL_KEEP_ALIVE] = NET_SSH2_MSG_CHANNEL_OPEN;
+            $response = $this->get_channel_packet(self::CHANNEL_KEEP_ALIVE);
+            $this->openChannel(self::CHANNEL_KEEP_ALIVE);
         } catch (\RuntimeException $e) {
             return $this->reconnect();
 …
             if (!$this->curTimeout) {
                 if ($this->keepAlive <= 0) {
                     @stream_select($read, $write, $except, null);
+                    static::stream_select($read, $write, $except, null);
                 } else {
                     if (!@stream_select($read, $write, $except, $this->keepAlive)) {
+                    if (!static::stream_select($read, $write, $except, $this->keepAlive)) {
                         $this->send_binary_packet(pack('CN', NET_SSH2_MSG_IGNORE, 0));
                         return $this->get_binary_packet(true);
 …
                 if ($this->keepAlive > 0 && $this->keepAlive < $this->curTimeout) {
                     if (!@stream_select($read, $write, $except, $this->keepAlive)) {
+                    if (!static::stream_select($read, $write, $except, $this->keepAlive)) {
                         $this->send_binary_packet(pack('CN', NET_SSH2_MSG_IGNORE, 0));
                         $elapsed = microtime(true) - $start;
 …
                 // this can return a "stream_select(): unable to select [4]: Interrupted system call" error
                 if (!@stream_select($read, $write, $except, $sec, $usec)) {
+                if (!static::stream_select($read, $write, $except, $sec, $usec)) {
                     $this->is_timeout = true;
                     return true;
 …
         if (defined('NET_SSH2_LOGGING')) {
             $current = microtime(true);
             $message_number = isset($this->message_numbers[ord($payload[0])]) ? $this->message_numbers[ord($payload[0])] : 'UNKNOWN (' . ord($payload[0]) . ')';
+            $message_number = isset(self::$message_numbers[ord($payload[0])]) ? self::$message_numbers[ord($payload[0])] : 'UNKNOWN (' . ord($payload[0]) . ')';
             $message_number = '<- ' . $message_number .
                               ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's)';
 …
                 Strings::shift($payload, 1);
                 list($reason_code, $message) = Strings::unpackSSH2('Ns', $payload);
                 $this->errors[] = 'SSH_MSG_DISCONNECT: ' . $this->disconnect_reasons[$reason_code] . "\r\n$message";
+                $this->errors[] = 'SSH_MSG_DISCONNECT: ' . static::$disconnect_reasons[$reason_code] . "\r\n$message";
                 $this->bitmap = 0;
                 return false;
 …
     public function disablePTY()
+    {
         if ($this->in_request_pty_exec) {
+        if ($this->isPTYOpen()) {
             $this->close_channel(self::CHANNEL_EXEC);
-            $this->in_request_pty_exec = false;
+        }
         $this->request_pty = false;
 …
      * - if the channel status is CHANNEL_OPEN and the response was CHANNEL_OPEN_CONFIRMATION
      * - if the channel status is CHANNEL_REQUEST and the response was CHANNEL_SUCCESS
+     * - if the channel status is CHANNEL_CLOSE and the response was CHANNEL_CLOSE
+     *
      * bool(false) is returned if:
 …
+                        }
                     case NET_SSH2_MSG_CHANNEL_CLOSE:
+                        return $type == NET_SSH2_MSG_CHANNEL_CLOSE ? true : $this->get_channel_packet($client_channel, $skip_extended);
+                        if ($client_channel == $channel && $type == NET_SSH2_MSG_CHANNEL_CLOSE) {
+                            return true;
+                        }
+                        return $this->get_channel_packet($client_channel, $skip_extended);
+                }
+            }
 …
                     $this->curTimeout = 5;
+                    if ($this->bitmap & self::MASK_SHELL) {
+                        $this->bitmap &= ~self::MASK_SHELL;
+                    }
+                    $this->close_channel_bitmap($channel);
                     if ($this->channel_status[$channel] != NET_SSH2_MSG_CHANNEL_EOF) {
                         $this->send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$channel]));
 …
                     $this->channel_status[$channel] = NET_SSH2_MSG_CHANNEL_CLOSE;
+                    $this->channelCount--;
                     if ($client_channel == $channel) {
                         return true;
 …
         if (defined('NET_SSH2_LOGGING')) {
             $current = microtime(true);
             $message_number = isset($this->message_numbers[ord($logged[0])]) ? $this->message_numbers[ord($logged[0])] : 'UNKNOWN (' . ord($logged[0]) . ')';
+            $message_number = isset(self::$message_numbers[ord($logged[0])]) ? self::$message_numbers[ord($logged[0])] : 'UNKNOWN (' . ord($logged[0]) . ')';
             $message_number = '-> ' . $message_number .
                               ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's)';
 …
         if (strlen($packet) != $sent) {
             $this->bitmap = 0;
+            throw new \RuntimeException("Only $sent of " . strlen($packet) . " bytes were sent");
+            $message = $sent === false ?
+                'Unable to write ' . strlen($packet) . ' bytes' :
+                "Only $sent of " . strlen($packet) . " bytes were sent";
+            throw new \RuntimeException($message);
+        }
+    }
 …
         $this->channel_status[$client_channel] = NET_SSH2_MSG_CHANNEL_CLOSE;
+        $this->channelCount--;
         $this->curTimeout = 5;
         while (!is_bool($this->get_channel_packet($client_channel))) {
+        }
-        if ($this->is_timeout) {
-            $this->disconnect();
+        }
 …
+        }
+        if ($this->bitmap & self::MASK_SHELL) {
+            $this->bitmap &= ~self::MASK_SHELL;
+        $this->close_channel_bitmap($client_channel);
+    }
+    /**
+     * Maintains execution state bitmap in response to channel closure
+     *
+     * @param int $client_channel The channel number to maintain closure status of
+     * @return void
+     */
+    private function close_channel_bitmap($client_channel)
+    {
+        switch ($client_channel) {
+            case self::CHANNEL_SHELL:
+                // Shell status has been maintained in the bitmap for backwards
+                //  compatibility sake, but can be removed going forward
+                if ($this->bitmap & self::MASK_SHELL) {
+                    $this->bitmap &= ~self::MASK_SHELL;
+                }
+                break;
+        }
+    }
 …
      * @access protected
      */
     protected function define_array(...$args)
+    protected static function define_array(...$args)
+    {
         foreach ($args as $arg) {
 …
+            ]
         ];
+    }
+    /**
+     * Force multiple channels (even if phpseclib has decided to disable them)
+     */
+    public function forceMultipleChannels()
+    {
+        $this->errorOnMultipleChannels = false;
+    }

Note: See TracChangeset for help on using the changeset viewer.

Trac UI Preferences

Context Navigation

Changeset 2967574

Legend:

Download in other formats: