minor #32923 [PhpUnitBridge] Remove calls to deprecated function assertAttributeX (jderusse)

nicolas-grekas · nicolas-grekas · commit dd814bfc8797 · 2019-08-04T17:19:50.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [PhpUnitBridge] Remove calls to deprecated function assertAttributeX | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #32844 | License | MIT | Doc PR | NA This PR remove unecessary call to assertAttribute and replace assertAttributeX by Reflection when no alternative is available. Commits ------- d098c11 Remove calls to deprecated function assertAttributeX
diff --git a/src/Symfony/Component/EventDispatcher/Tests/GenericEventTest.php b/src/Symfony/Component/EventDispatcher/Tests/GenericEventTest.php
@@ -61,14 +61,14 @@ public function testGetArguments()
     public function testSetArguments()
     {
         $result = $this->event->setArguments(['foo' => 'bar']);
-        $this->assertAttributeSame(['foo' => 'bar'], 'arguments', $this->event);
+        $this->assertSame(['foo' => 'bar'], $this->event->getArguments());
         $this->assertSame($this->event, $result);
     }
 
     public function testSetArgument()
     {
         $result = $this->event->setArgument('foo2', 'bar2');
-        $this->assertAttributeSame(['name' => 'Event', 'foo2' => 'bar2'], 'arguments', $this->event);
+        $this->assertSame(['name' => 'Event', 'foo2' => 'bar2'], $this->event->getArguments());
         $this->assertEquals($this->event, $result);
     }
 
@@ -97,13 +97,13 @@ public function testOffsetGet()
     public function testOffsetSet()
     {
         $this->event['foo2'] = 'bar2';
-        $this->assertAttributeSame(['name' => 'Event', 'foo2' => 'bar2'], 'arguments', $this->event);
+        $this->assertSame(['name' => 'Event', 'foo2' => 'bar2'], $this->event->getArguments());
     }
 
     public function testOffsetUnset()
     {
         unset($this->event['name']);
-        $this->assertAttributeSame([], 'arguments', $this->event);
+        $this->assertSame([], $this->event->getArguments());
     }
 
     public function testOffsetIsset()
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
@@ -324,15 +324,15 @@ public function testGetConnectionConnectsIfNeeded()
     public function testUrlDsn($url, $expectedDsn, $expectedUser = null, $expectedPassword = null)
     {
         $storage = new PdoSessionHandler($url);
-
-        $this->assertAttributeEquals($expectedDsn, 'dsn', $storage);
-
-        if (null !== $expectedUser) {
-            $this->assertAttributeEquals($expectedUser, 'username', $storage);
-        }
-
-        if (null !== $expectedPassword) {
-            $this->assertAttributeEquals($expectedPassword, 'password', $storage);
+        $reflection = new \ReflectionClass(PdoSessionHandler::class);
+
+        foreach (['dsn' => $expectedDsn, 'username' => $expectedUser, 'password' => $expectedPassword] as $property => $expectedValue) {
+            if (!isset($expectedValue)) {
+                continue;
+            }
+            $property = $reflection->getProperty($property);
+            $property->setAccessible(true);
+            $this->assertSame($expectedValue, $property->getValue($storage));
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -61,14 +61,14 @@ public function testGetArguments()`
`61`	`61`	`public function testSetArguments()`
`62`	`62`	`{`
`63`	`63`	`$result = $this->event->setArguments(['foo' => 'bar']);`
`64`		`- $this->assertAttributeSame(['foo' => 'bar'], 'arguments', $this->event);`
	`64`	`+ $this->assertSame(['foo' => 'bar'], $this->event->getArguments());`
`65`	`65`	`$this->assertSame($this->event, $result);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`public function testSetArgument()`
`69`	`69`	`{`
`70`	`70`	`$result = $this->event->setArgument('foo2', 'bar2');`
`71`		`- $this->assertAttributeSame(['name' => 'Event', 'foo2' => 'bar2'], 'arguments', $this->event);`
	`71`	`+ $this->assertSame(['name' => 'Event', 'foo2' => 'bar2'], $this->event->getArguments());`
`72`	`72`	`$this->assertEquals($this->event, $result);`
`73`	`73`	`}`
`74`	`74`
`@@ -97,13 +97,13 @@ public function testOffsetGet()`
`97`	`97`	`public function testOffsetSet()`
`98`	`98`	`{`
`99`	`99`	`$this->event['foo2'] = 'bar2';`
`100`		`- $this->assertAttributeSame(['name' => 'Event', 'foo2' => 'bar2'], 'arguments', $this->event);`
	`100`	`+ $this->assertSame(['name' => 'Event', 'foo2' => 'bar2'], $this->event->getArguments());`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`public function testOffsetUnset()`
`104`	`104`	`{`
`105`	`105`	`unset($this->event['name']);`
`106`		`- $this->assertAttributeSame([], 'arguments', $this->event);`
	`106`	`+ $this->assertSame([], $this->event->getArguments());`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`public function testOffsetIsset()`