Skip to content
This repository was archived by the owner on Jan 29, 2020. It is now read-only.

Commit 6dbebd5

Browse files
michalbundyramichalbundyra
committed
Use non-deprecated assertions
1 parent b3bda63 commit 6dbebd5

File tree

7 files changed

+57
-57
lines changed

7 files changed

+57
-57
lines changed

‎test/Generator/ClassGeneratorTest.php

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ public function testClassFromReflectionThatImplementsInterfaces()
295295
$expectedClassDef = 'class ClassWithInterface'
296296
. ' implements OneInterface'
297297
. ', TwoInterface';
298-
self::assertContains($expectedClassDef, $code);
298+
self::assertStringContainsString($expectedClassDef, $code);
299299
}
300300

301301
/**
@@ -313,7 +313,7 @@ public function testClassFromReflectionDiscardParentImplementedInterfaces()
313313
$expectedClassDef = 'class NewClassWithInterface'
314314
. ' extends ClassWithInterface'
315315
. ' implements ThreeInterface';
316-
self::assertContains($expectedClassDef, $code);
316+
self::assertStringContainsString($expectedClassDef, $code);
317317
}
318318

319319
/**
@@ -411,7 +411,7 @@ public function testPassingANamespacedClassnameShouldGenerateANamespaceDeclarati
411411
$classGeneratorClass = new ClassGenerator();
412412
$classGeneratorClass->setName('My\Namespaced\FunClass');
413413
$received = $classGeneratorClass->generate();
414-
self::assertContains('namespace My\Namespaced;', $received, $received);
414+
self::assertStringContainsString('namespace My\Namespaced;', $received, $received);
415415
}
416416

417417
/**
@@ -422,7 +422,7 @@ public function testPassingANamespacedClassnameShouldGenerateAClassnameWithoutIt
422422
$classGeneratorClass = new ClassGenerator();
423423
$classGeneratorClass->setName('My\Namespaced\FunClass');
424424
$received = $classGeneratorClass->generate();
425-
self::assertContains('class FunClass', $received, $received);
425+
self::assertStringContainsString('class FunClass', $received, $received);
426426
}
427427

428428
public function testHasUse()
@@ -478,8 +478,8 @@ public function testAddUses()
478478
$classGenerator->addUse('My\Second\Use\Class', 'MyAlias');
479479
$generated = $classGenerator->generate();
480480

481-
self::assertContains('use My\First\Use\Class;', $generated);
482-
self::assertContains('use My\Second\Use\Class as MyAlias;', $generated);
481+
self::assertStringContainsString('use My\First\Use\Class;', $generated);
482+
self::assertStringContainsString('use My\Second\Use\Class as MyAlias;', $generated);
483483
}
484484

485485
/**
@@ -495,7 +495,7 @@ public function testAddOneUseTwiceOnlyAddsOne()
495495

496496
self::assertCount(1, $classGenerator->getUses());
497497

498-
self::assertContains('use My\First\Use\Class;', $generated);
498+
self::assertStringContainsString('use My\First\Use\Class;', $generated);
499499
}
500500

501501
/**
@@ -511,7 +511,7 @@ public function testAddOneUseWithAliasTwiceOnlyAddsOne()
511511

512512
self::assertCount(1, $classGenerator->getUses());
513513

514-
self::assertContains('use My\First\Use\Class as MyAlias;', $generated);
514+
self::assertStringContainsString('use My\First\Use\Class as MyAlias;', $generated);
515515
}
516516

517517
public function testCreateFromArrayWithDocBlockFromArray()
@@ -543,12 +543,12 @@ public function testExtendedClassProperies()
543543
$reflClass = new ClassReflection(TestAsset\ExtendedClassWithProperties::class);
544544
$classGenerator = ClassGenerator::fromReflection($reflClass);
545545
$code = $classGenerator->generate();
546-
self::assertContains('publicExtendedClassProperty', $code);
547-
self::assertContains('protectedExtendedClassProperty', $code);
548-
self::assertContains('privateExtendedClassProperty', $code);
549-
self::assertNotContains('publicClassProperty', $code);
550-
self::assertNotContains('protectedClassProperty', $code);
551-
self::assertNotContains('privateClassProperty', $code);
546+
self::assertStringContainsString('publicExtendedClassProperty', $code);
547+
self::assertStringContainsString('protectedExtendedClassProperty', $code);
548+
self::assertStringContainsString('privateExtendedClassProperty', $code);
549+
self::assertStringNotContainsString('publicClassProperty', $code);
550+
self::assertStringNotContainsString('protectedClassProperty', $code);
551+
self::assertStringNotContainsString('privateClassProperty', $code);
552552
}
553553

554554
public function testHasMethodInsensitive()
@@ -1185,7 +1185,7 @@ public function testCorrectExtendNames()
11851185
$classGenerator->setNamespaceName('SomeNamespace');
11861186
$classGenerator->addUse(NameInformation::class);
11871187
$classGenerator->setExtendedClass(NameInformation::class);
1188-
self::assertContains('class ClassName extends NameInformation', $classGenerator->generate());
1188+
self::assertStringContainsString('class ClassName extends NameInformation', $classGenerator->generate());
11891189
}
11901190

11911191
/**
@@ -1197,7 +1197,7 @@ public function testCorrectlyExtendsFullyQualifiedParentClass()
11971197
$classGenerator->setName('ClassName');
11981198
$classGenerator->setNamespaceName('SomeNamespace');
11991199
$classGenerator->setExtendedClass('DateTime');
1200-
self::assertContains('class ClassName extends \DateTime', $classGenerator->generate());
1200+
self::assertStringContainsString('class ClassName extends \DateTime', $classGenerator->generate());
12011201
}
12021202

12031203
/**
@@ -1208,7 +1208,7 @@ public function testCorrectlyExtendsRelativeParentClass()
12081208
$classGenerator = new ClassGenerator();
12091209
$classGenerator->setName('ClassName');
12101210
$classGenerator->setExtendedClass('DateTime');
1211-
self::assertContains('class ClassName extends DateTime', $classGenerator->generate());
1211+
self::assertStringContainsString('class ClassName extends DateTime', $classGenerator->generate());
12121212
}
12131213

12141214
/**
@@ -1220,12 +1220,12 @@ public function testCorrectExtendNamesFromGlobalNamespace()
12201220
$classGenerator->setName('ClassName');
12211221
$classGenerator->setNamespaceName('SomeNamespace');
12221222
$classGenerator->setExtendedClass(DateTime::class);
1223-
self::assertContains('class ClassName extends \DateTime', $classGenerator->generate());
1223+
self::assertStringContainsString('class ClassName extends \DateTime', $classGenerator->generate());
12241224

12251225
$classGenerator = new ClassGenerator();
12261226
$classGenerator->setName('ClassName');
12271227
$classGenerator->setExtendedClass(DateTime::class);
1228-
self::assertContains('class ClassName extends DateTime', $classGenerator->generate());
1228+
self::assertStringContainsString('class ClassName extends DateTime', $classGenerator->generate());
12291229
}
12301230

12311231
public function testCorrectlyExtendsProvidedAliasIfUseAliasExists()
@@ -1236,7 +1236,7 @@ public function testCorrectlyExtendsProvidedAliasIfUseAliasExists()
12361236
$classGenerator->addUse('Foo\\Bar', 'BarAlias');
12371237
$classGenerator->setExtendedClass('BarAlias');
12381238
$generated = $classGenerator->generate();
1239-
self::assertContains('class ClassName extends BarAlias', $generated);
1239+
self::assertStringContainsString('class ClassName extends BarAlias', $generated);
12401240
}
12411241

12421242
public function testCorrectlyExtendsProvidedNamespaceAliasIfUseAliasExistsForNamespace()
@@ -1247,7 +1247,7 @@ public function testCorrectlyExtendsProvidedNamespaceAliasIfUseAliasExistsForNam
12471247
$classGenerator->addUse('Foo\\Bar', 'BarAlias');
12481248
$classGenerator->setExtendedClass('BarAlias\\FooBar');
12491249
$generated = $classGenerator->generate();
1250-
self::assertContains('class ClassName extends BarAlias\\FooBar', $generated);
1250+
self::assertStringContainsString('class ClassName extends BarAlias\\FooBar', $generated);
12511251
}
12521252

12531253
public function testCorrectlyExtendsAliasOfProvidedFQCNIfUseAliasExists()
@@ -1258,7 +1258,7 @@ public function testCorrectlyExtendsAliasOfProvidedFQCNIfUseAliasExists()
12581258
$classGenerator->addUse('Foo\\Bar', 'BarAlias');
12591259
$classGenerator->setExtendedClass('Foo\\Bar');
12601260
$generated = $classGenerator->generate();
1261-
self::assertContains('class ClassName extends BarAlias', $generated);
1261+
self::assertStringContainsString('class ClassName extends BarAlias', $generated);
12621262
}
12631263

12641264
public function testCorrectlyExtendsWithNamespaceAliasOfProvidedFQCNIfUseAliasExistsForNamespace()
@@ -1269,7 +1269,7 @@ public function testCorrectlyExtendsWithNamespaceAliasOfProvidedFQCNIfUseAliasEx
12691269
$classGenerator->addUse('Foo\\Bar', 'BarAlias');
12701270
$classGenerator->setExtendedClass('Foo\\Bar\\FooBar');
12711271
$generated = $classGenerator->generate();
1272-
self::assertContains('class ClassName extends BarAlias\\FooBar', $generated);
1272+
self::assertStringContainsString('class ClassName extends BarAlias\\FooBar', $generated);
12731273
}
12741274

12751275
public function testCorrectImplementNames()
@@ -1285,6 +1285,6 @@ public function testCorrectImplementNames()
12851285
]);
12861286

12871287
$expected = 'class ClassName implements ClassInterface, GeneratorInterface, \Iteratable';
1288-
self::assertContains($expected, $classGenerator->generate());
1288+
self::assertStringContainsString($expected, $classGenerator->generate());
12891289
}
12901290
}

‎test/Generator/FileGeneratorTest.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -198,16 +198,16 @@ public function testGeneratesUseStatements()
198198
['use' => 'Your\Bar', 'as' => 'bar'],
199199
]);
200200
$generated = $file->generate();
201-
self::assertContains('use My\\Baz;', $generated);
202-
self::assertContains('use Your\\Bar as bar;', $generated);
201+
self::assertStringContainsString('use My\\Baz;', $generated);
202+
self::assertStringContainsString('use Your\\Bar as bar;', $generated);
203203
}
204204

205205
public function testGeneratesNamespaceStatements()
206206
{
207207
$file = new FileGenerator();
208208
$file->setNamespace('Foo\Bar');
209209
$generated = $file->generate();
210-
self::assertContains('namespace Foo\\Bar', $generated, $generated);
210+
self::assertStringContainsString('namespace Foo\\Bar', $generated, $generated);
211211
}
212212

213213
public function testSetUseDoesntGenerateMultipleIdenticalUseStatements()
@@ -238,8 +238,8 @@ public function testSetUseAllowsMultipleAliasedUseStatements()
238238
['use' => 'Your\Bar', 'as' => 'bar2'],
239239
]);
240240
$generated = $file->generate();
241-
self::assertContains('use Your\\Bar as bar;', $generated);
242-
self::assertContains('use Your\\Bar as bar2;', $generated);
241+
self::assertStringContainsString('use Your\\Bar as bar;', $generated);
242+
self::assertStringContainsString('use Your\\Bar as bar2;', $generated);
243243
}
244244

245245
public function testSetUsesWithArrays()
@@ -250,8 +250,8 @@ public function testSetUsesWithArrays()
250250
['use' => 'My\\Baz', 'as' => 'FooBaz'],
251251
]);
252252
$generated = $file->generate();
253-
self::assertContains('use My\\Baz as FooBaz;', $generated);
254-
self::assertContains('use Your\\Bar as bar;', $generated);
253+
self::assertStringContainsString('use My\\Baz as FooBaz;', $generated);
254+
self::assertStringContainsString('use Your\\Bar as bar;', $generated);
255255
}
256256

257257
public function testSetUsesWithString()
@@ -263,9 +263,9 @@ public function testSetUsesWithString()
263263
['use' => 'Another\\Baz', 'as' => 'Baz2'],
264264
]);
265265
$generated = $file->generate();
266-
self::assertContains('use My\\Baz;', $generated);
267-
self::assertContains('use Your\\Bar;', $generated);
268-
self::assertContains('use Another\\Baz as Baz2;', $generated);
266+
self::assertStringContainsString('use My\\Baz;', $generated);
267+
self::assertStringContainsString('use Your\\Bar;', $generated);
268+
self::assertStringContainsString('use Another\\Baz as Baz2;', $generated);
269269
}
270270

271271
public function testSetUsesWithGetUses()
@@ -279,9 +279,9 @@ public function testSetUsesWithGetUses()
279279
$file->setUses($uses);
280280
$file->setUses($file->getUses());
281281
$generated = $file->generate();
282-
self::assertContains('use My\\Baz;', $generated);
283-
self::assertContains('use Your\\Bar;', $generated);
284-
self::assertContains('use Another\\Baz as Baz2;', $generated);
282+
self::assertStringContainsString('use My\\Baz;', $generated);
283+
self::assertStringContainsString('use Your\\Bar;', $generated);
284+
self::assertStringContainsString('use Another\\Baz as Baz2;', $generated);
285285
}
286286

287287
public function testCreateFromArrayWithClassInstance()

‎test/Generator/InterfaceGeneratorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ public function testPassingANamespacedClassnameShouldGenerateANamespaceDeclarati
183183
$classGeneratorClass = new InterfaceGenerator();
184184
$classGeneratorClass->setName('My\Namespaced\FunClass');
185185
$received = $classGeneratorClass->generate();
186-
self::assertContains('namespace My\Namespaced;', $received, $received);
186+
self::assertStringContainsString('namespace My\Namespaced;', $received, $received);
187187
}
188188

189189
/**
@@ -194,7 +194,7 @@ public function testPassingANamespacedClassnameShouldGenerateAClassnameWithoutIt
194194
$classGeneratorClass = new InterfaceGenerator();
195195
$classGeneratorClass->setName('My\Namespaced\FunClass');
196196
$received = $classGeneratorClass->generate();
197-
self::assertContains('interface FunClass', $received, $received);
197+
self::assertStringContainsString('interface FunClass', $received, $received);
198198
}
199199

200200
public function testCreateFromArrayWithDocBlockFromArray()

‎test/Generator/MethodGeneratorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public function testDefaultValueGenerationDoesNotIncludeTrailingSemicolon()
247247

248248
$method->setParameter($param);
249249
$generated = $method->generate();
250-
self::assertContains('array $options = [])', $generated);
250+
self::assertStringContainsString('array $options = [])', $generated);
251251
}
252252

253253
public function testCreateFromArray()

‎test/Generator/TraitGeneratorTest.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ public function testClassFromReflectionThatImplementsInterfaces()
236236
$code = $classGenerator->generate();
237237

238238
$expectedClassDef = 'trait ClassWithInterface';
239-
self::assertContains($expectedClassDef, $code);
239+
self::assertStringContainsString($expectedClassDef, $code);
240240
}
241241

242242
/**
@@ -252,7 +252,7 @@ public function testClassFromReflectionDiscardParentImplementedInterfaces()
252252
$code = $classGenerator->generate();
253253

254254
$expectedClassDef = 'trait NewClassWithInterface';
255-
self::assertContains($expectedClassDef, $code);
255+
self::assertStringContainsString($expectedClassDef, $code);
256256
}
257257

258258
/**
@@ -350,7 +350,7 @@ public function testPassingANamespacedClassnameShouldGenerateANamespaceDeclarati
350350
$classGeneratorClass = new TraitGenerator();
351351
$classGeneratorClass->setName('My\Namespaced\FunClass');
352352
$received = $classGeneratorClass->generate();
353-
self::assertContains('namespace My\Namespaced;', $received, $received);
353+
self::assertStringContainsString('namespace My\Namespaced;', $received, $received);
354354
}
355355

356356
/**
@@ -361,7 +361,7 @@ public function testPassingANamespacedClassnameShouldGenerateAClassnameWithoutIt
361361
$classGeneratorClass = new TraitGenerator();
362362
$classGeneratorClass->setName('My\Namespaced\FunClass');
363363
$received = $classGeneratorClass->generate();
364-
self::assertContains('trait FunClass', $received, $received);
364+
self::assertStringContainsString('trait FunClass', $received, $received);
365365
}
366366

367367
/**
@@ -375,8 +375,8 @@ public function testAddUses()
375375
$classGenerator->addUse('My\Second\Use\Class', 'MyAlias');
376376
$generated = $classGenerator->generate();
377377

378-
self::assertContains('use My\First\Use\Class;', $generated);
379-
self::assertContains('use My\Second\Use\Class as MyAlias;', $generated);
378+
self::assertStringContainsString('use My\First\Use\Class;', $generated);
379+
self::assertStringContainsString('use My\Second\Use\Class as MyAlias;', $generated);
380380
}
381381

382382
/**
@@ -392,7 +392,7 @@ public function testAddOneUseTwiceOnlyAddsOne()
392392

393393
self::assertCount(1, $classGenerator->getUses());
394394

395-
self::assertContains('use My\First\Use\Class;', $generated);
395+
self::assertStringContainsString('use My\First\Use\Class;', $generated);
396396
}
397397

398398
/**
@@ -408,7 +408,7 @@ public function testAddOneUseWithAliasTwiceOnlyAddsOne()
408408

409409
self::assertCount(1, $classGenerator->getUses());
410410

411-
self::assertContains('use My\First\Use\Class as MyAlias;', $generated);
411+
self::assertStringContainsString('use My\First\Use\Class as MyAlias;', $generated);
412412
}
413413

414414
public function testCreateFromArrayWithDocBlockFromArray()
@@ -440,12 +440,12 @@ public function testExtendedClassProperies()
440440
$reflClass = new ClassReflection(TestAsset\ExtendedClassWithProperties::class);
441441
$classGenerator = TraitGenerator::fromReflection($reflClass);
442442
$code = $classGenerator->generate();
443-
self::assertContains('publicExtendedClassProperty', $code);
444-
self::assertContains('protectedExtendedClassProperty', $code);
445-
self::assertContains('privateExtendedClassProperty', $code);
446-
self::assertNotContains('publicClassProperty', $code);
447-
self::assertNotContains('protectedClassProperty', $code);
448-
self::assertNotContains('privateClassProperty', $code);
443+
self::assertStringContainsString('publicExtendedClassProperty', $code);
444+
self::assertStringContainsString('protectedExtendedClassProperty', $code);
445+
self::assertStringContainsString('privateExtendedClassProperty', $code);
446+
self::assertStringNotContainsString('publicClassProperty', $code);
447+
self::assertStringNotContainsString('protectedClassProperty', $code);
448+
self::assertStringNotContainsString('privateClassProperty', $code);
449449
}
450450

451451
public function testHasMethodInsensitive()

‎test/Reflection/ClassReflectionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public function testStartLine()
153153
public function testGetDeclaringFileReturnsFilename()
154154
{
155155
$reflectionClass = new ClassReflection(TestAsset\TestSampleClass2::class);
156-
self::assertContains('TestSampleClass2.php', $reflectionClass->getDeclaringFile()->getFileName());
156+
self::assertStringContainsString('TestSampleClass2.php', $reflectionClass->getDeclaringFile()->getFileName());
157157
}
158158

159159
public function testGetAnnotationsWithNoNameInformations()

‎test/Reflection/FileReflectionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public function testFileReflectionShouldNotRaiseNoticesWhenReflectingClosures()
194194
{
195195
require_once __DIR__ . '/TestAsset/issue-70.php';
196196
$r = new FileReflection(__DIR__ . '/TestAsset/issue-70.php');
197-
self::assertContains('spl_autoload_register', $r->getContents());
198-
self::assertContains('function ()', $r->getContents());
197+
self::assertStringContainsString('spl_autoload_register', $r->getContents());
198+
self::assertStringContainsString('function ()', $r->getContents());
199199
}
200200
}

0 commit comments

Comments
 (0)