Merge branch '4.4' into 5.2

derrabus · derrabus · commit 4bdc0f48cc22 · 2021-05-19T23:12:45.000+02:00
* 4.4:
  Remove always-true requirement
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
@@ -122,9 +122,6 @@ public function testGc()
         $this->proxy->gc(86400);
     }
 
-    /**
-     * @requires PHPUnit 5.1
-     */
     public function testValidateId()
     {
         $mock = $this->createMock(TestSessionHandler::class);
@@ -137,9 +134,6 @@ public function testValidateId()
         $this->assertTrue($this->proxy->validateId('id'));
     }
 
-    /**
-     * @requires PHPUnit 5.1
-     */
     public function testUpdateTimestamp()
     {
         $mock = $this->createMock(TestSessionHandler::class);
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
@@ -157,9 +157,6 @@ public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetter()
         $this->propertyAccessor->getValue(new UninitializedPrivateProperty(), 'uninitialized');
     }
 
-    /**
-     * @requires PHP 7
-     */
     public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetterOfAnonymousClass()
     {
         $this->expectException(AccessException::class);
@@ -177,9 +174,6 @@ public function getUninitialized(): array
         $this->propertyAccessor->getValue($object, 'uninitialized');
     }
 
-    /**
-     * @requires PHP 7
-     */
     public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetterOfAnonymousStdClass()
     {
         $this->expectException(AccessException::class);
@@ -197,9 +191,6 @@ public function getUninitialized(): array
         $this->propertyAccessor->getValue($object, 'uninitialized');
     }
 
-    /**
-     * @requires PHP 7
-     */
     public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetterOfAnonymousChildClass()
     {
         $this->expectException(AccessException::class);

Original file line number	Diff line number	Diff line change
`@@ -122,9 +122,6 @@ public function testGc()`
`122`	`122`	`$this->proxy->gc(86400);`
`123`	`123`	`}`
`124`	`124`
`125`		`- /**`
`126`		`- * @requires PHPUnit 5.1`
`127`		`- */`
`128`	`125`	`public function testValidateId()`
`129`	`126`	`{`
`130`	`127`	`$mock = $this->createMock(TestSessionHandler::class);`
`@@ -137,9 +134,6 @@ public function testValidateId()`
`137`	`134`	`$this->assertTrue($this->proxy->validateId('id'));`
`138`	`135`	`}`
`139`	`136`
`140`		`- /**`
`141`		`- * @requires PHPUnit 5.1`
`142`		`- */`
`143`	`137`	`public function testUpdateTimestamp()`
`144`	`138`	`{`
`145`	`139`	`$mock = $this->createMock(TestSessionHandler::class);`
Original file line number	Diff line number	Diff line change
`@@ -157,9 +157,6 @@ public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetter()`
`157`	`157`	`$this->propertyAccessor->getValue(new UninitializedPrivateProperty(), 'uninitialized');`
`158`	`158`	`}`
`159`	`159`
`160`		`- /**`
`161`		`- * @requires PHP 7`
`162`		`- */`
`163`	`160`	`public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetterOfAnonymousClass()`
`164`	`161`	`{`
`165`	`162`	`$this->expectException(AccessException::class);`
`@@ -177,9 +174,6 @@ public function getUninitialized(): array`
`177`	`174`	`$this->propertyAccessor->getValue($object, 'uninitialized');`
`178`	`175`	`}`
`179`	`176`
`180`		`- /**`
`181`		`- * @requires PHP 7`
`182`		`- */`
`183`	`177`	`public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetterOfAnonymousStdClass()`
`184`	`178`	`{`
`185`	`179`	`$this->expectException(AccessException::class);`
`@@ -197,9 +191,6 @@ public function getUninitialized(): array`
`197`	`191`	`$this->propertyAccessor->getValue($object, 'uninitialized');`
`198`	`192`	`}`
`199`	`193`
`200`		`- /**`
`201`		`- * @requires PHP 7`
`202`		`- */`
`203`	`194`	`public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetterOfAnonymousChildClass()`
`204`	`195`	`{`
`205`	`196`	`$this->expectException(AccessException::class);`