10000 Merge branch '4.4' into 5.1 · symfony/symfony@1c6380f · GitHub
[go: up one dir, main page]
Skip to content

Commit 1c6380f

Browse files
derrabusderrabus
committed
Merge branch '4.4' into 5.1
2 parents 5578239 + aafad69 commit 1c6380f

File tree

17 files changed

+289
-178
lines changed

17 files changed

+289
-178
lines changed

‎.travis.yml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -123,23 +123,6 @@ before_install:
123123
}
124124
export -f tpecl
125125
126-
install_apcu_dev () {
127-
local ref=$1
128-
8000 local INI=$2
129-
130-
wget https://github.com/krakjoe/apcu/archive/${ref}.zip
131-
unzip ${ref}.zip
132-
cd apcu-${ref}
133-
phpize
134-
./configure
135-
make
136-
mv modules/apcu.so $(php -r "echo ini_get('extension_dir');")
137-
echo 'extension = apcu.so' >> $INI
138-
cd ..
139-
rm -rf apcu-${ref} ${ref}.zip
140-
}
141-
export -f install_apcu_dev
142-
143126
- |
144127
# Install sigchild-enabled PHP to test the Process component on the lowest PHP matrix line
145128
if [[ ! $deps && $TRAVIS_PHP_VERSION = ${MIN_PHP%.*} && ! -d php-$MIN_PHP/sapi ]]; then
@@ -176,7 +159,7 @@ before_install:
176159
tfold ext.memcached tpecl memcached-3.1.5 memcached.so $INI
177160
tfold ext.apcu install_apcu_dev 9c36db45100d4d27ec33072f4be90f1f5a0108b7 $INI
178161
else
179-
tfold ext.apcu tpecl apcu-5.1.18 apcu.so $INI
162+
tfold ext.apcu tpecl apcu-5.1.19 apcu.so $INI
180163
tfold ext.mongodb tpecl mongodb-1.6.16 mongodb.so $INI
181164
tfold ext.zookeeper tpecl zookeeper-0.7.2 zookeeper.so $INI
182165
tfold ext.amqp tpecl amqp-1.10.2 amqp.so $INI

‎src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -95,19 +95,10 @@ public function getTypes(string $class, string $property, array $context = [])
9595
$associationMapping = $metadata->getAssociationMapping($property);
9696

9797
if (isset($associationMapping['indexBy'])) {
98-
$indexProperty = $associationMapping['indexBy'];
98+
$indexColumn = $associationMapping['indexBy'];
9999
/** @var ClassMetadataInfo $subMetadata */
100100
$subMetadata = $this->entityManager ? $this->entityManager->getClassMetadata($associationMapping['targetEntity']) : $this->classMetadataFactory->getMetadataFor($associationMapping['targetEntity']);
101-
$typeOfField = $subMetadata->getTypeOfField($indexProperty);
102-
103-
if (null === $typeOfField) {
104-
$associationMapping = $subMetadata->getAssociationMapping($indexProperty);
105-
106-
/** @var ClassMetadataInfo $subMetadata */
107-
$indexProperty = $subMetadata->getSingleAssociationReferencedJoinColumnName($indexProperty);
108-
$subMetadata = $this->entityManager ? $this->entityManager->getClassMetadata($associationMapping['targetEntity']) : $this->classMetadataFactory->getMetadataFor($associationMapping['targetEntity']);
109-
$typeOfField = $subMetadata->getTypeOfField($indexProperty);
110-
}
101+
$typeOfField = $subMetadata->getTypeOfField($subMetadata->getFieldForColumn($indexColumn));
111102

112103
if (!$collectionKeyType = $this->getPhpType($typeOfField)) {
113104
return null;

‎src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,6 @@ class EntityTypeTest extends BaseTypeTest
6060

6161
protected static $supportedFeatureSetVersion = 404;
6262

63-
public static function setUpBeforeClass(): void
64-
{
65-
if (\PHP_VERSION_ID >= 80000) {
66-
self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
67-
}
68-
}
69-
7063
protected function setUp(): void
7164
{
7265
$this->em = DoctrineTestHelper::createTestEntityManager();

‎src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class DoctrineDummy
4242
public $bar;
4343

4444
/**
45-
* @ManyToMany(targetEntity="DoctrineRelation", indexBy="rguid")
45+
* @ManyToMany(targetEntity="DoctrineRelation", indexBy="rguid_column")
4646
*/
4747
protected $indexedBar;
4848

‎src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineRelation.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class DoctrineRelation
3030
public $id;
3131

3232
/**
33-
* @Column(type="guid")
33+
* @Column(type="guid", name="rguid_column")
3434
*/
3535
protected $rguid;
3636

‎src/Symfony/Bridge/Doctrine/Tests/Security/RememberMe/DoctrineTokenProviderTest.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,6 @@
1313
*/
1414
class DoctrineTokenProviderTest extends TestCase
1515
{
16-
public static function setUpBeforeClass(): void
17-
{
18-
if (\PHP_VERSION_ID >= 80000) {
19-
self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
20-
}
21-
}
22-
2316
public function testCreateNewToken()
2417
{
2518
$provider = $this->bootstrapProvider();

‎src/Symfony/Bridge/Doctrine/Tests/Security/User/EntityUserProviderTest.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,6 @@
2424

2525
class EntityUserProviderTest extends TestCase
2626
{
27-
public static function setUpBeforeClass(): void
28-
{
29-
if (\PHP_VERSION_ID >= 80000) {
30-
self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
31-
}
32-
}
3 F90E 3-
3427
public function testRefreshUserGetsUserByPrimaryKey()
3528
{
3629
$em = DoctrineTestHelper::createTestEntityManager();

‎src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,6 @@ class UniqueEntityValidatorTest extends ConstraintValidatorTestCase
5959

6060
protected $repositoryFactory;
6161

62-
public static function setUpBeforeClass(): void
63-
{
64-
if (\PHP_VERSION_ID >= 80000) {
65-
self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
66-
}
67-
}
68-
6962
protected function setUp(): void
7063
{
7164
$this->repositoryFactory = new TestRepositoryFactory();

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,6 @@ div.sf-toolbar .sf-toolbar-block a:hover {
541541
/***** Media query print: Do not print the Toolbar. *****/
542542
@media print {
543543
.sf-toolbar {
544-
display: none;
544+
display: none !important;
545545
}
546546
}

0 commit comments

Comments
 (0)
0