Skip to content

Commit dd27e89

Browse files
GrahamCampbellGrahamCampbell
committed
Fixed phpstan
1 parent db63b2e commit dd27e89

File tree

9 files changed

+237
-236
lines changed

9 files changed

+237
-236
lines changed

‎phpstan.tests.neon.dist

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ parameters:
55
- '#Parameter \#1 \$name of method Dotenv\\Repository\\RepositoryInterface::[a-z]+\(\) expects string, [a-z]+ given.#'
66
- '#no return typehint specified#'
77
- '#with no typehint#'
8+
- '#Call to deprecated method assertInternalType.+#'

‎tests/Dotenv/DotenvTest.php

Lines changed: 79 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -53,39 +53,39 @@ public function testDotenvThrowsExceptionWhenNoFiles()
5353
public function testDotenvTriesPathsToLoad()
5454
{
5555
$dotenv = Dotenv::createImmutable([__DIR__, $this->folder]);
56-
$this->assertCount(4, $dotenv->load());
56+
self::assertCount(4, $dotenv->load());
5757
}
5858

5959
public function testDotenvTriesPathsToSafeLoad()
6060
{
6161
$dotenv = Dotenv::createImmutable([__DIR__, $this->folder]);
62-
$this->assertCount(4, $dotenv->safeLoad());
62+
self::assertCount(4, $dotenv->safeLoad());
6363
}
6464

6565
public function testDotenvSkipsLoadingIfFileIsMissing()
6666
{
6767
$dotenv = Dotenv::createImmutable(__DIR__);
68-
$this->assertSame([], $dotenv->safeLoad());
68+
self::assertSame([], $dotenv->safeLoad());
6969
}
7070

7171
public function testDotenvLoadsEnvironmentVars()
7272
{
7373
$dotenv = Dotenv::createImmutable($this->folder);
74-
$this->assertSame(
74+
self::assertSame(
7575
['FOO' => 'bar', 'BAR' => 'baz', 'SPACED' => 'with spaces', 'NULL' => ''],
7676
$dotenv->load()
7777
);
78-
$this->assertSame('bar', getenv('FOO'));
79-
$this->assertSame('baz', getenv('BAR'));
80-
$this->assertSame('with spaces', getenv('SPACED'));
81-
$this->assertEmpty(getenv('NULL'));
78+
self::assertSame('bar', getenv('FOO'));
79+
self::assertSame('baz', getenv('BAR'));
80+
self::assertSame('with spaces', getenv('SPACED'));
81+
self::assertEmpty(getenv('NULL'));
8282
}
8383

8484
public function testDotenvLoadsEnvironmentVarsMultipleNotShortCircuitMode()
8585
{
8686
$dotenv = Dotenv::createImmutable($this->folder, ['.env', 'example.env']);
8787

88-
$this->assertSame(
88+
self::assertSame(
8989
['FOO' => 'bar', 'BAR' => 'baz', 'SPACED' => 'with spaces', 'NULL' => ''],
9090
$dotenv->load()
9191
);
@@ -95,7 +95,7 @@ public function testDotenvLoadsEnvironmentVarsMultipleWithShortCircuitMode()
9595
{
9696
$dotenv = Dotenv::createImmutable($this->folder, ['.env', 'example.env'], false);
9797

98-
$this->assertSame(
98+
self::assertSame(
9999
['FOO' => 'bar', 'BAR' => 'baz', 'SPACED' => 'with spaces', 'NULL' => '', 'EG' => 'example'],
100100
$dotenv->load()
101101
);
@@ -105,102 +105,102 @@ public function testCommentedDotenvLoadsEnvironmentVars()
105105
{
106106
$dotenv = Dotenv::createImmutable($this->folder, 'commented.env');
107107
$dotenv->load();
108-
$this->assertSame('bar', getenv('CFOO'));
109-
$this->assertFalse(getenv('CBAR'));
110-
$this->assertFalse(getenv('CZOO'));
111-
$this->assertSame('with spaces', getenv('CSPACED'));
112-
$this->assertSame('a value with a # character', getenv('CQUOTES'));
113-
$this->assertSame('a value with a # character & a quote " character inside quotes', getenv('CQUOTESWITHQUOTE'));
114-
$this->assertEmpty(getenv('CNULL'));
115-
$this->assertEmpty(getenv('EMPTY'));
116-
$this->assertEmpty(getenv('EMPTY2'));
117-
$this->assertSame('foo', getenv('FOOO'));
108+
self::assertSame('bar', getenv('CFOO'));
109+
self::assertFalse(getenv('CBAR'));
110+
self::assertFalse(getenv('CZOO'));
111+
self::assertSame('with spaces', getenv('CSPACED'));
112+
self::assertSame('a value with a # character', getenv('CQUOTES'));
113+
self::assertSame('a value with a # character & a quote " character inside quotes', getenv('CQUOTESWITHQUOTE'));
114+
self::assertEmpty(getenv('CNULL'));
115+
self::assertEmpty(getenv('EMPTY'));
116+
self::assertEmpty(getenv('EMPTY2'));
117+
self::assertSame('foo', getenv('FOOO'));
118118
}
119119

120120
public function testQuotedDotenvLoadsEnvironmentVars()
121121
{
122122
$dotenv = Dotenv::createImmutable($this->folder, 'quoted.env');
123123
$dotenv->load();
124-
$this->assertSame('bar', getenv('QFOO'));
125-
$this->assertSame('baz', getenv('QBAR'));
126-
$this->assertSame('with spaces', getenv('QSPACED'));
127-
$this->assertEmpty(getenv('QNULL'));
128-
129-
$this->assertSame('pgsql:host=localhost;dbname=test', getenv('QEQUALS'));
130-
$this->assertSame('test some escaped characters like a quote (") or maybe a backslash (\\)', getenv('QESCAPED'));
131-
$this->assertSame('iiiiviiiixiiiiviiii\\n', getenv('QSLASH'));
132-
$this->assertSame('iiiiviiiixiiiiviiii\\\\n', getenv('SQSLASH'));
124+
self::assertSame('bar', getenv('QFOO'));
125+
self::assertSame('baz', getenv('QBAR'));
126+
self::assertSame('with spaces', getenv('QSPACED'));
127+
self::assertEmpty(getenv('QNULL'));
128+
129+
self::assertSame('pgsql:host=localhost;dbname=test', getenv('QEQUALS'));
130+
self::assertSame('test some escaped characters like a quote (") or maybe a backslash (\\)', getenv('QESCAPED'));
131+
self::assertSame('iiiiviiiixiiiiviiii\\n', getenv('QSLASH'));
132+
self::assertSame('iiiiviiiixiiiiviiii\\\\n', getenv('SQSLASH'));
133133
}
134134

135135
public function testLargeDotenvLoadsEnvironmentVars()
136136
{
137137
$dotenv = Dotenv::createImmutable($this->folder, 'large.env');
138138
$dotenv->load();
139-
$this->assertNotEmpty(getenv('LARGE'));
139+
self::assertNotEmpty(getenv('LARGE'));
140140
}
141141

142142
public function testMultipleDotenvLoadsEnvironmentVars()
143143
{
144144
$dotenv = Dotenv::createImmutable($this->folder, 'multiple.env');
145145
$dotenv->load();
146-
$this->assertSame('bar', getenv('MULTI1'));
147-
$this->assertSame('foo', getenv('MULTI2'));
146+
self::assertSame('bar', getenv('MULTI1'));
147+
self::assertSame('foo', getenv('MULTI2'));
148148
}
149149

150150
public function testExportedDotenvLoadsEnvironmentVars()
151151
{
152152
$dotenv = Dotenv::createImmutable($this->folder, 'exported.env');
153153
$dotenv->load();
154-
$this->assertSame('bar', getenv('EFOO'));
155-
$this->assertSame('baz', getenv('EBAR'));
156-
$this->assertSame('with spaces', getenv('ESPACED'));
157-
$this->assertEmpty(getenv('ENULL'));
154+
self::assertSame('bar', getenv('EFOO'));
155+
self::assertSame('baz', getenv('EBAR'));
156+
self::assertSame('with spaces', getenv('ESPACED'));
157+
self::assertEmpty(getenv('ENULL'));
158158
}
159159

160160
public function testDotenvLoadsEnvGlobals()
161161
{
162162
$dotenv = Dotenv::createImmutable($this->folder);
163163
$dotenv->load();
164-
$this->assertSame('bar', $_SERVER['FOO']);
165-
$this->assertSame('baz', $_SERVER['BAR']);
166-
$this->assertSame('with spaces', $_SERVER['SPACED']);
167-
$this->assertEmpty($_SERVER['NULL']);
164+
self::assertSame('bar', $_SERVER['FOO']);
165+
self::assertSame('baz', $_SERVER['BAR']);
166+
self::assertSame('with spaces', $_SERVER['SPACED']);
167+
self::assertEmpty($_SERVER['NULL']);
168168
}
169169

170170
public function testDotenvLoadsServerGlobals()
171171
{
172172
$dotenv = Dotenv::createImmutable($this->folder);
173173
$dotenv->load();
174-
$this->assertSame('bar', $_ENV['FOO']);
175-
$this->assertSame('baz', $_ENV['BAR']);
176-
$this->assertSame('with spaces', $_ENV['SPACED']);
177-
$this->assertEmpty($_ENV['NULL']);
174+
self::assertSame('bar', $_ENV['FOO']);
175+
self::assertSame('baz', $_ENV['BAR']);
176+
self::assertSame('with spaces', $_ENV['SPACED']);
177+
self::assertEmpty($_ENV['NULL']);
178178
}
179179

180180
public function testDotenvNestedEnvironmentVars()
181181
{
182182
$dotenv = Dotenv::createImmutable($this->folder, 'nested.env');
183183
$dotenv->load();
184-
$this->assertSame('{$NVAR1} {$NVAR2}', $_ENV['NVAR3']); // not resolved
185-
$this->assertSame('Hello World!', $_ENV['NVAR4']);
186-
$this->assertSame('$NVAR1 {NVAR2}', $_ENV['NVAR5']); // not resolved
187-
$this->assertSame('Special Value', $_ENV['N.VAR6']); // new '.' (dot) in var name
188-
$this->assertSame('Special Value', $_ENV['NVAR7']); // nested '.' (dot) variable
189-
$this->assertSame('', $_ENV['NVAR8']); // nested variable is empty string
190-
$this->assertSame('', $_ENV['NVAR9']); // nested variable is empty string
191-
$this->assertSame('${NVAR888}', $_ENV['NVAR10']); // nested variable is not set
192-
$this->assertSame('NVAR1', $_ENV['NVAR11']);
193-
$this->assertSame('Hello', $_ENV['NVAR12']);
194-
$this->assertSame('${${NVAR11}}', $_ENV['NVAR13']); // single quotes
195-
$this->assertSame('${NVAR1} ${NVAR2}', $_ENV['NVAR14']); // single quotes
196-
$this->assertSame('${NVAR1} ${NVAR2}', $_ENV['NVAR15']); // escaped
184+
self::assertSame('{$NVAR1} {$NVAR2}', $_ENV['NVAR3']); // not resolved
185+
self::assertSame('Hello World!', $_ENV['NVAR4']);
186+
self::assertSame('$NVAR1 {NVAR2}', $_ENV['NVAR5']); // not resolved
187+
self::assertSame('Special Value', $_ENV['N.VAR6']); // new '.' (dot) in var name
188+
self::assertSame('Special Value', $_ENV['NVAR7']); // nested '.' (dot) variable
189+
self::assertSame('', $_ENV['NVAR8']); // nested variable is empty string
190+
self::assertSame('', $_ENV['NVAR9']); // nested variable is empty string
191+
self::assertSame('${NVAR888}', $_ENV['NVAR10']); // nested variable is not set
192+
self::assertSame('NVAR1', $_ENV['NVAR11']);
193+
self::assertSame('Hello', $_ENV['NVAR12']);
194+
self::assertSame('${${NVAR11}}', $_ENV['NVAR13']); // single quotes
195+
self::assertSame('${NVAR1} ${NVAR2}', $_ENV['NVAR14']); // single quotes
196+
self::assertSame('${NVAR1} ${NVAR2}', $_ENV['NVAR15']); // escaped
197197
}
198198

199199
public function testDotenvNullFileArgumentUsesDefault()
200200
{
201201
$dotenv = Dotenv::createImmutable($this->folder, null);
202202
$dotenv->load();
203-
$this->assertSame('bar', getenv('FOO'));
203+
self::assertSame('bar', getenv('FOO'));
204204
}
205205

206206
/**
@@ -212,70 +212,70 @@ public function testDotenvTrimmedKeys()
212212
{
213213
$dotenv = Dotenv::createImmutable($this->folder, 'quoted.env');
214214
$dotenv->load();
215-
$this->assertSame('no space', getenv('QWHITESPACE'));
215+
self::assertSame('no space', getenv('QWHITESPACE'));
216216
}
217217

218218
public function testDotenvLoadDoesNotOverwriteEnv()
219219
{
220220
putenv('IMMUTABLE=true');
221221
$dotenv = Dotenv::createImmutable($this->folder, 'immutable.env');
222222
$dotenv->load();
223-
$this->assertSame('true', getenv('IMMUTABLE'));
223+
self::assertSame('true', getenv('IMMUTABLE'));
224224
}
225225

226226
public function testDotenvLoadAfterOverload()
227227
{
228228
putenv('IMMUTABLE=true');
229229
$dotenv = Dotenv::createMutable($this->folder, 'immutable.env');
230230
$dotenv->load();
231-
$this->assertSame('false', getenv('IMMUTABLE'));
231+
self::assertSame('false', getenv('IMMUTABLE'));
232232
}
233233

234234
public function testDotenvOverloadAfterLoad()
235235
{
236236
putenv('IMMUTABLE=true');
237237
$dotenv = Dotenv::createImmutable($this->folder, 'immutable.env');
238238
$dotenv->load();
239-
$this->assertSame('true', getenv('IMMUTABLE'));
239+
self::assertSame('true', getenv('IMMUTABLE'));
240240
}
241241

242242
public function testDotenvOverloadDoesOverwriteEnv()
243243
{
244244
$dotenv = Dotenv::createMutable($this->folder, 'mutable.env');
245245
$dotenv->load();
246-
$this->assertSame('true', getenv('MUTABLE'));
246+
self::assertSame('true', getenv('MUTABLE'));
247247
}
248248

249249
public function testDotenvAllowsSpecialCharacters()
250250
{
251251
$dotenv = Dotenv::createImmutable($this->folder, 'specialchars.env');
252252
$dotenv->load();
253-
$this->assertSame('$a6^C7k%zs+e^.jvjXk', getenv('SPVAR1'));
254-
$this->assertSame('?BUty3koaV3%GA*hMAwH}B', getenv('SPVAR2'));
255-
$this->assertSame('jdgEB4{QgEC]HL))&GcXxokB+wqoN+j>xkV7K?m$r', getenv('SPVAR3'));
256-
$this->assertSame('22222:22#2^{', getenv('SPVAR4'));
257-
$this->assertSame('test some escaped characters like a quote " or maybe a backslash \\', getenv('SPVAR5'));
258-
$this->assertSame('secret!@', getenv('SPVAR6'));
259-
$this->assertSame('secret!@#', getenv('SPVAR7'));
260-
$this->assertSame('secret!@#', getenv('SPVAR8'));
253+
self::assertSame('$a6^C7k%zs+e^.jvjXk', getenv('SPVAR1'));
254+
self::assertSame('?BUty3koaV3%GA*hMAwH}B', getenv('SPVAR2'));
255+
self::assertSame('jdgEB4{QgEC]HL))&GcXxokB+wqoN+j>xkV7K?m$r', getenv('SPVAR3'));
256+
self::assertSame('22222:22#2^{', getenv('SPVAR4'));
257+
self::assertSame('test some escaped characters like a quote " or maybe a backslash \\', getenv('SPVAR5'));
258+
self::assertSame('secret!@', getenv('SPVAR6'));
259+
self::assertSame('secret!@#', getenv('SPVAR7'));
260+
self::assertSame('secret!@#', getenv('SPVAR8'));
261261
}
262262

263263
public function testMutlilineLoading()
264264
{
265265
$dotenv = Dotenv::createImmutable($this->folder, 'multiline.env');
266266
$dotenv->load();
267-
$this->assertSame("test\n test\"test\"\n test", getenv('TEST'));
268-
$this->assertSame("test\ntest", getenv('TEST_ND'));
269-
$this->assertSame('test\\ntest', getenv('TEST_NS'));
267+
self::assertSame("test\n test\"test\"\n test", getenv('TEST'));
268+
self::assertSame("test\ntest", getenv('TEST_ND'));
269+
self::assertSame('test\\ntest', getenv('TEST_NS'));
270270

271-
$this->assertSame('https://vision.googleapis.com/v1/images:annotate?key=', getenv('TEST_EQD'));
272-
$this->assertSame('https://vision.googleapis.com/v1/images:annotate?key=', getenv('TEST_EQS'));
271+
self::assertSame('https://vision.googleapis.com/v1/images:annotate?key=', getenv('TEST_EQD'));
272+
self::assertSame('https://vision.googleapis.com/v1/images:annotate?key=', getenv('TEST_EQS'));
273273
}
274274

275275
public function testEmptyLoading()
276276
{
277277
$dotenv = Dotenv::createImmutable($this->folder, 'empty.env');
278-
$this->assertSame(['EMPTY_VAR' => null], $dotenv->load());
278+
self::assertSame(['EMPTY_VAR' => null], $dotenv->load());
279279
}
280280

281281
public function testLegacyConstructor()
@@ -285,7 +285,7 @@ public function testLegacyConstructor()
285285

286286
$dotenv = new Dotenv($loader, $repository, [$this->folder.DIRECTORY_SEPARATOR.'.env']);
287287

288-
$this->assertSame([
288+
self::assertSame([
289289
'FOO' => 'bar',
290290
'BAR' => 'baz',
291291
'SPACED' => 'with spaces',
@@ -301,7 +301,7 @@ public function testLatestConstructor()
301301

302302
$dotenv = new Dotenv($loader, $repository, $store);
303303

304-
$this->assertSame([
304+
self::assertSame([
305305
'FOO' => 'bar',
306306
'BAR' => 'baz',
307307
'SPACED' => 'with spaces',

‎tests/Dotenv/LinesTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function testProcessBasic()
2323
"ASSERTVAR9=\"\n\n\"",
2424
];
2525

26-
$this->assertSame($expected, Lines::process(preg_split("/(\r\n|\n|\r)/", $content)));
26+
self::assertSame($expected, Lines::process(preg_split("/(\r\n|\n|\r)/", $content)));
2727
}
2828

2929
public function testProcessQuotes()
@@ -38,7 +38,7 @@ public function testProcessQuotes()
3838
'TEST_EQS=\'https://vision.googleapis.com/v1/images:annotate?key=\'',
3939
];
4040

41-
$this->assertSame($expected, Lines::process(preg_split("/(\r\n|\n|\r)/", $content)));
41+
self::assertSame($expected, Lines::process(preg_split("/(\r\n|\n|\r)/", $content)));
4242
}
4343

4444
public function testProcessClosingSlash()
@@ -51,6 +51,6 @@ public function testProcessClosingSlash()
5151
'SPVAR5="test some escaped characters like a quote \" or maybe a backslash \\" # not escaped',
5252
];
5353

54-
$this->assertSame($expected, $lines);
54+
self::assertSame($expected, $lines);
5555
}
5656
}

‎tests/Dotenv/LoaderTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public function testLoaderWithNoReaders()
1919
$content = "NVAR1=\"Hello\"\nNVAR2=\"World!\"\nNVAR3=\"{\$NVAR1} {\$NVAR2}\"\nNVAR4=\"\${NVAR1} \${NVAR2}\"";
2020
$expected = ['NVAR1' => 'Hello', 'NVAR2' => 'World!', 'NVAR3' => '{$NVAR1} {$NVAR2}', 'NVAR4' => '${NVAR1} ${NVAR2}'];
2121

22-
$this->assertSame($expected, $loader->load($repository, $content));
22+
self::assertSame($expected, $loader->load($repository, $content));
2323
}
2424

2525
public function testLoaderWithWhitelist()
@@ -28,10 +28,10 @@ public function testLoaderWithWhitelist()
2828
$repository = RepositoryBuilder::create()->withReaders([$adapter])->withWriters([$adapter])->make();
2929
$loader = new Loader(['FOO']);
3030

31-
$this->assertSame(['FOO' => 'Hello'], $loader->load($repository, "FOO=\"Hello\"\nBAR=\"World!\"\n"));
32-
$this->assertTrue($adapter->get('FOO')->isDefined());
33-
$this->assertSame('Hello', $adapter->get('FOO')->get());
34-
$this->assertFalse($adapter->get('BAR')->isDefined());
31+
self::assertSame(['FOO' => 'Hello'], $loader->load($repository, "FOO=\"Hello\"\nBAR=\"World!\"\n"));
32+
self::assertTrue($adapter->get('FOO')->isDefined());
33+
self::assertSame('Hello', $adapter->get('FOO')->get());
34+
self::assertFalse($adapter->get('BAR')->isDefined());
3535
}
3636

3737
public function providesAdapters()
@@ -55,6 +55,6 @@ public function testLoaderWithSpecificAdapter($adapters)
5555
$content = "NVAR1=\"Hello\"\nNVAR2=\"World!\"\nNVAR3=\"{\$NVAR1} {\$NVAR2}\"\nNVAR4=\"\${NVAR1} \${NVAR2}\"";
5656
$expected = ['NVAR1' => 'Hello', 'NVAR2' => 'World!', 'NVAR3' => '{$NVAR1} {$NVAR2}', 'NVAR4' => 'Hello World!'];
5757

58-
$this->assertSame($expected, $loader->load($repository, $content));
58+
self::assertSame($expected, $loader->load($repository, $content));
5959
}
6060
}

0 commit comments

Comments
 (0)