Completed
Push — develop ( 32764c...cb3cfa )
by
unknown
20:26
created
trustedlogin/psr/log/Psr/Log/Test/DummyTest.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -17,8 +17,8 @@
 block discarded – undo
17 17
  */
18 18
 class DummyTest
19 19
 {
20
-    public function __toString()
21
-    {
22
-        return 'DummyTest';
23
-    }
20
+	public function __toString()
21
+	{
22
+		return 'DummyTest';
23
+	}
24 24
 }
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -15,10 +15,8 @@
 block discarded – undo
15 15
  *
16 16
  * @internal
17 17
  */
18
-class DummyTest
19
-{
20
-    public function __toString()
21
-    {
18
+class DummyTest {
19
+    public function __toString() {
22 20
         return 'DummyTest';
23 21
     }
24 22
 }
Please login to merge, or discard this patch.
trustedlogin/psr/log/Psr/Log/LoggerInterface.php 3 patches
Indentation   +95 added lines, -95 removed lines patch added patch discarded remove patch
@@ -25,107 +25,107 @@
 block discarded – undo
25 25
  */
26 26
 interface LoggerInterface
27 27
 {
28
-    /**
29
-     * System is unusable.
30
-     *
31
-     * @param string  $message
32
-     * @param mixed[] $context
33
-     *
34
-     * @return void
35
-     */
36
-    public function emergency($message, array $context = array());
28
+	/**
29
+	 * System is unusable.
30
+	 *
31
+	 * @param string  $message
32
+	 * @param mixed[] $context
33
+	 *
34
+	 * @return void
35
+	 */
36
+	public function emergency($message, array $context = array());
37 37
 
38
-    /**
39
-     * Action must be taken immediately.
40
-     *
41
-     * Example: Entire website down, database unavailable, etc. This should
42
-     * trigger the SMS alerts and wake you up.
43
-     *
44
-     * @param string  $message
45
-     * @param mixed[] $context
46
-     *
47
-     * @return void
48
-     */
49
-    public function alert($message, array $context = array());
38
+	/**
39
+	 * Action must be taken immediately.
40
+	 *
41
+	 * Example: Entire website down, database unavailable, etc. This should
42
+	 * trigger the SMS alerts and wake you up.
43
+	 *
44
+	 * @param string  $message
45
+	 * @param mixed[] $context
46
+	 *
47
+	 * @return void
48
+	 */
49
+	public function alert($message, array $context = array());
50 50
 
51
-    /**
52
-     * Critical conditions.
53
-     *
54
-     * Example: Application component unavailable, unexpected exception.
55
-     *
56
-     * @param string  $message
57
-     * @param mixed[] $context
58
-     *
59
-     * @return void
60
-     */
61
-    public function critical($message, array $context = array());
51
+	/**
52
+	 * Critical conditions.
53
+	 *
54
+	 * Example: Application component unavailable, unexpected exception.
55
+	 *
56
+	 * @param string  $message
57
+	 * @param mixed[] $context
58
+	 *
59
+	 * @return void
60
+	 */
61
+	public function critical($message, array $context = array());
62 62
 
63
-    /**
64
-     * Runtime errors that do not require immediate action but should typically
65
-     * be logged and monitored.
66
-     *
67
-     * @param string  $message
68
-     * @param mixed[] $context
69
-     *
70
-     * @return void
71
-     */
72
-    public function error($message, array $context = array());
63
+	/**
64
+	 * Runtime errors that do not require immediate action but should typically
65
+	 * be logged and monitored.
66
+	 *
67
+	 * @param string  $message
68
+	 * @param mixed[] $context
69
+	 *
70
+	 * @return void
71
+	 */
72
+	public function error($message, array $context = array());
73 73
 
74
-    /**
75
-     * Exceptional occurrences that are not errors.
76
-     *
77
-     * Example: Use of deprecated APIs, poor use of an API, undesirable things
78
-     * that are not necessarily wrong.
79
-     *
80
-     * @param string  $message
81
-     * @param mixed[] $context
82
-     *
83
-     * @return void
84
-     */
85
-    public function warning($message, array $context = array());
74
+	/**
75
+	 * Exceptional occurrences that are not errors.
76
+	 *
77
+	 * Example: Use of deprecated APIs, poor use of an API, undesirable things
78
+	 * that are not necessarily wrong.
79
+	 *
80
+	 * @param string  $message
81
+	 * @param mixed[] $context
82
+	 *
83
+	 * @return void
84
+	 */
85
+	public function warning($message, array $context = array());
86 86
 
87
-    /**
88
-     * Normal but significant events.
89
-     *
90
-     * @param string  $message
91
-     * @param mixed[] $context
92
-     *
93
-     * @return void
94
-     */
95
-    public function notice($message, array $context = array());
87
+	/**
88
+	 * Normal but significant events.
89
+	 *
90
+	 * @param string  $message
91
+	 * @param mixed[] $context
92
+	 *
93
+	 * @return void
94
+	 */
95
+	public function notice($message, array $context = array());
96 96
 
97
-    /**
98
-     * Interesting events.
99
-     *
100
-     * Example: User logs in, SQL logs.
101
-     *
102
-     * @param string  $message
103
-     * @param mixed[] $context
104
-     *
105
-     * @return void
106
-     */
107
-    public function info($message, array $context = array());
97
+	/**
98
+	 * Interesting events.
99
+	 *
100
+	 * Example: User logs in, SQL logs.
101
+	 *
102
+	 * @param string  $message
103
+	 * @param mixed[] $context
104
+	 *
105
+	 * @return void
106
+	 */
107
+	public function info($message, array $context = array());
108 108
 
109
-    /**
110
-     * Detailed debug information.
111
-     *
112
-     * @param string  $message
113
-     * @param mixed[] $context
114
-     *
115
-     * @return void
116
-     */
117
-    public function debug($message, array $context = array());
109
+	/**
110
+	 * Detailed debug information.
111
+	 *
112
+	 * @param string  $message
113
+	 * @param mixed[] $context
114
+	 *
115
+	 * @return void
116
+	 */
117
+	public function debug($message, array $context = array());
118 118
 
119
-    /**
120
-     * Logs with an arbitrary level.
121
-     *
122
-     * @param mixed   $level
123
-     * @param string  $message
124
-     * @param mixed[] $context
125
-     *
126
-     * @return void
127
-     *
128
-     * @throws \GravityView\Psr\Log\InvalidArgumentException
129
-     */
130
-    public function log($level, $message, array $context = array());
119
+	/**
120
+	 * Logs with an arbitrary level.
121
+	 *
122
+	 * @param mixed   $level
123
+	 * @param string  $message
124
+	 * @param mixed[] $context
125
+	 *
126
+	 * @return void
127
+	 *
128
+	 * @throws \GravityView\Psr\Log\InvalidArgumentException
129
+	 */
130
+	public function log($level, $message, array $context = array());
131 131
 }
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,8 +23,7 @@
 block discarded – undo
23 23
  * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md
24 24
  * for the full interface specification.
25 25
  */
26
-interface LoggerInterface
27
-{
26
+interface LoggerInterface {
28 27
     /**
29 28
      * System is unusable.
30 29
      *
Please login to merge, or discard this patch.
trustedlogin/autoload.php 2 patches
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -2,19 +2,19 @@
 block discarded – undo
2 2
 // autoload.php @generated by Strauss
3 3
 
4 4
 if ( file_exists( __DIR__ . '/autoload-classmap.php' ) ) {
5
-    $class_map = include __DIR__ . '/autoload-classmap.php';
6
-    if ( is_array( $class_map ) ) {
7
-        spl_autoload_register(
8
-            function ( $classname ) use ( $class_map ) {
9
-                if ( isset( $class_map[ $classname ] ) && file_exists( $class_map[ $classname ] ) ) {
10
-                    require_once $class_map[ $classname ];
11
-                }
12
-            }
13
-        );
14
-    }
15
-    unset( $class_map );
5
+	$class_map = include __DIR__ . '/autoload-classmap.php';
6
+	if ( is_array( $class_map ) ) {
7
+		spl_autoload_register(
8
+			function ( $classname ) use ( $class_map ) {
9
+				if ( isset( $class_map[ $classname ] ) && file_exists( $class_map[ $classname ] ) ) {
10
+					require_once $class_map[ $classname ];
11
+				}
12
+			}
13
+		);
14
+	}
15
+	unset( $class_map );
16 16
 }
17 17
 
18 18
 if ( file_exists( __DIR__ . '/autoload-files.php' ) ) {
19
-    require_once __DIR__ . '/autoload-files.php';
19
+	require_once __DIR__ . '/autoload-files.php';
20 20
 }
21 21
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
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
                 }
Please login to merge, or discard this patch.
trustedlogin/autoload-classmap.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 
3 3
 // autoload-classmap.php @generated by Strauss
4 4
 
5
-$trustedlogin = dirname(__FILE__);
5
+$trustedlogin = dirname( __FILE__ );
6 6
 
7 7
 return array(
8 8
    'GravityView\Katzgrau\KLogger\Logger' => $trustedlogin . '/katzgrau/klogger/src/Logger.php',
Please login to merge, or discard this patch.
trustedlogin/katzgrau/klogger/src/Logger.php 3 patches
Indentation   +318 added lines, -318 removed lines patch added patch discarded remove patch
@@ -34,322 +34,322 @@
 block discarded – undo
34 34
  */
35 35
 class Logger extends AbstractLogger
36 36
 {
37
-    /**
38
-     * KLogger options
39
-     *  Anything options not considered 'core' to the logging library should be
40
-     *  settable view the third parameter in the constructor
41
-     *
42
-     *  Core options include the log file path and the log threshold
43
-     *
44
-     * @var array
45
-     */
46
-    protected $options = array (
47
-        'extension'      => 'txt',
48
-        'dateFormat'     => 'Y-m-d G:i:s.u',
49
-        'filename'       => false,
50
-        'flushFrequency' => false,
51
-        'prefix'         => 'log_',
52
-        'logFormat'      => false,
53
-        'appendContext'  => true,
54
-    );
55
-
56
-    /**
57
-     * Path to the log file
58
-     * @var string
59
-     */
60
-    private $logFilePath;
61
-
62
-    /**
63
-     * Current minimum logging threshold
64
-     * @var integer
65
-     */
66
-    protected $logLevelThreshold = LogLevel::DEBUG;
67
-
68
-    /**
69
-     * The number of lines logged in this instance's lifetime
70
-     * @var int
71
-     */
72
-    private $logLineCount = 0;
73
-
74
-    /**
75
-     * Log Levels
76
-     * @var array
77
-     */
78
-    protected $logLevels = array(
79
-        LogLevel::EMERGENCY => 0,
80
-        LogLevel::ALERT     => 1,
81
-        LogLevel::CRITICAL  => 2,
82
-        LogLevel::ERROR     => 3,
83
-        LogLevel::WARNING   => 4,
84
-        LogLevel::NOTICE    => 5,
85
-        LogLevel::INFO      => 6,
86
-        LogLevel::DEBUG     => 7
87
-    );
88
-
89
-    /**
90
-     * This holds the file handle for this instance's log file
91
-     * @var resource
92
-     */
93
-    private $fileHandle;
94
-
95
-    /**
96
-     * This holds the last line logged to the logger
97
-     *  Used for unit tests
98
-     * @var string
99
-     */
100
-    private $lastLine = '';
101
-
102
-    /**
103
-     * Octal notation for default permissions of the log file
104
-     * @var integer
105
-     */
106
-    private $defaultPermissions = 0777;
107
-
108
-    /**
109
-     * Class constructor
110
-     *
111
-     * @param string $logDirectory      File path to the logging directory
112
-     * @param string $logLevelThreshold The LogLevel Threshold
113
-     * @param array  $options
114
-     *
115
-     * @internal param string $logFilePrefix The prefix for the log file name
116
-     * @internal param string $logFileExt The extension for the log file
117
-     */
118
-    public function __construct($logDirectory, $logLevelThreshold = LogLevel::DEBUG, array $options = array())
119
-    {
120
-        $this->logLevelThreshold = $logLevelThreshold;
121
-        $this->options = array_merge($this->options, $options);
122
-
123
-        $logDirectory = rtrim($logDirectory, DIRECTORY_SEPARATOR);
124
-        if ( ! file_exists($logDirectory)) {
125
-            mkdir($logDirectory, $this->defaultPermissions, true);
126
-        }
127
-
128
-        if(strpos($logDirectory, 'php://') === 0) {
129
-            $this->setLogToStdOut($logDirectory);
130
-            $this->setFileHandle('w+');
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.');
135
-            }
136
-            $this->setFileHandle('a');
137
-        }
138
-
139
-        if ( ! $this->fileHandle) {
140
-            throw new RuntimeException('The file could not be opened. Check permissions.');
141
-        }
142
-    }
143
-
144
-    /**
145
-     * @param string $stdOutPath
146
-     */
147
-    public function setLogToStdOut($stdOutPath) {
148
-        $this->logFilePath = $stdOutPath;
149
-    }
150
-
151
-    /**
152
-     * @param string $logDirectory
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'];
158
-            }
159
-            else {
160
-                $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['filename'].'.'.$this->options['extension'];
161
-            }
162
-        } else {
163
-            $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['prefix'].date('Y-m-d').'.'.$this->options['extension'];
164
-        }
165
-    }
166
-
167
-    /**
168
-     * @param $writeMode
169
-     *
170
-     * @internal param resource $fileHandle
171
-     */
172
-    public function setFileHandle($writeMode) {
173
-        $this->fileHandle = fopen($this->logFilePath, $writeMode);
174
-    }
175
-
176
-
177
-    /**
178
-     * Class destructor
179
-     */
180
-    public function __destruct()
181
-    {
182
-        if ($this->fileHandle) {
183
-            fclose($this->fileHandle);
184
-        }
185
-    }
186
-
187
-    /**
188
-     * Sets the date format used by all instances of KLogger
189
-     *
190
-     * @param string $dateFormat Valid format string for date()
191
-     */
192
-    public function setDateFormat($dateFormat)
193
-    {
194
-        $this->options['dateFormat'] = $dateFormat;
195
-    }
196
-
197
-    /**
198
-     * Sets the Log Level Threshold
199
-     *
200
-     * @param string $logLevelThreshold The log level threshold
201
-     */
202
-    public function setLogLevelThreshold($logLevelThreshold)
203
-    {
204
-        $this->logLevelThreshold = $logLevelThreshold;
205
-    }
206
-
207
-    /**
208
-     * Logs with an arbitrary level.
209
-     *
210
-     * @param mixed $level
211
-     * @param string $message
212
-     * @param array $context
213
-     * @return null
214
-     */
215
-    public function log($level, $message, array $context = array())
216
-    {
217
-        if ($this->logLevels[$this->logLevelThreshold] < $this->logLevels[$level]) {
218
-            return;
219
-        }
220
-        $message = $this->formatMessage($level, $message, $context);
221
-        $this->write($message);
222
-    }
223
-
224
-    /**
225
-     * Writes a line to the log without prepending a status or timestamp
226
-     *
227
-     * @param string $message Line to write to the log
228
-     * @return void
229
-     */
230
-    public function write($message)
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.');
235
-            } else {
236
-                $this->lastLine = trim($message);
237
-                $this->logLineCount++;
238
-
239
-                if ($this->options['flushFrequency'] && $this->logLineCount % $this->options['flushFrequency'] === 0) {
240
-                    fflush($this->fileHandle);
241
-                }
242
-            }
243
-        }
244
-    }
245
-
246
-    /**
247
-     * Get the file path that the log is currently writing to
248
-     *
249
-     * @return string
250
-     */
251
-    public function getLogFilePath()
252
-    {
253
-        return $this->logFilePath;
254
-    }
255
-
256
-    /**
257
-     * Get the last line logged to the log file
258
-     *
259
-     * @return string
260
-     */
261
-    public function getLastLogLine()
262
-    {
263
-        return $this->lastLine;
264
-    }
265
-
266
-    /**
267
-     * Formats the message for logging.
268
-     *
269
-     * @param  string $level   The Log Level of the message
270
-     * @param  string $message The message to log
271
-     * @param  array  $context The context
272
-     * @return string
273
-     */
274
-    protected function formatMessage($level, $message, $context)
275
-    {
276
-        if ($this->options['logFormat']) {
277
-            $parts = array(
278
-                'date'          => $this->getTimestamp(),
279
-                'level'         => strtoupper($level),
280
-                'level-padding' => str_repeat(' ', 9 - strlen($level)),
281
-                'priority'      => $this->logLevels[$level],
282
-                'message'       => $message,
283
-                'context'       => json_encode($context),
284
-            );
285
-            $message = $this->options['logFormat'];
286
-            foreach ($parts as $part => $value) {
287
-                $message = str_replace('{'.$part.'}', $value, $message);
288
-            }
289
-
290
-        } else {
291
-            $message = "[{$this->getTimestamp()}] [{$level}] {$message}";
292
-        }
293
-
294
-        if ($this->options['appendContext'] && ! empty($context)) {
295
-            $message .= PHP_EOL.$this->indent($this->contextToString($context));
296
-        }
297
-
298
-        return $message.PHP_EOL;
299
-
300
-    }
301
-
302
-    /**
303
-     * Gets the correctly formatted Date/Time for the log entry.
304
-     *
305
-     * PHP DateTime is dump, and you have to resort to trickery to get microseconds
306
-     * to work correctly, so here it is.
307
-     *
308
-     * @return string
309
-     */
310
-    private function getTimestamp()
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));
315
-
316
-        return $date->format($this->options['dateFormat']);
317
-    }
318
-
319
-    /**
320
-     * Takes the given context and coverts it to a string.
321
-     *
322
-     * @param  array $context The Context
323
-     * @return string
324
-     */
325
-    protected function contextToString($context)
326
-    {
327
-        $export = '';
328
-        foreach ($context as $key => $value) {
329
-            $export .= "{$key}: ";
330
-            $export .= preg_replace(array(
331
-                '/=>\s+([a-zA-Z])/im',
332
-                '/array\(\s+\)/im',
333
-                '/^  |\G  /m'
334
-            ), array(
335
-                '=> $1',
336
-                'array()',
337
-                '    '
338
-            ), str_replace('array (', 'array(', var_export($value, true)));
339
-            $export .= PHP_EOL;
340
-        }
341
-        return str_replace(array('\\\\', '\\\''), array('\\', '\''), rtrim($export));
342
-    }
343
-
344
-    /**
345
-     * Indents the given string with the given indent.
346
-     *
347
-     * @param  string $string The string to indent
348
-     * @param  string $indent What to use as the indent.
349
-     * @return string
350
-     */
351
-    protected function indent($string, $indent = '    ')
352
-    {
353
-        return $indent.str_replace("\n", "\n".$indent, $string);
354
-    }
37
+	/**
38
+	 * KLogger options
39
+	 *  Anything options not considered 'core' to the logging library should be
40
+	 *  settable view the third parameter in the constructor
41
+	 *
42
+	 *  Core options include the log file path and the log threshold
43
+	 *
44
+	 * @var array
45
+	 */
46
+	protected $options = array (
47
+		'extension'      => 'txt',
48
+		'dateFormat'     => 'Y-m-d G:i:s.u',
49
+		'filename'       => false,
50
+		'flushFrequency' => false,
51
+		'prefix'         => 'log_',
52
+		'logFormat'      => false,
53
+		'appendContext'  => true,
54
+	);
55
+
56
+	/**
57
+	 * Path to the log file
58
+	 * @var string
59
+	 */
60
+	private $logFilePath;
61
+
62
+	/**
63
+	 * Current minimum logging threshold
64
+	 * @var integer
65
+	 */
66
+	protected $logLevelThreshold = LogLevel::DEBUG;
67
+
68
+	/**
69
+	 * The number of lines logged in this instance's lifetime
70
+	 * @var int
71
+	 */
72
+	private $logLineCount = 0;
73
+
74
+	/**
75
+	 * Log Levels
76
+	 * @var array
77
+	 */
78
+	protected $logLevels = array(
79
+		LogLevel::EMERGENCY => 0,
80
+		LogLevel::ALERT     => 1,
81
+		LogLevel::CRITICAL  => 2,
82
+		LogLevel::ERROR     => 3,
83
+		LogLevel::WARNING   => 4,
84
+		LogLevel::NOTICE    => 5,
85
+		LogLevel::INFO      => 6,
86
+		LogLevel::DEBUG     => 7
87
+	);
88
+
89
+	/**
90
+	 * This holds the file handle for this instance's log file
91
+	 * @var resource
92
+	 */
93
+	private $fileHandle;
94
+
95
+	/**
96
+	 * This holds the last line logged to the logger
97
+	 *  Used for unit tests
98
+	 * @var string
99
+	 */
100
+	private $lastLine = '';
101
+
102
+	/**
103
+	 * Octal notation for default permissions of the log file
104
+	 * @var integer
105
+	 */
106
+	private $defaultPermissions = 0777;
107
+
108
+	/**
109
+	 * Class constructor
110
+	 *
111
+	 * @param string $logDirectory      File path to the logging directory
112
+	 * @param string $logLevelThreshold The LogLevel Threshold
113
+	 * @param array  $options
114
+	 *
115
+	 * @internal param string $logFilePrefix The prefix for the log file name
116
+	 * @internal param string $logFileExt The extension for the log file
117
+	 */
118
+	public function __construct($logDirectory, $logLevelThreshold = LogLevel::DEBUG, array $options = array())
119
+	{
120
+		$this->logLevelThreshold = $logLevelThreshold;
121
+		$this->options = array_merge($this->options, $options);
122
+
123
+		$logDirectory = rtrim($logDirectory, DIRECTORY_SEPARATOR);
124
+		if ( ! file_exists($logDirectory)) {
125
+			mkdir($logDirectory, $this->defaultPermissions, true);
126
+		}
127
+
128
+		if(strpos($logDirectory, 'php://') === 0) {
129
+			$this->setLogToStdOut($logDirectory);
130
+			$this->setFileHandle('w+');
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.');
135
+			}
136
+			$this->setFileHandle('a');
137
+		}
138
+
139
+		if ( ! $this->fileHandle) {
140
+			throw new RuntimeException('The file could not be opened. Check permissions.');
141
+		}
142
+	}
143
+
144
+	/**
145
+	 * @param string $stdOutPath
146
+	 */
147
+	public function setLogToStdOut($stdOutPath) {
148
+		$this->logFilePath = $stdOutPath;
149
+	}
150
+
151
+	/**
152
+	 * @param string $logDirectory
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'];
158
+			}
159
+			else {
160
+				$this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['filename'].'.'.$this->options['extension'];
161
+			}
162
+		} else {
163
+			$this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['prefix'].date('Y-m-d').'.'.$this->options['extension'];
164
+		}
165
+	}
166
+
167
+	/**
168
+	 * @param $writeMode
169
+	 *
170
+	 * @internal param resource $fileHandle
171
+	 */
172
+	public function setFileHandle($writeMode) {
173
+		$this->fileHandle = fopen($this->logFilePath, $writeMode);
174
+	}
175
+
176
+
177
+	/**
178
+	 * Class destructor
179
+	 */
180
+	public function __destruct()
181
+	{
182
+		if ($this->fileHandle) {
183
+			fclose($this->fileHandle);
184
+		}
185
+	}
186
+
187
+	/**
188
+	 * Sets the date format used by all instances of KLogger
189
+	 *
190
+	 * @param string $dateFormat Valid format string for date()
191
+	 */
192
+	public function setDateFormat($dateFormat)
193
+	{
194
+		$this->options['dateFormat'] = $dateFormat;
195
+	}
196
+
197
+	/**
198
+	 * Sets the Log Level Threshold
199
+	 *
200
+	 * @param string $logLevelThreshold The log level threshold
201
+	 */
202
+	public function setLogLevelThreshold($logLevelThreshold)
203
+	{
204
+		$this->logLevelThreshold = $logLevelThreshold;
205
+	}
206
+
207
+	/**
208
+	 * Logs with an arbitrary level.
209
+	 *
210
+	 * @param mixed $level
211
+	 * @param string $message
212
+	 * @param array $context
213
+	 * @return null
214
+	 */
215
+	public function log($level, $message, array $context = array())
216
+	{
217
+		if ($this->logLevels[$this->logLevelThreshold] < $this->logLevels[$level]) {
218
+			return;
219
+		}
220
+		$message = $this->formatMessage($level, $message, $context);
221
+		$this->write($message);
222
+	}
223
+
224
+	/**
225
+	 * Writes a line to the log without prepending a status or timestamp
226
+	 *
227
+	 * @param string $message Line to write to the log
228
+	 * @return void
229
+	 */
230
+	public function write($message)
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.');
235
+			} else {
236
+				$this->lastLine = trim($message);
237
+				$this->logLineCount++;
238
+
239
+				if ($this->options['flushFrequency'] && $this->logLineCount % $this->options['flushFrequency'] === 0) {
240
+					fflush($this->fileHandle);
241
+				}
242
+			}
243
+		}
244
+	}
245
+
246
+	/**
247
+	 * Get the file path that the log is currently writing to
248
+	 *
249
+	 * @return string
250
+	 */
251
+	public function getLogFilePath()
252
+	{
253
+		return $this->logFilePath;
254
+	}
255
+
256
+	/**
257
+	 * Get the last line logged to the log file
258
+	 *
259
+	 * @return string
260
+	 */
261
+	public function getLastLogLine()
262
+	{
263
+		return $this->lastLine;
264
+	}
265
+
266
+	/**
267
+	 * Formats the message for logging.
268
+	 *
269
+	 * @param  string $level   The Log Level of the message
270
+	 * @param  string $message The message to log
271
+	 * @param  array  $context The context
272
+	 * @return string
273
+	 */
274
+	protected function formatMessage($level, $message, $context)
275
+	{
276
+		if ($this->options['logFormat']) {
277
+			$parts = array(
278
+				'date'          => $this->getTimestamp(),
279
+				'level'         => strtoupper($level),
280
+				'level-padding' => str_repeat(' ', 9 - strlen($level)),
281
+				'priority'      => $this->logLevels[$level],
282
+				'message'       => $message,
283
+				'context'       => json_encode($context),
284
+			);
285
+			$message = $this->options['logFormat'];
286
+			foreach ($parts as $part => $value) {
287
+				$message = str_replace('{'.$part.'}', $value, $message);
288
+			}
289
+
290
+		} else {
291
+			$message = "[{$this->getTimestamp()}] [{$level}] {$message}";
292
+		}
293
+
294
+		if ($this->options['appendContext'] && ! empty($context)) {
295
+			$message .= PHP_EOL.$this->indent($this->contextToString($context));
296
+		}
297
+
298
+		return $message.PHP_EOL;
299
+
300
+	}
301
+
302
+	/**
303
+	 * Gets the correctly formatted Date/Time for the log entry.
304
+	 *
305
+	 * PHP DateTime is dump, and you have to resort to trickery to get microseconds
306
+	 * to work correctly, so here it is.
307
+	 *
308
+	 * @return string
309
+	 */
310
+	private function getTimestamp()
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));
315
+
316
+		return $date->format($this->options['dateFormat']);
317
+	}
318
+
319
+	/**
320
+	 * Takes the given context and coverts it to a string.
321
+	 *
322
+	 * @param  array $context The Context
323
+	 * @return string
324
+	 */
325
+	protected function contextToString($context)
326
+	{
327
+		$export = '';
328
+		foreach ($context as $key => $value) {
329
+			$export .= "{$key}: ";
330
+			$export .= preg_replace(array(
331
+				'/=>\s+([a-zA-Z])/im',
332
+				'/array\(\s+\)/im',
333
+				'/^  |\G  /m'
334
+			), array(
335
+				'=> $1',
336
+				'array()',
337
+				'    '
338
+			), str_replace('array (', 'array(', var_export($value, true)));
339
+			$export .= PHP_EOL;
340
+		}
341
+		return str_replace(array('\\\\', '\\\''), array('\\', '\''), rtrim($export));
342
+	}
343
+
344
+	/**
345
+	 * Indents the given string with the given indent.
346
+	 *
347
+	 * @param  string $string The string to indent
348
+	 * @param  string $indent What to use as the indent.
349
+	 * @return string
350
+	 */
351
+	protected function indent($string, $indent = '    ')
352
+	{
353
+		return $indent.str_replace("\n", "\n".$indent, $string);
354
+	}
355 355
 }
Please login to merge, or discard this patch.
Spacing   +63 added lines, -63 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
Braces   +36 added lines, -50 removed lines patch added patch discarded remove patch
@@ -32,8 +32,7 @@  discard block
 block discarded – undo
32 32
 /**
33 33
  * Class documentation
34 34
  */
35
-class Logger extends AbstractLogger
36
-{
35
+class Logger extends AbstractLogger {
37 36
     /**
38 37
      * KLogger options
39 38
      *  Anything options not considered 'core' to the logging library should be
@@ -115,28 +114,27 @@  discard block
 block discarded – undo
115 114
      * @internal param string $logFilePrefix The prefix for the log file name
116 115
      * @internal param string $logFileExt The extension for the log file
117 116
      */
118
-    public function __construct($logDirectory, $logLevelThreshold = LogLevel::DEBUG, array $options = array())
119
-    {
117
+    public function __construct($logDirectory, $logLevelThreshold = LogLevel::DEBUG, array $options = array()) {
120 118
         $this->logLevelThreshold = $logLevelThreshold;
121 119
         $this->options = array_merge($this->options, $options);
122 120
 
123 121
         $logDirectory = rtrim($logDirectory, DIRECTORY_SEPARATOR);
124
-        if ( ! file_exists($logDirectory)) {
122
+        if ( ! file_exists($logDirectory)) {
125 123
             mkdir($logDirectory, $this->defaultPermissions, true);
126 124
         }
127 125
 
128
-        if(strpos($logDirectory, 'php://') === 0) {
126
+        if(strpos($logDirectory, 'php://') === 0) {
129 127
             $this->setLogToStdOut($logDirectory);
130 128
             $this->setFileHandle('w+');
131
-        } else {
129
+        } else {
132 130
             $this->setLogFilePath($logDirectory);
133
-            if(file_exists($this->logFilePath) && !is_writable($this->logFilePath)) {
131
+            if(file_exists($this->logFilePath) && !is_writable($this->logFilePath)) {
134 132
                 throw new RuntimeException('The file could not be written to. Check that appropriate permissions have been set.');
135 133
             }
136 134
             $this->setFileHandle('a');
137 135
         }
138 136
 
139
-        if ( ! $this->fileHandle) {
137
+        if ( ! $this->fileHandle) {
140 138
             throw new RuntimeException('The file could not be opened. Check permissions.');
141 139
         }
142 140
     }
@@ -144,22 +142,21 @@  discard block
 block discarded – undo
144 142
     /**
145 143
      * @param string $stdOutPath
146 144
      */
147
-    public function setLogToStdOut($stdOutPath) {
145
+    public function setLogToStdOut($stdOutPath) {
148 146
         $this->logFilePath = $stdOutPath;
149 147
     }
150 148
 
151 149
     /**
152 150
      * @param string $logDirectory
153 151
      */
154
-    public function setLogFilePath($logDirectory) {
155
-        if ($this->options['filename']) {
156
-            if (strpos($this->options['filename'], '.log') !== false || strpos($this->options['filename'], '.txt') !== false) {
152
+    public function setLogFilePath($logDirectory) {
153
+        if ($this->options['filename']) {
154
+            if (strpos($this->options['filename'], '.log') !== false || strpos($this->options['filename'], '.txt') !== false) {
157 155
                 $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['filename'];
158
-            }
159
-            else {
156
+            } else {
160 157
                 $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['filename'].'.'.$this->options['extension'];
161 158
             }
162
-        } else {
159
+        } else {
163 160
             $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['prefix'].date('Y-m-d').'.'.$this->options['extension'];
164 161
         }
165 162
     }
@@ -169,7 +166,7 @@  discard block
 block discarded – undo
169 166
      *
170 167
      * @internal param resource $fileHandle
171 168
      */
172
-    public function setFileHandle($writeMode) {
169
+    public function setFileHandle($writeMode) {
173 170
         $this->fileHandle = fopen($this->logFilePath, $writeMode);
174 171
     }
175 172
 
@@ -177,9 +174,8 @@  discard block
 block discarded – undo
177 174
     /**
178 175
      * Class destructor
179 176
      */
180
-    public function __destruct()
181
-    {
182
-        if ($this->fileHandle) {
177
+    public function __destruct() {
178
+        if ($this->fileHandle) {
183 179
             fclose($this->fileHandle);
184 180
         }
185 181
     }
@@ -189,8 +185,7 @@  discard block
 block discarded – undo
189 185
      *
190 186
      * @param string $dateFormat Valid format string for date()
191 187
      */
192
-    public function setDateFormat($dateFormat)
193
-    {
188
+    public function setDateFormat($dateFormat) {
194 189
         $this->options['dateFormat'] = $dateFormat;
195 190
     }
196 191
 
@@ -199,8 +194,7 @@  discard block
 block discarded – undo
199 194
      *
200 195
      * @param string $logLevelThreshold The log level threshold
201 196
      */
202
-    public function setLogLevelThreshold($logLevelThreshold)
203
-    {
197
+    public function setLogLevelThreshold($logLevelThreshold) {
204 198
         $this->logLevelThreshold = $logLevelThreshold;
205 199
     }
206 200
 
@@ -212,9 +206,8 @@  discard block
 block discarded – undo
212 206
      * @param array $context
213 207
      * @return null
214 208
      */
215
-    public function log($level, $message, array $context = array())
216
-    {
217
-        if ($this->logLevels[$this->logLevelThreshold] < $this->logLevels[$level]) {
209
+    public function log($level, $message, array $context = array()) {
210
+        if ($this->logLevels[$this->logLevelThreshold] < $this->logLevels[$level]) {
218 211
             return;
219 212
         }
220 213
         $message = $this->formatMessage($level, $message, $context);
@@ -227,16 +220,15 @@  discard block
 block discarded – undo
227 220
      * @param string $message Line to write to the log
228 221
      * @return void
229 222
      */
230
-    public function write($message)
231
-    {
232
-        if (null !== $this->fileHandle) {
233
-            if (fwrite($this->fileHandle, $message) === false) {
223
+    public function write($message) {
224
+        if (null !== $this->fileHandle) {
225
+            if (fwrite($this->fileHandle, $message) === false) {
234 226
                 throw new RuntimeException('The file could not be written to. Check that appropriate permissions have been set.');
235
-            } else {
227
+            } else {
236 228
                 $this->lastLine = trim($message);
237 229
                 $this->logLineCount++;
238 230
 
239
-                if ($this->options['flushFrequency'] && $this->logLineCount % $this->options['flushFrequency'] === 0) {
231
+                if ($this->options['flushFrequency'] && $this->logLineCount % $this->options['flushFrequency'] === 0) {
240 232
                     fflush($this->fileHandle);
241 233
                 }
242 234
             }
@@ -248,8 +240,7 @@  discard block
 block discarded – undo
248 240
      *
249 241
      * @return string
250 242
      */
251
-    public function getLogFilePath()
252
-    {
243
+    public function getLogFilePath() {
253 244
         return $this->logFilePath;
254 245
     }
255 246
 
@@ -258,8 +249,7 @@  discard block
 block discarded – undo
258 249
      *
259 250
      * @return string
260 251
      */
261
-    public function getLastLogLine()
262
-    {
252
+    public function getLastLogLine() {
263 253
         return $this->lastLine;
264 254
     }
265 255
 
@@ -271,9 +261,8 @@  discard block
 block discarded – undo
271 261
      * @param  array  $context The context
272 262
      * @return string
273 263
      */
274
-    protected function formatMessage($level, $message, $context)
275
-    {
276
-        if ($this->options['logFormat']) {
264
+    protected function formatMessage($level, $message, $context) {
265
+        if ($this->options['logFormat']) {
277 266
             $parts = array(
278 267
                 'date'          => $this->getTimestamp(),
279 268
                 'level'         => strtoupper($level),
@@ -283,15 +272,15 @@  discard block
 block discarded – undo
283 272
                 'context'       => json_encode($context),
284 273
             );
285 274
             $message = $this->options['logFormat'];
286
-            foreach ($parts as $part => $value) {
275
+            foreach ($parts as $part => $value) {
287 276
                 $message = str_replace('{'.$part.'}', $value, $message);
288 277
             }
289 278
 
290
-        } else {
279
+        } else {
291 280
             $message = "[{$this->getTimestamp()}] [{$level}] {$message}";
292 281
         }
293 282
 
294
-        if ($this->options['appendContext'] && ! empty($context)) {
283
+        if ($this->options['appendContext'] && ! empty($context)) {
295 284
             $message .= PHP_EOL.$this->indent($this->contextToString($context));
296 285
         }
297 286
 
@@ -307,8 +296,7 @@  discard block
 block discarded – undo
307 296
      *
308 297
      * @return string
309 298
      */
310
-    private function getTimestamp()
311
-    {
299
+    private function getTimestamp() {
312 300
         $originalTime = microtime(true);
313 301
         $micro = sprintf("%06d", ($originalTime - floor($originalTime)) * 1000000);
314 302
         $date = new DateTime(date('Y-m-d H:i:s.'.$micro, $originalTime));
@@ -322,10 +310,9 @@  discard block
 block discarded – undo
322 310
      * @param  array $context The Context
323 311
      * @return string
324 312
      */
325
-    protected function contextToString($context)
326
-    {
313
+    protected function contextToString($context) {
327 314
         $export = '';
328
-        foreach ($context as $key => $value) {
315
+        foreach ($context as $key => $value) {
329 316
             $export .= "{$key}: ";
330 317
             $export .= preg_replace(array(
331 318
                 '/=>\s+([a-zA-Z])/im',
@@ -348,8 +335,7 @@  discard block
 block discarded – undo
348 335
      * @param  string $indent What to use as the indent.
349 336
      * @return string
350 337
      */
351
-    protected function indent($string, $indent = '    ')
352
-    {
338
+    protected function indent($string, $indent = '    ') {
353 339
         return $indent.str_replace("\n", "\n".$indent, $string);
354 340
     }
355 341
 }
Please login to merge, or discard this patch.
plugin-and-theme-hooks/class-gravityview-plugin-hooks-trustedlogin.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 	}
Please login to merge, or discard this patch.
vendor/brianhenryie/strauss/tests/Unit/Composer/Extra/StraussConfigTest.php 4 patches
Indentation   +189 added lines, -189 removed lines patch added patch discarded remove patch
@@ -14,13 +14,13 @@  discard block
 block discarded – undo
14 14
 class StraussConfigTest extends TestCase
15 15
 {
16 16
 
17
-    /**
18
-     * With a full (at time of writing) config, test the getters.
19
-     */
20
-    public function testGetters()
21
-    {
17
+	/**
18
+	 * With a full (at time of writing) config, test the getters.
19
+	 */
20
+	public function testGetters()
21
+	{
22 22
 
23
-        $composerExtraStraussJson = <<<'EOD'
23
+		$composerExtraStraussJson = <<<'EOD'
24 24
 {
25 25
   "name": "brianhenryie/strauss-config-test",
26 26
   "require": {
@@ -50,38 +50,38 @@  discard block
 block discarded – undo
50 50
 }
51 51
 EOD;
52 52
 
53
-        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
54
-        file_put_contents($tmpfname, $composerExtraStraussJson);
53
+		$tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
54
+		file_put_contents($tmpfname, $composerExtraStraussJson);
55 55
 
56
-        $composer = Factory::create(new NullIO(), $tmpfname);
56
+		$composer = Factory::create(new NullIO(), $tmpfname);
57 57
 
58
-        $sut = new StraussConfig($composer);
58
+		$sut = new StraussConfig($composer);
59 59
 
60
-        $this->assertContains('pimple/pimple', $sut->getPackages());
60
+		$this->assertContains('pimple/pimple', $sut->getPackages());
61 61
 
62
-        $this->assertEquals('target_directory' . DIRECTORY_SEPARATOR, $sut->getTargetDirectory());
62
+		$this->assertEquals('target_directory' . DIRECTORY_SEPARATOR, $sut->getTargetDirectory());
63 63
 
64
-        $this->assertEquals("BrianHenryIE\\Strauss", $sut->getNamespacePrefix());
64
+		$this->assertEquals("BrianHenryIE\\Strauss", $sut->getNamespacePrefix());
65 65
 
66
-        $this->assertEquals('BrianHenryIE_Strauss_', $sut->getClassmapPrefix());
66
+		$this->assertEquals('BrianHenryIE_Strauss_', $sut->getClassmapPrefix());
67 67
 
68
-        // @see https://github.com/BrianHenryIE/strauss/issues/14
69
-        $this->assertContains('/^psr.*$/', $sut->getExcludeFilePatternsFromPrefixing());
68
+		// @see https://github.com/BrianHenryIE/strauss/issues/14
69
+		$this->assertContains('/^psr.*$/', $sut->getExcludeFilePatternsFromPrefixing());
70 70
 
71
-        $this->assertArrayHasKey('clancats/container', $sut->getOverrideAutoload());
71
+		$this->assertArrayHasKey('clancats/container', $sut->getOverrideAutoload());
72 72
 
73
-        $this->assertFalse($sut->isDeleteVendorFiles());
74
-    }
73
+		$this->assertFalse($sut->isDeleteVendorFiles());
74
+	}
75 75
 
76
-    /**
77
-     * Test how it handles an extra key.
78
-     *
79
-     * Turns out it just ignores it... good!
80
-     */
81
-    public function testExtraKey()
82
-    {
76
+	/**
77
+	 * Test how it handles an extra key.
78
+	 *
79
+	 * Turns out it just ignores it... good!
80
+	 */
81
+	public function testExtraKey()
82
+	{
83 83
 
84
-        $composerExtraStraussJson = <<<'EOD'
84
+		$composerExtraStraussJson = <<<'EOD'
85 85
 {
86 86
   "name": "brianhenryie/strauss-config-test",
87 87
   "require": {
@@ -112,31 +112,31 @@  discard block
 block discarded – undo
112 112
 }
113 113
 EOD;
114 114
 
115
-        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
116
-        file_put_contents($tmpfname, $composerExtraStraussJson);
115
+		$tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
116
+		file_put_contents($tmpfname, $composerExtraStraussJson);
117 117
 
118
-        $composer = Factory::create(new NullIO(), $tmpfname);
118
+		$composer = Factory::create(new NullIO(), $tmpfname);
119 119
 
120
-        $exception = null;
120
+		$exception = null;
121 121
 
122
-        try {
123
-            $sut = new StraussConfig($composer);
124
-        } catch (\Exception $e) {
125
-            $exception = $e;
126
-        }
122
+		try {
123
+			$sut = new StraussConfig($composer);
124
+		} catch (\Exception $e) {
125
+			$exception = $e;
126
+		}
127 127
 
128
-        $this->assertNull($exception);
129
-    }
128
+		$this->assertNull($exception);
129
+	}
130 130
 
131
-    /**
132
-     * straussconfig-test-3.json has no target_dir key.
133
-     *
134
-     * If no target_dir is specified, used "strauss/"
135
-     */
136
-    public function testDefaultTargetDir()
137
-    {
131
+	/**
132
+	 * straussconfig-test-3.json has no target_dir key.
133
+	 *
134
+	 * If no target_dir is specified, used "strauss/"
135
+	 */
136
+	public function testDefaultTargetDir()
137
+	{
138 138
 
139
-        $composerExtraStraussJson = <<<'EOD'
139
+		$composerExtraStraussJson = <<<'EOD'
140 140
 {
141 141
   "name": "brianhenryie/strauss-config-test",
142 142
   "require": {
@@ -163,23 +163,23 @@  discard block
 block discarded – undo
163 163
 }
164 164
 EOD;
165 165
 
166
-        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
167
-        file_put_contents($tmpfname, $composerExtraStraussJson);
166
+		$tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
167
+		file_put_contents($tmpfname, $composerExtraStraussJson);
168 168
 
169
-        $composer = Factory::create(new NullIO(), $tmpfname);
169
+		$composer = Factory::create(new NullIO(), $tmpfname);
170 170
 
171
-        $sut = new StraussConfig($composer);
171
+		$sut = new StraussConfig($composer);
172 172
 
173
-        $this->assertEquals('strauss'. DIRECTORY_SEPARATOR, $sut->getTargetDirectory());
174
-    }
173
+		$this->assertEquals('strauss'. DIRECTORY_SEPARATOR, $sut->getTargetDirectory());
174
+	}
175 175
 
176
-    /**
177
-     * When the namespace prefix isn't provided, use the PSR-4 autoload key name.
178
-     */
179
-    public function testDefaultNamespacePrefixFromAutoloaderPsr4()
180
-    {
176
+	/**
177
+	 * When the namespace prefix isn't provided, use the PSR-4 autoload key name.
178
+	 */
179
+	public function testDefaultNamespacePrefixFromAutoloaderPsr4()
180
+	{
181 181
 
182
-        $composerExtraStraussJson = <<<'EOD'
182
+		$composerExtraStraussJson = <<<'EOD'
183 183
 {
184 184
   "name": "brianhenryie/strauss-config-test",
185 185
   "require": {
@@ -194,23 +194,23 @@  discard block
 block discarded – undo
194 194
 }
195 195
 EOD;
196 196
 
197
-        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
198
-        file_put_contents($tmpfname, $composerExtraStraussJson);
197
+		$tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
198
+		file_put_contents($tmpfname, $composerExtraStraussJson);
199 199
 
200
-        $composer = Factory::create(new NullIO(), $tmpfname);
200
+		$composer = Factory::create(new NullIO(), $tmpfname);
201 201
 
202
-        $sut = new StraussConfig($composer);
202
+		$sut = new StraussConfig($composer);
203 203
 
204
-        $this->assertEquals("BrianHenryIE\\Strauss", $sut->getNamespacePrefix());
205
-    }
204
+		$this->assertEquals("BrianHenryIE\\Strauss", $sut->getNamespacePrefix());
205
+	}
206 206
 
207
-    /**
208
-     * When the namespace prefix isn't provided, use the PSR-0 autoload key name.
209
-     */
210
-    public function testDefaultNamespacePrefixFromAutoloaderPsr0()
211
-    {
207
+	/**
208
+	 * When the namespace prefix isn't provided, use the PSR-0 autoload key name.
209
+	 */
210
+	public function testDefaultNamespacePrefixFromAutoloaderPsr0()
211
+	{
212 212
 
213
-        $composerExtraStraussJson = <<<'EOD'
213
+		$composerExtraStraussJson = <<<'EOD'
214 214
 {
215 215
   "name": "brianhenryie/strauss-config-test",
216 216
   "require": {
@@ -224,25 +224,25 @@  discard block
 block discarded – undo
224 224
   }
225 225
 }
226 226
 EOD;
227
-        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
228
-        file_put_contents($tmpfname, $composerExtraStraussJson);
227
+		$tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
228
+		file_put_contents($tmpfname, $composerExtraStraussJson);
229 229
 
230
-        $composer = Factory::create(new NullIO(), $tmpfname);
230
+		$composer = Factory::create(new NullIO(), $tmpfname);
231 231
 
232
-        $sut = new StraussConfig($composer);
232
+		$sut = new StraussConfig($composer);
233 233
 
234
-        $this->assertEquals("BrianHenryIE\\Strauss", $sut->getNamespacePrefix());
235
-    }
234
+		$this->assertEquals("BrianHenryIE\\Strauss", $sut->getNamespacePrefix());
235
+	}
236 236
 
237
-    /**
238
-     * When the namespace prefix isn't provided, and there's no PSR-0 or PSR-4 autoloader to figure it from...
239
-     *
240
-     * brianhenryie/strauss-config-test
241
-     */
242
-    public function testDefaultNamespacePrefixWithNoAutoloader()
243
-    {
237
+	/**
238
+	 * When the namespace prefix isn't provided, and there's no PSR-0 or PSR-4 autoloader to figure it from...
239
+	 *
240
+	 * brianhenryie/strauss-config-test
241
+	 */
242
+	public function testDefaultNamespacePrefixWithNoAutoloader()
243
+	{
244 244
 
245
-        $composerExtraStraussJson = <<<'EOD'
245
+		$composerExtraStraussJson = <<<'EOD'
246 246
 {
247 247
   "name": "brianhenryie/strauss-config-test",
248 248
   "require": {
@@ -251,23 +251,23 @@  discard block
 block discarded – undo
251 251
 }
252 252
 EOD;
253 253
 
254
-        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
255
-        file_put_contents($tmpfname, $composerExtraStraussJson);
254
+		$tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
255
+		file_put_contents($tmpfname, $composerExtraStraussJson);
256 256
 
257
-        $composer = Factory::create(new NullIO(), $tmpfname);
257
+		$composer = Factory::create(new NullIO(), $tmpfname);
258 258
 
259
-        $sut = new StraussConfig($composer);
259
+		$sut = new StraussConfig($composer);
260 260
 
261
-        $this->assertEquals("Brianhenryie\\Strauss_Config_Test", $sut->getNamespacePrefix());
262
-    }
261
+		$this->assertEquals("Brianhenryie\\Strauss_Config_Test", $sut->getNamespacePrefix());
262
+	}
263 263
 
264
-    /**
265
-     * When the classmap prefix isn't provided, use the PSR-4 autoload key name.
266
-     */
267
-    public function testDefaultClassmapPrefixFromAutoloaderPsr4()
268
-    {
264
+	/**
265
+	 * When the classmap prefix isn't provided, use the PSR-4 autoload key name.
266
+	 */
267
+	public function testDefaultClassmapPrefixFromAutoloaderPsr4()
268
+	{
269 269
 
270
-        $composerExtraStraussJson = <<<'EOD'
270
+		$composerExtraStraussJson = <<<'EOD'
271 271
 {
272 272
   "name": "brianhenryie/strauss-config-test",
273 273
   "require": {
@@ -282,23 +282,23 @@  discard block
 block discarded – undo
282 282
 }
283 283
 EOD;
284 284
 
285
-        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
286
-        file_put_contents($tmpfname, $composerExtraStraussJson);
285
+		$tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
286
+		file_put_contents($tmpfname, $composerExtraStraussJson);
287 287
 
288
-        $composer = Factory::create(new NullIO(), $tmpfname);
288
+		$composer = Factory::create(new NullIO(), $tmpfname);
289 289
 
290
-        $sut = new StraussConfig($composer);
290
+		$sut = new StraussConfig($composer);
291 291
 
292
-        $this->assertEquals("BrianHenryIE_Strauss_", $sut->getClassmapPrefix());
293
-    }
292
+		$this->assertEquals("BrianHenryIE_Strauss_", $sut->getClassmapPrefix());
293
+	}
294 294
 
295
-    /**
296
-     * When the classmap prefix isn't provided, use the PSR-0 autoload key name.
297
-     */
298
-    public function testDefaultClassmapPrefixFromAutoloaderPsr0()
299
-    {
295
+	/**
296
+	 * When the classmap prefix isn't provided, use the PSR-0 autoload key name.
297
+	 */
298
+	public function testDefaultClassmapPrefixFromAutoloaderPsr0()
299
+	{
300 300
 
301
-        $composerExtraStraussJson = <<<'EOD'
301
+		$composerExtraStraussJson = <<<'EOD'
302 302
 {
303 303
   "name": "brianhenryie/strauss-config-test",
304 304
   "require": {
@@ -312,26 +312,26 @@  discard block
 block discarded – undo
312 312
   }
313 313
 }
314 314
 EOD;
315
-        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
316
-        file_put_contents($tmpfname, $composerExtraStraussJson);
315
+		$tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
316
+		file_put_contents($tmpfname, $composerExtraStraussJson);
317 317
 
318
-        $composer = Factory::create(new NullIO(), $tmpfname);
318
+		$composer = Factory::create(new NullIO(), $tmpfname);
319 319
 
320 320
 
321
-        $sut = new StraussConfig($composer);
321
+		$sut = new StraussConfig($composer);
322 322
 
323
-        $this->assertEquals("BrianHenryIE_Strauss_", $sut->getClassmapPrefix());
324
-    }
323
+		$this->assertEquals("BrianHenryIE_Strauss_", $sut->getClassmapPrefix());
324
+	}
325 325
 
326
-    /**
327
-     * When the classmap prefix isn't provided, and there's no PSR-0 or PSR-4 autoloader to figure it from...
328
-     *
329
-     * brianhenryie/strauss-config-test
330
-     */
331
-    public function testDefaultClassmapPrefixWithNoAutoloader()
332
-    {
326
+	/**
327
+	 * When the classmap prefix isn't provided, and there's no PSR-0 or PSR-4 autoloader to figure it from...
328
+	 *
329
+	 * brianhenryie/strauss-config-test
330
+	 */
331
+	public function testDefaultClassmapPrefixWithNoAutoloader()
332
+	{
333 333
 
334
-        $composerExtraStraussJson = <<<'EOD'
334
+		$composerExtraStraussJson = <<<'EOD'
335 335
 {
336 336
   "name": "brianhenryie/strauss-config-test",
337 337
   "require": {
@@ -340,23 +340,23 @@  discard block
 block discarded – undo
340 340
 
341 341
 }
342 342
 EOD;
343
-        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
344
-        file_put_contents($tmpfname, $composerExtraStraussJson);
343
+		$tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
344
+		file_put_contents($tmpfname, $composerExtraStraussJson);
345 345
 
346
-        $composer = Factory::create(new NullIO(), $tmpfname);
346
+		$composer = Factory::create(new NullIO(), $tmpfname);
347 347
 
348
-        $sut = new StraussConfig($composer);
348
+		$sut = new StraussConfig($composer);
349 349
 
350
-        $this->assertEquals("Brianhenryie_Strauss_Config_Test", $sut->getClassmapPrefix());
351
-    }
350
+		$this->assertEquals("Brianhenryie_Strauss_Config_Test", $sut->getClassmapPrefix());
351
+	}
352 352
 
353
-    /**
354
-     * When Strauss config has packages specified, obviously use them.
355
-     */
356
-    public function testGetPackagesFromConfig()
357
-    {
353
+	/**
354
+	 * When Strauss config has packages specified, obviously use them.
355
+	 */
356
+	public function testGetPackagesFromConfig()
357
+	{
358 358
 
359
-        $composerExtraStraussJson = <<<'EOD'
359
+		$composerExtraStraussJson = <<<'EOD'
360 360
 {
361 361
   "name": "brianhenryie/strauss-config-test",
362 362
   "require": {
@@ -386,23 +386,23 @@  discard block
 block discarded – undo
386 386
 }
387 387
 
388 388
 EOD;
389
-        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
390
-        file_put_contents($tmpfname, $composerExtraStraussJson);
389
+		$tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
390
+		file_put_contents($tmpfname, $composerExtraStraussJson);
391 391
 
392
-        $composer = Factory::create(new NullIO(), $tmpfname);
392
+		$composer = Factory::create(new NullIO(), $tmpfname);
393 393
 
394
-        $sut = new StraussConfig($composer);
394
+		$sut = new StraussConfig($composer);
395 395
 
396
-        $this->assertContains('pimple/pimple', $sut->getPackages());
397
-    }
396
+		$this->assertContains('pimple/pimple', $sut->getPackages());
397
+	}
398 398
 
399
-    /**
400
-     * When Strauss config has no packages specified, use composer.json's require list.
401
-     */
402
-    public function testGetPackagesNoConfig()
403
-    {
399
+	/**
400
+	 * When Strauss config has no packages specified, use composer.json's require list.
401
+	 */
402
+	public function testGetPackagesNoConfig()
403
+	{
404 404
 
405
-        $composerExtraStraussJson = <<<'EOD'
405
+		$composerExtraStraussJson = <<<'EOD'
406 406
 {
407 407
   "name": "brianhenryie/strauss-config-test",
408 408
   "require": {
@@ -428,23 +428,23 @@  discard block
 block discarded – undo
428 428
   }
429 429
 }
430 430
 EOD;
431
-        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
432
-        file_put_contents($tmpfname, $composerExtraStraussJson);
431
+		$tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
432
+		file_put_contents($tmpfname, $composerExtraStraussJson);
433 433
 
434
-        $composer = Factory::create(new NullIO(), $tmpfname);
434
+		$composer = Factory::create(new NullIO(), $tmpfname);
435 435
 
436
-        $sut = new StraussConfig($composer);
436
+		$sut = new StraussConfig($composer);
437 437
 
438
-        $this->assertContains('league/container', $sut->getPackages());
439
-    }
438
+		$this->assertContains('league/container', $sut->getPackages());
439
+	}
440 440
 
441
-    /**
442
-     * For backwards compatibility, if a Mozart config is present, use it.
443
-     */
444
-    public function testMapMozartConfig()
445
-    {
441
+	/**
442
+	 * For backwards compatibility, if a Mozart config is present, use it.
443
+	 */
444
+	public function testMapMozartConfig()
445
+	{
446 446
 
447
-        $composerExtraStraussJson = <<<'EOD'
447
+		$composerExtraStraussJson = <<<'EOD'
448 448
 {
449 449
   "extra": {
450 450
     "mozart": {
@@ -469,41 +469,41 @@  discard block
 block discarded – undo
469 469
   }
470 470
 }
471 471
 EOD;
472
-        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
473
-        file_put_contents($tmpfname, $composerExtraStraussJson);
472
+		$tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
473
+		file_put_contents($tmpfname, $composerExtraStraussJson);
474 474
 
475
-        $composer = Factory::create(new NullIO(), $tmpfname);
475
+		$composer = Factory::create(new NullIO(), $tmpfname);
476 476
 
477
-        $sut = new StraussConfig($composer);
477
+		$sut = new StraussConfig($composer);
478 478
 
479
-        $this->assertContains('pimple/pimple', $sut->getPackages());
479
+		$this->assertContains('pimple/pimple', $sut->getPackages());
480 480
 
481
-        $this->assertEquals('dep_directory' . DIRECTORY_SEPARATOR, $sut->getTargetDirectory());
481
+		$this->assertEquals('dep_directory' . DIRECTORY_SEPARATOR, $sut->getTargetDirectory());
482 482
 
483
-        $this->assertEquals("My_Mozart_Config", $sut->getNamespacePrefix());
483
+		$this->assertEquals("My_Mozart_Config", $sut->getNamespacePrefix());
484 484
 
485
-        $this->assertEquals('My_Mozart_Config_', $sut->getClassmapPrefix());
485
+		$this->assertEquals('My_Mozart_Config_', $sut->getClassmapPrefix());
486 486
 
487
-        $this->assertContains('psr/container', $sut->getExcludePackagesFromPrefixing());
487
+		$this->assertContains('psr/container', $sut->getExcludePackagesFromPrefixing());
488 488
 
489
-        $this->assertArrayHasKey('clancats/container', $sut->getOverrideAutoload());
489
+		$this->assertArrayHasKey('clancats/container', $sut->getOverrideAutoload());
490 490
 
491
-        // Mozart default was true.
492
-        $this->assertTrue($sut->isDeleteVendorFiles());
493
-    }
491
+		// Mozart default was true.
492
+		$this->assertTrue($sut->isDeleteVendorFiles());
493
+	}
494
+
495
+	/**
496
+	 * Since sometimes the namespace we're prefixing will already have a leading backslash, sometimes
497
+	 * the namespace_prefix will want its slash at the beginning, sometimes at the end.
498
+	 *
499
+	 * @see Prefixer::replaceNamespace()
500
+	 *
501
+	 * @covers \BrianHenryIE\Strauss\Composer\Extra\StraussConfig::getNamespacePrefix
502
+	 */
503
+	public function testNamespacePrefixHasNoSlash()
504
+	{
494 505
 
495
-    /**
496
-     * Since sometimes the namespace we're prefixing will already have a leading backslash, sometimes
497
-     * the namespace_prefix will want its slash at the beginning, sometimes at the end.
498
-     *
499
-     * @see Prefixer::replaceNamespace()
500
-     *
501
-     * @covers \BrianHenryIE\Strauss\Composer\Extra\StraussConfig::getNamespacePrefix
502
-     */
503
-    public function testNamespacePrefixHasNoSlash()
504
-    {
505
-
506
-        $composerExtraStraussJson = <<<'EOD'
506
+		$composerExtraStraussJson = <<<'EOD'
507 507
 {
508 508
   "extra": {
509 509
     "mozart": {
@@ -512,13 +512,13 @@  discard block
 block discarded – undo
512 512
   }
513 513
 }
514 514
 EOD;
515
-        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
516
-        file_put_contents($tmpfname, $composerExtraStraussJson);
515
+		$tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
516
+		file_put_contents($tmpfname, $composerExtraStraussJson);
517 517
 
518
-        $composer = Factory::create(new NullIO(), $tmpfname);
518
+		$composer = Factory::create(new NullIO(), $tmpfname);
519 519
 
520
-        $sut = new StraussConfig($composer);
520
+		$sut = new StraussConfig($composer);
521 521
 
522
-        $this->assertEquals("My_Mozart_Config", $sut->getNamespacePrefix());
523
-    }
522
+		$this->assertEquals("My_Mozart_Config", $sut->getNamespacePrefix());
523
+	}
524 524
 }
Please login to merge, or discard this patch.
Spacing   +78 added lines, -78 removed lines patch added patch discarded remove patch
@@ -50,27 +50,27 @@  discard block
 block discarded – undo
50 50
 }
51 51
 EOD;
52 52
 
53
-        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
54
-        file_put_contents($tmpfname, $composerExtraStraussJson);
53
+        $tmpfname = tempnam( sys_get_temp_dir(), 'strauss-test-' );
54
+        file_put_contents( $tmpfname, $composerExtraStraussJson );
55 55
 
56
-        $composer = Factory::create(new NullIO(), $tmpfname);
56
+        $composer = Factory::create( new NullIO(), $tmpfname );
57 57
 
58
-        $sut = new StraussConfig($composer);
58
+        $sut = new StraussConfig( $composer );
59 59
 
60
-        $this->assertContains('pimple/pimple', $sut->getPackages());
60
+        $this->assertContains( 'pimple/pimple', $sut->getPackages() );
61 61
 
62
-        $this->assertEquals('target_directory' . DIRECTORY_SEPARATOR, $sut->getTargetDirectory());
62
+        $this->assertEquals( 'target_directory' . DIRECTORY_SEPARATOR, $sut->getTargetDirectory() );
63 63
 
64
-        $this->assertEquals("BrianHenryIE\\Strauss", $sut->getNamespacePrefix());
64
+        $this->assertEquals( "BrianHenryIE\\Strauss", $sut->getNamespacePrefix() );
65 65
 
66
-        $this->assertEquals('BrianHenryIE_Strauss_', $sut->getClassmapPrefix());
66
+        $this->assertEquals( 'BrianHenryIE_Strauss_', $sut->getClassmapPrefix() );
67 67
 
68 68
         // @see https://github.com/BrianHenryIE/strauss/issues/14
69
-        $this->assertContains('/^psr.*$/', $sut->getExcludeFilePatternsFromPrefixing());
69
+        $this->assertContains( '/^psr.*$/', $sut->getExcludeFilePatternsFromPrefixing() );
70 70
 
71
-        $this->assertArrayHasKey('clancats/container', $sut->getOverrideAutoload());
71
+        $this->assertArrayHasKey( 'clancats/container', $sut->getOverrideAutoload() );
72 72
 
73
-        $this->assertFalse($sut->isDeleteVendorFiles());
73
+        $this->assertFalse( $sut->isDeleteVendorFiles() );
74 74
     }
75 75
 
76 76
     /**
@@ -112,20 +112,20 @@  discard block
 block discarded – undo
112 112
 }
113 113
 EOD;
114 114
 
115
-        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
116
-        file_put_contents($tmpfname, $composerExtraStraussJson);
115
+        $tmpfname = tempnam( sys_get_temp_dir(), 'strauss-test-' );
116
+        file_put_contents( $tmpfname, $composerExtraStraussJson );
117 117
 
118
-        $composer = Factory::create(new NullIO(), $tmpfname);
118
+        $composer = Factory::create( new NullIO(), $tmpfname );
119 119
 
120 120
         $exception = null;
121 121
 
122 122
         try {
123
-            $sut = new StraussConfig($composer);
124
-        } catch (\Exception $e) {
123
+            $sut = new StraussConfig( $composer );
124
+        } catch ( \Exception $e ) {
125 125
             $exception = $e;
126 126
         }
127 127
 
128
-        $this->assertNull($exception);
128
+        $this->assertNull( $exception );
129 129
     }
130 130
 
131 131
     /**
@@ -163,14 +163,14 @@  discard block
 block discarded – undo
163 163
 }
164 164
 EOD;
165 165
 
166
-        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
167
-        file_put_contents($tmpfname, $composerExtraStraussJson);
166
+        $tmpfname = tempnam( sys_get_temp_dir(), 'strauss-test-' );
167
+        file_put_contents( $tmpfname, $composerExtraStraussJson );
168 168
 
169
-        $composer = Factory::create(new NullIO(), $tmpfname);
169
+        $composer = Factory::create( new NullIO(), $tmpfname );
170 170
 
171
-        $sut = new StraussConfig($composer);
171
+        $sut = new StraussConfig( $composer );
172 172
 
173
-        $this->assertEquals('strauss'. DIRECTORY_SEPARATOR, $sut->getTargetDirectory());
173
+        $this->assertEquals( 'strauss' . DIRECTORY_SEPARATOR, $sut->getTargetDirectory() );
174 174
     }
175 175
 
176 176
     /**
@@ -194,14 +194,14 @@  discard block
 block discarded – undo
194 194
 }
195 195
 EOD;
196 196
 
197
-        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
198
-        file_put_contents($tmpfname, $composerExtraStraussJson);
197
+        $tmpfname = tempnam( sys_get_temp_dir(), 'strauss-test-' );
198
+        file_put_contents( $tmpfname, $composerExtraStraussJson );
199 199
 
200
-        $composer = Factory::create(new NullIO(), $tmpfname);
200
+        $composer = Factory::create( new NullIO(), $tmpfname );
201 201
 
202
-        $sut = new StraussConfig($composer);
202
+        $sut = new StraussConfig( $composer );
203 203
 
204
-        $this->assertEquals("BrianHenryIE\\Strauss", $sut->getNamespacePrefix());
204
+        $this->assertEquals( "BrianHenryIE\\Strauss", $sut->getNamespacePrefix() );
205 205
     }
206 206
 
207 207
     /**
@@ -224,14 +224,14 @@  discard block
 block discarded – undo
224 224
   }
225 225
 }
226 226
 EOD;
227
-        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
228
-        file_put_contents($tmpfname, $composerExtraStraussJson);
227
+        $tmpfname = tempnam( sys_get_temp_dir(), 'strauss-test-' );
228
+        file_put_contents( $tmpfname, $composerExtraStraussJson );
229 229
 
230
-        $composer = Factory::create(new NullIO(), $tmpfname);
230
+        $composer = Factory::create( new NullIO(), $tmpfname );
231 231
 
232
-        $sut = new StraussConfig($composer);
232
+        $sut = new StraussConfig( $composer );
233 233
 
234
-        $this->assertEquals("BrianHenryIE\\Strauss", $sut->getNamespacePrefix());
234
+        $this->assertEquals( "BrianHenryIE\\Strauss", $sut->getNamespacePrefix() );
235 235
     }
236 236
 
237 237
     /**
@@ -251,14 +251,14 @@  discard block
 block discarded – undo
251 251
 }
252 252
 EOD;
253 253
 
254
-        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
255
-        file_put_contents($tmpfname, $composerExtraStraussJson);
254
+        $tmpfname = tempnam( sys_get_temp_dir(), 'strauss-test-' );
255
+        file_put_contents( $tmpfname, $composerExtraStraussJson );
256 256
 
257
-        $composer = Factory::create(new NullIO(), $tmpfname);
257
+        $composer = Factory::create( new NullIO(), $tmpfname );
258 258
 
259
-        $sut = new StraussConfig($composer);
259
+        $sut = new StraussConfig( $composer );
260 260
 
261
-        $this->assertEquals("Brianhenryie\\Strauss_Config_Test", $sut->getNamespacePrefix());
261
+        $this->assertEquals( "Brianhenryie\\Strauss_Config_Test", $sut->getNamespacePrefix() );
262 262
     }
263 263
 
264 264
     /**
@@ -282,14 +282,14 @@  discard block
 block discarded – undo
282 282
 }
283 283
 EOD;
284 284
 
285
-        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
286
-        file_put_contents($tmpfname, $composerExtraStraussJson);
285
+        $tmpfname = tempnam( sys_get_temp_dir(), 'strauss-test-' );
286
+        file_put_contents( $tmpfname, $composerExtraStraussJson );
287 287
 
288
-        $composer = Factory::create(new NullIO(), $tmpfname);
288
+        $composer = Factory::create( new NullIO(), $tmpfname );
289 289
 
290
-        $sut = new StraussConfig($composer);
290
+        $sut = new StraussConfig( $composer );
291 291
 
292
-        $this->assertEquals("BrianHenryIE_Strauss_", $sut->getClassmapPrefix());
292
+        $this->assertEquals( "BrianHenryIE_Strauss_", $sut->getClassmapPrefix() );
293 293
     }
294 294
 
295 295
     /**
@@ -312,15 +312,15 @@  discard block
 block discarded – undo
312 312
   }
313 313
 }
314 314
 EOD;
315
-        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
316
-        file_put_contents($tmpfname, $composerExtraStraussJson);
315
+        $tmpfname = tempnam( sys_get_temp_dir(), 'strauss-test-' );
316
+        file_put_contents( $tmpfname, $composerExtraStraussJson );
317 317
 
318
-        $composer = Factory::create(new NullIO(), $tmpfname);
318
+        $composer = Factory::create( new NullIO(), $tmpfname );
319 319
 
320 320
 
321
-        $sut = new StraussConfig($composer);
321
+        $sut = new StraussConfig( $composer );
322 322
 
323
-        $this->assertEquals("BrianHenryIE_Strauss_", $sut->getClassmapPrefix());
323
+        $this->assertEquals( "BrianHenryIE_Strauss_", $sut->getClassmapPrefix() );
324 324
     }
325 325
 
326 326
     /**
@@ -340,14 +340,14 @@  discard block
 block discarded – undo
340 340
 
341 341
 }
342 342
 EOD;
343
-        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
344
-        file_put_contents($tmpfname, $composerExtraStraussJson);
343
+        $tmpfname = tempnam( sys_get_temp_dir(), 'strauss-test-' );
344
+        file_put_contents( $tmpfname, $composerExtraStraussJson );
345 345
 
346
-        $composer = Factory::create(new NullIO(), $tmpfname);
346
+        $composer = Factory::create( new NullIO(), $tmpfname );
347 347
 
348
-        $sut = new StraussConfig($composer);
348
+        $sut = new StraussConfig( $composer );
349 349
 
350
-        $this->assertEquals("Brianhenryie_Strauss_Config_Test", $sut->getClassmapPrefix());
350
+        $this->assertEquals( "Brianhenryie_Strauss_Config_Test", $sut->getClassmapPrefix() );
351 351
     }
352 352
 
353 353
     /**
@@ -386,14 +386,14 @@  discard block
 block discarded – undo
386 386
 }
387 387
 
388 388
 EOD;
389
-        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
390
-        file_put_contents($tmpfname, $composerExtraStraussJson);
389
+        $tmpfname = tempnam( sys_get_temp_dir(), 'strauss-test-' );
390
+        file_put_contents( $tmpfname, $composerExtraStraussJson );
391 391
 
392
-        $composer = Factory::create(new NullIO(), $tmpfname);
392
+        $composer = Factory::create( new NullIO(), $tmpfname );
393 393
 
394
-        $sut = new StraussConfig($composer);
394
+        $sut = new StraussConfig( $composer );
395 395
 
396
-        $this->assertContains('pimple/pimple', $sut->getPackages());
396
+        $this->assertContains( 'pimple/pimple', $sut->getPackages() );
397 397
     }
398 398
 
399 399
     /**
@@ -428,14 +428,14 @@  discard block
 block discarded – undo
428 428
   }
429 429
 }
430 430
 EOD;
431
-        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
432
-        file_put_contents($tmpfname, $composerExtraStraussJson);
431
+        $tmpfname = tempnam( sys_get_temp_dir(), 'strauss-test-' );
432
+        file_put_contents( $tmpfname, $composerExtraStraussJson );
433 433
 
434
-        $composer = Factory::create(new NullIO(), $tmpfname);
434
+        $composer = Factory::create( new NullIO(), $tmpfname );
435 435
 
436
-        $sut = new StraussConfig($composer);
436
+        $sut = new StraussConfig( $composer );
437 437
 
438
-        $this->assertContains('league/container', $sut->getPackages());
438
+        $this->assertContains( 'league/container', $sut->getPackages() );
439 439
     }
440 440
 
441 441
     /**
@@ -469,27 +469,27 @@  discard block
 block discarded – undo
469 469
   }
470 470
 }
471 471
 EOD;
472
-        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
473
-        file_put_contents($tmpfname, $composerExtraStraussJson);
472
+        $tmpfname = tempnam( sys_get_temp_dir(), 'strauss-test-' );
473
+        file_put_contents( $tmpfname, $composerExtraStraussJson );
474 474
 
475
-        $composer = Factory::create(new NullIO(), $tmpfname);
475
+        $composer = Factory::create( new NullIO(), $tmpfname );
476 476
 
477
-        $sut = new StraussConfig($composer);
477
+        $sut = new StraussConfig( $composer );
478 478
 
479
-        $this->assertContains('pimple/pimple', $sut->getPackages());
479
+        $this->assertContains( 'pimple/pimple', $sut->getPackages() );
480 480
 
481
-        $this->assertEquals('dep_directory' . DIRECTORY_SEPARATOR, $sut->getTargetDirectory());
481
+        $this->assertEquals( 'dep_directory' . DIRECTORY_SEPARATOR, $sut->getTargetDirectory() );
482 482
 
483
-        $this->assertEquals("My_Mozart_Config", $sut->getNamespacePrefix());
483
+        $this->assertEquals( "My_Mozart_Config", $sut->getNamespacePrefix() );
484 484
 
485
-        $this->assertEquals('My_Mozart_Config_', $sut->getClassmapPrefix());
485
+        $this->assertEquals( 'My_Mozart_Config_', $sut->getClassmapPrefix() );
486 486
 
487
-        $this->assertContains('psr/container', $sut->getExcludePackagesFromPrefixing());
487
+        $this->assertContains( 'psr/container', $sut->getExcludePackagesFromPrefixing() );
488 488
 
489
-        $this->assertArrayHasKey('clancats/container', $sut->getOverrideAutoload());
489
+        $this->assertArrayHasKey( 'clancats/container', $sut->getOverrideAutoload() );
490 490
 
491 491
         // Mozart default was true.
492
-        $this->assertTrue($sut->isDeleteVendorFiles());
492
+        $this->assertTrue( $sut->isDeleteVendorFiles() );
493 493
     }
494 494
 
495 495
     /**
@@ -512,13 +512,13 @@  discard block
 block discarded – undo
512 512
   }
513 513
 }
514 514
 EOD;
515
-        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
516
-        file_put_contents($tmpfname, $composerExtraStraussJson);
515
+        $tmpfname = tempnam( sys_get_temp_dir(), 'strauss-test-' );
516
+        file_put_contents( $tmpfname, $composerExtraStraussJson );
517 517
 
518
-        $composer = Factory::create(new NullIO(), $tmpfname);
518
+        $composer = Factory::create( new NullIO(), $tmpfname );
519 519
 
520
-        $sut = new StraussConfig($composer);
520
+        $sut = new StraussConfig( $composer );
521 521
 
522
-        $this->assertEquals("My_Mozart_Config", $sut->getNamespacePrefix());
522
+        $this->assertEquals( "My_Mozart_Config", $sut->getNamespacePrefix() );
523 523
     }
524 524
 }
Please login to merge, or discard this patch.
Braces   +14 added lines, -28 removed lines patch added patch discarded remove patch
@@ -11,14 +11,12 @@  discard block
 block discarded – undo
11 11
 use Composer\IO\NullIO;
12 12
 use PHPUnit\Framework\TestCase;
13 13
 
14
-class StraussConfigTest extends TestCase
15
-{
14
+class StraussConfigTest extends TestCase {
16 15
 
17 16
     /**
18 17
      * With a full (at time of writing) config, test the getters.
19 18
      */
20
-    public function testGetters()
21
-    {
19
+    public function testGetters() {
22 20
 
23 21
         $composerExtraStraussJson = <<<'EOD'
24 22
 {
@@ -78,8 +76,7 @@  discard block
 block discarded – undo
78 76
      *
79 77
      * Turns out it just ignores it... good!
80 78
      */
81
-    public function testExtraKey()
82
-    {
79
+    public function testExtraKey() {
83 80
 
84 81
         $composerExtraStraussJson = <<<'EOD'
85 82
 {
@@ -133,8 +130,7 @@  discard block
 block discarded – undo
133 130
      *
134 131
      * If no target_dir is specified, used "strauss/"
135 132
      */
136
-    public function testDefaultTargetDir()
137
-    {
133
+    public function testDefaultTargetDir() {
138 134
 
139 135
         $composerExtraStraussJson = <<<'EOD'
140 136
 {
@@ -176,8 +172,7 @@  discard block
 block discarded – undo
176 172
     /**
177 173
      * When the namespace prefix isn't provided, use the PSR-4 autoload key name.
178 174
      */
179
-    public function testDefaultNamespacePrefixFromAutoloaderPsr4()
180
-    {
175
+    public function testDefaultNamespacePrefixFromAutoloaderPsr4() {
181 176
 
182 177
         $composerExtraStraussJson = <<<'EOD'
183 178
 {
@@ -207,8 +202,7 @@  discard block
 block discarded – undo
207 202
     /**
208 203
      * When the namespace prefix isn't provided, use the PSR-0 autoload key name.
209 204
      */
210
-    public function testDefaultNamespacePrefixFromAutoloaderPsr0()
211
-    {
205
+    public function testDefaultNamespacePrefixFromAutoloaderPsr0() {
212 206
 
213 207
         $composerExtraStraussJson = <<<'EOD'
214 208
 {
@@ -239,8 +233,7 @@  discard block
 block discarded – undo
239 233
      *
240 234
      * brianhenryie/strauss-config-test
241 235
      */
242
-    public function testDefaultNamespacePrefixWithNoAutoloader()
243
-    {
236
+    public function testDefaultNamespacePrefixWithNoAutoloader() {
244 237
 
245 238
         $composerExtraStraussJson = <<<'EOD'
246 239
 {
@@ -264,8 +257,7 @@  discard block
 block discarded – undo
264 257
     /**
265 258
      * When the classmap prefix isn't provided, use the PSR-4 autoload key name.
266 259
      */
267
-    public function testDefaultClassmapPrefixFromAutoloaderPsr4()
268
-    {
260
+    public function testDefaultClassmapPrefixFromAutoloaderPsr4() {
269 261
 
270 262
         $composerExtraStraussJson = <<<'EOD'
271 263
 {
@@ -295,8 +287,7 @@  discard block
 block discarded – undo
295 287
     /**
296 288
      * When the classmap prefix isn't provided, use the PSR-0 autoload key name.
297 289
      */
298
-    public function testDefaultClassmapPrefixFromAutoloaderPsr0()
299
-    {
290
+    public function testDefaultClassmapPrefixFromAutoloaderPsr0() {
300 291
 
301 292
         $composerExtraStraussJson = <<<'EOD'
302 293
 {
@@ -328,8 +319,7 @@  discard block
 block discarded – undo
328 319
      *
329 320
      * brianhenryie/strauss-config-test
330 321
      */
331
-    public function testDefaultClassmapPrefixWithNoAutoloader()
332
-    {
322
+    public function testDefaultClassmapPrefixWithNoAutoloader() {
333 323
 
334 324
         $composerExtraStraussJson = <<<'EOD'
335 325
 {
@@ -353,8 +343,7 @@  discard block
 block discarded – undo
353 343
     /**
354 344
      * When Strauss config has packages specified, obviously use them.
355 345
      */
356
-    public function testGetPackagesFromConfig()
357
-    {
346
+    public function testGetPackagesFromConfig() {
358 347
 
359 348
         $composerExtraStraussJson = <<<'EOD'
360 349
 {
@@ -399,8 +388,7 @@  discard block
 block discarded – undo
399 388
     /**
400 389
      * When Strauss config has no packages specified, use composer.json's require list.
401 390
      */
402
-    public function testGetPackagesNoConfig()
403
-    {
391
+    public function testGetPackagesNoConfig() {
404 392
 
405 393
         $composerExtraStraussJson = <<<'EOD'
406 394
 {
@@ -441,8 +429,7 @@  discard block
 block discarded – undo
441 429
     /**
442 430
      * For backwards compatibility, if a Mozart config is present, use it.
443 431
      */
444
-    public function testMapMozartConfig()
445
-    {
432
+    public function testMapMozartConfig() {
446 433
 
447 434
         $composerExtraStraussJson = <<<'EOD'
448 435
 {
@@ -500,8 +487,7 @@  discard block
 block discarded – undo
500 487
      *
501 488
      * @covers \BrianHenryIE\Strauss\Composer\Extra\StraussConfig::getNamespacePrefix
502 489
      */
503
-    public function testNamespacePrefixHasNoSlash()
504
-    {
490
+    public function testNamespacePrefixHasNoSlash() {
505 491
 
506 492
         $composerExtraStraussJson = <<<'EOD'
507 493
 {
Please login to merge, or discard this patch.
Upper-Lower-Casing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
     }
49 49
   }
50 50
 }
51
-EOD;
51
+eod;
52 52
 
53 53
         $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
54 54
         file_put_contents($tmpfname, $composerExtraStraussJson);
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
     }
111 111
   }
112 112
 }
113
-EOD;
113
+eod;
114 114
 
115 115
         $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
116 116
         file_put_contents($tmpfname, $composerExtraStraussJson);
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
     }
162 162
   }
163 163
 }
164
-EOD;
164
+eod;
165 165
 
166 166
         $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
167 167
         file_put_contents($tmpfname, $composerExtraStraussJson);
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
     }
193 193
   }
194 194
 }
195
-EOD;
195
+eod;
196 196
 
197 197
         $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
198 198
         file_put_contents($tmpfname, $composerExtraStraussJson);
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
     }
224 224
   }
225 225
 }
226
-EOD;
226
+eod;
227 227
         $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
228 228
         file_put_contents($tmpfname, $composerExtraStraussJson);
229 229
 
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
     "league/container": "*"
250 250
   }
251 251
 }
252
-EOD;
252
+eod;
253 253
 
254 254
         $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
255 255
         file_put_contents($tmpfname, $composerExtraStraussJson);
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
280 280
     }
281 281
   }
282 282
 }
283
-EOD;
283
+eod;
284 284
 
285 285
         $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
286 286
         file_put_contents($tmpfname, $composerExtraStraussJson);
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
     }
312 312
   }
313 313
 }
314
-EOD;
314
+eod;
315 315
         $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
316 316
         file_put_contents($tmpfname, $composerExtraStraussJson);
317 317
 
@@ -339,7 +339,7 @@  discard block
 block discarded – undo
339 339
   }
340 340
 
341 341
 }
342
-EOD;
342
+eod;
343 343
         $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
344 344
         file_put_contents($tmpfname, $composerExtraStraussJson);
345 345
 
@@ -385,7 +385,7 @@  discard block
 block discarded – undo
385 385
   }
386 386
 }
387 387
 
388
-EOD;
388
+eod;
389 389
         $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
390 390
         file_put_contents($tmpfname, $composerExtraStraussJson);
391 391
 
@@ -427,7 +427,7 @@  discard block
 block discarded – undo
427 427
     }
428 428
   }
429 429
 }
430
-EOD;
430
+eod;
431 431
         $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
432 432
         file_put_contents($tmpfname, $composerExtraStraussJson);
433 433
 
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
468 468
     }
469 469
   }
470 470
 }
471
-EOD;
471
+eod;
472 472
         $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
473 473
         file_put_contents($tmpfname, $composerExtraStraussJson);
474 474
 
@@ -511,7 +511,7 @@  discard block
 block discarded – undo
511 511
     }
512 512
   }
513 513
 }
514
-EOD;
514
+eod;
515 515
         $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
516 516
         file_put_contents($tmpfname, $composerExtraStraussJson);
517 517
 
Please login to merge, or discard this patch.
vendor/brianhenryie/strauss/tests/Unit/Composer/ComposerPackageTest.php 3 patches
Indentation   +88 added lines, -88 removed lines patch added patch discarded remove patch
@@ -8,134 +8,134 @@
 block discarded – undo
8 8
 class ComposerPackageTest extends TestCase
9 9
 {
10 10
 
11
-    /**
12
-     * A simple test to check the getters all work.
13
-     */
14
-    public function testParseJson()
15
-    {
11
+	/**
12
+	 * A simple test to check the getters all work.
13
+	 */
14
+	public function testParseJson()
15
+	{
16 16
 
17
-        $testFile = __DIR__ . '/composerpackage-test-libmergepdf.json';
17
+		$testFile = __DIR__ . '/composerpackage-test-libmergepdf.json';
18 18
 
19
-        $composer = new ComposerPackage($testFile);
19
+		$composer = new ComposerPackage($testFile);
20 20
 
21
-        $this->assertEquals('iio/libmergepdf', $composer->getName());
21
+		$this->assertEquals('iio/libmergepdf', $composer->getName());
22 22
 
23
-        $this->assertIsArray($composer->getAutoload());
23
+		$this->assertIsArray($composer->getAutoload());
24 24
 
25
-        $this->assertIsArray($composer->getRequiresNames());
26
-    }
25
+		$this->assertIsArray($composer->getRequiresNames());
26
+	}
27 27
 
28
-    /**
29
-     * Test the dependencies' names are returned.
30
-     */
31
-    public function testGetRequiresNames()
32
-    {
28
+	/**
29
+	 * Test the dependencies' names are returned.
30
+	 */
31
+	public function testGetRequiresNames()
32
+	{
33 33
 
34
-        $testFile = __DIR__ . '/composerpackage-test-libmergepdf.json';
34
+		$testFile = __DIR__ . '/composerpackage-test-libmergepdf.json';
35 35
 
36
-        $composer = new ComposerPackage($testFile);
36
+		$composer = new ComposerPackage($testFile);
37 37
 
38
-        $requiresNames = $composer->getRequiresNames();
38
+		$requiresNames = $composer->getRequiresNames();
39 39
 
40
-        $this->assertContains('tecnickcom/tcpdf', $requiresNames);
41
-        $this->assertContains('setasign/fpdi', $requiresNames);
42
-    }
40
+		$this->assertContains('tecnickcom/tcpdf', $requiresNames);
41
+		$this->assertContains('setasign/fpdi', $requiresNames);
42
+	}
43 43
 
44
-    /**
45
-     * Test PHP and ext- are not returned, since we won't be dealing with them.
46
-     */
47
-    public function testGetRequiresNamesDoesNotContain()
48
-    {
44
+	/**
45
+	 * Test PHP and ext- are not returned, since we won't be dealing with them.
46
+	 */
47
+	public function testGetRequiresNamesDoesNotContain()
48
+	{
49 49
 
50
-        $testFile = __DIR__ . '/composerpackage-test-easypost-php.json';
50
+		$testFile = __DIR__ . '/composerpackage-test-easypost-php.json';
51 51
 
52
-        $composer = new ComposerPackage($testFile);
52
+		$composer = new ComposerPackage($testFile);
53 53
 
54
-        $requiresNames = $composer->getRequiresNames();
54
+		$requiresNames = $composer->getRequiresNames();
55 55
 
56
-        $this->assertNotContains('ext-curl', $requiresNames);
57
-        $this->assertNotContains('php', $requiresNames);
58
-    }
56
+		$this->assertNotContains('ext-curl', $requiresNames);
57
+		$this->assertNotContains('php', $requiresNames);
58
+	}
59 59
 
60 60
 
61
-    /**
62
-     *
63
-     */
64
-    public function testAutoloadPsr0()
65
-    {
61
+	/**
62
+	 *
63
+	 */
64
+	public function testAutoloadPsr0()
65
+	{
66 66
 
67
-        $testFile = __DIR__ . '/composerpackage-test-easypost-php.json';
67
+		$testFile = __DIR__ . '/composerpackage-test-easypost-php.json';
68 68
 
69
-        $composer = new ComposerPackage($testFile);
69
+		$composer = new ComposerPackage($testFile);
70 70
 
71
-        $autoload = $composer->getAutoload();
71
+		$autoload = $composer->getAutoload();
72 72
 
73
-        $this->assertArrayHasKey('psr-0', $autoload);
73
+		$this->assertArrayHasKey('psr-0', $autoload);
74 74
 
75
-        $this->assertIsArray($autoload['psr-0']);
76
-    }
75
+		$this->assertIsArray($autoload['psr-0']);
76
+	}
77 77
 
78
-    /**
79
-     *
80
-     */
81
-    public function testAutoloadPsr4()
82
-    {
78
+	/**
79
+	 *
80
+	 */
81
+	public function testAutoloadPsr4()
82
+	{
83 83
 
84
-        $testFile = __DIR__ . '/composerpackage-test-libmergepdf.json';
84
+		$testFile = __DIR__ . '/composerpackage-test-libmergepdf.json';
85 85
 
86
-        $composer = new ComposerPackage($testFile);
86
+		$composer = new ComposerPackage($testFile);
87 87
 
88
-        $autoload = $composer->getAutoload();
88
+		$autoload = $composer->getAutoload();
89 89
 
90
-        $this->assertArrayHasKey('psr-4', $autoload);
90
+		$this->assertArrayHasKey('psr-4', $autoload);
91 91
 
92
-        $this->assertIsArray($autoload['psr-4']);
93
-    }
92
+		$this->assertIsArray($autoload['psr-4']);
93
+	}
94 94
 
95
-    /**
96
-     *
97
-     */
98
-    public function testAutoloadClassmap()
99
-    {
95
+	/**
96
+	 *
97
+	 */
98
+	public function testAutoloadClassmap()
99
+	{
100 100
 
101
-        $testFile = __DIR__ . '/composerpackage-test-libmergepdf.json';
101
+		$testFile = __DIR__ . '/composerpackage-test-libmergepdf.json';
102 102
 
103
-        $composer = new ComposerPackage($testFile);
103
+		$composer = new ComposerPackage($testFile);
104 104
 
105
-        $autoload = $composer->getAutoload();
105
+		$autoload = $composer->getAutoload();
106 106
 
107
-        $this->assertArrayHasKey('classmap', $autoload);
107
+		$this->assertArrayHasKey('classmap', $autoload);
108 108
 
109
-        $this->assertIsArray($autoload['classmap']);
110
-    }
109
+		$this->assertIsArray($autoload['classmap']);
110
+	}
111 111
 
112
-    /**
113
-     *
114
-     */
115
-    public function testAutoloadFiles()
116
-    {
112
+	/**
113
+	 *
114
+	 */
115
+	public function testAutoloadFiles()
116
+	{
117 117
 
118
-        $testFile = __DIR__ . '/composerpackage-test-php-di.json';
118
+		$testFile = __DIR__ . '/composerpackage-test-php-di.json';
119 119
 
120
-        $composer = new ComposerPackage($testFile);
120
+		$composer = new ComposerPackage($testFile);
121 121
 
122
-        $autoload = $composer->getAutoload();
122
+		$autoload = $composer->getAutoload();
123 123
 
124
-        $this->assertArrayHasKey('files', $autoload);
124
+		$this->assertArrayHasKey('files', $autoload);
125 125
 
126
-        $this->assertIsArray($autoload['files']);
127
-    }
126
+		$this->assertIsArray($autoload['files']);
127
+	}
128 128
 
129
-    public function testOverrideAutoload()
130
-    {
131
-        $this->markTestIncomplete();
132
-    }
129
+	public function testOverrideAutoload()
130
+	{
131
+		$this->markTestIncomplete();
132
+	}
133 133
 
134
-    /**
135
-     * When composer.json is not where it was specified, what error message (via Exception) should be returned?
136
-     */
137
-    public function testMissingComposer()
138
-    {
139
-        $this->markTestIncomplete();
140
-    }
134
+	/**
135
+	 * When composer.json is not where it was specified, what error message (via Exception) should be returned?
136
+	 */
137
+	public function testMissingComposer()
138
+	{
139
+		$this->markTestIncomplete();
140
+	}
141 141
 }
Please login to merge, or discard this patch.
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -16,13 +16,13 @@  discard block
 block discarded – undo
16 16
 
17 17
         $testFile = __DIR__ . '/composerpackage-test-libmergepdf.json';
18 18
 
19
-        $composer = new ComposerPackage($testFile);
19
+        $composer = new ComposerPackage( $testFile );
20 20
 
21
-        $this->assertEquals('iio/libmergepdf', $composer->getName());
21
+        $this->assertEquals( 'iio/libmergepdf', $composer->getName() );
22 22
 
23
-        $this->assertIsArray($composer->getAutoload());
23
+        $this->assertIsArray( $composer->getAutoload() );
24 24
 
25
-        $this->assertIsArray($composer->getRequiresNames());
25
+        $this->assertIsArray( $composer->getRequiresNames() );
26 26
     }
27 27
 
28 28
     /**
@@ -33,12 +33,12 @@  discard block
 block discarded – undo
33 33
 
34 34
         $testFile = __DIR__ . '/composerpackage-test-libmergepdf.json';
35 35
 
36
-        $composer = new ComposerPackage($testFile);
36
+        $composer = new ComposerPackage( $testFile );
37 37
 
38 38
         $requiresNames = $composer->getRequiresNames();
39 39
 
40
-        $this->assertContains('tecnickcom/tcpdf', $requiresNames);
41
-        $this->assertContains('setasign/fpdi', $requiresNames);
40
+        $this->assertContains( 'tecnickcom/tcpdf', $requiresNames );
41
+        $this->assertContains( 'setasign/fpdi', $requiresNames );
42 42
     }
43 43
 
44 44
     /**
@@ -49,12 +49,12 @@  discard block
 block discarded – undo
49 49
 
50 50
         $testFile = __DIR__ . '/composerpackage-test-easypost-php.json';
51 51
 
52
-        $composer = new ComposerPackage($testFile);
52
+        $composer = new ComposerPackage( $testFile );
53 53
 
54 54
         $requiresNames = $composer->getRequiresNames();
55 55
 
56
-        $this->assertNotContains('ext-curl', $requiresNames);
57
-        $this->assertNotContains('php', $requiresNames);
56
+        $this->assertNotContains( 'ext-curl', $requiresNames );
57
+        $this->assertNotContains( 'php', $requiresNames );
58 58
     }
59 59
 
60 60
 
@@ -66,13 +66,13 @@  discard block
 block discarded – undo
66 66
 
67 67
         $testFile = __DIR__ . '/composerpackage-test-easypost-php.json';
68 68
 
69
-        $composer = new ComposerPackage($testFile);
69
+        $composer = new ComposerPackage( $testFile );
70 70
 
71 71
         $autoload = $composer->getAutoload();
72 72
 
73
-        $this->assertArrayHasKey('psr-0', $autoload);
73
+        $this->assertArrayHasKey( 'psr-0', $autoload );
74 74
 
75
-        $this->assertIsArray($autoload['psr-0']);
75
+        $this->assertIsArray( $autoload[ 'psr-0' ] );
76 76
     }
77 77
 
78 78
     /**
@@ -83,13 +83,13 @@  discard block
 block discarded – undo
83 83
 
84 84
         $testFile = __DIR__ . '/composerpackage-test-libmergepdf.json';
85 85
 
86
-        $composer = new ComposerPackage($testFile);
86
+        $composer = new ComposerPackage( $testFile );
87 87
 
88 88
         $autoload = $composer->getAutoload();
89 89
 
90
-        $this->assertArrayHasKey('psr-4', $autoload);
90
+        $this->assertArrayHasKey( 'psr-4', $autoload );
91 91
 
92
-        $this->assertIsArray($autoload['psr-4']);
92
+        $this->assertIsArray( $autoload[ 'psr-4' ] );
93 93
     }
94 94
 
95 95
     /**
@@ -100,13 +100,13 @@  discard block
 block discarded – undo
100 100
 
101 101
         $testFile = __DIR__ . '/composerpackage-test-libmergepdf.json';
102 102
 
103
-        $composer = new ComposerPackage($testFile);
103
+        $composer = new ComposerPackage( $testFile );
104 104
 
105 105
         $autoload = $composer->getAutoload();
106 106
 
107
-        $this->assertArrayHasKey('classmap', $autoload);
107
+        $this->assertArrayHasKey( 'classmap', $autoload );
108 108
 
109
-        $this->assertIsArray($autoload['classmap']);
109
+        $this->assertIsArray( $autoload[ 'classmap' ] );
110 110
     }
111 111
 
112 112
     /**
@@ -117,13 +117,13 @@  discard block
 block discarded – undo
117 117
 
118 118
         $testFile = __DIR__ . '/composerpackage-test-php-di.json';
119 119
 
120
-        $composer = new ComposerPackage($testFile);
120
+        $composer = new ComposerPackage( $testFile );
121 121
 
122 122
         $autoload = $composer->getAutoload();
123 123
 
124
-        $this->assertArrayHasKey('files', $autoload);
124
+        $this->assertArrayHasKey( 'files', $autoload );
125 125
 
126
-        $this->assertIsArray($autoload['files']);
126
+        $this->assertIsArray( $autoload[ 'files' ] );
127 127
     }
128 128
 
129 129
     public function testOverrideAutoload()
Please login to merge, or discard this patch.
Braces   +10 added lines, -20 removed lines patch added patch discarded remove patch
@@ -5,14 +5,12 @@  discard block
 block discarded – undo
5 5
 use BrianHenryIE\Strauss\Composer\ComposerPackage;
6 6
 use PHPUnit\Framework\TestCase;
7 7
 
8
-class ComposerPackageTest extends TestCase
9
-{
8
+class ComposerPackageTest extends TestCase {
10 9
 
11 10
     /**
12 11
      * A simple test to check the getters all work.
13 12
      */
14
-    public function testParseJson()
15
-    {
13
+    public function testParseJson() {
16 14
 
17 15
         $testFile = __DIR__ . '/composerpackage-test-libmergepdf.json';
18 16
 
@@ -28,8 +26,7 @@  discard block
 block discarded – undo
28 26
     /**
29 27
      * Test the dependencies' names are returned.
30 28
      */
31
-    public function testGetRequiresNames()
32
-    {
29
+    public function testGetRequiresNames() {
33 30
 
34 31
         $testFile = __DIR__ . '/composerpackage-test-libmergepdf.json';
35 32
 
@@ -44,8 +41,7 @@  discard block
 block discarded – undo
44 41
     /**
45 42
      * Test PHP and ext- are not returned, since we won't be dealing with them.
46 43
      */
47
-    public function testGetRequiresNamesDoesNotContain()
48
-    {
44
+    public function testGetRequiresNamesDoesNotContain() {
49 45
 
50 46
         $testFile = __DIR__ . '/composerpackage-test-easypost-php.json';
51 47
 
@@ -61,8 +57,7 @@  discard block
 block discarded – undo
61 57
     /**
62 58
      *
63 59
      */
64
-    public function testAutoloadPsr0()
65
-    {
60
+    public function testAutoloadPsr0() {
66 61
 
67 62
         $testFile = __DIR__ . '/composerpackage-test-easypost-php.json';
68 63
 
@@ -78,8 +73,7 @@  discard block
 block discarded – undo
78 73
     /**
79 74
      *
80 75
      */
81
-    public function testAutoloadPsr4()
82
-    {
76
+    public function testAutoloadPsr4() {
83 77
 
84 78
         $testFile = __DIR__ . '/composerpackage-test-libmergepdf.json';
85 79
 
@@ -95,8 +89,7 @@  discard block
 block discarded – undo
95 89
     /**
96 90
      *
97 91
      */
98
-    public function testAutoloadClassmap()
99
-    {
92
+    public function testAutoloadClassmap() {
100 93
 
101 94
         $testFile = __DIR__ . '/composerpackage-test-libmergepdf.json';
102 95
 
@@ -112,8 +105,7 @@  discard block
 block discarded – undo
112 105
     /**
113 106
      *
114 107
      */
115
-    public function testAutoloadFiles()
116
-    {
108
+    public function testAutoloadFiles() {
117 109
 
118 110
         $testFile = __DIR__ . '/composerpackage-test-php-di.json';
119 111
 
@@ -126,16 +118,14 @@  discard block
 block discarded – undo
126 118
         $this->assertIsArray($autoload['files']);
127 119
     }
128 120
 
129
-    public function testOverrideAutoload()
130
-    {
121
+    public function testOverrideAutoload() {
131 122
         $this->markTestIncomplete();
132 123
     }
133 124
 
134 125
     /**
135 126
      * When composer.json is not where it was specified, what error message (via Exception) should be returned?
136 127
      */
137
-    public function testMissingComposer()
138
-    {
128
+    public function testMissingComposer() {
139 129
         $this->markTestIncomplete();
140 130
     }
141 131
 }
Please login to merge, or discard this patch.
brianhenryie/strauss/tests/Unit/Composer/ProjectComposerPackageTest.php 3 patches
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -9,18 +9,18 @@
 block discarded – undo
9 9
 class ProjectComposerPackageTest extends TestCase
10 10
 {
11 11
 
12
-    /**
13
-     * A simple test to check the getters all work.
14
-     */
15
-    public function testParseJson()
16
-    {
12
+	/**
13
+	 * A simple test to check the getters all work.
14
+	 */
15
+	public function testParseJson()
16
+	{
17 17
 
18
-        $testFile = __DIR__ . '/projectcomposerpackage-test-1.json';
18
+		$testFile = __DIR__ . '/projectcomposerpackage-test-1.json';
19 19
 
20
-        $composer = new ProjectComposerPackage($testFile);
20
+		$composer = new ProjectComposerPackage($testFile);
21 21
 
22
-        $config = $composer->getStraussConfig();
22
+		$config = $composer->getStraussConfig();
23 23
 
24
-        $this->assertInstanceOf(StraussConfig::class, $config);
25
-    }
24
+		$this->assertInstanceOf(StraussConfig::class, $config);
25
+	}
26 26
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,10 +17,10 @@
 block discarded – undo
17 17
 
18 18
         $testFile = __DIR__ . '/projectcomposerpackage-test-1.json';
19 19
 
20
-        $composer = new ProjectComposerPackage($testFile);
20
+        $composer = new ProjectComposerPackage( $testFile );
21 21
 
22 22
         $config = $composer->getStraussConfig();
23 23
 
24
-        $this->assertInstanceOf(StraussConfig::class, $config);
24
+        $this->assertInstanceOf( StraussConfig::class, $config );
25 25
     }
26 26
 }
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -6,14 +6,12 @@
 block discarded – undo
6 6
 use BrianHenryIE\Strauss\Composer\ProjectComposerPackage;
7 7
 use PHPUnit\Framework\TestCase;
8 8
 
9
-class ProjectComposerPackageTest extends TestCase
10
-{
9
+class ProjectComposerPackageTest extends TestCase {
11 10
 
12 11
     /**
13 12
      * A simple test to check the getters all work.
14 13
      */
15
-    public function testParseJson()
16
-    {
14
+    public function testParseJson() {
17 15
 
18 16
         $testFile = __DIR__ . '/projectcomposerpackage-test-1.json';
19 17
 
Please login to merge, or discard this patch.