gravityview / GravityView

trustedlogin/psr/log/Psr/Log/Test/TestLogger.php

Indentation +78 added lines, -78 removed lines

@@ -62,92 +62,92 @@
  */
 class TestLogger extends AbstractLogger
 {
-    /**
-     * @var array
-     */
-    public $records = [];
+	/**
+	 * @var array
+	 */
+	public $records = [];
 
-    public $recordsByLevel = [];
+	public $recordsByLevel = [];
 
-    /**
-     * @inheritdoc
-     */
-    public function log($level, $message, array $context = [])
-    {
-        $record = [
-            'level' => $level,
-            'message' => $message,
-            'context' => $context,
-        ];
+	/**
+	 * @inheritdoc
+	 */
+	public function log($level, $message, array $context = [])
+	{
+		$record = [
+			'level' => $level,
+			'message' => $message,
+			'context' => $context,
+		];
 
-        $this->recordsByLevel[$record['level']][] = $record;
-        $this->records[] = $record;
-    }
+		$this->recordsByLevel[$record['level']][] = $record;
+		$this->records[] = $record;
+	}
 
-    public function hasRecords($level)
-    {
-        return isset($this->recordsByLevel[$level]);
-    }
+	public function hasRecords($level)
+	{
+		return isset($this->recordsByLevel[$level]);
+	}
 
-    public function hasRecord($record, $level)
-    {
-        if (is_string($record)) {
-            $record = ['message' => $record];
-        }
-        return $this->hasRecordThatPasses(function ($rec) use ($record) {
-            if ($rec['message'] !== $record['message']) {
-                return false;
-            }
-            if (isset($record['context']) && $rec['context'] !== $record['context']) {
-                return false;
-            }
-            return true;
-        }, $level);
-    }
+	public function hasRecord($record, $level)
+	{
+		if (is_string($record)) {
+			$record = ['message' => $record];
+		}
+		return $this->hasRecordThatPasses(function ($rec) use ($record) {
+			if ($rec['message'] !== $record['message']) {
+				return false;
+			}
+			if (isset($record['context']) && $rec['context'] !== $record['context']) {
+				return false;
+			}
+			return true;
+		}, $level);
+	}
 
-    public function hasRecordThatContains($message, $level)
-    {
-        return $this->hasRecordThatPasses(function ($rec) use ($message) {
-            return strpos($rec['message'], $message) !== false;
-        }, $level);
-    }
+	public function hasRecordThatContains($message, $level)
+	{
+		return $this->hasRecordThatPasses(function ($rec) use ($message) {
+			return strpos($rec['message'], $message) !== false;
+		}, $level);
+	}
 
-    public function hasRecordThatMatches($regex, $level)
-    {
-        return $this->hasRecordThatPasses(function ($rec) use ($regex) {
-            return preg_match($regex, $rec['message']) > 0;
-        }, $level);
-    }
+	public function hasRecordThatMatches($regex, $level)
+	{
+		return $this->hasRecordThatPasses(function ($rec) use ($regex) {
+			return preg_match($regex, $rec['message']) > 0;
+		}, $level);
+	}
 
-    public function hasRecordThatPasses(callable $predicate, $level)
-    {
-        if (!isset($this->recordsByLevel[$level])) {
-            return false;
-        }
-        foreach ($this->recordsByLevel[$level] as $i => $rec) {
-            if (call_user_func($predicate, $rec, $i)) {
-                return true;
-            }
-        }
-        return false;
-    }
+	public function hasRecordThatPasses(callable $predicate, $level)
+	{
+		if (!isset($this->recordsByLevel[$level])) {
+			return false;
+		}
+		foreach ($this->recordsByLevel[$level] as $i => $rec) {
+			if (call_user_func($predicate, $rec, $i)) {
+				return true;
+			}
+		}
+		return false;
+	}
 
-    public function __call($method, $args)
-    {
-        if (preg_match('/(.*)(Debug|Info|Notice|Warning|Error|Critical|Alert|Emergency)(.*)/', $method, $matches) > 0) {
-            $genericMethod = $matches[1] . ('Records' !== $matches[3] ? 'Record' : '') . $matches[3];
-            $level = strtolower($matches[2]);
-            if (method_exists($this, $genericMethod)) {
-                $args[] = $level;
-                return call_user_func_array([$this, $genericMethod], $args);
-            }
-        }
-        throw new \BadMethodCallException('Call to undefined method ' . get_class($this) . '::' . $method . '()');
-    }
+	public function __call($method, $args)
+	{
+		if (preg_match('/(.*)(Debug|Info|Notice|Warning|Error|Critical|Alert|Emergency)(.*)/', $method, $matches) > 0) {
+			$genericMethod = $matches[1] . ('Records' !== $matches[3] ? 'Record' : '') . $matches[3];
+			$level = strtolower($matches[2]);
+			if (method_exists($this, $genericMethod)) {
+				$args[] = $level;
+				return call_user_func_array([$this, $genericMethod], $args);
+			}
+		}
+		throw new \BadMethodCallException('Call to undefined method ' . get_class($this) . '::' . $method . '()');
+	}
 
-    public function reset()
-    {
-        $this->records = [];
-        $this->recordsByLevel = [];
-    }
+	public function reset()
+	{
+		$this->records = [];
+		$this->recordsByLevel = [];
+	}
 }

trustedlogin/psr/log/Psr/Log/Test/LoggerInterfaceTest.php

Indentation +121 added lines, -121 removed lines

@@ -20,125 +20,125 @@
  */
 abstract class LoggerInterfaceTest extends TestCase
 {
-    /**
-     * @return LoggerInterface
-     */
-    abstract public function getLogger();
-
-    /**
-     * This must return the log messages in order.
-     *
-     * The simple formatting of the messages is: "<LOG LEVEL> <MESSAGE>".
-     *
-     * Example ->error('Foo') would yield "error Foo".
-     *
-     * @return string[]
-     */
-    abstract public function getLogs();
-
-    public function testImplements()
-    {
-        $this->assertInstanceOf('GravityView\Psr\Log\LoggerInterface', $this->getLogger());
-    }
-
-    /**
-     * @dataProvider provideLevelsAndMessages
-     */
-    public function testLogsAtAllLevels($level, $message)
-    {
-        $logger = $this->getLogger();
-        $logger->{$level}($message, array('user' => 'Bob'));
-        $logger->log($level, $message, array('user' => 'Bob'));
-
-        $expected = array(
-            $level.' message of level '.$level.' with context: Bob',
-            $level.' message of level '.$level.' with context: Bob',
-        );
-        $this->assertEquals($expected, $this->getLogs());
-    }
-
-    public function provideLevelsAndMessages()
-    {
-        return array(
-            LogLevel::EMERGENCY => array(LogLevel::EMERGENCY, 'message of level emergency with context: {user}'),
-            LogLevel::ALERT => array(LogLevel::ALERT, 'message of level alert with context: {user}'),
-            LogLevel::CRITICAL => array(LogLevel::CRITICAL, 'message of level critical with context: {user}'),
-            LogLevel::ERROR => array(LogLevel::ERROR, 'message of level error with context: {user}'),
-            LogLevel::WARNING => array(LogLevel::WARNING, 'message of level warning with context: {user}'),
-            LogLevel::NOTICE => array(LogLevel::NOTICE, 'message of level notice with context: {user}'),
-            LogLevel::INFO => array(LogLevel::INFO, 'message of level info with context: {user}'),
-            LogLevel::DEBUG => array(LogLevel::DEBUG, 'message of level debug with context: {user}'),
-        );
-    }
-
-    /**
-     * @expectedException \GravityView\Psr\Log\InvalidArgumentException
-     */
-    public function testThrowsOnInvalidLevel()
-    {
-        $logger = $this->getLogger();
-        $logger->log('invalid level', 'Foo');
-    }
-
-    public function testContextReplacement()
-    {
-        $logger = $this->getLogger();
-        $logger->info('{Message {nothing} {user} {foo.bar} a}', array('user' => 'Bob', 'foo.bar' => 'Bar'));
-
-        $expected = array('info {Message {nothing} Bob Bar a}');
-        $this->assertEquals($expected, $this->getLogs());
-    }
-
-    public function testObjectCastToString()
-    {
-        if (method_exists($this, 'createPartialMock')) {
-            $dummy = $this->createPartialMock('GravityView\GravityView\Psr\Log\Test\DummyTest', array('__toString'));
-        } else {
-            $dummy = $this->getMock('GravityView\GravityView\Psr\Log\Test\DummyTest', array('__toString'));
-        }
-        $dummy->expects($this->once())
-            ->method('__toString')
-            ->will($this->returnValue('DUMMY'));
-
-        $this->getLogger()->warning($dummy);
-
-        $expected = array('warning DUMMY');
-        $this->assertEquals($expected, $this->getLogs());
-    }
-
-    public function testContextCanContainAnything()
-    {
-        $closed = fopen('php://memory', 'r');
-        fclose($closed);
-
-        $context = array(
-            'bool' => true,
-            'null' => null,
-            'string' => 'Foo',
-            'int' => 0,
-            'float' => 0.5,
-            'nested' => array('with object' => new DummyTest),
-            'object' => new \DateTime,
-            'resource' => fopen('php://memory', 'r'),
-            'closed' => $closed,
-        );
-
-        $this->getLogger()->warning('Crazy context data', $context);
-
-        $expected = array('warning Crazy context data');
-        $this->assertEquals($expected, $this->getLogs());
-    }
-
-    public function testContextExceptionKeyCanBeExceptionOrOtherValues()
-    {
-        $logger = $this->getLogger();
-        $logger->warning('Random message', array('exception' => 'oops'));
-        $logger->critical('Uncaught Exception!', array('exception' => new \LogicException('Fail')));
-
-        $expected = array(
-            'warning Random message',
-            'critical Uncaught Exception!'
-        );
-        $this->assertEquals($expected, $this->getLogs());
-    }
+	/**
+	 * @return LoggerInterface
+	 */
+	abstract public function getLogger();
+
+	/**
+	 * This must return the log messages in order.
+	 *
+	 * The simple formatting of the messages is: "<LOG LEVEL> <MESSAGE>".
+	 *
+	 * Example ->error('Foo') would yield "error Foo".
+	 *
+	 * @return string[]
+	 */
+	abstract public function getLogs();
+
+	public function testImplements()
+	{
+		$this->assertInstanceOf('GravityView\Psr\Log\LoggerInterface', $this->getLogger());
+	}
+
+	/**
+	 * @dataProvider provideLevelsAndMessages
+	 */
+	public function testLogsAtAllLevels($level, $message)
+	{
+		$logger = $this->getLogger();
+		$logger->{$level}($message, array('user' => 'Bob'));
+		$logger->log($level, $message, array('user' => 'Bob'));
+
+		$expected = array(
+			$level.' message of level '.$level.' with context: Bob',
+			$level.' message of level '.$level.' with context: Bob',
+		);
+		$this->assertEquals($expected, $this->getLogs());
+	}
+
+	public function provideLevelsAndMessages()
+	{
+		return array(
+			LogLevel::EMERGENCY => array(LogLevel::EMERGENCY, 'message of level emergency with context: {user}'),
+			LogLevel::ALERT => array(LogLevel::ALERT, 'message of level alert with context: {user}'),
+			LogLevel::CRITICAL => array(LogLevel::CRITICAL, 'message of level critical with context: {user}'),
+			LogLevel::ERROR => array(LogLevel::ERROR, 'message of level error with context: {user}'),
+			LogLevel::WARNING => array(LogLevel::WARNING, 'message of level warning with context: {user}'),
+			LogLevel::NOTICE => array(LogLevel::NOTICE, 'message of level notice with context: {user}'),
+			LogLevel::INFO => array(LogLevel::INFO, 'message of level info with context: {user}'),
+			LogLevel::DEBUG => array(LogLevel::DEBUG, 'message of level debug with context: {user}'),
+		);
+	}
+
+	/**
+	 * @expectedException \GravityView\Psr\Log\InvalidArgumentException
+	 */
+	public function testThrowsOnInvalidLevel()
+	{
+		$logger = $this->getLogger();
+		$logger->log('invalid level', 'Foo');
+	}
+
+	public function testContextReplacement()
+	{
+		$logger = $this->getLogger();
+		$logger->info('{Message {nothing} {user} {foo.bar} a}', array('user' => 'Bob', 'foo.bar' => 'Bar'));
+
+		$expected = array('info {Message {nothing} Bob Bar a}');
+		$this->assertEquals($expected, $this->getLogs());
+	}
+
+	public function testObjectCastToString()
+	{
+		if (method_exists($this, 'createPartialMock')) {
+			$dummy = $this->createPartialMock('GravityView\GravityView\Psr\Log\Test\DummyTest', array('__toString'));
+		} else {
+			$dummy = $this->getMock('GravityView\GravityView\Psr\Log\Test\DummyTest', array('__toString'));
+		}
+		$dummy->expects($this->once())
+			->method('__toString')
+			->will($this->returnValue('DUMMY'));
+
+		$this->getLogger()->warning($dummy);
+
+		$expected = array('warning DUMMY');
+		$this->assertEquals($expected, $this->getLogs());
+	}
+
+	public function testContextCanContainAnything()
+	{
+		$closed = fopen('php://memory', 'r');
+		fclose($closed);
+
+		$context = array(
+			'bool' => true,
+			'null' => null,
+			'string' => 'Foo',
+			'int' => 0,
+			'float' => 0.5,
+			'nested' => array('with object' => new DummyTest),
+			'object' => new \DateTime,
+			'resource' => fopen('php://memory', 'r'),
+			'closed' => $closed,
+		);
+
+		$this->getLogger()->warning('Crazy context data', $context);
+
+		$expected = array('warning Crazy context data');
+		$this->assertEquals($expected, $this->getLogs());
+	}
+
+	public function testContextExceptionKeyCanBeExceptionOrOtherValues()
+	{
+		$logger = $this->getLogger();
+		$logger->warning('Random message', array('exception' => 'oops'));
+		$logger->critical('Uncaught Exception!', array('exception' => new \LogicException('Fail')));
+
+		$expected = array(
+			'warning Random message',
+			'critical Uncaught Exception!'
+		);
+		$this->assertEquals($expected, $this->getLogs());
+	}
 }

trustedlogin/psr/log/Psr/Log/Test/DummyTest.php

Indentation +4 added lines, -4 removed lines

@@ -17,8 +17,8 @@
  */
 class DummyTest
 {
-    public function __toString()
-    {
-        return 'DummyTest';
-    }
+	public function __toString()
+	{
+		return 'DummyTest';
+	}
 }

trustedlogin/psr/log/Psr/Log/LoggerInterface.php

Indentation +95 added lines, -95 removed lines

@@ -25,107 +25,107 @@
  */
 interface LoggerInterface
 {
-    /**
-     * System is unusable.
-     *
-     * @param string  $message
-     * @param mixed[] $context
-     *
-     * @return void
-     */
-    public function emergency($message, array $context = array());
+	/**
+	 * System is unusable.
+	 *
+	 * @param string  $message
+	 * @param mixed[] $context
+	 *
+	 * @return void
+	 */
+	public function emergency($message, array $context = array());
 
-    /**
-     * Action must be taken immediately.
-     *
-     * Example: Entire website down, database unavailable, etc. This should
-     * trigger the SMS alerts and wake you up.
-     *
-     * @param string  $message
-     * @param mixed[] $context
-     *
-     * @return void
-     */
-    public function alert($message, array $context = array());
+	/**
+	 * Action must be taken immediately.
+	 *
+	 * Example: Entire website down, database unavailable, etc. This should
+	 * trigger the SMS alerts and wake you up.
+	 *
+	 * @param string  $message
+	 * @param mixed[] $context
+	 *
+	 * @return void
+	 */
+	public function alert($message, array $context = array());
 
-    /**
-     * Critical conditions.
-     *
-     * Example: Application component unavailable, unexpected exception.
-     *
-     * @param string  $message
-     * @param mixed[] $context
-     *
-     * @return void
-     */
-    public function critical($message, array $context = array());
+	/**
+	 * Critical conditions.
+	 *
+	 * Example: Application component unavailable, unexpected exception.
+	 *
+	 * @param string  $message
+	 * @param mixed[] $context
+	 *
+	 * @return void
+	 */
+	public function critical($message, array $context = array());
 
-    /**
-     * Runtime errors that do not require immediate action but should typically
-     * be logged and monitored.
-     *
-     * @param string  $message
-     * @param mixed[] $context
-     *
-     * @return void
-     */
-    public function error($message, array $context = array());
+	/**
+	 * Runtime errors that do not require immediate action but should typically
+	 * be logged and monitored.
+	 *
+	 * @param string  $message
+	 * @param mixed[] $context
+	 *
+	 * @return void
+	 */
+	public function error($message, array $context = array());
 
-    /**
-     * Exceptional occurrences that are not errors.
-     *
-     * Example: Use of deprecated APIs, poor use of an API, undesirable things
-     * that are not necessarily wrong.
-     *
-     * @param string  $message
-     * @param mixed[] $context
-     *
-     * @return void
-     */
-    public function warning($message, array $context = array());
+	/**
+	 * Exceptional occurrences that are not errors.
+	 *
+	 * Example: Use of deprecated APIs, poor use of an API, undesirable things
+	 * that are not necessarily wrong.
+	 *
+	 * @param string  $message
+	 * @param mixed[] $context
+	 *
+	 * @return void
+	 */
+	public function warning($message, array $context = array());
 
-    /**
-     * Normal but significant events.
-     *
-     * @param string  $message
-     * @param mixed[] $context
-     *
-     * @return void
-     */
-    public function notice($message, array $context = array());
+	/**
+	 * Normal but significant events.
+	 *
+	 * @param string  $message
+	 * @param mixed[] $context
+	 *
+	 * @return void
+	 */
+	public function notice($message, array $context = array());
 
-    /**
-     * Interesting events.
-     *
-     * Example: User logs in, SQL logs.
-     *
-     * @param string  $message
-     * @param mixed[] $context
-     *
-     * @return void
-     */
-    public function info($message, array $context = array());
+	/**
+	 * Interesting events.
+	 *
+	 * Example: User logs in, SQL logs.
+	 *
+	 * @param string  $message
+	 * @param mixed[] $context
+	 *
+	 * @return void
+	 */
+	public function info($message, array $context = array());
 
-    /**
-     * Detailed debug information.
-     *
-     * @param string  $message
-     * @param mixed[] $context
-     *
-     * @return void
-     */
-    public function debug($message, array $context = array());
+	/**
+	 * Detailed debug information.
+	 *
+	 * @param string  $message
+	 * @param mixed[] $context
+	 *
+	 * @return void
+	 */
+	public function debug($message, array $context = array());
 
-    /**
-     * Logs with an arbitrary level.
-     *
-     * @param mixed   $level
-     * @param string  $message
-     * @param mixed[] $context
-     *
-     * @return void
-     *
-     * @throws \GravityView\Psr\Log\InvalidArgumentException
-     */
-    public function log($level, $message, array $context = array());
+	/**
+	 * Logs with an arbitrary level.
+	 *
+	 * @param mixed   $level
+	 * @param string  $message
+	 * @param mixed[] $context
+	 *
+	 * @return void
+	 *
+	 * @throws \GravityView\Psr\Log\InvalidArgumentException
+	 */
+	public function log($level, $message, array $context = array());
 }

trustedlogin/autoload.php

Indentation +12 added lines, -12 removed lines

@@ -2,19 +2,19 @@
 // autoload.php @generated by Strauss
 
 if ( file_exists( __DIR__ . '/autoload-classmap.php' ) ) {
-    $class_map = include __DIR__ . '/autoload-classmap.php';
-    if ( is_array( $class_map ) ) {
-        spl_autoload_register(
-            function ( $classname ) use ( $class_map ) {
-                if ( isset( $class_map[ $classname ] ) && file_exists( $class_map[ $classname ] ) ) {
-                    require_once $class_map[ $classname ];
-                }
-            }
-        );
-    }
-    unset( $class_map );
+	$class_map = include __DIR__ . '/autoload-classmap.php';
+	if ( is_array( $class_map ) ) {
+		spl_autoload_register(
+			function ( $classname ) use ( $class_map ) {
+				if ( isset( $class_map[ $classname ] ) && file_exists( $class_map[ $classname ] ) ) {
+					require_once $class_map[ $classname ];
+				}
+			}
+		);
+	}
+	unset( $class_map );
 }
 
 if ( file_exists( __DIR__ . '/autoload-files.php' ) ) {
-    require_once __DIR__ . '/autoload-files.php';
+	require_once __DIR__ . '/autoload-files.php';
 }
\ No newline at end of file

trustedlogin/katzgrau/klogger/src/Logger.php

Indentation +318 added lines, -318 removed lines

@@ -34,322 +34,322 @@
  */

 class Logger extends AbstractLogger

 {

-    /**

-     * KLogger options

-     *  Anything options not considered 'core' to the logging library should be

-     *  settable view the third parameter in the constructor

-     *

-     *  Core options include the log file path and the log threshold

-     *

-     * @var array

-     */

-    protected $options = array (

-        'extension'      => 'txt',

-        'dateFormat'     => 'Y-m-d G:i:s.u',

-        'filename'       => false,

-        'flushFrequency' => false,

-        'prefix'         => 'log_',

-        'logFormat'      => false,

-        'appendContext'  => true,

-    );

-

-    /**

-     * Path to the log file

-     * @var string

-     */

-    private $logFilePath;

-

-    /**

-     * Current minimum logging threshold

-     * @var integer

-     */

-    protected $logLevelThreshold = LogLevel::DEBUG;

-

-    /**

-     * The number of lines logged in this instance's lifetime

-     * @var int

-     */

-    private $logLineCount = 0;

-

-    /**

-     * Log Levels

-     * @var array

-     */

-    protected $logLevels = array(

-        LogLevel::EMERGENCY => 0,

-        LogLevel::ALERT     => 1,

-        LogLevel::CRITICAL  => 2,

-        LogLevel::ERROR     => 3,

-        LogLevel::WARNING   => 4,

-        LogLevel::NOTICE    => 5,

-        LogLevel::INFO      => 6,

-        LogLevel::DEBUG     => 7

-    );

-

-    /**

-     * This holds the file handle for this instance's log file

-     * @var resource

-     */

-    private $fileHandle;

-

-    /**

-     * This holds the last line logged to the logger

-     *  Used for unit tests

-     * @var string

-     */

-    private $lastLine = '';

-

-    /**

-     * Octal notation for default permissions of the log file

-     * @var integer

-     */

-    private $defaultPermissions = 0777;

-

-    /**

-     * Class constructor

-     *

-     * @param string $logDirectory      File path to the logging directory

-     * @param string $logLevelThreshold The LogLevel Threshold

-     * @param array  $options

-     *

-     * @internal param string $logFilePrefix The prefix for the log file name

-     * @internal param string $logFileExt The extension for the log file

-     */

-    public function __construct($logDirectory, $logLevelThreshold = LogLevel::DEBUG, array $options = array())

-    {

-        $this->logLevelThreshold = $logLevelThreshold;

-        $this->options = array_merge($this->options, $options);

-

-        $logDirectory = rtrim($logDirectory, DIRECTORY_SEPARATOR);

-        if ( ! file_exists($logDirectory)) {

-            mkdir($logDirectory, $this->defaultPermissions, true);

-        }

-

-        if(strpos($logDirectory, 'php://') === 0) {

-            $this->setLogToStdOut($logDirectory);

-            $this->setFileHandle('w+');

-        } else {

-            $this->setLogFilePath($logDirectory);

-            if(file_exists($this->logFilePath) && !is_writable($this->logFilePath)) {

-                throw new RuntimeException('The file could not be written to. Check that appropriate permissions have been set.');

-            }

-            $this->setFileHandle('a');

-        }

-

-        if ( ! $this->fileHandle) {

-            throw new RuntimeException('The file could not be opened. Check permissions.');

-        }

-    }

-

-    /**

-     * @param string $stdOutPath

-     */

-    public function setLogToStdOut($stdOutPath) {

-        $this->logFilePath = $stdOutPath;

-    }

-

-    /**

-     * @param string $logDirectory

-     */

-    public function setLogFilePath($logDirectory) {

-        if ($this->options['filename']) {

-            if (strpos($this->options['filename'], '.log') !== false || strpos($this->options['filename'], '.txt') !== false) {

-                $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['filename'];

-            }

-            else {

-                $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['filename'].'.'.$this->options['extension'];

-            }

-        } else {

-            $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['prefix'].date('Y-m-d').'.'.$this->options['extension'];

-        }

-    }

-

-    /**

-     * @param $writeMode

-     *

-     * @internal param resource $fileHandle

-     */

-    public function setFileHandle($writeMode) {

-        $this->fileHandle = fopen($this->logFilePath, $writeMode);

-    }

-

-

-    /**

-     * Class destructor

-     */

-    public function __destruct()

-    {

-        if ($this->fileHandle) {

-            fclose($this->fileHandle);

-        }

-    }

-

-    /**

-     * Sets the date format used by all instances of KLogger

-     *

-     * @param string $dateFormat Valid format string for date()

-     */

-    public function setDateFormat($dateFormat)

-    {

-        $this->options['dateFormat'] = $dateFormat;

-    }

-

-    /**

-     * Sets the Log Level Threshold

-     *

-     * @param string $logLevelThreshold The log level threshold

-     */

-    public function setLogLevelThreshold($logLevelThreshold)

-    {

-        $this->logLevelThreshold = $logLevelThreshold;

-    }

-

-    /**

-     * Logs with an arbitrary level.

-     *

-     * @param mixed $level

-     * @param string $message

-     * @param array $context

-     * @return null

-     */

-    public function log($level, $message, array $context = array())

-    {

-        if ($this->logLevels[$this->logLevelThreshold] < $this->logLevels[$level]) {

-            return;

-        }

-        $message = $this->formatMessage($level, $message, $context);

-        $this->write($message);

-    }

-

-    /**

-     * Writes a line to the log without prepending a status or timestamp

-     *

-     * @param string $message Line to write to the log

-     * @return void

-     */

-    public function write($message)

-    {

-        if (null !== $this->fileHandle) {

-            if (fwrite($this->fileHandle, $message) === false) {

-                throw new RuntimeException('The file could not be written to. Check that appropriate permissions have been set.');

-            } else {

-                $this->lastLine = trim($message);

-                $this->logLineCount++;

-

-                if ($this->options['flushFrequency'] && $this->logLineCount % $this->options['flushFrequency'] === 0) {

-                    fflush($this->fileHandle);

-                }

-            }

-        }

-    }

-

-    /**

-     * Get the file path that the log is currently writing to

-     *

-     * @return string

-     */

-    public function getLogFilePath()

-    {

-        return $this->logFilePath;

-    }

-

-    /**

-     * Get the last line logged to the log file

-     *

-     * @return string

-     */

-    public function getLastLogLine()

-    {

-        return $this->lastLine;

-    }

-

-    /**

-     * Formats the message for logging.

-     *

-     * @param  string $level   The Log Level of the message

-     * @param  string $message The message to log

-     * @param  array  $context The context

-     * @return string

-     */

-    protected function formatMessage($level, $message, $context)

-    {

-        if ($this->options['logFormat']) {

-            $parts = array(

-                'date'          => $this->getTimestamp(),

-                'level'         => strtoupper($level),

-                'level-padding' => str_repeat(' ', 9 - strlen($level)),

-                'priority'      => $this->logLevels[$level],

-                'message'       => $message,

-                'context'       => json_encode($context),

-            );

-            $message = $this->options['logFormat'];

-            foreach ($parts as $part => $value) {

-                $message = str_replace('{'.$part.'}', $value, $message);

-            }

-

-        } else {

-            $message = "[{$this->getTimestamp()}] [{$level}] {$message}";

-        }

-

-        if ($this->options['appendContext'] && ! empty($context)) {

-            $message .= PHP_EOL.$this->indent($this->contextToString($context));

-        }

-

-        return $message.PHP_EOL;

-

-    }

-

-    /**

-     * Gets the correctly formatted Date/Time for the log entry.

-     *

-     * PHP DateTime is dump, and you have to resort to trickery to get microseconds

-     * to work correctly, so here it is.

-     *

-     * @return string

-     */

-    private function getTimestamp()

-    {

-        $originalTime = microtime(true);

-        $micro = sprintf("%06d", ($originalTime - floor($originalTime)) * 1000000);

-        $date = new DateTime(date('Y-m-d H:i:s.'.$micro, $originalTime));

-

-        return $date->format($this->options['dateFormat']);

-    }

-

-    /**

-     * Takes the given context and coverts it to a string.

-     *

-     * @param  array $context The Context

-     * @return string

-     */

-    protected function contextToString($context)

-    {

-        $export = '';

-        foreach ($context as $key => $value) {

-            $export .= "{$key}: ";

-            $export .= preg_replace(array(

-                '/=>\s+([a-zA-Z])/im',

-                '/array\(\s+\)/im',

-                '/^  |\G  /m'

-            ), array(

-                '=> $1',

-                'array()',

-                '    '

-            ), str_replace('array (', 'array(', var_export($value, true)));

-            $export .= PHP_EOL;

-        }

-        return str_replace(array('\\\\', '\\\''), array('\\', '\''), rtrim($export));

-    }

-

-    /**

-     * Indents the given string with the given indent.

-     *

-     * @param  string $string The string to indent

-     * @param  string $indent What to use as the indent.

-     * @return string

-     */

-    protected function indent($string, $indent = '    ')

-    {

-        return $indent.str_replace("\n", "\n".$indent, $string);

-    }

+	/**

+	 * KLogger options

+	 *  Anything options not considered 'core' to the logging library should be

+	 *  settable view the third parameter in the constructor

+	 *

+	 *  Core options include the log file path and the log threshold

+	 *

+	 * @var array

+	 */

+	protected $options = array (

+		'extension'      => 'txt',

+		'dateFormat'     => 'Y-m-d G:i:s.u',

+		'filename'       => false,

+		'flushFrequency' => false,

+		'prefix'         => 'log_',

+		'logFormat'      => false,

+		'appendContext'  => true,

+	);

+

+	/**

+	 * Path to the log file

+	 * @var string

+	 */

+	private $logFilePath;

+

+	/**

+	 * Current minimum logging threshold

+	 * @var integer

+	 */

+	protected $logLevelThreshold = LogLevel::DEBUG;

+

+	/**

+	 * The number of lines logged in this instance's lifetime

+	 * @var int

+	 */

+	private $logLineCount = 0;

+

+	/**

+	 * Log Levels

+	 * @var array

+	 */

+	protected $logLevels = array(

+		LogLevel::EMERGENCY => 0,

+		LogLevel::ALERT     => 1,

+		LogLevel::CRITICAL  => 2,

+		LogLevel::ERROR     => 3,

+		LogLevel::WARNING   => 4,

+		LogLevel::NOTICE    => 5,

+		LogLevel::INFO      => 6,

+		LogLevel::DEBUG     => 7

+	);

+

+	/**

+	 * This holds the file handle for this instance's log file

+	 * @var resource

+	 */

+	private $fileHandle;

+

+	/**

+	 * This holds the last line logged to the logger

+	 *  Used for unit tests

+	 * @var string

+	 */

+	private $lastLine = '';

+

+	/**

+	 * Octal notation for default permissions of the log file

+	 * @var integer

+	 */

+	private $defaultPermissions = 0777;

+

+	/**

+	 * Class constructor

+	 *

+	 * @param string $logDirectory      File path to the logging directory

+	 * @param string $logLevelThreshold The LogLevel Threshold

+	 * @param array  $options

+	 *

+	 * @internal param string $logFilePrefix The prefix for the log file name

+	 * @internal param string $logFileExt The extension for the log file

+	 */

+	public function __construct($logDirectory, $logLevelThreshold = LogLevel::DEBUG, array $options = array())

+	{

+		$this->logLevelThreshold = $logLevelThreshold;

+		$this->options = array_merge($this->options, $options);

+

+		$logDirectory = rtrim($logDirectory, DIRECTORY_SEPARATOR);

+		if ( ! file_exists($logDirectory)) {

+			mkdir($logDirectory, $this->defaultPermissions, true);

+		}

+

+		if(strpos($logDirectory, 'php://') === 0) {

+			$this->setLogToStdOut($logDirectory);

+			$this->setFileHandle('w+');

+		} else {

+			$this->setLogFilePath($logDirectory);

+			if(file_exists($this->logFilePath) && !is_writable($this->logFilePath)) {

+				throw new RuntimeException('The file could not be written to. Check that appropriate permissions have been set.');

+			}

+			$this->setFileHandle('a');

+		}

+

+		if ( ! $this->fileHandle) {

+			throw new RuntimeException('The file could not be opened. Check permissions.');

+		}

+	}

+

+	/**

+	 * @param string $stdOutPath

+	 */

+	public function setLogToStdOut($stdOutPath) {

+		$this->logFilePath = $stdOutPath;

+	}

+

+	/**

+	 * @param string $logDirectory

+	 */

+	public function setLogFilePath($logDirectory) {

+		if ($this->options['filename']) {

+			if (strpos($this->options['filename'], '.log') !== false || strpos($this->options['filename'], '.txt') !== false) {

+				$this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['filename'];

+			}

+			else {

+				$this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['filename'].'.'.$this->options['extension'];

+			}

+		} else {

+			$this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['prefix'].date('Y-m-d').'.'.$this->options['extension'];

+		}

+	}

+

+	/**

+	 * @param $writeMode

+	 *

+	 * @internal param resource $fileHandle

+	 */

+	public function setFileHandle($writeMode) {

+		$this->fileHandle = fopen($this->logFilePath, $writeMode);

+	}

+

+

+	/**

+	 * Class destructor

+	 */

+	public function __destruct()

+	{

+		if ($this->fileHandle) {

+			fclose($this->fileHandle);

+		}

+	}

+

+	/**

+	 * Sets the date format used by all instances of KLogger

+	 *

+	 * @param string $dateFormat Valid format string for date()

+	 */

+	public function setDateFormat($dateFormat)

+	{

+		$this->options['dateFormat'] = $dateFormat;

+	}

+

+	/**

+	 * Sets the Log Level Threshold

+	 *

+	 * @param string $logLevelThreshold The log level threshold

+	 */

+	public function setLogLevelThreshold($logLevelThreshold)

+	{

+		$this->logLevelThreshold = $logLevelThreshold;

+	}

+

+	/**

+	 * Logs with an arbitrary level.

+	 *

+	 * @param mixed $level

+	 * @param string $message

+	 * @param array $context

+	 * @return null

+	 */

+	public function log($level, $message, array $context = array())

+	{

+		if ($this->logLevels[$this->logLevelThreshold] < $this->logLevels[$level]) {

+			return;

+		}

+		$message = $this->formatMessage($level, $message, $context);

+		$this->write($message);

+	}

+

+	/**

+	 * Writes a line to the log without prepending a status or timestamp

+	 *

+	 * @param string $message Line to write to the log

+	 * @return void

+	 */

+	public function write($message)

+	{

+		if (null !== $this->fileHandle) {

+			if (fwrite($this->fileHandle, $message) === false) {

+				throw new RuntimeException('The file could not be written to. Check that appropriate permissions have been set.');

+			} else {

+				$this->lastLine = trim($message);

+				$this->logLineCount++;

+

+				if ($this->options['flushFrequency'] && $this->logLineCount % $this->options['flushFrequency'] === 0) {

+					fflush($this->fileHandle);

+				}

+			}

+		}

+	}

+

+	/**

+	 * Get the file path that the log is currently writing to

+	 *

+	 * @return string

+	 */

+	public function getLogFilePath()

+	{

+		return $this->logFilePath;

+	}

+

+	/**

+	 * Get the last line logged to the log file

+	 *

+	 * @return string

+	 */

+	public function getLastLogLine()

+	{

+		return $this->lastLine;

+	}

+

+	/**

+	 * Formats the message for logging.

+	 *

+	 * @param  string $level   The Log Level of the message

+	 * @param  string $message The message to log

+	 * @param  array  $context The context

+	 * @return string

+	 */

+	protected function formatMessage($level, $message, $context)

+	{

+		if ($this->options['logFormat']) {

+			$parts = array(

+				'date'          => $this->getTimestamp(),

+				'level'         => strtoupper($level),

+				'level-padding' => str_repeat(' ', 9 - strlen($level)),

+				'priority'      => $this->logLevels[$level],

+				'message'       => $message,

+				'context'       => json_encode($context),

+			);

+			$message = $this->options['logFormat'];

+			foreach ($parts as $part => $value) {

+				$message = str_replace('{'.$part.'}', $value, $message);

+			}

+

+		} else {

+			$message = "[{$this->getTimestamp()}] [{$level}] {$message}";

+		}

+

+		if ($this->options['appendContext'] && ! empty($context)) {

+			$message .= PHP_EOL.$this->indent($this->contextToString($context));

+		}

+

+		return $message.PHP_EOL;

+

+	}

+

+	/**

+	 * Gets the correctly formatted Date/Time for the log entry.

+	 *

+	 * PHP DateTime is dump, and you have to resort to trickery to get microseconds

+	 * to work correctly, so here it is.

+	 *

+	 * @return string

+	 */

+	private function getTimestamp()

+	{

+		$originalTime = microtime(true);

+		$micro = sprintf("%06d", ($originalTime - floor($originalTime)) * 1000000);

+		$date = new DateTime(date('Y-m-d H:i:s.'.$micro, $originalTime));

+

+		return $date->format($this->options['dateFormat']);

+	}

+

+	/**

+	 * Takes the given context and coverts it to a string.

+	 *

+	 * @param  array $context The Context

+	 * @return string

+	 */

+	protected function contextToString($context)

+	{

+		$export = '';

+		foreach ($context as $key => $value) {

+			$export .= "{$key}: ";

+			$export .= preg_replace(array(

+				'/=>\s+([a-zA-Z])/im',

+				'/array\(\s+\)/im',

+				'/^  |\G  /m'

+			), array(

+				'=> $1',

+				'array()',

+				'    '

+			), str_replace('array (', 'array(', var_export($value, true)));

+			$export .= PHP_EOL;

+		}

+		return str_replace(array('\\\\', '\\\''), array('\\', '\''), rtrim($export));

+	}

+

+	/**

+	 * Indents the given string with the given indent.

+	 *

+	 * @param  string $string The string to indent

+	 * @param  string $indent What to use as the indent.

+	 * @return string

+	 */

+	protected function indent($string, $indent = '    ')

+	{

+		return $indent.str_replace("\n", "\n".$indent, $string);

+	}

 }

vendor/paragonie/random_compat/lib/random_bytes_dev_urandom.php

Indentation +148 added lines, -148 removed lines

@@ -27,164 +27,164 @@
  */
 
 if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
-    define('RANDOM_COMPAT_READ_BUFFER', 8);
+	define('RANDOM_COMPAT_READ_BUFFER', 8);
 }
 
 if (!is_callable('random_bytes')) {
-    /**
-     * Unless open_basedir is enabled, use /dev/urandom for
-     * random numbers in accordance with best practices
-     *
-     * Why we use /dev/urandom and not /dev/random
-     * @ref https://www.2uo.de/myths-about-urandom
-     * @ref http://sockpuppet.org/blog/2014/02/25/safely-generate-random-numbers
-     *
-     * @param int $bytes
-     *
-     * @throws Exception
-     *
-     * @return string
-     */
-    function random_bytes($bytes)
-    {
-        /** @var resource $fp */
-        static $fp = null;
+	/**
+	 * Unless open_basedir is enabled, use /dev/urandom for
+	 * random numbers in accordance with best practices
+	 *
+	 * Why we use /dev/urandom and not /dev/random
+	 * @ref https://www.2uo.de/myths-about-urandom
+	 * @ref http://sockpuppet.org/blog/2014/02/25/safely-generate-random-numbers
+	 *
+	 * @param int $bytes
+	 *
+	 * @throws Exception
+	 *
+	 * @return string
+	 */
+	function random_bytes($bytes)
+	{
+		/** @var resource $fp */
+		static $fp = null;
 
-        /**
-         * This block should only be run once
-         */
-        if (empty($fp)) {
-            /**
-             * We don't want to ever read C:\dev\random, only /dev/urandom on
-             * Unix-like operating systems. While we guard against this
-             * condition in random.php, it doesn't hurt to be defensive in depth
-             * here.
-             *
-             * To that end, we only try to open /dev/urandom if we're on a Unix-
-             * like operating system (which means the directory separator is set
-             * to "/" not "\".
-             */
-            if (DIRECTORY_SEPARATOR === '/') {
-                if (!is_readable('/dev/urandom')) {
-                    throw new Exception(
-                        'Environment misconfiguration: ' .
-                        '/dev/urandom cannot be read.'
-                    );
-                }
-                /**
-                 * We use /dev/urandom if it is a char device.
-                 * We never fall back to /dev/random
-                 */
-                /** @var resource|bool $fp */
-                $fp = fopen('/dev/urandom', 'rb');
-                if (is_resource($fp)) {
-                    /** @var array<string, int> $st */
-                    $st = fstat($fp);
-                    if (($st['mode'] & 0170000) !== 020000) {
-                        fclose($fp);
-                        $fp = false;
-                    }
-                }
-            }
+		/**
+		 * This block should only be run once
+		 */
+		if (empty($fp)) {
+			/**
+			 * We don't want to ever read C:\dev\random, only /dev/urandom on
+			 * Unix-like operating systems. While we guard against this
+			 * condition in random.php, it doesn't hurt to be defensive in depth
+			 * here.
+			 *
+			 * To that end, we only try to open /dev/urandom if we're on a Unix-
+			 * like operating system (which means the directory separator is set
+			 * to "/" not "\".
+			 */
+			if (DIRECTORY_SEPARATOR === '/') {
+				if (!is_readable('/dev/urandom')) {
+					throw new Exception(
+						'Environment misconfiguration: ' .
+						'/dev/urandom cannot be read.'
+					);
+				}
+				/**
+				 * We use /dev/urandom if it is a char device.
+				 * We never fall back to /dev/random
+				 */
+				/** @var resource|bool $fp */
+				$fp = fopen('/dev/urandom', 'rb');
+				if (is_resource($fp)) {
+					/** @var array<string, int> $st */
+					$st = fstat($fp);
+					if (($st['mode'] & 0170000) !== 020000) {
+						fclose($fp);
+						$fp = false;
+					}
+				}
+			}
 
-            if (is_resource($fp)) {
-                /**
-                 * stream_set_read_buffer() does not exist in HHVM
-                 *
-                 * If we don't set the stream's read buffer to 0, PHP will
-                 * internally buffer 8192 bytes, which can waste entropy
-                 *
-                 * stream_set_read_buffer returns 0 on success
-                 */
-                if (is_callable('stream_set_read_buffer')) {
-                    stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER);
-                }
-                if (is_callable('stream_set_chunk_size')) {
-                    stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER);
-                }
-            }
-        }
+			if (is_resource($fp)) {
+				/**
+				 * stream_set_read_buffer() does not exist in HHVM
+				 *
+				 * If we don't set the stream's read buffer to 0, PHP will
+				 * internally buffer 8192 bytes, which can waste entropy
+				 *
+				 * stream_set_read_buffer returns 0 on success
+				 */
+				if (is_callable('stream_set_read_buffer')) {
+					stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER);
+				}
+				if (is_callable('stream_set_chunk_size')) {
+					stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER);
+				}
+			}
+		}
 
-        try {
-            /** @var int $bytes */
-            $bytes = RandomCompat_intval($bytes);
-        } catch (TypeError $ex) {
-            throw new TypeError(
-                'random_bytes(): $bytes must be an integer'
-            );
-        }
+		try {
+			/** @var int $bytes */
+			$bytes = RandomCompat_intval($bytes);
+		} catch (TypeError $ex) {
+			throw new TypeError(
+				'random_bytes(): $bytes must be an integer'
+			);
+		}
 
-        if ($bytes < 1) {
-            throw new Error(
-                'Length must be greater than 0'
-            );
-        }
+		if ($bytes < 1) {
+			throw new Error(
+				'Length must be greater than 0'
+			);
+		}
 
-        /**
-         * This if() block only runs if we managed to open a file handle
-         *
-         * It does not belong in an else {} block, because the above
-         * if (empty($fp)) line is logic that should only be run once per
-         * page load.
-         */
-        if (is_resource($fp)) {
-            /**
-             * @var int
-             */
-            $remaining = $bytes;
+		/**
+		 * This if() block only runs if we managed to open a file handle
+		 *
+		 * It does not belong in an else {} block, because the above
+		 * if (empty($fp)) line is logic that should only be run once per
+		 * page load.
+		 */
+		if (is_resource($fp)) {
+			/**
+			 * @var int
+			 */
+			$remaining = $bytes;
 
-            /**
-             * @var string|bool
-             */
-            $buf = '';
+			/**
+			 * @var string|bool
+			 */
+			$buf = '';
 
-            /**
-             * We use fread() in a loop to protect against partial reads
-             */
-            do {
-                /**
-                 * @var string|bool
-                 */
-                $read = fread($fp, $remaining);
-                if (!is_string($read)) {
-                    /**
-                     * We cannot safely read from the file. Exit the
-                     * do-while loop and trigger the exception condition
-                     *
-                     * @var string|bool
-                     */
-                    $buf = false;
-                    break;
-                }
-                /**
-                 * Decrease the number of bytes returned from remaining
-                 */
-                $remaining -= RandomCompat_strlen($read);
-                /**
-                 * @var string $buf
-                 */
-                $buf .= $read;
-            } while ($remaining > 0);
+			/**
+			 * We use fread() in a loop to protect against partial reads
+			 */
+			do {
+				/**
+				 * @var string|bool
+				 */
+				$read = fread($fp, $remaining);
+				if (!is_string($read)) {
+					/**
+					 * We cannot safely read from the file. Exit the
+					 * do-while loop and trigger the exception condition
+					 *
+					 * @var string|bool
+					 */
+					$buf = false;
+					break;
+				}
+				/**
+				 * Decrease the number of bytes returned from remaining
+				 */
+				$remaining -= RandomCompat_strlen($read);
+				/**
+				 * @var string $buf
+				 */
+				$buf .= $read;
+			} while ($remaining > 0);
 
-            /**
-             * Is our result valid?
-             * @var string|bool $buf
-             */
-            if (is_string($buf)) {
-                if (RandomCompat_strlen($buf) === $bytes) {
-                    /**
-                     * Return our random entropy buffer here:
-                     */
-                    return $buf;
-                }
-            }
-        }
+			/**
+			 * Is our result valid?
+			 * @var string|bool $buf
+			 */
+			if (is_string($buf)) {
+				if (RandomCompat_strlen($buf) === $bytes) {
+					/**
+					 * Return our random entropy buffer here:
+					 */
+					return $buf;
+				}
+			}
+		}
 
-        /**
-         * If we reach here, PHP has failed us.
-         */
-        throw new Exception(
-            'Error reading from source device'
-        );
-    }
+		/**
+		 * If we reach here, PHP has failed us.
+		 */
+		throw new Exception(
+			'Error reading from source device'
+		);
+	}
 }

vendor/paragonie/random_compat/lib/random_int.php

Indentation +200 added lines, -200 removed lines

@@ -1,204 +1,204 @@
 <?php
 
 if (!is_callable('random_int')) {
-    /**
-     * Random_* Compatibility Library
-     * for using the new PHP 7 random_* API in PHP 5 projects
-     *
-     * The MIT License (MIT)
-     *
-     * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
-     *
-     * Permission is hereby granted, free of charge, to any person obtaining a copy
-     * of this software and associated documentation files (the "Software"), to deal
-     * in the Software without restriction, including without limitation the rights
-     * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-     * copies of the Software, and to permit persons to whom the Software is
-     * furnished to do so, subject to the following conditions:
-     *
-     * The above copyright notice and this permission notice shall be included in
-     * all copies or substantial portions of the Software.
-     *
-     * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-     * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-     * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-     * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-     * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-     * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-     * SOFTWARE.
-     */
-
-    /**
-     * Fetch a random integer between $min and $max inclusive
-     *
-     * @param int $min
-     * @param int $max
-     *
-     * @throws Exception
-     *
-     * @return int
-     */
-    function random_int($min, $max)
-    {
-        /**
-         * Type and input logic checks
-         *
-         * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
-         * (non-inclusive), it will sanely cast it to an int. If you it's equal to
-         * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats
-         * lose precision, so the <= and => operators might accidentally let a float
-         * through.
-         */
-
-        try {
-            /** @var int $min */
-            $min = RandomCompat_intval($min);
-        } catch (TypeError $ex) {
-            throw new TypeError(
-                'random_int(): $min must be an integer'
-            );
-        }
-
-        try {
-            /** @var int $max */
-            $max = RandomCompat_intval($max);
-        } catch (TypeError $ex) {
-            throw new TypeError(
-                'random_int(): $max must be an integer'
-            );
-        }
-
-        /**
-         * Now that we've verified our weak typing system has given us an integer,
-         * let's validate the logic then we can move forward with generating random
-         * integers along a given range.
-         */
-        if ($min > $max) {
-            throw new Error(
-                'Minimum value must be less than or equal to the maximum value'
-            );
-        }
-
-        if ($max === $min) {
-            return (int) $min;
-        }
-
-        /**
-         * Initialize variables to 0
-         *
-         * We want to store:
-         * $bytes => the number of random bytes we need
-         * $mask => an integer bitmask (for use with the &) operator
-         *          so we can minimize the number of discards
-         */
-        $attempts = $bits = $bytes = $mask = $valueShift = 0;
-        /** @var int $attempts */
-        /** @var int $bits */
-        /** @var int $bytes */
-        /** @var int $mask */
-        /** @var int $valueShift */
-
-        /**
-         * At this point, $range is a positive number greater than 0. It might
-         * overflow, however, if $max - $min > PHP_INT_MAX. PHP will cast it to
-         * a float and we will lose some precision.
-         *
-         * @var int|float $range
-         */
-        $range = $max - $min;
-
-        /**
-         * Test for integer overflow:
-         */
-        if (!is_int($range)) {
-
-            /**
-             * Still safely calculate wider ranges.
-             * Provided by @CodesInChaos, @oittaa
-             *
-             * @ref https://gist.github.com/CodesInChaos/03f9ea0b58e8b2b8d435
-             *
-             * We use ~0 as a mask in this case because it generates all 1s
-             *
-             * @ref https://eval.in/400356 (32-bit)
-             * @ref http://3v4l.org/XX9r5  (64-bit)
-             */
-            $bytes = PHP_INT_SIZE;
-            /** @var int $mask */
-            $mask = ~0;
-
-        } else {
-
-            /**
-             * $bits is effectively ceil(log($range, 2)) without dealing with
-             * type juggling
-             */
-            while ($range > 0) {
-                if ($bits % 8 === 0) {
-                    ++$bytes;
-                }
-                ++$bits;
-                $range >>= 1;
-                /** @var int $mask */
-                $mask = $mask << 1 | 1;
-            }
-            $valueShift = $min;
-        }
-
-        /** @var int $val */
-        $val = 0;
-        /**
-         * Now that we have our parameters set up, let's begin generating
-         * random integers until one falls between $min and $max
-         */
-        /** @psalm-suppress RedundantCondition */
-        do {
-            /**
-             * The rejection probability is at most 0.5, so this corresponds
-             * to a failure probability of 2^-128 for a working RNG
-             */
-            if ($attempts > 128) {
-                throw new Exception(
-                    'random_int: RNG is broken - too many rejections'
-                );
-            }
-
-            /**
-             * Let's grab the necessary number of random bytes
-             */
-            $randomByteString = random_bytes($bytes);
-
-            /**
-             * Let's turn $randomByteString into an integer
-             *
-             * This uses bitwise operators (<< and |) to build an integer
-             * out of the values extracted from ord()
-             *
-             * Example: [9F] | [6D] | [32] | [0C] =>
-             *   159 + 27904 + 3276800 + 201326592 =>
-             *   204631455
-             */
-            $val &= 0;
-            for ($i = 0; $i < $bytes; ++$i) {
-                $val |= ord($randomByteString[$i]) << ($i * 8);
-            }
-            /** @var int $val */
-
-            /**
-             * Apply mask
-             */
-            $val &= $mask;
-            $val += $valueShift;
-
-            ++$attempts;
-            /**
-             * If $val overflows to a floating point number,
-             * ... or is larger than $max,
-             * ... or smaller than $min,
-             * then try again.
-             */
-        } while (!is_int($val) || $val > $max || $val < $min);
-
-        return (int) $val;
-    }
+	/**
+	 * Random_* Compatibility Library
+	 * for using the new PHP 7 random_* API in PHP 5 projects
+	 *
+	 * The MIT License (MIT)
+	 *
+	 * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
+	 *
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
+	 * of this software and associated documentation files (the "Software"), to deal
+	 * in the Software without restriction, including without limitation the rights
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	 * copies of the Software, and to permit persons to whom the Software is
+	 * furnished to do so, subject to the following conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be included in
+	 * all copies or substantial portions of the Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+	 * SOFTWARE.
+	 */
+
+	/**
+	 * Fetch a random integer between $min and $max inclusive
+	 *
+	 * @param int $min
+	 * @param int $max
+	 *
+	 * @throws Exception
+	 *
+	 * @return int
+	 */
+	function random_int($min, $max)
+	{
+		/**
+		 * Type and input logic checks
+		 *
+		 * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
+		 * (non-inclusive), it will sanely cast it to an int. If you it's equal to
+		 * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats
+		 * lose precision, so the <= and => operators might accidentally let a float
+		 * through.
+		 */
+
+		try {
+			/** @var int $min */
+			$min = RandomCompat_intval($min);
+		} catch (TypeError $ex) {
+			throw new TypeError(
+				'random_int(): $min must be an integer'
+			);
+		}
+
+		try {
+			/** @var int $max */
+			$max = RandomCompat_intval($max);
+		} catch (TypeError $ex) {
+			throw new TypeError(
+				'random_int(): $max must be an integer'
+			);
+		}
+
+		/**
+		 * Now that we've verified our weak typing system has given us an integer,
+		 * let's validate the logic then we can move forward with generating random
+		 * integers along a given range.
+		 */
+		if ($min > $max) {
+			throw new Error(
+				'Minimum value must be less than or equal to the maximum value'
+			);
+		}
+
+		if ($max === $min) {
+			return (int) $min;
+		}
+
+		/**
+		 * Initialize variables to 0
+		 *
+		 * We want to store:
+		 * $bytes => the number of random bytes we need
+		 * $mask => an integer bitmask (for use with the &) operator
+		 *          so we can minimize the number of discards
+		 */
+		$attempts = $bits = $bytes = $mask = $valueShift = 0;
+		/** @var int $attempts */
+		/** @var int $bits */
+		/** @var int $bytes */
+		/** @var int $mask */
+		/** @var int $valueShift */
+
+		/**
+		 * At this point, $range is a positive number greater than 0. It might
+		 * overflow, however, if $max - $min > PHP_INT_MAX. PHP will cast it to
+		 * a float and we will lose some precision.
+		 *
+		 * @var int|float $range
+		 */
+		$range = $max - $min;
+
+		/**
+		 * Test for integer overflow:
+		 */
+		if (!is_int($range)) {
+
+			/**
+			 * Still safely calculate wider ranges.
+			 * Provided by @CodesInChaos, @oittaa
+			 *
+			 * @ref https://gist.github.com/CodesInChaos/03f9ea0b58e8b2b8d435
+			 *
+			 * We use ~0 as a mask in this case because it generates all 1s
+			 *
+			 * @ref https://eval.in/400356 (32-bit)
+			 * @ref http://3v4l.org/XX9r5  (64-bit)
+			 */
+			$bytes = PHP_INT_SIZE;
+			/** @var int $mask */
+			$mask = ~0;
+
+		} else {
+
+			/**
+			 * $bits is effectively ceil(log($range, 2)) without dealing with
+			 * type juggling
+			 */
+			while ($range > 0) {
+				if ($bits % 8 === 0) {
+					++$bytes;
+				}
+				++$bits;
+				$range >>= 1;
+				/** @var int $mask */
+				$mask = $mask << 1 | 1;
+			}
+			$valueShift = $min;
+		}
+
+		/** @var int $val */
+		$val = 0;
+		/**
+		 * Now that we have our parameters set up, let's begin generating
+		 * random integers until one falls between $min and $max
+		 */
+		/** @psalm-suppress RedundantCondition */
+		do {
+			/**
+			 * The rejection probability is at most 0.5, so this corresponds
+			 * to a failure probability of 2^-128 for a working RNG
+			 */
+			if ($attempts > 128) {
+				throw new Exception(
+					'random_int: RNG is broken - too many rejections'
+				);
+			}
+
+			/**
+			 * Let's grab the necessary number of random bytes
+			 */
+			$randomByteString = random_bytes($bytes);
+
+			/**
+			 * Let's turn $randomByteString into an integer
+			 *
+			 * This uses bitwise operators (<< and |) to build an integer
+			 * out of the values extracted from ord()
+			 *
+			 * Example: [9F] | [6D] | [32] | [0C] =>
+			 *   159 + 27904 + 3276800 + 201326592 =>
+			 *   204631455
+			 */
+			$val &= 0;
+			for ($i = 0; $i < $bytes; ++$i) {
+				$val |= ord($randomByteString[$i]) << ($i * 8);
+			}
+			/** @var int $val */
+
+			/**
+			 * Apply mask
+			 */
+			$val &= $mask;
+			$val += $valueShift;
+
+			++$attempts;
+			/**
+			 * If $val overflows to a floating point number,
+			 * ... or is larger than $max,
+			 * ... or smaller than $min,
+			 * then try again.
+			 */
+		} while (!is_int($val) || $val > $max || $val < $min);
+
+		return (int) $val;
+	}
 }

vendor/paragonie/random_compat/lib/random_bytes_libsodium_legacy.php

Indentation +58 added lines, -58 removed lines

@@ -27,67 +27,67 @@
  */
 
 if (!is_callable('random_bytes')) {
-    /**
-     * If the libsodium PHP extension is loaded, we'll use it above any other
-     * solution.
-     *
-     * libsodium-php project:
-     * @ref https://github.com/jedisct1/libsodium-php
-     *
-     * @param int $bytes
-     *
-     * @throws Exception
-     *
-     * @return string
-     */
-    function random_bytes($bytes)
-    {
-        try {
-            /** @var int $bytes */
-            $bytes = RandomCompat_intval($bytes);
-        } catch (TypeError $ex) {
-            throw new TypeError(
-                'random_bytes(): $bytes must be an integer'
-            );
-        }
+	/**
+	 * If the libsodium PHP extension is loaded, we'll use it above any other
+	 * solution.
+	 *
+	 * libsodium-php project:
+	 * @ref https://github.com/jedisct1/libsodium-php
+	 *
+	 * @param int $bytes
+	 *
+	 * @throws Exception
+	 *
+	 * @return string
+	 */
+	function random_bytes($bytes)
+	{
+		try {
+			/** @var int $bytes */
+			$bytes = RandomCompat_intval($bytes);
+		} catch (TypeError $ex) {
+			throw new TypeError(
+				'random_bytes(): $bytes must be an integer'
+			);
+		}
 
-        if ($bytes < 1) {
-            throw new Error(
-                'Length must be greater than 0'
-            );
-        }
+		if ($bytes < 1) {
+			throw new Error(
+				'Length must be greater than 0'
+			);
+		}
 
-        /**
-         * @var string
-         */
-        $buf = '';
+		/**
+		 * @var string
+		 */
+		$buf = '';
 
-        /**
-         * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be
-         * generated in one invocation.
-         */
-        if ($bytes > 2147483647) {
-            for ($i = 0; $i < $bytes; $i += 1073741824) {
-                $n = ($bytes - $i) > 1073741824
-                    ? 1073741824
-                    : $bytes - $i;
-                $buf .= Sodium::randombytes_buf((int) $n);
-            }
-        } else {
-            $buf .= Sodium::randombytes_buf((int) $bytes);
-        }
+		/**
+		 * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be
+		 * generated in one invocation.
+		 */
+		if ($bytes > 2147483647) {
+			for ($i = 0; $i < $bytes; $i += 1073741824) {
+				$n = ($bytes - $i) > 1073741824
+					? 1073741824
+					: $bytes - $i;
+				$buf .= Sodium::randombytes_buf((int) $n);
+			}
+		} else {
+			$buf .= Sodium::randombytes_buf((int) $bytes);
+		}
 
-        if (is_string($buf)) {
-            if (RandomCompat_strlen($buf) === $bytes) {
-                return $buf;
-            }
-        }
+		if (is_string($buf)) {
+			if (RandomCompat_strlen($buf) === $bytes) {
+				return $buf;
+			}
+		}
 
-        /**
-         * If we reach here, PHP has failed us.
-         */
-        throw new Exception(
-            'Could not gather sufficient random data'
-        );
-    }
+		/**
+		 * If we reach here, PHP has failed us.
+		 */
+		throw new Exception(
+			'Could not gather sufficient random data'
+		);
+	}
 }