Skip to content

Commit 1e3de01

Browse files
PowerKiKiPowerKiKi
committed
Deprecated PHPunit stuff
1 parent 5babab7 commit 1e3de01

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

‎tests/Zend/View/Helper/HeadLinkTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,8 @@ public function testStylesheetAttributesGetSet()
305305
{
306306
$this->helper->setStylesheet('/styles.css', 'projection', 'ie6');
307307
$item = $this->helper->getValue();
308-
$this->assertObjectHasAttribute('media', $item);
309-
$this->assertObjectHasAttribute('conditionalStylesheet', $item);
308+
$this->assertObjectHasProperty('media', $item);
309+
$this->assertObjectHasProperty('conditionalStylesheet', $item);
310310

311311
$this->assertEquals('projection', $item->media);
312312
$this->assertEquals('ie6', $item->conditionalStylesheet);
@@ -316,7 +316,7 @@ public function testConditionalStylesheetNotCreatedByDefault()
316316
{
317317
$this->helper->setStylesheet('/styles.css');
318318
$item = $this->helper->getValue();
319-
$this->assertObjectHasAttribute('conditionalStylesheet', $item);
319+
$this->assertObjectHasProperty('conditionalStylesheet', $item);
320320
$this->assertFalse($item->conditionalStylesheet);
321321

322322
$string = $this->helper->toString();
@@ -330,7 +330,7 @@ public function testConditionalStylesheetCreationOccursWhenRequested()
330330
{
331331
$this->helper->setStylesheet('/styles.css', 'screen', 'ie6');
332332
$item = $this->helper->getValue();
333-
$this->assertObjectHasAttribute('conditionalStylesheet', $item);
333+
$this->assertObjectHasProperty('conditionalStylesheet', $item);
334334
$this->assertEquals('ie6', $item->conditionalStylesheet);
335335

336336
$string = $this->helper->toString();
@@ -500,7 +500,7 @@ public function testConditionalStylesheetCreationNoIE()
500500
{
501501
$this->helper->setStylesheet('/styles.css', 'screen', '!IE');
502502
$item = $this->helper->getValue();
503-
$this->assertObjectHasAttribute('conditionalStylesheet', $item);
503+
$this->assertObjectHasProperty('conditionalStylesheet', $item);
504504
$this->assertEquals('!IE', $item->conditionalStylesheet);
505505
$string = $this->helper->toString();
506506
$this->assertStringContainsString('/styles.css', $string);
@@ -515,7 +515,7 @@ public function testConditionalStylesheetCreationNoIEWidthSpaces()
515515
{
516516
$this->helper->setStylesheet('/styles.css', 'screen', '! IE');
517517
$item = $this->helper->getValue();
518-
$this->assertObjectHasAttribute('conditionalStylesheet', $item);
518+
$this->assertObjectHasProperty('conditionalStylesheet', $item);
519519
$this->assertEquals('! IE', $item->conditionalStylesheet);
520520
$string = $this->helper->toString();
521521
$this->assertStringContainsString('/styles.css', $string);

‎tests/Zend/View/Helper/HeadMetaTest.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,10 @@ protected function _testOverloadAppend($type)
157157
$this->assertEquals($i + 1, is_countable($values) ? count($values) : 0);
158158

159159
$item = $values[$i];
160-
$this->assertObjectHasAttribute('type', $item);
161-
$this->assertObjectHasAttribute('modifiers', $item);
162-
$this->assertObjectHasAttribute('content', $item);
163-
$this->assertObjectHasAttribute($item->type, $item);
160+
$this->assertObjectHasProperty('type', $item);
161+
$this->assertObjectHasProperty('modifiers', $item);
162+
$this->assertObjectHasProperty('content', $item);
163+
$this->assertObjectHasProperty($item->type, $item);
164164
$this->assertEquals('keywords', $item->{$item->type});
165165
$this->assertEquals($string, $item->content);
166166
}
@@ -177,10 +177,10 @@ protected function _testOverloadPrepend($type)
177177
$this->assertEquals($i + 1, is_countable($values) ? count($values) : 0);
178178
$item = array_shift($values);
179179

180-
$this->assertObjectHasAttribute('type', $item);
181-
$this->assertObjectHasAttribute('modifiers', $item);
182-
$this->assertObjectHasAttribute('content', $item);
183-
$this->assertObjectHasAttribute($item->type, $item);
180+
$this->assertObjectHasProperty('type', $item);
181+
$this->assertObjectHasProperty('modifiers', $item);
182+
$this->assertObjectHasProperty('content', $item);
183+
$this->assertObjectHasProperty($item->type, $item);
184184
$this->assertEquals('keywords', $item->{$item->type});
185185
$this->assertEquals($string, $item->content);
186186
}
@@ -200,10 +200,10 @@ protected function _testOverloadSet($type)
200200
$this->assertEquals(1, is_countable($values) ? count($values) : 0);
201201
$item = array_shift($values);
202202

203-
$this->assertObjectHasAttribute('type', $item);
204-
$this->assertObjectHasAttribute('modifiers', $item);
205-
$this->assertObjectHasAttribute('content', $item);
206-
$this->assertObjectHasAttribute($item->type, $item);
203+
$this->assertObjectHasProperty('type', $item);
204+
$this->assertObjectHasProperty('modifiers', $item);
205+
$this->assertObjectHasProperty('content', $item);
206+
$this->assertObjectHasProperty($item->type, $item);
207207
$this->assertEquals('keywords', $item->{$item->type});
208208
$this->assertEquals($string, $item->content);
209209
}
@@ -263,7 +263,7 @@ public function testCanBuildMetaTagsWithAttributes()
263263
$this->helper->setName('keywords', 'foo bar', ['lang' => 'us_en', 'scheme' => 'foo', 'bogus' => 'unused']);
264264
$value = $this->helper->getValue();
265265

266-
$this->assertObjectHasAttribute('modifiers', $value);
266+
$this->assertObjectHasProperty('modifiers', $value);
267267
$modifiers = $value->modifiers;
268268
$this->assertTrue(array_key_exists('lang', $modifiers));
269269
$this->assertEquals('us_en', $modifiers['lang']);

‎tests/Zend/View/Helper/HeadScriptTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,18 +276,18 @@ public function testHeadScriptAppropriatelySetsScriptItems()
276276
$item = $items[$i];
277277
switch ($i) {
278278
case 0:
279-
$this->assertObjectHasAttribute('source', $item);
279+
$this->assertObjectHasProperty('source', $item);
280280
$this->assertEquals('bar', $item->source);
281281

282282
break;
283283
case 1:
284-
$this->assertObjectHasAttribute('attributes', $item);
284+
$this->assertObjectHasProperty('attributes', $item);
285285
$this->assertTrue(isset($item->attributes['src']));
286286
$this->assertEquals('foo', $item->attributes['src']);
287287

288288
break;
289289
case 2:
290-
$this->assertObjectHasAttribute('source', $item);
290+
$this->assertObjectHasProperty('source', $item);
291291
$this->assertEquals('baz', $item->source);
292292

293293
break;

‎tests/Zend/View/Helper/HeadStyleTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ public function testOverloadAppendStyleAppendsStyleToStack()
135135
$item = $values[$i];
136136

137137
$this->assertTrue($item instanceof stdClass);
138-
$this->assertObjectHasAttribute('content', $item);
139-
$this->assertObjectHasAttribute('attributes', $item);
138+
$this->assertObjectHasProperty('content', $item);
139+
$this->assertObjectHasProperty('attributes', $item);
140140
$this->assertEquals($string, $item->content);
141141
}
142142
}
@@ -152,8 +152,8 @@ public function testOverloadPrependStylePrependsStyleToStack()
152152
$item = array_shift($values);
153153

154154
$this->assertTrue($item instanceof stdClass);
155-
$this->assertObjectHasAttribute('content', $item);
156-
$this->assertObjectHasAttribute('attributes', $item);
155+
$this->assertObjectHasProperty('content', $item);
156+
$this->assertObjectHasProperty('attributes', $item);
157157
$this->assertEquals($string, $item->content);
158158
}
159159
}
@@ -171,8 +171,8 @@ public function testOverloadSetOversitesStack()
171171
$item = array_shift($values);
172172

173173
$this->assertTrue($item instanceof stdClass);
174-
$this->assertObjectHasAttribute('content', $item);
175-
$this->assertObjectHasAttribute('attributes', $item);
174+
$this->assertObjectHasProperty('content', $item);
175+
$this->assertObjectHasProperty('attributes', $item);
176176
$this->assertEquals($string, $item->content);
177177
}
178178

@@ -187,7 +187,7 @@ public function testCanBuildStyleTagsWithAttributes()
187187
]);
188188
$value = $this->helper->getValue();
189189

190-
$this->assertObjectHasAttribute('attributes', $value);
190+
$this->assertObjectHasProperty('attributes', $value);
191191
$attributes = $value->attributes;
192192

193193
$this->assertTrue(isset($attributes['lang']));

0 commit comments

Comments
 (0)