@@ -114,14 +114,14 @@ |
||
114 | 114 | /** Require critical legacy core files. @todo Deprecate */ |
115 | 115 | require_once $this->plugin->dir( 'includes/import-functions.php' ); |
116 | 116 | require_once $this->plugin->dir( 'includes/helper-functions.php' ); |
117 | - require_once $this->plugin->dir( 'includes/class-common.php'); |
|
118 | - require_once $this->plugin->dir( 'includes/connector-functions.php'); |
|
117 | + require_once $this->plugin->dir( 'includes/class-common.php' ); |
|
118 | + require_once $this->plugin->dir( 'includes/connector-functions.php' ); |
|
119 | 119 | require_once $this->plugin->dir( 'includes/class-gravityview-compatibility.php' ); |
120 | 120 | require_once $this->plugin->dir( 'includes/class-gravityview-roles-capabilities.php' ); |
121 | 121 | require_once $this->plugin->dir( 'includes/class-gravityview-admin-notices.php' ); |
122 | 122 | require_once $this->plugin->dir( 'includes/class-admin.php' ); |
123 | - require_once $this->plugin->dir( 'includes/class-post-types.php'); |
|
124 | - require_once $this->plugin->dir( 'includes/class-cache.php'); |
|
123 | + require_once $this->plugin->dir( 'includes/class-post-types.php' ); |
|
124 | + require_once $this->plugin->dir( 'includes/class-cache.php' ); |
|
125 | 125 | |
126 | 126 | /** |
127 | 127 | * GravityView extensions and widgets. |
@@ -46,11 +46,11 @@ discard block |
||
46 | 46 | */ |
47 | 47 | function gravityview_import_helper_fix_line_breaks( $postmeta = array(), $post_id = 0, $post = array() ) { |
48 | 48 | |
49 | - if ( empty( $post['postmeta'] ) ) { |
|
49 | + if ( empty( $post[ 'postmeta' ] ) ) { |
|
50 | 50 | return $postmeta; |
51 | 51 | } |
52 | 52 | |
53 | - if ( 'gravityview' !== $post['post_type'] ) { |
|
53 | + if ( 'gravityview' !== $post[ 'post_type' ] ) { |
|
54 | 54 | return $postmeta; |
55 | 55 | } |
56 | 56 | |
@@ -62,27 +62,27 @@ discard block |
||
62 | 62 | $performed_fix = false; |
63 | 63 | |
64 | 64 | foreach ( $postmeta as &$meta ) { |
65 | - $key = $meta['key']; |
|
65 | + $key = $meta[ 'key' ]; |
|
66 | 66 | |
67 | 67 | if ( ! in_array( $key, $keys_to_fix, true ) ) { |
68 | 68 | continue; |
69 | 69 | } |
70 | 70 | |
71 | - $is_valid_serialized_data = maybe_unserialize( $meta['value'] ); |
|
71 | + $is_valid_serialized_data = maybe_unserialize( $meta[ 'value' ] ); |
|
72 | 72 | |
73 | 73 | // The values are not corrupted serialized data. No need to fix. |
74 | 74 | if ( false !== $is_valid_serialized_data ) { |
75 | 75 | continue; |
76 | 76 | } |
77 | 77 | |
78 | - $meta['value'] = str_replace( "\n", "\n\n", $meta['value'] ); |
|
78 | + $meta[ 'value' ] = str_replace( "\n", "\n\n", $meta[ 'value' ] ); |
|
79 | 79 | |
80 | 80 | $performed_fix = true; |
81 | 81 | } |
82 | 82 | |
83 | 83 | // Leave a note that this modification has been done. We'll use it later. |
84 | 84 | if ( $performed_fix ) { |
85 | - $postmeta[] = array( |
|
85 | + $postmeta[ ] = array( |
|
86 | 86 | 'key' => '_gravityview_fixed_import_serialization', |
87 | 87 | 'value' => 1, |
88 | 88 | ); |
@@ -17,118 +17,118 @@ |
||
17 | 17 | */ |
18 | 18 | abstract class AbstractLogger implements LoggerInterface |
19 | 19 | { |
20 | - /** |
|
21 | - * System is unusable. |
|
22 | - * |
|
23 | - * @param string $message |
|
24 | - * @param mixed[] $context |
|
25 | - * |
|
26 | - * @return void |
|
27 | - */ |
|
28 | - public function emergency($message, array $context = array()) |
|
29 | - { |
|
30 | - $this->log(LogLevel::EMERGENCY, $message, $context); |
|
31 | - } |
|
20 | + /** |
|
21 | + * System is unusable. |
|
22 | + * |
|
23 | + * @param string $message |
|
24 | + * @param mixed[] $context |
|
25 | + * |
|
26 | + * @return void |
|
27 | + */ |
|
28 | + public function emergency($message, array $context = array()) |
|
29 | + { |
|
30 | + $this->log(LogLevel::EMERGENCY, $message, $context); |
|
31 | + } |
|
32 | 32 | |
33 | - /** |
|
34 | - * Action must be taken immediately. |
|
35 | - * |
|
36 | - * Example: Entire website down, database unavailable, etc. This should |
|
37 | - * trigger the SMS alerts and wake you up. |
|
38 | - * |
|
39 | - * @param string $message |
|
40 | - * @param mixed[] $context |
|
41 | - * |
|
42 | - * @return void |
|
43 | - */ |
|
44 | - public function alert($message, array $context = array()) |
|
45 | - { |
|
46 | - $this->log(LogLevel::ALERT, $message, $context); |
|
47 | - } |
|
33 | + /** |
|
34 | + * Action must be taken immediately. |
|
35 | + * |
|
36 | + * Example: Entire website down, database unavailable, etc. This should |
|
37 | + * trigger the SMS alerts and wake you up. |
|
38 | + * |
|
39 | + * @param string $message |
|
40 | + * @param mixed[] $context |
|
41 | + * |
|
42 | + * @return void |
|
43 | + */ |
|
44 | + public function alert($message, array $context = array()) |
|
45 | + { |
|
46 | + $this->log(LogLevel::ALERT, $message, $context); |
|
47 | + } |
|
48 | 48 | |
49 | - /** |
|
50 | - * Critical conditions. |
|
51 | - * |
|
52 | - * Example: Application component unavailable, unexpected exception. |
|
53 | - * |
|
54 | - * @param string $message |
|
55 | - * @param mixed[] $context |
|
56 | - * |
|
57 | - * @return void |
|
58 | - */ |
|
59 | - public function critical($message, array $context = array()) |
|
60 | - { |
|
61 | - $this->log(LogLevel::CRITICAL, $message, $context); |
|
62 | - } |
|
49 | + /** |
|
50 | + * Critical conditions. |
|
51 | + * |
|
52 | + * Example: Application component unavailable, unexpected exception. |
|
53 | + * |
|
54 | + * @param string $message |
|
55 | + * @param mixed[] $context |
|
56 | + * |
|
57 | + * @return void |
|
58 | + */ |
|
59 | + public function critical($message, array $context = array()) |
|
60 | + { |
|
61 | + $this->log(LogLevel::CRITICAL, $message, $context); |
|
62 | + } |
|
63 | 63 | |
64 | - /** |
|
65 | - * Runtime errors that do not require immediate action but should typically |
|
66 | - * be logged and monitored. |
|
67 | - * |
|
68 | - * @param string $message |
|
69 | - * @param mixed[] $context |
|
70 | - * |
|
71 | - * @return void |
|
72 | - */ |
|
73 | - public function error($message, array $context = array()) |
|
74 | - { |
|
75 | - $this->log(LogLevel::ERROR, $message, $context); |
|
76 | - } |
|
64 | + /** |
|
65 | + * Runtime errors that do not require immediate action but should typically |
|
66 | + * be logged and monitored. |
|
67 | + * |
|
68 | + * @param string $message |
|
69 | + * @param mixed[] $context |
|
70 | + * |
|
71 | + * @return void |
|
72 | + */ |
|
73 | + public function error($message, array $context = array()) |
|
74 | + { |
|
75 | + $this->log(LogLevel::ERROR, $message, $context); |
|
76 | + } |
|
77 | 77 | |
78 | - /** |
|
79 | - * Exceptional occurrences that are not errors. |
|
80 | - * |
|
81 | - * Example: Use of deprecated APIs, poor use of an API, undesirable things |
|
82 | - * that are not necessarily wrong. |
|
83 | - * |
|
84 | - * @param string $message |
|
85 | - * @param mixed[] $context |
|
86 | - * |
|
87 | - * @return void |
|
88 | - */ |
|
89 | - public function warning($message, array $context = array()) |
|
90 | - { |
|
91 | - $this->log(LogLevel::WARNING, $message, $context); |
|
92 | - } |
|
78 | + /** |
|
79 | + * Exceptional occurrences that are not errors. |
|
80 | + * |
|
81 | + * Example: Use of deprecated APIs, poor use of an API, undesirable things |
|
82 | + * that are not necessarily wrong. |
|
83 | + * |
|
84 | + * @param string $message |
|
85 | + * @param mixed[] $context |
|
86 | + * |
|
87 | + * @return void |
|
88 | + */ |
|
89 | + public function warning($message, array $context = array()) |
|
90 | + { |
|
91 | + $this->log(LogLevel::WARNING, $message, $context); |
|
92 | + } |
|
93 | 93 | |
94 | - /** |
|
95 | - * Normal but significant events. |
|
96 | - * |
|
97 | - * @param string $message |
|
98 | - * @param mixed[] $context |
|
99 | - * |
|
100 | - * @return void |
|
101 | - */ |
|
102 | - public function notice($message, array $context = array()) |
|
103 | - { |
|
104 | - $this->log(LogLevel::NOTICE, $message, $context); |
|
105 | - } |
|
94 | + /** |
|
95 | + * Normal but significant events. |
|
96 | + * |
|
97 | + * @param string $message |
|
98 | + * @param mixed[] $context |
|
99 | + * |
|
100 | + * @return void |
|
101 | + */ |
|
102 | + public function notice($message, array $context = array()) |
|
103 | + { |
|
104 | + $this->log(LogLevel::NOTICE, $message, $context); |
|
105 | + } |
|
106 | 106 | |
107 | - /** |
|
108 | - * Interesting events. |
|
109 | - * |
|
110 | - * Example: User logs in, SQL logs. |
|
111 | - * |
|
112 | - * @param string $message |
|
113 | - * @param mixed[] $context |
|
114 | - * |
|
115 | - * @return void |
|
116 | - */ |
|
117 | - public function info($message, array $context = array()) |
|
118 | - { |
|
119 | - $this->log(LogLevel::INFO, $message, $context); |
|
120 | - } |
|
107 | + /** |
|
108 | + * Interesting events. |
|
109 | + * |
|
110 | + * Example: User logs in, SQL logs. |
|
111 | + * |
|
112 | + * @param string $message |
|
113 | + * @param mixed[] $context |
|
114 | + * |
|
115 | + * @return void |
|
116 | + */ |
|
117 | + public function info($message, array $context = array()) |
|
118 | + { |
|
119 | + $this->log(LogLevel::INFO, $message, $context); |
|
120 | + } |
|
121 | 121 | |
122 | - /** |
|
123 | - * Detailed debug information. |
|
124 | - * |
|
125 | - * @param string $message |
|
126 | - * @param mixed[] $context |
|
127 | - * |
|
128 | - * @return void |
|
129 | - */ |
|
130 | - public function debug($message, array $context = array()) |
|
131 | - { |
|
132 | - $this->log(LogLevel::DEBUG, $message, $context); |
|
133 | - } |
|
122 | + /** |
|
123 | + * Detailed debug information. |
|
124 | + * |
|
125 | + * @param string $message |
|
126 | + * @param mixed[] $context |
|
127 | + * |
|
128 | + * @return void |
|
129 | + */ |
|
130 | + public function debug($message, array $context = array()) |
|
131 | + { |
|
132 | + $this->log(LogLevel::DEBUG, $message, $context); |
|
133 | + } |
|
134 | 134 | } |
@@ -25,9 +25,9 @@ discard block |
||
25 | 25 | * |
26 | 26 | * @return void |
27 | 27 | */ |
28 | - public function emergency($message, array $context = array()) |
|
28 | + public function emergency( $message, array $context = array() ) |
|
29 | 29 | { |
30 | - $this->log(LogLevel::EMERGENCY, $message, $context); |
|
30 | + $this->log( LogLevel::EMERGENCY, $message, $context ); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | /** |
@@ -41,9 +41,9 @@ discard block |
||
41 | 41 | * |
42 | 42 | * @return void |
43 | 43 | */ |
44 | - public function alert($message, array $context = array()) |
|
44 | + public function alert( $message, array $context = array() ) |
|
45 | 45 | { |
46 | - $this->log(LogLevel::ALERT, $message, $context); |
|
46 | + $this->log( LogLevel::ALERT, $message, $context ); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | /** |
@@ -56,9 +56,9 @@ discard block |
||
56 | 56 | * |
57 | 57 | * @return void |
58 | 58 | */ |
59 | - public function critical($message, array $context = array()) |
|
59 | + public function critical( $message, array $context = array() ) |
|
60 | 60 | { |
61 | - $this->log(LogLevel::CRITICAL, $message, $context); |
|
61 | + $this->log( LogLevel::CRITICAL, $message, $context ); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | /** |
@@ -70,9 +70,9 @@ discard block |
||
70 | 70 | * |
71 | 71 | * @return void |
72 | 72 | */ |
73 | - public function error($message, array $context = array()) |
|
73 | + public function error( $message, array $context = array() ) |
|
74 | 74 | { |
75 | - $this->log(LogLevel::ERROR, $message, $context); |
|
75 | + $this->log( LogLevel::ERROR, $message, $context ); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | /** |
@@ -86,9 +86,9 @@ discard block |
||
86 | 86 | * |
87 | 87 | * @return void |
88 | 88 | */ |
89 | - public function warning($message, array $context = array()) |
|
89 | + public function warning( $message, array $context = array() ) |
|
90 | 90 | { |
91 | - $this->log(LogLevel::WARNING, $message, $context); |
|
91 | + $this->log( LogLevel::WARNING, $message, $context ); |
|
92 | 92 | } |
93 | 93 | |
94 | 94 | /** |
@@ -99,9 +99,9 @@ discard block |
||
99 | 99 | * |
100 | 100 | * @return void |
101 | 101 | */ |
102 | - public function notice($message, array $context = array()) |
|
102 | + public function notice( $message, array $context = array() ) |
|
103 | 103 | { |
104 | - $this->log(LogLevel::NOTICE, $message, $context); |
|
104 | + $this->log( LogLevel::NOTICE, $message, $context ); |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | /** |
@@ -114,9 +114,9 @@ discard block |
||
114 | 114 | * |
115 | 115 | * @return void |
116 | 116 | */ |
117 | - public function info($message, array $context = array()) |
|
117 | + public function info( $message, array $context = array() ) |
|
118 | 118 | { |
119 | - $this->log(LogLevel::INFO, $message, $context); |
|
119 | + $this->log( LogLevel::INFO, $message, $context ); |
|
120 | 120 | } |
121 | 121 | |
122 | 122 | /** |
@@ -127,8 +127,8 @@ discard block |
||
127 | 127 | * |
128 | 128 | * @return void |
129 | 129 | */ |
130 | - public function debug($message, array $context = array()) |
|
130 | + public function debug( $message, array $context = array() ) |
|
131 | 131 | { |
132 | - $this->log(LogLevel::DEBUG, $message, $context); |
|
132 | + $this->log( LogLevel::DEBUG, $message, $context ); |
|
133 | 133 | } |
134 | 134 | } |
@@ -15,8 +15,7 @@ discard block |
||
15 | 15 | * reduce boilerplate code that a simple Logger that does the same thing with |
16 | 16 | * messages regardless of the error level has to implement. |
17 | 17 | */ |
18 | -abstract class AbstractLogger implements LoggerInterface |
|
19 | -{ |
|
18 | +abstract class AbstractLogger implements LoggerInterface { |
|
20 | 19 | /** |
21 | 20 | * System is unusable. |
22 | 21 | * |
@@ -25,8 +24,7 @@ discard block |
||
25 | 24 | * |
26 | 25 | * @return void |
27 | 26 | */ |
28 | - public function emergency($message, array $context = array()) |
|
29 | - { |
|
27 | + public function emergency($message, array $context = array()) { |
|
30 | 28 | $this->log(LogLevel::EMERGENCY, $message, $context); |
31 | 29 | } |
32 | 30 | |
@@ -41,8 +39,7 @@ discard block |
||
41 | 39 | * |
42 | 40 | * @return void |
43 | 41 | */ |
44 | - public function alert($message, array $context = array()) |
|
45 | - { |
|
42 | + public function alert($message, array $context = array()) { |
|
46 | 43 | $this->log(LogLevel::ALERT, $message, $context); |
47 | 44 | } |
48 | 45 | |
@@ -56,8 +53,7 @@ discard block |
||
56 | 53 | * |
57 | 54 | * @return void |
58 | 55 | */ |
59 | - public function critical($message, array $context = array()) |
|
60 | - { |
|
56 | + public function critical($message, array $context = array()) { |
|
61 | 57 | $this->log(LogLevel::CRITICAL, $message, $context); |
62 | 58 | } |
63 | 59 | |
@@ -70,8 +66,7 @@ discard block |
||
70 | 66 | * |
71 | 67 | * @return void |
72 | 68 | */ |
73 | - public function error($message, array $context = array()) |
|
74 | - { |
|
69 | + public function error($message, array $context = array()) { |
|
75 | 70 | $this->log(LogLevel::ERROR, $message, $context); |
76 | 71 | } |
77 | 72 | |
@@ -86,8 +81,7 @@ discard block |
||
86 | 81 | * |
87 | 82 | * @return void |
88 | 83 | */ |
89 | - public function warning($message, array $context = array()) |
|
90 | - { |
|
84 | + public function warning($message, array $context = array()) { |
|
91 | 85 | $this->log(LogLevel::WARNING, $message, $context); |
92 | 86 | } |
93 | 87 | |
@@ -99,8 +93,7 @@ discard block |
||
99 | 93 | * |
100 | 94 | * @return void |
101 | 95 | */ |
102 | - public function notice($message, array $context = array()) |
|
103 | - { |
|
96 | + public function notice($message, array $context = array()) { |
|
104 | 97 | $this->log(LogLevel::NOTICE, $message, $context); |
105 | 98 | } |
106 | 99 | |
@@ -114,8 +107,7 @@ discard block |
||
114 | 107 | * |
115 | 108 | * @return void |
116 | 109 | */ |
117 | - public function info($message, array $context = array()) |
|
118 | - { |
|
110 | + public function info($message, array $context = array()) { |
|
119 | 111 | $this->log(LogLevel::INFO, $message, $context); |
120 | 112 | } |
121 | 113 | |
@@ -127,8 +119,7 @@ discard block |
||
127 | 119 | * |
128 | 120 | * @return void |
129 | 121 | */ |
130 | - public function debug($message, array $context = array()) |
|
131 | - { |
|
122 | + public function debug($message, array $context = array()) { |
|
132 | 123 | $this->log(LogLevel::DEBUG, $message, $context); |
133 | 124 | } |
134 | 125 | } |
@@ -13,20 +13,20 @@ |
||
13 | 13 | */ |
14 | 14 | trait LoggerAwareTrait |
15 | 15 | { |
16 | - /** |
|
17 | - * The logger instance. |
|
18 | - * |
|
19 | - * @var LoggerInterface|null |
|
20 | - */ |
|
21 | - protected $logger; |
|
16 | + /** |
|
17 | + * The logger instance. |
|
18 | + * |
|
19 | + * @var LoggerInterface|null |
|
20 | + */ |
|
21 | + protected $logger; |
|
22 | 22 | |
23 | - /** |
|
24 | - * Sets a logger. |
|
25 | - * |
|
26 | - * @param LoggerInterface $logger |
|
27 | - */ |
|
28 | - public function setLogger(LoggerInterface $logger) |
|
29 | - { |
|
30 | - $this->logger = $logger; |
|
31 | - } |
|
23 | + /** |
|
24 | + * Sets a logger. |
|
25 | + * |
|
26 | + * @param LoggerInterface $logger |
|
27 | + */ |
|
28 | + public function setLogger(LoggerInterface $logger) |
|
29 | + { |
|
30 | + $this->logger = $logger; |
|
31 | + } |
|
32 | 32 | } |
@@ -25,7 +25,7 @@ |
||
25 | 25 | * |
26 | 26 | * @param LoggerInterface $logger |
27 | 27 | */ |
28 | - public function setLogger(LoggerInterface $logger) |
|
28 | + public function setLogger( LoggerInterface $logger ) |
|
29 | 29 | { |
30 | 30 | $this->logger = $logger; |
31 | 31 | } |
@@ -11,8 +11,7 @@ discard block |
||
11 | 11 | /** |
12 | 12 | * Basic Implementation of LoggerAwareInterface. |
13 | 13 | */ |
14 | -trait LoggerAwareTrait |
|
15 | -{ |
|
14 | +trait LoggerAwareTrait { |
|
16 | 15 | /** |
17 | 16 | * The logger instance. |
18 | 17 | * |
@@ -25,8 +24,7 @@ discard block |
||
25 | 24 | * |
26 | 25 | * @param LoggerInterface $logger |
27 | 26 | */ |
28 | - public function setLogger(LoggerInterface $logger) |
|
29 | - { |
|
27 | + public function setLogger(LoggerInterface $logger) { |
|
30 | 28 | $this->logger = $logger; |
31 | 29 | } |
32 | 30 | } |
@@ -13,12 +13,12 @@ |
||
13 | 13 | */ |
14 | 14 | interface LoggerAwareInterface |
15 | 15 | { |
16 | - /** |
|
17 | - * Sets a logger instance on the object. |
|
18 | - * |
|
19 | - * @param LoggerInterface $logger |
|
20 | - * |
|
21 | - * @return void |
|
22 | - */ |
|
23 | - public function setLogger(LoggerInterface $logger); |
|
16 | + /** |
|
17 | + * Sets a logger instance on the object. |
|
18 | + * |
|
19 | + * @param LoggerInterface $logger |
|
20 | + * |
|
21 | + * @return void |
|
22 | + */ |
|
23 | + public function setLogger(LoggerInterface $logger); |
|
24 | 24 | } |
@@ -20,5 +20,5 @@ |
||
20 | 20 | * |
21 | 21 | * @return void |
22 | 22 | */ |
23 | - public function setLogger(LoggerInterface $logger); |
|
23 | + public function setLogger( LoggerInterface $logger ); |
|
24 | 24 | } |
@@ -11,8 +11,7 @@ |
||
11 | 11 | /** |
12 | 12 | * Describes a logger-aware instance. |
13 | 13 | */ |
14 | -interface LoggerAwareInterface |
|
15 | -{ |
|
14 | +interface LoggerAwareInterface { |
|
16 | 15 | /** |
17 | 16 | * Sets a logger instance on the object. |
18 | 17 | * |
@@ -13,12 +13,12 @@ |
||
13 | 13 | */ |
14 | 14 | class LogLevel |
15 | 15 | { |
16 | - const EMERGENCY = 'emergency'; |
|
17 | - const ALERT = 'alert'; |
|
18 | - const CRITICAL = 'critical'; |
|
19 | - const ERROR = 'error'; |
|
20 | - const WARNING = 'warning'; |
|
21 | - const NOTICE = 'notice'; |
|
22 | - const INFO = 'info'; |
|
23 | - const DEBUG = 'debug'; |
|
16 | + const EMERGENCY = 'emergency'; |
|
17 | + const ALERT = 'alert'; |
|
18 | + const CRITICAL = 'critical'; |
|
19 | + const ERROR = 'error'; |
|
20 | + const WARNING = 'warning'; |
|
21 | + const NOTICE = 'notice'; |
|
22 | + const INFO = 'info'; |
|
23 | + const DEBUG = 'debug'; |
|
24 | 24 | } |
@@ -11,8 +11,7 @@ |
||
11 | 11 | /** |
12 | 12 | * Describes log levels. |
13 | 13 | */ |
14 | -class LogLevel |
|
15 | -{ |
|
14 | +class LogLevel { |
|
16 | 15 | const EMERGENCY = 'emergency'; |
17 | 16 | const ALERT = 'alert'; |
18 | 17 | const CRITICAL = 'critical'; |
@@ -18,19 +18,19 @@ |
||
18 | 18 | */ |
19 | 19 | class NullLogger extends AbstractLogger |
20 | 20 | { |
21 | - /** |
|
22 | - * Logs with an arbitrary level. |
|
23 | - * |
|
24 | - * @param mixed $level |
|
25 | - * @param string $message |
|
26 | - * @param array $context |
|
27 | - * |
|
28 | - * @return void |
|
29 | - * |
|
30 | - * @throws \GravityView\Psr\Log\InvalidArgumentException |
|
31 | - */ |
|
32 | - public function log($level, $message, array $context = array()) |
|
33 | - { |
|
34 | - // noop |
|
35 | - } |
|
21 | + /** |
|
22 | + * Logs with an arbitrary level. |
|
23 | + * |
|
24 | + * @param mixed $level |
|
25 | + * @param string $message |
|
26 | + * @param array $context |
|
27 | + * |
|
28 | + * @return void |
|
29 | + * |
|
30 | + * @throws \GravityView\Psr\Log\InvalidArgumentException |
|
31 | + */ |
|
32 | + public function log($level, $message, array $context = array()) |
|
33 | + { |
|
34 | + // noop |
|
35 | + } |
|
36 | 36 | } |
@@ -29,7 +29,7 @@ |
||
29 | 29 | * |
30 | 30 | * @throws \GravityView\Psr\Log\InvalidArgumentException |
31 | 31 | */ |
32 | - public function log($level, $message, array $context = array()) |
|
32 | + public function log( $level, $message, array $context = array() ) |
|
33 | 33 | { |
34 | 34 | // noop |
35 | 35 | } |
@@ -16,8 +16,7 @@ discard block |
||
16 | 16 | * is a good way to avoid littering your code with `if ($this->logger) { }` |
17 | 17 | * blocks. |
18 | 18 | */ |
19 | -class NullLogger extends AbstractLogger |
|
20 | -{ |
|
19 | +class NullLogger extends AbstractLogger { |
|
21 | 20 | /** |
22 | 21 | * Logs with an arbitrary level. |
23 | 22 | * |
@@ -29,8 +28,7 @@ discard block |
||
29 | 28 | * |
30 | 29 | * @throws \GravityView\Psr\Log\InvalidArgumentException |
31 | 30 | */ |
32 | - public function log($level, $message, array $context = array()) |
|
33 | - { |
|
31 | + public function log($level, $message, array $context = array()) { |
|
34 | 32 | // noop |
35 | 33 | } |
36 | 34 | } |
@@ -18,131 +18,131 @@ |
||
18 | 18 | */ |
19 | 19 | trait LoggerTrait |
20 | 20 | { |
21 | - /** |
|
22 | - * System is unusable. |
|
23 | - * |
|
24 | - * @param string $message |
|
25 | - * @param array $context |
|
26 | - * |
|
27 | - * @return void |
|
28 | - */ |
|
29 | - public function emergency($message, array $context = array()) |
|
30 | - { |
|
31 | - $this->log(LogLevel::EMERGENCY, $message, $context); |
|
32 | - } |
|
21 | + /** |
|
22 | + * System is unusable. |
|
23 | + * |
|
24 | + * @param string $message |
|
25 | + * @param array $context |
|
26 | + * |
|
27 | + * @return void |
|
28 | + */ |
|
29 | + public function emergency($message, array $context = array()) |
|
30 | + { |
|
31 | + $this->log(LogLevel::EMERGENCY, $message, $context); |
|
32 | + } |
|
33 | 33 | |
34 | - /** |
|
35 | - * Action must be taken immediately. |
|
36 | - * |
|
37 | - * Example: Entire website down, database unavailable, etc. This should |
|
38 | - * trigger the SMS alerts and wake you up. |
|
39 | - * |
|
40 | - * @param string $message |
|
41 | - * @param array $context |
|
42 | - * |
|
43 | - * @return void |
|
44 | - */ |
|
45 | - public function alert($message, array $context = array()) |
|
46 | - { |
|
47 | - $this->log(LogLevel::ALERT, $message, $context); |
|
48 | - } |
|
34 | + /** |
|
35 | + * Action must be taken immediately. |
|
36 | + * |
|
37 | + * Example: Entire website down, database unavailable, etc. This should |
|
38 | + * trigger the SMS alerts and wake you up. |
|
39 | + * |
|
40 | + * @param string $message |
|
41 | + * @param array $context |
|
42 | + * |
|
43 | + * @return void |
|
44 | + */ |
|
45 | + public function alert($message, array $context = array()) |
|
46 | + { |
|
47 | + $this->log(LogLevel::ALERT, $message, $context); |
|
48 | + } |
|
49 | 49 | |
50 | - /** |
|
51 | - * Critical conditions. |
|
52 | - * |
|
53 | - * Example: Application component unavailable, unexpected exception. |
|
54 | - * |
|
55 | - * @param string $message |
|
56 | - * @param array $context |
|
57 | - * |
|
58 | - * @return void |
|
59 | - */ |
|
60 | - public function critical($message, array $context = array()) |
|
61 | - { |
|
62 | - $this->log(LogLevel::CRITICAL, $message, $context); |
|
63 | - } |
|
50 | + /** |
|
51 | + * Critical conditions. |
|
52 | + * |
|
53 | + * Example: Application component unavailable, unexpected exception. |
|
54 | + * |
|
55 | + * @param string $message |
|
56 | + * @param array $context |
|
57 | + * |
|
58 | + * @return void |
|
59 | + */ |
|
60 | + public function critical($message, array $context = array()) |
|
61 | + { |
|
62 | + $this->log(LogLevel::CRITICAL, $message, $context); |
|
63 | + } |
|
64 | 64 | |
65 | - /** |
|
66 | - * Runtime errors that do not require immediate action but should typically |
|
67 | - * be logged and monitored. |
|
68 | - * |
|
69 | - * @param string $message |
|
70 | - * @param array $context |
|
71 | - * |
|
72 | - * @return void |
|
73 | - */ |
|
74 | - public function error($message, array $context = array()) |
|
75 | - { |
|
76 | - $this->log(LogLevel::ERROR, $message, $context); |
|
77 | - } |
|
65 | + /** |
|
66 | + * Runtime errors that do not require immediate action but should typically |
|
67 | + * be logged and monitored. |
|
68 | + * |
|
69 | + * @param string $message |
|
70 | + * @param array $context |
|
71 | + * |
|
72 | + * @return void |
|
73 | + */ |
|
74 | + public function error($message, array $context = array()) |
|
75 | + { |
|
76 | + $this->log(LogLevel::ERROR, $message, $context); |
|
77 | + } |
|
78 | 78 | |
79 | - /** |
|
80 | - * Exceptional occurrences that are not errors. |
|
81 | - * |
|
82 | - * Example: Use of deprecated APIs, poor use of an API, undesirable things |
|
83 | - * that are not necessarily wrong. |
|
84 | - * |
|
85 | - * @param string $message |
|
86 | - * @param array $context |
|
87 | - * |
|
88 | - * @return void |
|
89 | - */ |
|
90 | - public function warning($message, array $context = array()) |
|
91 | - { |
|
92 | - $this->log(LogLevel::WARNING, $message, $context); |
|
93 | - } |
|
79 | + /** |
|
80 | + * Exceptional occurrences that are not errors. |
|
81 | + * |
|
82 | + * Example: Use of deprecated APIs, poor use of an API, undesirable things |
|
83 | + * that are not necessarily wrong. |
|
84 | + * |
|
85 | + * @param string $message |
|
86 | + * @param array $context |
|
87 | + * |
|
88 | + * @return void |
|
89 | + */ |
|
90 | + public function warning($message, array $context = array()) |
|
91 | + { |
|
92 | + $this->log(LogLevel::WARNING, $message, $context); |
|
93 | + } |
|
94 | 94 | |
95 | - /** |
|
96 | - * Normal but significant events. |
|
97 | - * |
|
98 | - * @param string $message |
|
99 | - * @param array $context |
|
100 | - * |
|
101 | - * @return void |
|
102 | - */ |
|
103 | - public function notice($message, array $context = array()) |
|
104 | - { |
|
105 | - $this->log(LogLevel::NOTICE, $message, $context); |
|
106 | - } |
|
95 | + /** |
|
96 | + * Normal but significant events. |
|
97 | + * |
|
98 | + * @param string $message |
|
99 | + * @param array $context |
|
100 | + * |
|
101 | + * @return void |
|
102 | + */ |
|
103 | + public function notice($message, array $context = array()) |
|
104 | + { |
|
105 | + $this->log(LogLevel::NOTICE, $message, $context); |
|
106 | + } |
|
107 | 107 | |
108 | - /** |
|
109 | - * Interesting events. |
|
110 | - * |
|
111 | - * Example: User logs in, SQL logs. |
|
112 | - * |
|
113 | - * @param string $message |
|
114 | - * @param array $context |
|
115 | - * |
|
116 | - * @return void |
|
117 | - */ |
|
118 | - public function info($message, array $context = array()) |
|
119 | - { |
|
120 | - $this->log(LogLevel::INFO, $message, $context); |
|
121 | - } |
|
108 | + /** |
|
109 | + * Interesting events. |
|
110 | + * |
|
111 | + * Example: User logs in, SQL logs. |
|
112 | + * |
|
113 | + * @param string $message |
|
114 | + * @param array $context |
|
115 | + * |
|
116 | + * @return void |
|
117 | + */ |
|
118 | + public function info($message, array $context = array()) |
|
119 | + { |
|
120 | + $this->log(LogLevel::INFO, $message, $context); |
|
121 | + } |
|
122 | 122 | |
123 | - /** |
|
124 | - * Detailed debug information. |
|
125 | - * |
|
126 | - * @param string $message |
|
127 | - * @param array $context |
|
128 | - * |
|
129 | - * @return void |
|
130 | - */ |
|
131 | - public function debug($message, array $context = array()) |
|
132 | - { |
|
133 | - $this->log(LogLevel::DEBUG, $message, $context); |
|
134 | - } |
|
123 | + /** |
|
124 | + * Detailed debug information. |
|
125 | + * |
|
126 | + * @param string $message |
|
127 | + * @param array $context |
|
128 | + * |
|
129 | + * @return void |
|
130 | + */ |
|
131 | + public function debug($message, array $context = array()) |
|
132 | + { |
|
133 | + $this->log(LogLevel::DEBUG, $message, $context); |
|
134 | + } |
|
135 | 135 | |
136 | - /** |
|
137 | - * Logs with an arbitrary level. |
|
138 | - * |
|
139 | - * @param mixed $level |
|
140 | - * @param string $message |
|
141 | - * @param array $context |
|
142 | - * |
|
143 | - * @return void |
|
144 | - * |
|
145 | - * @throws \GravityView\Psr\Log\InvalidArgumentException |
|
146 | - */ |
|
147 | - abstract public function log($level, $message, array $context = array()); |
|
136 | + /** |
|
137 | + * Logs with an arbitrary level. |
|
138 | + * |
|
139 | + * @param mixed $level |
|
140 | + * @param string $message |
|
141 | + * @param array $context |
|
142 | + * |
|
143 | + * @return void |
|
144 | + * |
|
145 | + * @throws \GravityView\Psr\Log\InvalidArgumentException |
|
146 | + */ |
|
147 | + abstract public function log($level, $message, array $context = array()); |
|
148 | 148 | } |
@@ -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 | } |
@@ -16,8 +16,7 @@ discard block |
||
16 | 16 | * reduce boilerplate code that a simple Logger that does the same thing with |
17 | 17 | * messages regardless of the error level has to implement. |
18 | 18 | */ |
19 | -trait LoggerTrait |
|
20 | -{ |
|
19 | +trait LoggerTrait { |
|
21 | 20 | /** |
22 | 21 | * System is unusable. |
23 | 22 | * |
@@ -26,8 +25,7 @@ discard block |
||
26 | 25 | * |
27 | 26 | * @return void |
28 | 27 | */ |
29 | - public function emergency($message, array $context = array()) |
|
30 | - { |
|
28 | + public function emergency($message, array $context = array()) { |
|
31 | 29 | $this->log(LogLevel::EMERGENCY, $message, $context); |
32 | 30 | } |
33 | 31 | |
@@ -42,8 +40,7 @@ discard block |
||
42 | 40 | * |
43 | 41 | * @return void |
44 | 42 | */ |
45 | - public function alert($message, array $context = array()) |
|
46 | - { |
|
43 | + public function alert($message, array $context = array()) { |
|
47 | 44 | $this->log(LogLevel::ALERT, $message, $context); |
48 | 45 | } |
49 | 46 | |
@@ -57,8 +54,7 @@ discard block |
||
57 | 54 | * |
58 | 55 | * @return void |
59 | 56 | */ |
60 | - public function critical($message, array $context = array()) |
|
61 | - { |
|
57 | + public function critical($message, array $context = array()) { |
|
62 | 58 | $this->log(LogLevel::CRITICAL, $message, $context); |
63 | 59 | } |
64 | 60 | |
@@ -71,8 +67,7 @@ discard block |
||
71 | 67 | * |
72 | 68 | * @return void |
73 | 69 | */ |
74 | - public function error($message, array $context = array()) |
|
75 | - { |
|
70 | + public function error($message, array $context = array()) { |
|
76 | 71 | $this->log(LogLevel::ERROR, $message, $context); |
77 | 72 | } |
78 | 73 | |
@@ -87,8 +82,7 @@ discard block |
||
87 | 82 | * |
88 | 83 | * @return void |
89 | 84 | */ |
90 | - public function warning($message, array $context = array()) |
|
91 | - { |
|
85 | + public function warning($message, array $context = array()) { |
|
92 | 86 | $this->log(LogLevel::WARNING, $message, $context); |
93 | 87 | } |
94 | 88 | |
@@ -100,8 +94,7 @@ discard block |
||
100 | 94 | * |
101 | 95 | * @return void |
102 | 96 | */ |
103 | - public function notice($message, array $context = array()) |
|
104 | - { |
|
97 | + public function notice($message, array $context = array()) { |
|
105 | 98 | $this->log(LogLevel::NOTICE, $message, $context); |
106 | 99 | } |
107 | 100 | |
@@ -115,8 +108,7 @@ discard block |
||
115 | 108 | * |
116 | 109 | * @return void |
117 | 110 | */ |
118 | - public function info($message, array $context = array()) |
|
119 | - { |
|
111 | + public function info($message, array $context = array()) { |
|
120 | 112 | $this->log(LogLevel::INFO, $message, $context); |
121 | 113 | } |
122 | 114 | |
@@ -128,8 +120,7 @@ discard block |
||
128 | 120 | * |
129 | 121 | * @return void |
130 | 122 | */ |
131 | - public function debug($message, array $context = array()) |
|
132 | - { |
|
123 | + public function debug($message, array $context = array()) { |
|
133 | 124 | $this->log(LogLevel::DEBUG, $message, $context); |
134 | 125 | } |
135 | 126 |
@@ -62,92 +62,92 @@ |
||
62 | 62 | */ |
63 | 63 | class TestLogger extends AbstractLogger |
64 | 64 | { |
65 | - /** |
|
66 | - * @var array |
|
67 | - */ |
|
68 | - public $records = []; |
|
65 | + /** |
|
66 | + * @var array |
|
67 | + */ |
|
68 | + public $records = []; |
|
69 | 69 | |
70 | - public $recordsByLevel = []; |
|
70 | + public $recordsByLevel = []; |
|
71 | 71 | |
72 | - /** |
|
73 | - * @inheritdoc |
|
74 | - */ |
|
75 | - public function log($level, $message, array $context = []) |
|
76 | - { |
|
77 | - $record = [ |
|
78 | - 'level' => $level, |
|
79 | - 'message' => $message, |
|
80 | - 'context' => $context, |
|
81 | - ]; |
|
72 | + /** |
|
73 | + * @inheritdoc |
|
74 | + */ |
|
75 | + public function log($level, $message, array $context = []) |
|
76 | + { |
|
77 | + $record = [ |
|
78 | + 'level' => $level, |
|
79 | + 'message' => $message, |
|
80 | + 'context' => $context, |
|
81 | + ]; |
|
82 | 82 | |
83 | - $this->recordsByLevel[$record['level']][] = $record; |
|
84 | - $this->records[] = $record; |
|
85 | - } |
|
83 | + $this->recordsByLevel[$record['level']][] = $record; |
|
84 | + $this->records[] = $record; |
|
85 | + } |
|
86 | 86 | |
87 | - public function hasRecords($level) |
|
88 | - { |
|
89 | - return isset($this->recordsByLevel[$level]); |
|
90 | - } |
|
87 | + public function hasRecords($level) |
|
88 | + { |
|
89 | + return isset($this->recordsByLevel[$level]); |
|
90 | + } |
|
91 | 91 | |
92 | - public function hasRecord($record, $level) |
|
93 | - { |
|
94 | - if (is_string($record)) { |
|
95 | - $record = ['message' => $record]; |
|
96 | - } |
|
97 | - return $this->hasRecordThatPasses(function ($rec) use ($record) { |
|
98 | - if ($rec['message'] !== $record['message']) { |
|
99 | - return false; |
|
100 | - } |
|
101 | - if (isset($record['context']) && $rec['context'] !== $record['context']) { |
|
102 | - return false; |
|
103 | - } |
|
104 | - return true; |
|
105 | - }, $level); |
|
106 | - } |
|
92 | + public function hasRecord($record, $level) |
|
93 | + { |
|
94 | + if (is_string($record)) { |
|
95 | + $record = ['message' => $record]; |
|
96 | + } |
|
97 | + return $this->hasRecordThatPasses(function ($rec) use ($record) { |
|
98 | + if ($rec['message'] !== $record['message']) { |
|
99 | + return false; |
|
100 | + } |
|
101 | + if (isset($record['context']) && $rec['context'] !== $record['context']) { |
|
102 | + return false; |
|
103 | + } |
|
104 | + return true; |
|
105 | + }, $level); |
|
106 | + } |
|
107 | 107 | |
108 | - public function hasRecordThatContains($message, $level) |
|
109 | - { |
|
110 | - return $this->hasRecordThatPasses(function ($rec) use ($message) { |
|
111 | - return strpos($rec['message'], $message) !== false; |
|
112 | - }, $level); |
|
113 | - } |
|
108 | + public function hasRecordThatContains($message, $level) |
|
109 | + { |
|
110 | + return $this->hasRecordThatPasses(function ($rec) use ($message) { |
|
111 | + return strpos($rec['message'], $message) !== false; |
|
112 | + }, $level); |
|
113 | + } |
|
114 | 114 | |
115 | - public function hasRecordThatMatches($regex, $level) |
|
116 | - { |
|
117 | - return $this->hasRecordThatPasses(function ($rec) use ($regex) { |
|
118 | - return preg_match($regex, $rec['message']) > 0; |
|
119 | - }, $level); |
|
120 | - } |
|
115 | + public function hasRecordThatMatches($regex, $level) |
|
116 | + { |
|
117 | + return $this->hasRecordThatPasses(function ($rec) use ($regex) { |
|
118 | + return preg_match($regex, $rec['message']) > 0; |
|
119 | + }, $level); |
|
120 | + } |
|
121 | 121 | |
122 | - public function hasRecordThatPasses(callable $predicate, $level) |
|
123 | - { |
|
124 | - if (!isset($this->recordsByLevel[$level])) { |
|
125 | - return false; |
|
126 | - } |
|
127 | - foreach ($this->recordsByLevel[$level] as $i => $rec) { |
|
128 | - if (call_user_func($predicate, $rec, $i)) { |
|
129 | - return true; |
|
130 | - } |
|
131 | - } |
|
132 | - return false; |
|
133 | - } |
|
122 | + public function hasRecordThatPasses(callable $predicate, $level) |
|
123 | + { |
|
124 | + if (!isset($this->recordsByLevel[$level])) { |
|
125 | + return false; |
|
126 | + } |
|
127 | + foreach ($this->recordsByLevel[$level] as $i => $rec) { |
|
128 | + if (call_user_func($predicate, $rec, $i)) { |
|
129 | + return true; |
|
130 | + } |
|
131 | + } |
|
132 | + return false; |
|
133 | + } |
|
134 | 134 | |
135 | - public function __call($method, $args) |
|
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); |
|
143 | - } |
|
144 | - } |
|
145 | - throw new \BadMethodCallException('Call to undefined method ' . get_class($this) . '::' . $method . '()'); |
|
146 | - } |
|
135 | + public function __call($method, $args) |
|
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); |
|
143 | + } |
|
144 | + } |
|
145 | + throw new \BadMethodCallException('Call to undefined method ' . get_class($this) . '::' . $method . '()'); |
|
146 | + } |
|
147 | 147 | |
148 | - public function reset() |
|
149 | - { |
|
150 | - $this->records = []; |
|
151 | - $this->recordsByLevel = []; |
|
152 | - } |
|
148 | + public function reset() |
|
149 | + { |
|
150 | + $this->records = []; |
|
151 | + $this->recordsByLevel = []; |
|
152 | + } |
|
153 | 153 | } |
@@ -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 | } |
@@ -60,8 +60,7 @@ discard block |
||
60 | 60 | * @method bool hasInfoThatPasses($message) |
61 | 61 | * @method bool hasDebugThatPasses($message) |
62 | 62 | */ |
63 | -class TestLogger extends AbstractLogger |
|
64 | -{ |
|
63 | +class TestLogger extends AbstractLogger { |
|
65 | 64 | /** |
66 | 65 | * @var array |
67 | 66 | */ |
@@ -72,8 +71,7 @@ discard block |
||
72 | 71 | /** |
73 | 72 | * @inheritdoc |
74 | 73 | */ |
75 | - public function log($level, $message, array $context = []) |
|
76 | - { |
|
74 | + public function log($level, $message, array $context = []) { |
|
77 | 75 | $record = [ |
78 | 76 | 'level' => $level, |
79 | 77 | 'message' => $message, |
@@ -84,13 +82,11 @@ discard block |
||
84 | 82 | $this->records[] = $record; |
85 | 83 | } |
86 | 84 | |
87 | - public function hasRecords($level) |
|
88 | - { |
|
85 | + public function hasRecords($level) { |
|
89 | 86 | return isset($this->recordsByLevel[$level]); |
90 | 87 | } |
91 | 88 | |
92 | - public function hasRecord($record, $level) |
|
93 | - { |
|
89 | + public function hasRecord($record, $level) { |
|
94 | 90 | if (is_string($record)) { |
95 | 91 | $record = ['message' => $record]; |
96 | 92 | } |
@@ -105,22 +101,19 @@ discard block |
||
105 | 101 | }, $level); |
106 | 102 | } |
107 | 103 | |
108 | - public function hasRecordThatContains($message, $level) |
|
109 | - { |
|
104 | + public function hasRecordThatContains($message, $level) { |
|
110 | 105 | return $this->hasRecordThatPasses(function ($rec) use ($message) { |
111 | 106 | return strpos($rec['message'], $message) !== false; |
112 | 107 | }, $level); |
113 | 108 | } |
114 | 109 | |
115 | - public function hasRecordThatMatches($regex, $level) |
|
116 | - { |
|
110 | + public function hasRecordThatMatches($regex, $level) { |
|
117 | 111 | return $this->hasRecordThatPasses(function ($rec) use ($regex) { |
118 | 112 | return preg_match($regex, $rec['message']) > 0; |
119 | 113 | }, $level); |
120 | 114 | } |
121 | 115 | |
122 | - public function hasRecordThatPasses(callable $predicate, $level) |
|
123 | - { |
|
116 | + public function hasRecordThatPasses(callable $predicate, $level) { |
|
124 | 117 | if (!isset($this->recordsByLevel[$level])) { |
125 | 118 | return false; |
126 | 119 | } |
@@ -132,8 +125,7 @@ discard block |
||
132 | 125 | return false; |
133 | 126 | } |
134 | 127 | |
135 | - public function __call($method, $args) |
|
136 | - { |
|
128 | + public function __call($method, $args) { |
|
137 | 129 | if (preg_match('/(.*)(Debug|Info|Notice|Warning|Error|Critical|Alert|Emergency)(.*)/', $method, $matches) > 0) { |
138 | 130 | $genericMethod = $matches[1] . ('Records' !== $matches[3] ? 'Record' : '') . $matches[3]; |
139 | 131 | $level = strtolower($matches[2]); |
@@ -145,8 +137,7 @@ discard block |
||
145 | 137 | throw new \BadMethodCallException('Call to undefined method ' . get_class($this) . '::' . $method . '()'); |
146 | 138 | } |
147 | 139 | |
148 | - public function reset() |
|
149 | - { |
|
140 | + public function reset() { |
|
150 | 141 | $this->records = []; |
151 | 142 | $this->recordsByLevel = []; |
152 | 143 | } |