Merge pull request #214 from owncloud/dbal_2.5.2

Bumped doctrine/dbal to 2.5.2
owncloud-archive · Nov 2, 2015 · be700d4 · be700d4
2 parents 48dd23b + 6a5ca4c
commit be700d4
Show file tree

Hide file tree

Showing 32 changed files with 697 additions and 459 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,13 +10,17 @@ doctrine/cache/tests
 doctrine/cache/.travis.yml
 doctrine/collections/tests
 doctrine/collections/.travis.yml
+doctrine/collections/README.md
+doctrine/collections/composer.json
 doctrine/common/tests
 doctrine/common/.travis.yml
 doctrine/dbal/tests
 doctrine/dbal/docs
 doctrine/dbal/run-all.sh
 doctrine/dbal/.travis.yml
 doctrine/inflector/tests
+doctrine/lexer/composer.json
+doctrine/lexer/LICENSE
 
 pear/archive_tar/.travis.sh
 pear/archive_tar/.travis.yml

diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
 	},
 	"require": {
 		"sabre/dav" : "2.1.7",
-		"doctrine/dbal": "2.5.1",
+		"doctrine/dbal": "2.5.2",
 		"mcnetic/zipstreamer": "v0.7",
 		"phpseclib/phpseclib": "2.0.0",
 		"rackspace/php-opencloud": "v1.9.2",

diff --git a/composer.lock b/composer.lock