@@ -26,9 +26,9 @@ discard block |
||
| 26 | 26 | * |
| 27 | 27 | * @return void |
| 28 | 28 | */ |
| 29 | - public function emergency($message, array $context = array()) |
|
| 29 | + public function emergency( $message, array $context = array() ) |
|
| 30 | 30 | { |
| 31 | - $this->log(LogLevel::EMERGENCY, $message, $context); |
|
| 31 | + $this->log( LogLevel::EMERGENCY, $message, $context ); |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | /** |
@@ -42,9 +42,9 @@ discard block |
||
| 42 | 42 | * |
| 43 | 43 | * @return void |
| 44 | 44 | */ |
| 45 | - public function alert($message, array $context = array()) |
|
| 45 | + public function alert( $message, array $context = array() ) |
|
| 46 | 46 | { |
| 47 | - $this->log(LogLevel::ALERT, $message, $context); |
|
| 47 | + $this->log( LogLevel::ALERT, $message, $context ); |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | /** |
@@ -57,9 +57,9 @@ discard block |
||
| 57 | 57 | * |
| 58 | 58 | * @return void |
| 59 | 59 | */ |
| 60 | - public function critical($message, array $context = array()) |
|
| 60 | + public function critical( $message, array $context = array() ) |
|
| 61 | 61 | { |
| 62 | - $this->log(LogLevel::CRITICAL, $message, $context); |
|
| 62 | + $this->log( LogLevel::CRITICAL, $message, $context ); |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | /** |
@@ -71,9 +71,9 @@ discard block |
||
| 71 | 71 | * |
| 72 | 72 | * @return void |
| 73 | 73 | */ |
| 74 | - public function error($message, array $context = array()) |
|
| 74 | + public function error( $message, array $context = array() ) |
|
| 75 | 75 | { |
| 76 | - $this->log(LogLevel::ERROR, $message, $context); |
|
| 76 | + $this->log( LogLevel::ERROR, $message, $context ); |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | /** |
@@ -87,9 +87,9 @@ discard block |
||
| 87 | 87 | * |
| 88 | 88 | * @return void |
| 89 | 89 | */ |
| 90 | - public function warning($message, array $context = array()) |
|
| 90 | + public function warning( $message, array $context = array() ) |
|
| 91 | 91 | { |
| 92 | - $this->log(LogLevel::WARNING, $message, $context); |
|
| 92 | + $this->log( LogLevel::WARNING, $message, $context ); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | /** |
@@ -100,9 +100,9 @@ discard block |
||
| 100 | 100 | * |
| 101 | 101 | * @return void |
| 102 | 102 | */ |
| 103 | - public function notice($message, array $context = array()) |
|
| 103 | + public function notice( $message, array $context = array() ) |
|
| 104 | 104 | { |
| 105 | - $this->log(LogLevel::NOTICE, $message, $context); |
|
| 105 | + $this->log( LogLevel::NOTICE, $message, $context ); |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | /** |
@@ -115,9 +115,9 @@ discard block |
||
| 115 | 115 | * |
| 116 | 116 | * @return void |
| 117 | 117 | */ |
| 118 | - public function info($message, array $context = array()) |
|
| 118 | + public function info( $message, array $context = array() ) |
|
| 119 | 119 | { |
| 120 | - $this->log(LogLevel::INFO, $message, $context); |
|
| 120 | + $this->log( LogLevel::INFO, $message, $context ); |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | /** |
@@ -128,9 +128,9 @@ discard block |
||
| 128 | 128 | * |
| 129 | 129 | * @return void |
| 130 | 130 | */ |
| 131 | - public function debug($message, array $context = array()) |
|
| 131 | + public function debug( $message, array $context = array() ) |
|
| 132 | 132 | { |
| 133 | - $this->log(LogLevel::DEBUG, $message, $context); |
|
| 133 | + $this->log( LogLevel::DEBUG, $message, $context ); |
|
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | /** |
@@ -144,5 +144,5 @@ discard block |
||
| 144 | 144 | * |
| 145 | 145 | * @throws \GravityView\Psr\Log\InvalidArgumentException |
| 146 | 146 | */ |
| 147 | - abstract public function log($level, $message, array $context = array()); |
|
| 147 | + abstract public function log( $level, $message, array $context = array() ); |
|
| 148 | 148 | } |
@@ -65,14 +65,14 @@ discard block |
||
| 65 | 65 | /** |
| 66 | 66 | * @var array |
| 67 | 67 | */ |
| 68 | - public $records = []; |
|
| 68 | + public $records = [ ]; |
|
| 69 | 69 | |
| 70 | - public $recordsByLevel = []; |
|
| 70 | + public $recordsByLevel = [ ]; |
|
| 71 | 71 | |
| 72 | 72 | /** |
| 73 | 73 | * @inheritdoc |
| 74 | 74 | */ |
| 75 | - public function log($level, $message, array $context = []) |
|
| 75 | + public function log( $level, $message, array $context = [ ] ) |
|
| 76 | 76 | { |
| 77 | 77 | $record = [ |
| 78 | 78 | 'level' => $level, |
@@ -80,74 +80,74 @@ discard block |
||
| 80 | 80 | 'context' => $context, |
| 81 | 81 | ]; |
| 82 | 82 | |
| 83 | - $this->recordsByLevel[$record['level']][] = $record; |
|
| 84 | - $this->records[] = $record; |
|
| 83 | + $this->recordsByLevel[ $record[ 'level' ] ][ ] = $record; |
|
| 84 | + $this->records[ ] = $record; |
|
| 85 | 85 | } |
| 86 | 86 | |
| 87 | - public function hasRecords($level) |
|
| 87 | + public function hasRecords( $level ) |
|
| 88 | 88 | { |
| 89 | - return isset($this->recordsByLevel[$level]); |
|
| 89 | + return isset( $this->recordsByLevel[ $level ] ); |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | - public function hasRecord($record, $level) |
|
| 92 | + public function hasRecord( $record, $level ) |
|
| 93 | 93 | { |
| 94 | - if (is_string($record)) { |
|
| 95 | - $record = ['message' => $record]; |
|
| 94 | + if ( is_string( $record ) ) { |
|
| 95 | + $record = [ 'message' => $record ]; |
|
| 96 | 96 | } |
| 97 | - return $this->hasRecordThatPasses(function ($rec) use ($record) { |
|
| 98 | - if ($rec['message'] !== $record['message']) { |
|
| 97 | + return $this->hasRecordThatPasses( function( $rec ) use ( $record ) { |
|
| 98 | + if ( $rec[ 'message' ] !== $record[ 'message' ] ) { |
|
| 99 | 99 | return false; |
| 100 | 100 | } |
| 101 | - if (isset($record['context']) && $rec['context'] !== $record['context']) { |
|
| 101 | + if ( isset( $record[ 'context' ] ) && $rec[ 'context' ] !== $record[ 'context' ] ) { |
|
| 102 | 102 | return false; |
| 103 | 103 | } |
| 104 | 104 | return true; |
| 105 | - }, $level); |
|
| 105 | + }, $level ); |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | - public function hasRecordThatContains($message, $level) |
|
| 108 | + public function hasRecordThatContains( $message, $level ) |
|
| 109 | 109 | { |
| 110 | - return $this->hasRecordThatPasses(function ($rec) use ($message) { |
|
| 111 | - return strpos($rec['message'], $message) !== false; |
|
| 112 | - }, $level); |
|
| 110 | + return $this->hasRecordThatPasses( function( $rec ) use ( $message ) { |
|
| 111 | + return strpos( $rec[ 'message' ], $message ) !== false; |
|
| 112 | + }, $level ); |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | - public function hasRecordThatMatches($regex, $level) |
|
| 115 | + public function hasRecordThatMatches( $regex, $level ) |
|
| 116 | 116 | { |
| 117 | - return $this->hasRecordThatPasses(function ($rec) use ($regex) { |
|
| 118 | - return preg_match($regex, $rec['message']) > 0; |
|
| 119 | - }, $level); |
|
| 117 | + return $this->hasRecordThatPasses( function( $rec ) use ( $regex ) { |
|
| 118 | + return preg_match( $regex, $rec[ 'message' ] ) > 0; |
|
| 119 | + }, $level ); |
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | - public function hasRecordThatPasses(callable $predicate, $level) |
|
| 122 | + public function hasRecordThatPasses( callable $predicate, $level ) |
|
| 123 | 123 | { |
| 124 | - if (!isset($this->recordsByLevel[$level])) { |
|
| 124 | + if ( ! isset( $this->recordsByLevel[ $level ] ) ) { |
|
| 125 | 125 | return false; |
| 126 | 126 | } |
| 127 | - foreach ($this->recordsByLevel[$level] as $i => $rec) { |
|
| 128 | - if (call_user_func($predicate, $rec, $i)) { |
|
| 127 | + foreach ( $this->recordsByLevel[ $level ] as $i => $rec ) { |
|
| 128 | + if ( call_user_func( $predicate, $rec, $i ) ) { |
|
| 129 | 129 | return true; |
| 130 | 130 | } |
| 131 | 131 | } |
| 132 | 132 | return false; |
| 133 | 133 | } |
| 134 | 134 | |
| 135 | - public function __call($method, $args) |
|
| 135 | + public function __call( $method, $args ) |
|
| 136 | 136 | { |
| 137 | - if (preg_match('/(.*)(Debug|Info|Notice|Warning|Error|Critical|Alert|Emergency)(.*)/', $method, $matches) > 0) { |
|
| 138 | - $genericMethod = $matches[1] . ('Records' !== $matches[3] ? 'Record' : '') . $matches[3]; |
|
| 139 | - $level = strtolower($matches[2]); |
|
| 140 | - if (method_exists($this, $genericMethod)) { |
|
| 141 | - $args[] = $level; |
|
| 142 | - return call_user_func_array([$this, $genericMethod], $args); |
|
| 137 | + if ( preg_match( '/(.*)(Debug|Info|Notice|Warning|Error|Critical|Alert|Emergency)(.*)/', $method, $matches ) > 0 ) { |
|
| 138 | + $genericMethod = $matches[ 1 ] . ( 'Records' !== $matches[ 3 ] ? 'Record' : '' ) . $matches[ 3 ]; |
|
| 139 | + $level = strtolower( $matches[ 2 ] ); |
|
| 140 | + if ( method_exists( $this, $genericMethod ) ) { |
|
| 141 | + $args[ ] = $level; |
|
| 142 | + return call_user_func_array( [ $this, $genericMethod ], $args ); |
|
| 143 | 143 | } |
| 144 | 144 | } |
| 145 | - throw new \BadMethodCallException('Call to undefined method ' . get_class($this) . '::' . $method . '()'); |
|
| 145 | + throw new \BadMethodCallException( 'Call to undefined method ' . get_class( $this ) . '::' . $method . '()' ); |
|
| 146 | 146 | } |
| 147 | 147 | |
| 148 | 148 | public function reset() |
| 149 | 149 | { |
| 150 | - $this->records = []; |
|
| 151 | - $this->recordsByLevel = []; |
|
| 150 | + $this->records = [ ]; |
|
| 151 | + $this->recordsByLevel = [ ]; |
|
| 152 | 152 | } |
| 153 | 153 | } |
@@ -38,36 +38,36 @@ discard block |
||
| 38 | 38 | |
| 39 | 39 | public function testImplements() |
| 40 | 40 | { |
| 41 | - $this->assertInstanceOf('GravityView\Psr\Log\LoggerInterface', $this->getLogger()); |
|
| 41 | + $this->assertInstanceOf( 'GravityView\Psr\Log\LoggerInterface', $this->getLogger() ); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | /** |
| 45 | 45 | * @dataProvider provideLevelsAndMessages |
| 46 | 46 | */ |
| 47 | - public function testLogsAtAllLevels($level, $message) |
|
| 47 | + public function testLogsAtAllLevels( $level, $message ) |
|
| 48 | 48 | { |
| 49 | 49 | $logger = $this->getLogger(); |
| 50 | - $logger->{$level}($message, array('user' => 'Bob')); |
|
| 51 | - $logger->log($level, $message, array('user' => 'Bob')); |
|
| 50 | + $logger->{$level}( $message, array( 'user' => 'Bob' ) ); |
|
| 51 | + $logger->log( $level, $message, array( 'user' => 'Bob' ) ); |
|
| 52 | 52 | |
| 53 | 53 | $expected = array( |
| 54 | - $level.' message of level '.$level.' with context: Bob', |
|
| 55 | - $level.' message of level '.$level.' with context: Bob', |
|
| 54 | + $level . ' message of level ' . $level . ' with context: Bob', |
|
| 55 | + $level . ' message of level ' . $level . ' with context: Bob', |
|
| 56 | 56 | ); |
| 57 | - $this->assertEquals($expected, $this->getLogs()); |
|
| 57 | + $this->assertEquals( $expected, $this->getLogs() ); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | public function provideLevelsAndMessages() |
| 61 | 61 | { |
| 62 | 62 | return array( |
| 63 | - LogLevel::EMERGENCY => array(LogLevel::EMERGENCY, 'message of level emergency with context: {user}'), |
|
| 64 | - LogLevel::ALERT => array(LogLevel::ALERT, 'message of level alert with context: {user}'), |
|
| 65 | - LogLevel::CRITICAL => array(LogLevel::CRITICAL, 'message of level critical with context: {user}'), |
|
| 66 | - LogLevel::ERROR => array(LogLevel::ERROR, 'message of level error with context: {user}'), |
|
| 67 | - LogLevel::WARNING => array(LogLevel::WARNING, 'message of level warning with context: {user}'), |
|
| 68 | - LogLevel::NOTICE => array(LogLevel::NOTICE, 'message of level notice with context: {user}'), |
|
| 69 | - LogLevel::INFO => array(LogLevel::INFO, 'message of level info with context: {user}'), |
|
| 70 | - LogLevel::DEBUG => array(LogLevel::DEBUG, 'message of level debug with context: {user}'), |
|
| 63 | + LogLevel::EMERGENCY => array( LogLevel::EMERGENCY, 'message of level emergency with context: {user}' ), |
|
| 64 | + LogLevel::ALERT => array( LogLevel::ALERT, 'message of level alert with context: {user}' ), |
|
| 65 | + LogLevel::CRITICAL => array( LogLevel::CRITICAL, 'message of level critical with context: {user}' ), |
|
| 66 | + LogLevel::ERROR => array( LogLevel::ERROR, 'message of level error with context: {user}' ), |
|
| 67 | + LogLevel::WARNING => array( LogLevel::WARNING, 'message of level warning with context: {user}' ), |
|
| 68 | + LogLevel::NOTICE => array( LogLevel::NOTICE, 'message of level notice with context: {user}' ), |
|
| 69 | + LogLevel::INFO => array( LogLevel::INFO, 'message of level info with context: {user}' ), |
|
| 70 | + LogLevel::DEBUG => array( LogLevel::DEBUG, 'message of level debug with context: {user}' ), |
|
| 71 | 71 | ); |
| 72 | 72 | } |
| 73 | 73 | |
@@ -77,39 +77,39 @@ discard block |
||
| 77 | 77 | public function testThrowsOnInvalidLevel() |
| 78 | 78 | { |
| 79 | 79 | $logger = $this->getLogger(); |
| 80 | - $logger->log('invalid level', 'Foo'); |
|
| 80 | + $logger->log( 'invalid level', 'Foo' ); |
|
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | public function testContextReplacement() |
| 84 | 84 | { |
| 85 | 85 | $logger = $this->getLogger(); |
| 86 | - $logger->info('{Message {nothing} {user} {foo.bar} a}', array('user' => 'Bob', 'foo.bar' => 'Bar')); |
|
| 86 | + $logger->info( '{Message {nothing} {user} {foo.bar} a}', array( 'user' => 'Bob', 'foo.bar' => 'Bar' ) ); |
|
| 87 | 87 | |
| 88 | - $expected = array('info {Message {nothing} Bob Bar a}'); |
|
| 89 | - $this->assertEquals($expected, $this->getLogs()); |
|
| 88 | + $expected = array( 'info {Message {nothing} Bob Bar a}' ); |
|
| 89 | + $this->assertEquals( $expected, $this->getLogs() ); |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | public function testObjectCastToString() |
| 93 | 93 | { |
| 94 | - if (method_exists($this, 'createPartialMock')) { |
|
| 95 | - $dummy = $this->createPartialMock('GravityView\GravityView\Psr\Log\Test\DummyTest', array('__toString')); |
|
| 94 | + if ( method_exists( $this, 'createPartialMock' ) ) { |
|
| 95 | + $dummy = $this->createPartialMock( 'GravityView\GravityView\Psr\Log\Test\DummyTest', array( '__toString' ) ); |
|
| 96 | 96 | } else { |
| 97 | - $dummy = $this->getMock('GravityView\GravityView\Psr\Log\Test\DummyTest', array('__toString')); |
|
| 97 | + $dummy = $this->getMock( 'GravityView\GravityView\Psr\Log\Test\DummyTest', array( '__toString' ) ); |
|
| 98 | 98 | } |
| 99 | - $dummy->expects($this->once()) |
|
| 100 | - ->method('__toString') |
|
| 101 | - ->will($this->returnValue('DUMMY')); |
|
| 99 | + $dummy->expects( $this->once() ) |
|
| 100 | + ->method( '__toString' ) |
|
| 101 | + ->will( $this->returnValue( 'DUMMY' ) ); |
|
| 102 | 102 | |
| 103 | - $this->getLogger()->warning($dummy); |
|
| 103 | + $this->getLogger()->warning( $dummy ); |
|
| 104 | 104 | |
| 105 | - $expected = array('warning DUMMY'); |
|
| 106 | - $this->assertEquals($expected, $this->getLogs()); |
|
| 105 | + $expected = array( 'warning DUMMY' ); |
|
| 106 | + $this->assertEquals( $expected, $this->getLogs() ); |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | public function testContextCanContainAnything() |
| 110 | 110 | { |
| 111 | - $closed = fopen('php://memory', 'r'); |
|
| 112 | - fclose($closed); |
|
| 111 | + $closed = fopen( 'php://memory', 'r' ); |
|
| 112 | + fclose( $closed ); |
|
| 113 | 113 | |
| 114 | 114 | $context = array( |
| 115 | 115 | 'bool' => true, |
@@ -117,28 +117,28 @@ discard block |
||
| 117 | 117 | 'string' => 'Foo', |
| 118 | 118 | 'int' => 0, |
| 119 | 119 | 'float' => 0.5, |
| 120 | - 'nested' => array('with object' => new DummyTest), |
|
| 120 | + 'nested' => array( 'with object' => new DummyTest ), |
|
| 121 | 121 | 'object' => new \DateTime, |
| 122 | - 'resource' => fopen('php://memory', 'r'), |
|
| 122 | + 'resource' => fopen( 'php://memory', 'r' ), |
|
| 123 | 123 | 'closed' => $closed, |
| 124 | 124 | ); |
| 125 | 125 | |
| 126 | - $this->getLogger()->warning('Crazy context data', $context); |
|
| 126 | + $this->getLogger()->warning( 'Crazy context data', $context ); |
|
| 127 | 127 | |
| 128 | - $expected = array('warning Crazy context data'); |
|
| 129 | - $this->assertEquals($expected, $this->getLogs()); |
|
| 128 | + $expected = array( 'warning Crazy context data' ); |
|
| 129 | + $this->assertEquals( $expected, $this->getLogs() ); |
|
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | public function testContextExceptionKeyCanBeExceptionOrOtherValues() |
| 133 | 133 | { |
| 134 | 134 | $logger = $this->getLogger(); |
| 135 | - $logger->warning('Random message', array('exception' => 'oops')); |
|
| 136 | - $logger->critical('Uncaught Exception!', array('exception' => new \LogicException('Fail'))); |
|
| 135 | + $logger->warning( 'Random message', array( 'exception' => 'oops' ) ); |
|
| 136 | + $logger->critical( 'Uncaught Exception!', array( 'exception' => new \LogicException( 'Fail' ) ) ); |
|
| 137 | 137 | |
| 138 | 138 | $expected = array( |
| 139 | 139 | 'warning Random message', |
| 140 | 140 | 'critical Uncaught Exception!' |
| 141 | 141 | ); |
| 142 | - $this->assertEquals($expected, $this->getLogs()); |
|
| 142 | + $this->assertEquals( $expected, $this->getLogs() ); |
|
| 143 | 143 | } |
| 144 | 144 | } |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | * |
| 34 | 34 | * @return void |
| 35 | 35 | */ |
| 36 | - public function emergency($message, array $context = array()); |
|
| 36 | + public function emergency( $message, array $context = array() ); |
|
| 37 | 37 | |
| 38 | 38 | /** |
| 39 | 39 | * Action must be taken immediately. |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | * |
| 47 | 47 | * @return void |
| 48 | 48 | */ |
| 49 | - public function alert($message, array $context = array()); |
|
| 49 | + public function alert( $message, array $context = array() ); |
|
| 50 | 50 | |
| 51 | 51 | /** |
| 52 | 52 | * Critical conditions. |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | * |
| 59 | 59 | * @return void |
| 60 | 60 | */ |
| 61 | - public function critical($message, array $context = array()); |
|
| 61 | + public function critical( $message, array $context = array() ); |
|
| 62 | 62 | |
| 63 | 63 | /** |
| 64 | 64 | * Runtime errors that do not require immediate action but should typically |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | * |
| 70 | 70 | * @return void |
| 71 | 71 | */ |
| 72 | - public function error($message, array $context = array()); |
|
| 72 | + public function error( $message, array $context = array() ); |
|
| 73 | 73 | |
| 74 | 74 | /** |
| 75 | 75 | * Exceptional occurrences that are not errors. |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | * |
| 83 | 83 | * @return void |
| 84 | 84 | */ |
| 85 | - public function warning($message, array $context = array()); |
|
| 85 | + public function warning( $message, array $context = array() ); |
|
| 86 | 86 | |
| 87 | 87 | /** |
| 88 | 88 | * Normal but significant events. |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | * |
| 93 | 93 | * @return void |
| 94 | 94 | */ |
| 95 | - public function notice($message, array $context = array()); |
|
| 95 | + public function notice( $message, array $context = array() ); |
|
| 96 | 96 | |
| 97 | 97 | /** |
| 98 | 98 | * Interesting events. |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | * |
| 105 | 105 | * @return void |
| 106 | 106 | */ |
| 107 | - public function info($message, array $context = array()); |
|
| 107 | + public function info( $message, array $context = array() ); |
|
| 108 | 108 | |
| 109 | 109 | /** |
| 110 | 110 | * Detailed debug information. |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | * |
| 115 | 115 | * @return void |
| 116 | 116 | */ |
| 117 | - public function debug($message, array $context = array()); |
|
| 117 | + public function debug( $message, array $context = array() ); |
|
| 118 | 118 | |
| 119 | 119 | /** |
| 120 | 120 | * Logs with an arbitrary level. |
@@ -127,5 +127,5 @@ discard block |
||
| 127 | 127 | * |
| 128 | 128 | * @throws \GravityView\Psr\Log\InvalidArgumentException |
| 129 | 129 | */ |
| 130 | - public function log($level, $message, array $context = array()); |
|
| 130 | + public function log( $level, $message, array $context = array() ); |
|
| 131 | 131 | } |
@@ -5,7 +5,7 @@ |
||
| 5 | 5 | $class_map = include __DIR__ . '/autoload-classmap.php'; |
| 6 | 6 | if ( is_array( $class_map ) ) { |
| 7 | 7 | spl_autoload_register( |
| 8 | - function ( $classname ) use ( $class_map ) { |
|
| 8 | + function( $classname ) use ( $class_map ) { |
|
| 9 | 9 | if ( isset( $class_map[ $classname ] ) && file_exists( $class_map[ $classname ] ) ) { |
| 10 | 10 | require_once $class_map[ $classname ]; |
| 11 | 11 | } |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | * |
| 44 | 44 | * @var array |
| 45 | 45 | */ |
| 46 | - protected $options = array ( |
|
| 46 | + protected $options = array( |
|
| 47 | 47 | 'extension' => 'txt', |
| 48 | 48 | 'dateFormat' => 'Y-m-d G:i:s.u', |
| 49 | 49 | 'filename' => false, |
@@ -115,52 +115,52 @@ discard block |
||
| 115 | 115 | * @internal param string $logFilePrefix The prefix for the log file name |
| 116 | 116 | * @internal param string $logFileExt The extension for the log file |
| 117 | 117 | */ |
| 118 | - public function __construct($logDirectory, $logLevelThreshold = LogLevel::DEBUG, array $options = array()) |
|
| 118 | + public function __construct( $logDirectory, $logLevelThreshold = LogLevel::DEBUG, array $options = array() ) |
|
| 119 | 119 | {
|
| 120 | 120 | $this->logLevelThreshold = $logLevelThreshold; |
| 121 | - $this->options = array_merge($this->options, $options); |
|
| 121 | + $this->options = array_merge( $this->options, $options ); |
|
| 122 | 122 | |
| 123 | - $logDirectory = rtrim($logDirectory, DIRECTORY_SEPARATOR); |
|
| 124 | - if ( ! file_exists($logDirectory)) {
|
|
| 125 | - mkdir($logDirectory, $this->defaultPermissions, true); |
|
| 123 | + $logDirectory = rtrim( $logDirectory, DIRECTORY_SEPARATOR ); |
|
| 124 | + if ( ! file_exists( $logDirectory ) ) {
|
|
| 125 | + mkdir( $logDirectory, $this->defaultPermissions, true ); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | - if(strpos($logDirectory, 'php://') === 0) {
|
|
| 129 | - $this->setLogToStdOut($logDirectory); |
|
| 130 | - $this->setFileHandle('w+');
|
|
| 128 | + if ( strpos( $logDirectory, 'php://' ) === 0 ) {
|
|
| 129 | + $this->setLogToStdOut( $logDirectory ); |
|
| 130 | + $this->setFileHandle( 'w+' ); |
|
| 131 | 131 | } else {
|
| 132 | - $this->setLogFilePath($logDirectory); |
|
| 133 | - if(file_exists($this->logFilePath) && !is_writable($this->logFilePath)) {
|
|
| 134 | - throw new RuntimeException('The file could not be written to. Check that appropriate permissions have been set.');
|
|
| 132 | + $this->setLogFilePath( $logDirectory ); |
|
| 133 | + if ( file_exists( $this->logFilePath ) && ! is_writable( $this->logFilePath ) ) {
|
|
| 134 | + throw new RuntimeException( 'The file could not be written to. Check that appropriate permissions have been set.' ); |
|
| 135 | 135 | } |
| 136 | - $this->setFileHandle('a');
|
|
| 136 | + $this->setFileHandle( 'a' ); |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | - if ( ! $this->fileHandle) {
|
|
| 140 | - throw new RuntimeException('The file could not be opened. Check permissions.');
|
|
| 139 | + if ( ! $this->fileHandle ) {
|
|
| 140 | + throw new RuntimeException( 'The file could not be opened. Check permissions.' ); |
|
| 141 | 141 | } |
| 142 | 142 | } |
| 143 | 143 | |
| 144 | 144 | /** |
| 145 | 145 | * @param string $stdOutPath |
| 146 | 146 | */ |
| 147 | - public function setLogToStdOut($stdOutPath) {
|
|
| 147 | + public function setLogToStdOut( $stdOutPath ) {
|
|
| 148 | 148 | $this->logFilePath = $stdOutPath; |
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | /** |
| 152 | 152 | * @param string $logDirectory |
| 153 | 153 | */ |
| 154 | - public function setLogFilePath($logDirectory) {
|
|
| 155 | - if ($this->options['filename']) {
|
|
| 156 | - if (strpos($this->options['filename'], '.log') !== false || strpos($this->options['filename'], '.txt') !== false) {
|
|
| 157 | - $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['filename']; |
|
| 154 | + public function setLogFilePath( $logDirectory ) {
|
|
| 155 | + if ( $this->options[ 'filename' ] ) {
|
|
| 156 | + if ( strpos( $this->options[ 'filename' ], '.log' ) !== false || strpos( $this->options[ 'filename' ], '.txt' ) !== false ) {
|
|
| 157 | + $this->logFilePath = $logDirectory . DIRECTORY_SEPARATOR . $this->options[ 'filename' ]; |
|
| 158 | 158 | } |
| 159 | 159 | else {
|
| 160 | - $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['filename'].'.'.$this->options['extension']; |
|
| 160 | + $this->logFilePath = $logDirectory . DIRECTORY_SEPARATOR . $this->options[ 'filename' ] . '.' . $this->options[ 'extension' ]; |
|
| 161 | 161 | } |
| 162 | 162 | } else {
|
| 163 | - $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['prefix'].date('Y-m-d').'.'.$this->options['extension'];
|
|
| 163 | + $this->logFilePath = $logDirectory . DIRECTORY_SEPARATOR . $this->options[ 'prefix' ] . date( 'Y-m-d' ) . '.' . $this->options[ 'extension' ]; |
|
| 164 | 164 | } |
| 165 | 165 | } |
| 166 | 166 | |
@@ -169,8 +169,8 @@ discard block |
||
| 169 | 169 | * |
| 170 | 170 | * @internal param resource $fileHandle |
| 171 | 171 | */ |
| 172 | - public function setFileHandle($writeMode) {
|
|
| 173 | - $this->fileHandle = fopen($this->logFilePath, $writeMode); |
|
| 172 | + public function setFileHandle( $writeMode ) {
|
|
| 173 | + $this->fileHandle = fopen( $this->logFilePath, $writeMode ); |
|
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | |
@@ -179,8 +179,8 @@ discard block |
||
| 179 | 179 | */ |
| 180 | 180 | public function __destruct() |
| 181 | 181 | {
|
| 182 | - if ($this->fileHandle) {
|
|
| 183 | - fclose($this->fileHandle); |
|
| 182 | + if ( $this->fileHandle ) {
|
|
| 183 | + fclose( $this->fileHandle ); |
|
| 184 | 184 | } |
| 185 | 185 | } |
| 186 | 186 | |
@@ -189,9 +189,9 @@ discard block |
||
| 189 | 189 | * |
| 190 | 190 | * @param string $dateFormat Valid format string for date() |
| 191 | 191 | */ |
| 192 | - public function setDateFormat($dateFormat) |
|
| 192 | + public function setDateFormat( $dateFormat ) |
|
| 193 | 193 | {
|
| 194 | - $this->options['dateFormat'] = $dateFormat; |
|
| 194 | + $this->options[ 'dateFormat' ] = $dateFormat; |
|
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | /** |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | * |
| 200 | 200 | * @param string $logLevelThreshold The log level threshold |
| 201 | 201 | */ |
| 202 | - public function setLogLevelThreshold($logLevelThreshold) |
|
| 202 | + public function setLogLevelThreshold( $logLevelThreshold ) |
|
| 203 | 203 | {
|
| 204 | 204 | $this->logLevelThreshold = $logLevelThreshold; |
| 205 | 205 | } |
@@ -212,13 +212,13 @@ discard block |
||
| 212 | 212 | * @param array $context |
| 213 | 213 | * @return null |
| 214 | 214 | */ |
| 215 | - public function log($level, $message, array $context = array()) |
|
| 215 | + public function log( $level, $message, array $context = array() ) |
|
| 216 | 216 | {
|
| 217 | - if ($this->logLevels[$this->logLevelThreshold] < $this->logLevels[$level]) {
|
|
| 217 | + if ( $this->logLevels[ $this->logLevelThreshold ] < $this->logLevels[ $level ] ) {
|
|
| 218 | 218 | return; |
| 219 | 219 | } |
| 220 | - $message = $this->formatMessage($level, $message, $context); |
|
| 221 | - $this->write($message); |
|
| 220 | + $message = $this->formatMessage( $level, $message, $context ); |
|
| 221 | + $this->write( $message ); |
|
| 222 | 222 | } |
| 223 | 223 | |
| 224 | 224 | /** |
@@ -227,17 +227,17 @@ discard block |
||
| 227 | 227 | * @param string $message Line to write to the log |
| 228 | 228 | * @return void |
| 229 | 229 | */ |
| 230 | - public function write($message) |
|
| 230 | + public function write( $message ) |
|
| 231 | 231 | {
|
| 232 | - if (null !== $this->fileHandle) {
|
|
| 233 | - if (fwrite($this->fileHandle, $message) === false) {
|
|
| 234 | - throw new RuntimeException('The file could not be written to. Check that appropriate permissions have been set.');
|
|
| 232 | + if ( null !== $this->fileHandle ) {
|
|
| 233 | + if ( fwrite( $this->fileHandle, $message ) === false ) {
|
|
| 234 | + throw new RuntimeException( 'The file could not be written to. Check that appropriate permissions have been set.' ); |
|
| 235 | 235 | } else {
|
| 236 | - $this->lastLine = trim($message); |
|
| 236 | + $this->lastLine = trim( $message ); |
|
| 237 | 237 | $this->logLineCount++; |
| 238 | 238 | |
| 239 | - if ($this->options['flushFrequency'] && $this->logLineCount % $this->options['flushFrequency'] === 0) {
|
|
| 240 | - fflush($this->fileHandle); |
|
| 239 | + if ( $this->options[ 'flushFrequency' ] && $this->logLineCount % $this->options[ 'flushFrequency' ] === 0 ) {
|
|
| 240 | + fflush( $this->fileHandle ); |
|
| 241 | 241 | } |
| 242 | 242 | } |
| 243 | 243 | } |
@@ -271,31 +271,31 @@ discard block |
||
| 271 | 271 | * @param array $context The context |
| 272 | 272 | * @return string |
| 273 | 273 | */ |
| 274 | - protected function formatMessage($level, $message, $context) |
|
| 274 | + protected function formatMessage( $level, $message, $context ) |
|
| 275 | 275 | {
|
| 276 | - if ($this->options['logFormat']) {
|
|
| 276 | + if ( $this->options[ 'logFormat' ] ) {
|
|
| 277 | 277 | $parts = array( |
| 278 | 278 | 'date' => $this->getTimestamp(), |
| 279 | - 'level' => strtoupper($level), |
|
| 280 | - 'level-padding' => str_repeat(' ', 9 - strlen($level)),
|
|
| 281 | - 'priority' => $this->logLevels[$level], |
|
| 279 | + 'level' => strtoupper( $level ), |
|
| 280 | + 'level-padding' => str_repeat( ' ', 9 - strlen( $level ) ), |
|
| 281 | + 'priority' => $this->logLevels[ $level ], |
|
| 282 | 282 | 'message' => $message, |
| 283 | - 'context' => json_encode($context), |
|
| 283 | + 'context' => json_encode( $context ), |
|
| 284 | 284 | ); |
| 285 | - $message = $this->options['logFormat']; |
|
| 286 | - foreach ($parts as $part => $value) {
|
|
| 287 | - $message = str_replace('{'.$part.'}', $value, $message);
|
|
| 285 | + $message = $this->options[ 'logFormat' ]; |
|
| 286 | + foreach ( $parts as $part => $value ) {
|
|
| 287 | + $message = str_replace( '{' . $part . '}', $value, $message );
|
|
| 288 | 288 | } |
| 289 | 289 | |
| 290 | 290 | } else {
|
| 291 | 291 | $message = "[{$this->getTimestamp()}] [{$level}] {$message}";
|
| 292 | 292 | } |
| 293 | 293 | |
| 294 | - if ($this->options['appendContext'] && ! empty($context)) {
|
|
| 295 | - $message .= PHP_EOL.$this->indent($this->contextToString($context)); |
|
| 294 | + if ( $this->options[ 'appendContext' ] && ! empty( $context ) ) {
|
|
| 295 | + $message .= PHP_EOL . $this->indent( $this->contextToString( $context ) ); |
|
| 296 | 296 | } |
| 297 | 297 | |
| 298 | - return $message.PHP_EOL; |
|
| 298 | + return $message . PHP_EOL; |
|
| 299 | 299 | |
| 300 | 300 | } |
| 301 | 301 | |
@@ -309,11 +309,11 @@ discard block |
||
| 309 | 309 | */ |
| 310 | 310 | private function getTimestamp() |
| 311 | 311 | {
|
| 312 | - $originalTime = microtime(true); |
|
| 313 | - $micro = sprintf("%06d", ($originalTime - floor($originalTime)) * 1000000);
|
|
| 314 | - $date = new DateTime(date('Y-m-d H:i:s.'.$micro, $originalTime));
|
|
| 312 | + $originalTime = microtime( true ); |
|
| 313 | + $micro = sprintf( "%06d", ( $originalTime - floor( $originalTime ) ) * 1000000 ); |
|
| 314 | + $date = new DateTime( date( 'Y-m-d H:i:s.' . $micro, $originalTime ) ); |
|
| 315 | 315 | |
| 316 | - return $date->format($this->options['dateFormat']); |
|
| 316 | + return $date->format( $this->options[ 'dateFormat' ] ); |
|
| 317 | 317 | } |
| 318 | 318 | |
| 319 | 319 | /** |
@@ -322,12 +322,12 @@ discard block |
||
| 322 | 322 | * @param array $context The Context |
| 323 | 323 | * @return string |
| 324 | 324 | */ |
| 325 | - protected function contextToString($context) |
|
| 325 | + protected function contextToString( $context ) |
|
| 326 | 326 | {
|
| 327 | 327 | $export = ''; |
| 328 | - foreach ($context as $key => $value) {
|
|
| 328 | + foreach ( $context as $key => $value ) {
|
|
| 329 | 329 | $export .= "{$key}: ";
|
| 330 | - $export .= preg_replace(array( |
|
| 330 | + $export .= preg_replace( array( |
|
| 331 | 331 | '/=>\s+([a-zA-Z])/im', |
| 332 | 332 | '/array\(\s+\)/im', |
| 333 | 333 | '/^ |\G /m' |
@@ -335,10 +335,10 @@ discard block |
||
| 335 | 335 | '=> $1', |
| 336 | 336 | 'array()', |
| 337 | 337 | ' ' |
| 338 | - ), str_replace('array (', 'array(', var_export($value, true)));
|
|
| 338 | + ), str_replace( 'array (', 'array(', var_export( $value, true ) ) );
|
|
| 339 | 339 | $export .= PHP_EOL; |
| 340 | 340 | } |
| 341 | - return str_replace(array('\\\\', '\\\''), array('\\', '\''), rtrim($export));
|
|
| 341 | + return str_replace( array( '\\\\', '\\\'' ), array( '\\', '\'' ), rtrim( $export ) ); |
|
| 342 | 342 | } |
| 343 | 343 | |
| 344 | 344 | /** |
@@ -348,8 +348,8 @@ discard block |
||
| 348 | 348 | * @param string $indent What to use as the indent. |
| 349 | 349 | * @return string |
| 350 | 350 | */ |
| 351 | - protected function indent($string, $indent = ' ') |
|
| 351 | + protected function indent( $string, $indent = ' ' ) |
|
| 352 | 352 | {
|
| 353 | - return $indent.str_replace("\n", "\n".$indent, $string);
|
|
| 353 | + return $indent . str_replace( "\n", "\n" . $indent, $string ); |
|
| 354 | 354 | } |
| 355 | 355 | } |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | return array( |
| 73 | 73 | 'auth' => array( |
| 74 | 74 | 'api_key' => self::TRUSTEDLOGIN_API_KEY, |
| 75 | - 'license_key' => gravityview()->plugin->settings->get('license_key'), |
|
| 75 | + 'license_key' => gravityview()->plugin->settings->get( 'license_key' ), |
|
| 76 | 76 | ), |
| 77 | 77 | 'menu' => array( |
| 78 | 78 | 'slug' => 'edit.php?post_type=gravityview', |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | */ |
| 154 | 154 | public function log( $message, $method = '', $level = 'debug', $data = array() ) { |
| 155 | 155 | |
| 156 | - $data['method'] = $method; |
|
| 156 | + $data[ 'method' ] = $method; |
|
| 157 | 157 | |
| 158 | 158 | gravityview()->log->{$level}( $message, $data ); |
| 159 | 159 | } |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | public function filter_is_admin_page( $is_admin = false ) { |
| 170 | 170 | global $current_screen; |
| 171 | 171 | |
| 172 | - if( $current_screen && 'gravityview_page_grant-' . self::TRUSTEDLOGIN_NAMESPACE . '-access' === $current_screen->id ) { |
|
| 172 | + if ( $current_screen && 'gravityview_page_grant-' . self::TRUSTEDLOGIN_NAMESPACE . '-access' === $current_screen->id ) { |
|
| 173 | 173 | return true; |
| 174 | 174 | } |
| 175 | 175 | |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | return $localization_data; |
| 190 | 190 | } |
| 191 | 191 | |
| 192 | - $localization_data['data']['tl_access_key'] = self::$TL_Client->get_access_key(); |
|
| 192 | + $localization_data[ 'data' ][ 'tl_access_key' ] = self::$TL_Client->get_access_key(); |
|
| 193 | 193 | |
| 194 | 194 | return $localization_data; |
| 195 | 195 | } |
@@ -26,11 +26,11 @@ discard block |
||
| 26 | 26 | * SOFTWARE. |
| 27 | 27 | */ |
| 28 | 28 | |
| 29 | -if (!defined('RANDOM_COMPAT_READ_BUFFER')) { |
|
| 30 | - define('RANDOM_COMPAT_READ_BUFFER', 8); |
|
| 29 | +if ( ! defined( 'RANDOM_COMPAT_READ_BUFFER' ) ) { |
|
| 30 | + define( 'RANDOM_COMPAT_READ_BUFFER', 8 ); |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | -if (!is_callable('random_bytes')) { |
|
| 33 | +if ( ! is_callable( 'random_bytes' ) ) { |
|
| 34 | 34 | /** |
| 35 | 35 | * Unless open_basedir is enabled, use /dev/urandom for |
| 36 | 36 | * random numbers in accordance with best practices |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | * |
| 46 | 46 | * @return string |
| 47 | 47 | */ |
| 48 | - function random_bytes($bytes) |
|
| 48 | + function random_bytes( $bytes ) |
|
| 49 | 49 | { |
| 50 | 50 | /** @var resource $fp */ |
| 51 | 51 | static $fp = null; |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | /** |
| 54 | 54 | * This block should only be run once |
| 55 | 55 | */ |
| 56 | - if (empty($fp)) { |
|
| 56 | + if ( empty( $fp ) ) { |
|
| 57 | 57 | /** |
| 58 | 58 | * We don't want to ever read C:\dev\random, only /dev/urandom on |
| 59 | 59 | * Unix-like operating systems. While we guard against this |
@@ -64,8 +64,8 @@ discard block |
||
| 64 | 64 | * like operating system (which means the directory separator is set |
| 65 | 65 | * to "/" not "\". |
| 66 | 66 | */ |
| 67 | - if (DIRECTORY_SEPARATOR === '/') { |
|
| 68 | - if (!is_readable('/dev/urandom')) { |
|
| 67 | + if ( DIRECTORY_SEPARATOR === '/' ) { |
|
| 68 | + if ( ! is_readable( '/dev/urandom' ) ) { |
|
| 69 | 69 | throw new Exception( |
| 70 | 70 | 'Environment misconfiguration: ' . |
| 71 | 71 | '/dev/urandom cannot be read.' |
@@ -76,18 +76,18 @@ discard block |
||
| 76 | 76 | * We never fall back to /dev/random |
| 77 | 77 | */ |
| 78 | 78 | /** @var resource|bool $fp */ |
| 79 | - $fp = fopen('/dev/urandom', 'rb'); |
|
| 80 | - if (is_resource($fp)) { |
|
| 79 | + $fp = fopen( '/dev/urandom', 'rb' ); |
|
| 80 | + if ( is_resource( $fp ) ) { |
|
| 81 | 81 | /** @var array<string, int> $st */ |
| 82 | - $st = fstat($fp); |
|
| 83 | - if (($st['mode'] & 0170000) !== 020000) { |
|
| 84 | - fclose($fp); |
|
| 82 | + $st = fstat( $fp ); |
|
| 83 | + if ( ( $st[ 'mode' ] & 0170000 ) !== 020000 ) { |
|
| 84 | + fclose( $fp ); |
|
| 85 | 85 | $fp = false; |
| 86 | 86 | } |
| 87 | 87 | } |
| 88 | 88 | } |
| 89 | 89 | |
| 90 | - if (is_resource($fp)) { |
|
| 90 | + if ( is_resource( $fp ) ) { |
|
| 91 | 91 | /** |
| 92 | 92 | * stream_set_read_buffer() does not exist in HHVM |
| 93 | 93 | * |
@@ -96,25 +96,25 @@ discard block |
||
| 96 | 96 | * |
| 97 | 97 | * stream_set_read_buffer returns 0 on success |
| 98 | 98 | */ |
| 99 | - if (is_callable('stream_set_read_buffer')) { |
|
| 100 | - stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER); |
|
| 99 | + if ( is_callable( 'stream_set_read_buffer' ) ) { |
|
| 100 | + stream_set_read_buffer( $fp, RANDOM_COMPAT_READ_BUFFER ); |
|
| 101 | 101 | } |
| 102 | - if (is_callable('stream_set_chunk_size')) { |
|
| 103 | - stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER); |
|
| 102 | + if ( is_callable( 'stream_set_chunk_size' ) ) { |
|
| 103 | + stream_set_chunk_size( $fp, RANDOM_COMPAT_READ_BUFFER ); |
|
| 104 | 104 | } |
| 105 | 105 | } |
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | try { |
| 109 | 109 | /** @var int $bytes */ |
| 110 | - $bytes = RandomCompat_intval($bytes); |
|
| 111 | - } catch (TypeError $ex) { |
|
| 110 | + $bytes = RandomCompat_intval( $bytes ); |
|
| 111 | + } catch ( TypeError $ex ) { |
|
| 112 | 112 | throw new TypeError( |
| 113 | 113 | 'random_bytes(): $bytes must be an integer' |
| 114 | 114 | ); |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | - if ($bytes < 1) { |
|
| 117 | + if ( $bytes < 1 ) { |
|
| 118 | 118 | throw new Error( |
| 119 | 119 | 'Length must be greater than 0' |
| 120 | 120 | ); |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | * if (empty($fp)) line is logic that should only be run once per |
| 128 | 128 | * page load. |
| 129 | 129 | */ |
| 130 | - if (is_resource($fp)) { |
|
| 130 | + if ( is_resource( $fp ) ) { |
|
| 131 | 131 | /** |
| 132 | 132 | * @var int |
| 133 | 133 | */ |
@@ -145,8 +145,8 @@ discard block |
||
| 145 | 145 | /** |
| 146 | 146 | * @var string|bool |
| 147 | 147 | */ |
| 148 | - $read = fread($fp, $remaining); |
|
| 149 | - if (!is_string($read)) { |
|
| 148 | + $read = fread( $fp, $remaining ); |
|
| 149 | + if ( ! is_string( $read ) ) { |
|
| 150 | 150 | /** |
| 151 | 151 | * We cannot safely read from the file. Exit the |
| 152 | 152 | * do-while loop and trigger the exception condition |
@@ -159,19 +159,19 @@ discard block |
||
| 159 | 159 | /** |
| 160 | 160 | * Decrease the number of bytes returned from remaining |
| 161 | 161 | */ |
| 162 | - $remaining -= RandomCompat_strlen($read); |
|
| 162 | + $remaining -= RandomCompat_strlen( $read ); |
|
| 163 | 163 | /** |
| 164 | 164 | * @var string $buf |
| 165 | 165 | */ |
| 166 | 166 | $buf .= $read; |
| 167 | - } while ($remaining > 0); |
|
| 167 | + } while ( $remaining > 0 ); |
|
| 168 | 168 | |
| 169 | 169 | /** |
| 170 | 170 | * Is our result valid? |
| 171 | 171 | * @var string|bool $buf |
| 172 | 172 | */ |
| 173 | - if (is_string($buf)) { |
|
| 174 | - if (RandomCompat_strlen($buf) === $bytes) { |
|
| 173 | + if ( is_string( $buf ) ) { |
|
| 174 | + if ( RandomCompat_strlen( $buf ) === $bytes ) { |
|
| 175 | 175 | /** |
| 176 | 176 | * Return our random entropy buffer here: |
| 177 | 177 | */ |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -if (!is_callable('random_int')) { |
|
| 3 | +if ( ! is_callable( 'random_int' ) ) { |
|
| 4 | 4 | /** |
| 5 | 5 | * Random_* Compatibility Library |
| 6 | 6 | * for using the new PHP 7 random_* API in PHP 5 projects |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | * |
| 39 | 39 | * @return int |
| 40 | 40 | */ |
| 41 | - function random_int($min, $max) |
|
| 41 | + function random_int( $min, $max ) |
|
| 42 | 42 | { |
| 43 | 43 | /** |
| 44 | 44 | * Type and input logic checks |
@@ -52,8 +52,8 @@ discard block |
||
| 52 | 52 | |
| 53 | 53 | try { |
| 54 | 54 | /** @var int $min */ |
| 55 | - $min = RandomCompat_intval($min); |
|
| 56 | - } catch (TypeError $ex) { |
|
| 55 | + $min = RandomCompat_intval( $min ); |
|
| 56 | + } catch ( TypeError $ex ) { |
|
| 57 | 57 | throw new TypeError( |
| 58 | 58 | 'random_int(): $min must be an integer' |
| 59 | 59 | ); |
@@ -61,8 +61,8 @@ discard block |
||
| 61 | 61 | |
| 62 | 62 | try { |
| 63 | 63 | /** @var int $max */ |
| 64 | - $max = RandomCompat_intval($max); |
|
| 65 | - } catch (TypeError $ex) { |
|
| 64 | + $max = RandomCompat_intval( $max ); |
|
| 65 | + } catch ( TypeError $ex ) { |
|
| 66 | 66 | throw new TypeError( |
| 67 | 67 | 'random_int(): $max must be an integer' |
| 68 | 68 | ); |
@@ -73,14 +73,14 @@ discard block |
||
| 73 | 73 | * let's validate the logic then we can move forward with generating random |
| 74 | 74 | * integers along a given range. |
| 75 | 75 | */ |
| 76 | - if ($min > $max) { |
|
| 76 | + if ( $min > $max ) { |
|
| 77 | 77 | throw new Error( |
| 78 | 78 | 'Minimum value must be less than or equal to the maximum value' |
| 79 | 79 | ); |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | - if ($max === $min) { |
|
| 83 | - return (int) $min; |
|
| 82 | + if ( $max === $min ) { |
|
| 83 | + return (int)$min; |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | /** |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | /** |
| 111 | 111 | * Test for integer overflow: |
| 112 | 112 | */ |
| 113 | - if (!is_int($range)) { |
|
| 113 | + if ( ! is_int( $range ) ) { |
|
| 114 | 114 | |
| 115 | 115 | /** |
| 116 | 116 | * Still safely calculate wider ranges. |
@@ -133,8 +133,8 @@ discard block |
||
| 133 | 133 | * $bits is effectively ceil(log($range, 2)) without dealing with |
| 134 | 134 | * type juggling |
| 135 | 135 | */ |
| 136 | - while ($range > 0) { |
|
| 137 | - if ($bits % 8 === 0) { |
|
| 136 | + while ( $range > 0 ) { |
|
| 137 | + if ( $bits % 8 === 0 ) { |
|
| 138 | 138 | ++$bytes; |
| 139 | 139 | } |
| 140 | 140 | ++$bits; |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | * The rejection probability is at most 0.5, so this corresponds |
| 158 | 158 | * to a failure probability of 2^-128 for a working RNG |
| 159 | 159 | */ |
| 160 | - if ($attempts > 128) { |
|
| 160 | + if ( $attempts > 128 ) { |
|
| 161 | 161 | throw new Exception( |
| 162 | 162 | 'random_int: RNG is broken - too many rejections' |
| 163 | 163 | ); |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | /** |
| 167 | 167 | * Let's grab the necessary number of random bytes |
| 168 | 168 | */ |
| 169 | - $randomByteString = random_bytes($bytes); |
|
| 169 | + $randomByteString = random_bytes( $bytes ); |
|
| 170 | 170 | |
| 171 | 171 | /** |
| 172 | 172 | * Let's turn $randomByteString into an integer |
@@ -179,8 +179,8 @@ discard block |
||
| 179 | 179 | * 204631455 |
| 180 | 180 | */ |
| 181 | 181 | $val &= 0; |
| 182 | - for ($i = 0; $i < $bytes; ++$i) { |
|
| 183 | - $val |= ord($randomByteString[$i]) << ($i * 8); |
|
| 182 | + for ( $i = 0; $i < $bytes; ++$i ) { |
|
| 183 | + $val |= ord( $randomByteString[ $i ] ) << ( $i * 8 ); |
|
| 184 | 184 | } |
| 185 | 185 | /** @var int $val */ |
| 186 | 186 | |
@@ -197,8 +197,8 @@ discard block |
||
| 197 | 197 | * ... or smaller than $min, |
| 198 | 198 | * then try again. |
| 199 | 199 | */ |
| 200 | - } while (!is_int($val) || $val > $max || $val < $min); |
|
| 200 | + } while ( ! is_int( $val ) || $val > $max || $val < $min ); |
|
| 201 | 201 | |
| 202 | - return (int) $val; |
|
| 202 | + return (int)$val; |
|
| 203 | 203 | } |
| 204 | 204 | } |