diff --git a/composer.json b/composer.json
index 874c457f87b1af164871aeb4f599bcade6366477..5fc250451fc86e139dac1726d3269bdc0ee58924 100644
--- a/composer.json
+++ b/composer.json
@@ -3,11 +3,6 @@
"description": "Drupal is an open source content management platform powering millions of websites and applications.",
"type": "drupal-core",
"license": "GPL-2.0+",
- "repositories": [{
- "type": "vcs",
- "url": "https://github.com/dawehner/common.git"
- }
- ],
"require": {
"sdboyer/gliph": "0.1.*",
"symfony/class-loader": "2.3.*",
@@ -20,7 +15,7 @@
"symfony/validator": "2.3.*",
"symfony/yaml": "2.3.*",
"twig/twig": "1.15.*",
- "doctrine/common": "dev-bmaster#99b44f52a1b844f9c4c34e618b160664d5c27daf",
+ "doctrine/common": "dev-master#a45d110f71c323e29f41eb0696fa230e3fa1b1b5",
"doctrine/annotations": "dev-master#463d926a8dcc49271cb7db5a08364a70ed6e3cd3",
"guzzle/http": "3.7.*",
"kriswallsmith/assetic": "1.1.*@alpha",
diff --git a/composer.lock b/composer.lock
index 59cdcd83545a26728891dc871de6ecb60415cbb5..cdfad6248179a1f7295b840f098ebb0ce5712e57 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3,7 +3,7 @@
"This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
],
- "hash": "14b55ea7402f04abe36b677892e442f3",
+ "hash": "f6456b9e0dbaab50041a3766d73c954e",
"packages": [
{
"name": "doctrine/annotations",
@@ -207,29 +207,18 @@
},
{
"name": "doctrine/common",
- "version": "dev-bmaster",
+ "version": "dev-master",
"source": {
"type": "git",
- "url": "https://github.com/dawehner/common.git",
- "reference": "99b44f52a1b844f9c4c34e618b160664d5c27daf"
+ "url": "https://github.com/doctrine/common.git",
+ "reference": "a45d110f71c323e29f41eb0696fa230e3fa1b1b5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/dawehner/common/zipball/99b44f52a1b844f9c4c34e618b160664d5c27daf",
- "reference": "99b44f52a1b844f9c4c34e618b160664d5c27daf",
+ "url": "https://api.github.com/repos/doctrine/common/zipball/a45d110f71c323e29f41eb0696fa230e3fa1b1b5",
+ "reference": "a45d110f71c323e29f41eb0696fa230e3fa1b1b5",
"shasum": ""
},
- "archive": {
- "exclude": [
- "!vendor",
- "tests",
- "*phpunit.xml",
- ".travis.yml",
- "build.xml",
- "build.properties",
- "composer.phar"
- ]
- },
"require": {
"doctrine/annotations": "1.*",
"doctrine/cache": "1.*",
@@ -238,6 +227,9 @@
"doctrine/lexer": "1.*",
"php": ">=5.3.2"
},
+ "require-dev": {
+ "phpunit/phpunit": "~3.7"
+ },
"type": "library",
"extra": {
"branch-alias": {
@@ -249,13 +241,21 @@
"Doctrine\\Common\\": "lib/"
}
},
+ "notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
+ {
+ "name": "Jonathan Wage",
+ "email": "jonwage@gmail.com",
+ "homepage": "http://www.jwage.com/",
+ "role": "Creator"
+ },
{
"name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
+ "email": "guilhermeblanco@gmail.com",
+ "homepage": "http://www.instaclick.com"
},
{
"name": "Roman Borschel",
@@ -265,13 +265,11 @@
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de"
},
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com"
- },
{
"name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com"
+ "email": "schmittjoh@gmail.com",
+ "homepage": "http://jmsyst.com",
+ "role": "Developer of wrapped JMSSerializerBundle"
}
],
"description": "Common Library for Doctrine projects",
@@ -283,10 +281,7 @@
"persistence",
"spl"
],
- "support": {
- "source": "https://github.com/dawehner/common/tree/bmaster"
- },
- "time": "2013-12-12 18:37:37"
+ "time": "2014-01-12 22:00:08"
},
{
"name": "doctrine/inflector",
diff --git a/core/vendor/autoload.php b/core/vendor/autoload.php
index c0be8fba77572f69c5ea0c2a828594eb1d80be7e..6b2b2867bbc89915767d7d634ff4dc4d68813623 100644
--- a/core/vendor/autoload.php
+++ b/core/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInitf089bd3ae5f9f883a3ebe89eb643eced::getLoader();
+return ComposerAutoloaderInitc8a0ebe8345566b52e82e4437041f111::getLoader();
diff --git a/core/vendor/composer/autoload_real.php b/core/vendor/composer/autoload_real.php
index b215e77a5715030878accc5cce201bbbfca61e48..fecdbf7b128ab22e8a219940a67e7dcd23390a9f 100644
--- a/core/vendor/composer/autoload_real.php
+++ b/core/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInitf089bd3ae5f9f883a3ebe89eb643eced
+class ComposerAutoloaderInitc8a0ebe8345566b52e82e4437041f111
{
private static $loader;
@@ -19,9 +19,9 @@ public static function getLoader()
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInitf089bd3ae5f9f883a3ebe89eb643eced', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInitc8a0ebe8345566b52e82e4437041f111', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInitf089bd3ae5f9f883a3ebe89eb643eced', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInitc8a0ebe8345566b52e82e4437041f111', 'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname(dirname($vendorDir));
diff --git a/core/vendor/composer/installed.json b/core/vendor/composer/installed.json
index 51c9889d13949d66313feda89daa3db1c32f6dfe..58681c1b684b9ffee1e1454ef65810a98628f75d 100644
--- a/core/vendor/composer/installed.json
+++ b/core/vendor/composer/installed.json
@@ -95,57 +95,6 @@
"psr-3"
]
},
- {
- "name": "twig/twig",
- "version": "v1.12.3",
- "version_normalized": "1.12.3.0",
- "source": {
- "type": "git",
- "url": "https://github.com/fabpot/Twig.git",
- "reference": "v1.12.3"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/fabpot/Twig/zipball/v1.12.3",
- "reference": "v1.12.3",
- "shasum": ""
- },
- "require": {
- "php": ">=5.2.4"
- },
- "time": "2013-04-08 12:40:11",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.12-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Twig_": "lib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Armin Ronacher",
- "email": "armin.ronacher@active-4.com"
- }
- ],
- "description": "Twig, the flexible, fast, and secure template language for PHP",
- "homepage": "http://twig.sensiolabs.org",
- "keywords": [
- "templating"
- ]
- },
{
"name": "kriswallsmith/assetic",
"version": "v1.1.1",
@@ -2042,30 +1991,70 @@
]
},
{
- "name": "doctrine/common",
- "version": "dev-bmaster",
- "version_normalized": "dev-bmaster",
+ "name": "twig/twig",
+ "version": "v1.15.0",
+ "version_normalized": "1.15.0.0",
"source": {
"type": "git",
- "url": "https://github.com/dawehner/common.git",
- "reference": "99b44f52a1b844f9c4c34e618b160664d5c27daf"
+ "url": "https://github.com/fabpot/Twig.git",
+ "reference": "85e4ff98000157ff753d934b9f13659a953f5666"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/dawehner/common/zipball/99b44f52a1b844f9c4c34e618b160664d5c27daf",
- "reference": "99b44f52a1b844f9c4c34e618b160664d5c27daf",
+ "url": "https://api.github.com/repos/fabpot/Twig/zipball/85e4ff98000157ff753d934b9f13659a953f5666",
+ "reference": "85e4ff98000157ff753d934b9f13659a953f5666",
"shasum": ""
},
- "archive": {
- "exclude": [
- "!vendor",
- "tests",
- "*phpunit.xml",
- ".travis.yml",
- "build.xml",
- "build.properties",
- "composer.phar"
- ]
+ "require": {
+ "php": ">=5.2.4"
+ },
+ "time": "2013-12-06 07:47:10",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.15-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "Twig_": "lib/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Armin Ronacher",
+ "email": "armin.ronacher@active-4.com"
+ }
+ ],
+ "description": "Twig, the flexible, fast, and secure template language for PHP",
+ "homepage": "http://twig.sensiolabs.org",
+ "keywords": [
+ "templating"
+ ]
+ },
+ {
+ "name": "doctrine/common",
+ "version": "dev-master",
+ "version_normalized": "9999999-dev",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/doctrine/common.git",
+ "reference": "a45d110f71c323e29f41eb0696fa230e3fa1b1b5"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/doctrine/common/zipball/a45d110f71c323e29f41eb0696fa230e3fa1b1b5",
+ "reference": "a45d110f71c323e29f41eb0696fa230e3fa1b1b5",
+ "shasum": ""
},
"require": {
"doctrine/annotations": "1.*",
@@ -2075,7 +2064,10 @@
"doctrine/lexer": "1.*",
"php": ">=5.3.2"
},
- "time": "2013-12-12 18:37:37",
+ "require-dev": {
+ "phpunit/phpunit": "~3.7"
+ },
+ "time": "2014-01-12 22:00:08",
"type": "library",
"extra": {
"branch-alias": {
@@ -2088,13 +2080,21 @@
"Doctrine\\Common\\": "lib/"
}
},
+ "notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
+ {
+ "name": "Jonathan Wage",
+ "email": "jonwage@gmail.com",
+ "homepage": "http://www.jwage.com/",
+ "role": "Creator"
+ },
{
"name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
+ "email": "guilhermeblanco@gmail.com",
+ "homepage": "http://www.instaclick.com"
},
{
"name": "Roman Borschel",
@@ -2104,13 +2104,11 @@
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de"
},
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com"
- },
{
"name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com"
+ "email": "schmittjoh@gmail.com",
+ "homepage": "http://jmsyst.com",
+ "role": "Developer of wrapped JMSSerializerBundle"
}
],
"description": "Common Library for Doctrine projects",
@@ -2121,9 +2119,6 @@
"eventmanager",
"persistence",
"spl"
- ],
- "support": {
- "source": "https://github.com/dawehner/common/tree/bmaster"
- }
+ ]
}
]
diff --git a/core/vendor/doctrine/common/.gitignore b/core/vendor/doctrine/common/.gitignore
index fc873f9bd7141f8124127c3df84fdcaf54d8b07e..b15c686b462d9405a91ec46ead3c058a230e4d68 100644
--- a/core/vendor/doctrine/common/.gitignore
+++ b/core/vendor/doctrine/common/.gitignore
@@ -5,5 +5,6 @@ dist/
tests/Doctrine/Tests/Common/Proxy/generated/
vendor/
.idea
+composer.lock
doctrine-common-*.tar
doctrine-common-*.tar.gz
diff --git a/core/vendor/doctrine/common/.travis.yml b/core/vendor/doctrine/common/.travis.yml
index 333d36b3bdc432bf95732567b43b824db22280bf..3344d11ada597442ccbe646e9a08347797eed9be 100644
--- a/core/vendor/doctrine/common/.travis.yml
+++ b/core/vendor/doctrine/common/.travis.yml
@@ -5,6 +5,14 @@ php:
- 5.3
- 5.4
- 5.5
+ - hhvm
before_script:
- - composer --prefer-source install
+ - composer --prefer-source install
+
+script:
+ - ./vendor/bin/phpunit
+
+matrix:
+ allow_failures:
+ - php: hhvm
diff --git a/core/vendor/doctrine/common/composer.json b/core/vendor/doctrine/common/composer.json
index 41cef10bcef1e1db462638cc47d7527c14daaf85..4f4f2158ba57732a394d65ef4e78990fbe3a095f 100644
--- a/core/vendor/doctrine/common/composer.json
+++ b/core/vendor/doctrine/common/composer.json
@@ -20,6 +20,10 @@
"doctrine/lexer": "1.*",
"doctrine/annotations": "1.*"
},
+ "minimum-stability": "dev",
+ "require-dev": {
+ "phpunit/phpunit": "~3.7"
+ },
"autoload": {
"psr-0": { "Doctrine\\Common\\": "lib/" }
},
diff --git a/core/vendor/doctrine/common/composer.lock b/core/vendor/doctrine/common/composer.lock
deleted file mode 100644
index 1ed8a6b230331d32c16d6be4ff0d240bee5d0630..0000000000000000000000000000000000000000
--- a/core/vendor/doctrine/common/composer.lock
+++ /dev/null
@@ -1,322 +0,0 @@
-{
- "hash": "f763db6a8f5bcaff6e51ae516283a4c9",
- "packages": [
- {
- "name": "doctrine/annotations",
- "version": "v1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/annotations.git",
- "reference": "v1.0"
- },
- "dist": {
- "type": "zip",
- "url": "https://github.com/doctrine/annotations/archive/v1.0.zip",
- "reference": "v1.0",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.2",
- "doctrine/lexer": "1.*"
- },
- "require-dev": {
- "doctrine/cache": "1.*"
- },
- "time": "2013-01-12 19:23:32",
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Doctrine\\Common\\Annotations\\": "lib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com",
- "homepage": "http://www.jwage.com/"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com",
- "homepage": "http://www.instaclick.com"
- },
- {
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com",
- "homepage": "https://github.com/schmittjoh",
- "role": "Developer of wrapped JMSSerializerBundle"
- }
- ],
- "description": "Docblock Annotations Parser",
- "homepage": "http://www.doctrine-project.org",
- "keywords": [
- "annotations",
- "parser",
- "docblock"
- ]
- },
- {
- "name": "doctrine/cache",
- "version": "v1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/cache.git",
- "reference": "v1.0"
- },
- "dist": {
- "type": "zip",
- "url": "https://github.com/doctrine/cache/archive/v1.0.zip",
- "reference": "v1.0",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.2"
- },
- "time": "2013-01-10 22:43:46",
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Doctrine\\Common\\Cache\\": "lib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com",
- "homepage": "http://www.jwage.com/"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com",
- "homepage": "http://www.instaclick.com"
- },
- {
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com",
- "homepage": "https://github.com/schmittjoh",
- "role": "Developer of wrapped JMSSerializerBundle"
- }
- ],
- "description": "Caching library offering an object-oriented API for many cache backends",
- "homepage": "http://www.doctrine-project.org",
- "keywords": [
- "cache",
- "caching"
- ]
- },
- {
- "name": "doctrine/collections",
- "version": "v1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/collections.git",
- "reference": "v1.0"
- },
- "dist": {
- "type": "zip",
- "url": "https://github.com/doctrine/collections/archive/v1.0.zip",
- "reference": "v1.0",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.2"
- },
- "time": "2013-01-12 16:36:50",
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Doctrine\\Common\\Collections\\": "lib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com",
- "homepage": "http://www.jwage.com/"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com",
- "homepage": "http://www.instaclick.com"
- },
- {
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com",
- "homepage": "https://github.com/schmittjoh",
- "role": "Developer of wrapped JMSSerializerBundle"
- }
- ],
- "description": "Collections Abstraction library",
- "homepage": "http://www.doctrine-project.org",
- "keywords": [
- "collections",
- "iterator",
- "array"
- ]
- },
- {
- "name": "doctrine/inflector",
- "version": "v1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/inflector.git",
- "reference": "v1.0"
- },
- "dist": {
- "type": "zip",
- "url": "https://github.com/doctrine/inflector/archive/v1.0.zip",
- "reference": "v1.0",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.2"
- },
- "time": "2013-01-10 21:49:15",
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Doctrine\\Common\\Inflector\\": "lib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com",
- "homepage": "http://www.jwage.com/"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com",
- "homepage": "http://www.instaclick.com"
- },
- {
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com",
- "homepage": "https://github.com/schmittjoh",
- "role": "Developer of wrapped JMSSerializerBundle"
- }
- ],
- "description": "Common String Manipulations with regard to casing and singular/plural rules.",
- "homepage": "http://www.doctrine-project.org",
- "keywords": [
- "string",
- "inflection",
- "singuarlize",
- "pluarlize"
- ]
- },
- {
- "name": "doctrine/lexer",
- "version": "v1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/lexer.git",
- "reference": "v1.0"
- },
- "dist": {
- "type": "zip",
- "url": "https://github.com/doctrine/lexer/archive/v1.0.zip",
- "reference": "v1.0",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.2"
- },
- "time": "2013-01-12 18:59:04",
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Doctrine\\Common\\Lexer\\": "lib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com",
- "homepage": "http://www.instaclick.com"
- },
- {
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com",
- "homepage": "https://github.com/schmittjoh",
- "role": "Developer of wrapped JMSSerializerBundle"
- }
- ],
- "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
- "homepage": "http://www.doctrine-project.org",
- "keywords": [
- "parser",
- "lexer"
- ]
- }
- ],
- "packages-dev": null,
- "aliases": [
-
- ],
- "minimum-stability": "stable",
- "stability-flags": [
-
- ]
-}
diff --git a/core/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/UnexpectedValueException.php b/core/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/UnexpectedValueException.php
index 73ec64d30277aee0b632831dd3b4da7419e4bd9e..2b8e6386115e6c2067e2e8369fd42f1d49ab2aa8 100644
--- a/core/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/UnexpectedValueException.php
+++ b/core/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/UnexpectedValueException.php
@@ -33,9 +33,9 @@ class UnexpectedValueException extends BaseUnexpectedValueException implements P
/**
* @return self
*/
- public static function proxyDirectoryNotWritable()
+ public static function proxyDirectoryNotWritable($proxyDirectory)
{
- return new self('Your proxy directory must be writable');
+ return new self(sprintf('Your proxy directory "%s" must be writable', $proxyDirectory));
}
/**
diff --git a/core/vendor/doctrine/common/lib/Doctrine/Common/Proxy/ProxyGenerator.php b/core/vendor/doctrine/common/lib/Doctrine/Common/Proxy/ProxyGenerator.php
index fd7649053b9f0fc141eb77608ed5651e59918af5..4c5a239a4a5e34772c158e8dd1c44828b0b3d8c0 100644
--- a/core/vendor/doctrine/common/lib/Doctrine/Common/Proxy/ProxyGenerator.php
+++ b/core/vendor/doctrine/common/lib/Doctrine/Common/Proxy/ProxyGenerator.php
@@ -292,11 +292,11 @@ public function generateProxyClass(ClassMetadata $class, $fileName = false)
$parentDirectory = dirname($fileName);
if ( ! is_dir($parentDirectory) && (false === @mkdir($parentDirectory, 0775, true))) {
- throw UnexpectedValueException::proxyDirectoryNotWritable();
+ throw UnexpectedValueException::proxyDirectoryNotWritable($this->proxyDirectory);
}
if ( ! is_writable($parentDirectory)) {
- throw UnexpectedValueException::proxyDirectoryNotWritable();
+ throw UnexpectedValueException::proxyDirectoryNotWritable($this->proxyDirectory);
}
$tmpFileName = $fileName . '.' . uniqid('', true);
diff --git a/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Reflection/ExampleAnnotationClass.php b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Reflection/ExampleAnnotationClass.php
new file mode 100644
index 0000000000000000000000000000000000000000..45aee1c52bbc9b7b45d1d50d7625a72b715d281a
--- /dev/null
+++ b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Reflection/ExampleAnnotationClass.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Doctrine\Tests\Common\Reflection;
+
+use Doctrine\Common\Annotations\Annotation;
+
+/**
+ * @Annotation(
+ * key = "value"
+ * )
+ */
+class ExampleAnnotationClass {
+
+}