Skip to content

Bump doctrine #1682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 2 commits into from
Oct 11, 2016
Merged

Bump doctrine #1682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe43b30
[3rdparty] Bump doctrine
rullzer Oct 10, 2016
b1641cc
Fix QueryBuilderTests
DeepDiver1975 Sep 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty
Open in desktop
Submodule 3rdparty updated 68 files
+21 −0 .drone.yml
+1 −1 composer.json
+26 −26 composer.lock
+2 −0 composer/autoload_classmap.php
+0 −1 composer/autoload_namespaces.php
+1 −0 composer/autoload_psr4.php
+7 −4 composer/autoload_static.php
+220 −220 composer/installed.json
+18 −7 doctrine/cache/lib/Doctrine/Common/Cache/ApcCache.php
+56 −8 doctrine/cache/lib/Doctrine/Common/Cache/ArrayCache.php
+36 −1 doctrine/cache/lib/Doctrine/Common/Cache/CacheProvider.php
+12 −0 doctrine/cache/lib/Doctrine/Common/Cache/MemcachedCache.php
+28 −0 doctrine/cache/lib/Doctrine/Common/Cache/PredisCache.php
+22 −0 doctrine/cache/lib/Doctrine/Common/Cache/RedisCache.php
+1 −1 doctrine/cache/lib/Doctrine/Common/Cache/Version.php
+10 −0 doctrine/cache/lib/Doctrine/Common/Cache/WinCacheCache.php
+0 −10 doctrine/common/.gitignore
+0 −3 doctrine/common/.gitmodules
+1 −1 doctrine/common/LICENSE
+0 −3 doctrine/common/build.properties
+0 −101 doctrine/common/build.xml
+3 −3 doctrine/common/lib/Doctrine/Common/ClassLoader.php
+1 −1 doctrine/common/lib/Doctrine/Common/EventManager.php
+2 −2 doctrine/common/lib/Doctrine/Common/Persistence/AbstractManagerRegistry.php
+5 −5 doctrine/common/lib/Doctrine/Common/Persistence/Mapping/AbstractClassMetadataFactory.php
+5 −5 doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/AnnotationDriver.php
+2 −2 doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/DefaultFileLocator.php
+8 −5 doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/FileDriver.php
+4 −4 doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/MappingDriverChain.php
+3 −3 doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/PHPDriver.php
+3 −3 doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/StaticPHPDriver.php
+3 −3 doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/SymfonyFileLocator.php
+1 −1 doctrine/common/lib/Doctrine/Common/Persistence/Mapping/StaticReflectionService.php
+1 −1 doctrine/common/lib/Doctrine/Common/Persistence/PersistentObject.php
+1 −1 doctrine/common/lib/Doctrine/Common/Proxy/AbstractProxyFactory.php
+68 −37 doctrine/common/lib/Doctrine/Common/Proxy/ProxyGenerator.php
+1 −1 doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionClass.php
+5 −5 doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionParser.php
+3 −3 doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionProperty.php
+3 −2 doctrine/common/lib/Doctrine/Common/Util/Debug.php
+1 −1 doctrine/common/lib/Doctrine/Common/Version.php
+0 −25 doctrine/common/phpunit.xml.dist
+1 −1 doctrine/dbal/composer.json
+13 −1 doctrine/dbal/lib/Doctrine/DBAL/DBALException.php
+3 −3 doctrine/dbal/lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php
+15 −0 doctrine/dbal/lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php
+3 −3 doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOPgSql/Driver.php
+174 −26 doctrine/dbal/lib/Doctrine/DBAL/DriverManager.php
+5 −1 doctrine/dbal/lib/Doctrine/DBAL/Event/Listeners/OracleSessionInit.php
+17 −9 doctrine/dbal/lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
+37 −5 doctrine/dbal/lib/Doctrine/DBAL/Platforms/DB2Platform.php
+69 −24 doctrine/dbal/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
+71 −25 doctrine/dbal/lib/Doctrine/DBAL/Platforms/OraclePlatform.php
+3 −1 doctrine/dbal/lib/Doctrine/DBAL/Platforms/PostgreSQL92Platform.php
+26 −6 doctrine/dbal/lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php
+19 −8 doctrine/dbal/lib/Doctrine/DBAL/Platforms/SQLAnywherePlatform.php
+53 −0 doctrine/dbal/lib/Doctrine/DBAL/Platforms/SQLServer2012Platform.php
+14 −7 doctrine/dbal/lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php
+10 −5 doctrine/dbal/lib/Doctrine/DBAL/Platforms/SqlitePlatform.php
+2 −2 doctrine/dbal/lib/Doctrine/DBAL/Query/QueryBuilder.php
+1 −1 doctrine/dbal/lib/Doctrine/DBAL/SQLParserUtils.php
+3 −1 doctrine/dbal/lib/Doctrine/DBAL/Schema/ColumnDiff.php
+4 −0 doctrine/dbal/lib/Doctrine/DBAL/Schema/Comparator.php
+8 −0 doctrine/dbal/lib/Doctrine/DBAL/Schema/DB2SchemaManager.php
+6 −1 doctrine/dbal/lib/Doctrine/DBAL/Schema/Identifier.php
+1 −1 doctrine/dbal/lib/Doctrine/DBAL/Schema/SchemaDiff.php
+3 −0 doctrine/dbal/lib/Doctrine/DBAL/Statement.php
+1 −1 doctrine/dbal/lib/Doctrine/DBAL/Version.php
20 changes: 10 additions & 10 deletions tests/lib/DB/QueryBuilder/QueryBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ public function testWhere($whereArguments, $expectedQueryPart, $expectedQuery) {
);

$this->assertSame(
'SELECT `column` FROM WHERE ' . $expectedQuery,
'SELECT `column` WHERE ' . $expectedQuery,
$this->queryBuilder->getSQL()
);
}
Expand All @@ -765,7 +765,7 @@ public function testAndWhere($whereArguments, $expectedQueryPart, $expectedQuery
);

$this->assertSame(
'SELECT `column` FROM WHERE ' . $expectedQuery,
'SELECT `column` WHERE ' . $expectedQuery,
$this->queryBuilder->getSQL()
);
}
Expand Down Expand Up @@ -797,7 +797,7 @@ public function testOrWhere($whereArguments, $expectedQueryPart, $expectedQuery)
);

$this->assertSame(
'SELECT `column` FROM WHERE ' . $expectedQuery,
'SELECT `column` WHERE ' . $expectedQuery,
$this->queryBuilder->getSQL()
);
}
Expand Down Expand Up @@ -829,7 +829,7 @@ public function testGroupBy($groupByArguments, $expectedQueryPart, $expectedQuer
);

$this->assertSame(
'SELECT `column` FROM GROUP BY ' . $expectedQuery,
'SELECT `column` GROUP BY ' . $expectedQuery,
$this->queryBuilder->getSQL()
);
}
Expand Down Expand Up @@ -862,7 +862,7 @@ public function testAddGroupBy($groupByArguments, $expectedQueryPart, $expectedQ
);

$this->assertSame(
'SELECT `column` FROM GROUP BY ' . $expectedQuery,
'SELECT `column` GROUP BY ' . $expectedQuery,
$this->queryBuilder->getSQL()
);
}
Expand Down Expand Up @@ -957,7 +957,7 @@ public function testHaving($havingArguments, $expectedQueryPart, $expectedQuery)
);

$this->assertSame(
'SELECT FROM ' . $expectedQuery,
'SELECT ' . $expectedQuery,
$this->queryBuilder->getSQL()
);
}
Expand Down Expand Up @@ -999,7 +999,7 @@ public function testAndHaving($havingArguments, $expectedQueryPart, $expectedQue
);

$this->assertSame(
'SELECT FROM ' . $expectedQuery,
'SELECT ' . $expectedQuery,
$this->queryBuilder->getSQL()
);
}
Expand Down Expand Up @@ -1041,7 +1041,7 @@ public function testOrHaving($havingArguments, $expectedQueryPart, $expectedQuer
);

$this->assertSame(
'SELECT FROM ' . $expectedQuery,
'SELECT ' . $expectedQuery,
$this->queryBuilder->getSQL()
);
}
Expand Down Expand Up @@ -1071,7 +1071,7 @@ public function testOrderBy($sort, $order, $expectedQueryPart, $expectedQuery) {
);

$this->assertSame(
'SELECT FROM ' . $expectedQuery,
'SELECT ' . $expectedQuery,
$this->queryBuilder->getSQL()
);
}
Expand Down Expand Up @@ -1109,7 +1109,7 @@ public function testAddOrderBy($sort2, $order2, $order1, $expectedQueryPart, $ex
);

$this->assertSame(
'SELECT FROM ' . $expectedQuery,
'SELECT ' . $expectedQuery,
$this->queryBuilder->getSQL()
);
}
Expand Down