Merge branch '5.4' into 6.0

derrabus · derrabus · commit 68563ec60cb2 · 2021-05-19T23:17:20.000+02:00
* 5.4:
  Remove always-true requirement
  Fix the detection of the stable Symfony branch
diff --git a/.travis.yml b/.travis.yml
@@ -55,7 +55,8 @@ before_install:
       export COMPOSER_UP='composer update --no-progress --ansi'
       export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
       export SYMFONY_DEPRECATIONS_HELPER=max[indirect]=170
-      export SYMFONY_FEATURE_BRANCH=$(curl -s https://flex.symfony.com/versions.json | jq -r '."dev-name"')
+      export SYMFONY_FLEX_VERSIONS=$(curl -s https://flex.symfony.com/versions.json)
+      export SYMFONY_FEATURE_BRANCH=$(echo $SYMFONY_FLEX_VERSIONS | jq -r '."dev"')
 
       nanoseconds () {
           local cmd="date"
@@ -204,7 +205,10 @@ install:
       # For the feature-branch, when deps=high, the version before it is checked out and tested with the locally patched components
       if [[ $deps = high && $TRAVIS_BRANCH = $SYMFONY_FEATURE_BRANCH ]]; then
           export FLIP='^'
-          export SYMFONY_VERSION=$(echo "$SYMFONY_VERSIONS" | grep -o '/[1-9]\.[0-9].*' | tail -n 1 | sed s/.//) &&
+          export SYMFONY_VERSION=$(echo $SYMFONY_FLEX_VERSIONS | jq -r '."next"')
+          if [ $SYMFONY_VERSION = $SYMFONY_FEATURE_BRANCH ]; then
+              export SYMFONY_VERSION = $(echo $SYMFONY_FLEX_VERSIONS | jq -r '."stable"')
+          fi
           git fetch --depth=2 origin $SYMFONY_VERSION &&
           git checkout -m FETCH_HEAD &&
           export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
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
@@ -186,9 +186,6 @@ public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetter()
         $this->propertyAccessor->getValue(new UninitializedPrivateProperty(), 'uninitialized');
     }
 
-    /**
-     * @requires PHP 7
-     */
     public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetterOfAnonymousClass()
     {
         $this->expectException(AccessException::class);
@@ -206,9 +203,6 @@ public function getUninitialized(): array
         $this->propertyAccessor->getValue($object, 'uninitialized');
     }
 
-    /**
-     * @requires PHP 7
-     */
     public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetterOfAnonymousStdClass()
     {
         $this->expectException(AccessException::class);
@@ -226,9 +220,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
`@@ -186,9 +186,6 @@ public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetter()`
`186`	`186`	`$this->propertyAccessor->getValue(new UninitializedPrivateProperty(), 'uninitialized');`
`187`	`187`	`}`
`188`	`188`
`189`		`- /**`
`190`		`- * @requires PHP 7`
`191`		`- */`
`192`	`189`	`public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetterOfAnonymousClass()`
`193`	`190`	`{`
`194`	`191`	`$this->expectException(AccessException::class);`
`@@ -206,9 +203,6 @@ public function getUninitialized(): array`
`206`	`203`	`$this->propertyAccessor->getValue($object, 'uninitialized');`
`207`	`204`	`}`
`208`	`205`
`209`		`- /**`
`210`		`- * @requires PHP 7`
`211`		`- */`
`212`	`206`	`public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetterOfAnonymousStdClass()`
`213`	`207`	`{`
`214`	`208`	`$this->expectException(AccessException::class);`
`@@ -226,9 +220,6 @@ public function getUninitialized(): array`
`226`	`220`	`$this->propertyAccessor->getValue($object, 'uninitialized');`
`227`	`221`	`}`
`228`	`222`
`229`		`- /**`
`230`		`- * @requires PHP 7`
`231`		`- */`
`232`	`223`	`public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetterOfAnonymousChildClass()`
`233`	`224`	`{`
`234`	`225`	`$this->expectException(AccessException::class);`