Merge 4bdf5ab6d2 into 2fce8aeb3e

phpBB/phpbb/db/tools/doctrine.php

@@ -514,7 +514,7 @@ class doctrine implements tools_interface
 		catch (Exception $e)
 		{
 			// @todo: check if it makes sense to properly handle the exception
-			return [$e->getMessage()];
+			return false;
 		}
 	}
 

tests/dbal/migration/schema.php

@@ -33,8 +33,8 @@ class phpbb_dbal_migration_schema extends \phpbb\db\migration\migration
 					],
 					'PRIMARY_KEY'	=> 'module_id',
 					'KEYS'			=> [
-					//	'i_simple'	=> ['INDEX', ['user_id', 'endpoint:191']],
-					//	'i_uniq'	=> ['UNIQUE', ['expiration_time', 'p256dh(100)']],
+						'i_simple'	=> ['INDEX', ['user_id', 'endpoint:191']],
+						'i_uniq'	=> ['UNIQUE', ['expiration_time', 'p256dh(100)']],
 						'i_auth'	=> ['INDEX', 'auth'],
 					],
 				],

tests/dbal/migrator_test.php

@@ -424,7 +424,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
 					$this->assertEmpty($index_data['options']['lengths'][0]);
 					$this->assertEquals($mysql ? 191 : null, $index_data['options']['lengths'][1]);
 				break;
-			/*	case 'i_uniq':
+				case 'i_uniq':
 					$this->assertEquals(['expiration_time', 'p256dh'], $index_data['columns']);
 					$this->assertEmpty($index_data['flags']);
 					$this->assertFalse($index_data['is_primary']);
@@ -433,7 +433,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
 					$this->assertEquals(2, count($index_data['options']['lengths']));
 					$this->assertEmpty($index_data['options']['lengths'][0]);
 					$this->assertEquals($mysql ? 100 : null, $index_data['options']['lengths'][1]);
-				break;*/
+				break;
 				case 'i_auth':
 					$this->assertEquals(['auth'], $index_data['columns']);
 					$this->assertEmpty($index_data['flags']);