diff --git a/composer.json b/composer.json index 7d460ed..ea0b5fb 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.12.*", - "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 1850816..f13b1e8 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": "06006c1512fb829fcdb498b7e515901d", + "hash": "1a838032341d99f65c1e91e399f83115", "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", @@ -266,12 +266,10 @@ "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 c0be8fb..034076e 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 ComposerAutoloaderInit8f1d5789e4ec6630d58ae63c3fabab53::getLoader(); diff --git a/core/vendor/composer/autoload_real.php b/core/vendor/composer/autoload_real.php index b215e77..45158da 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 ComposerAutoloaderInit8f1d5789e4ec6630d58ae63c3fabab53 { 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('ComposerAutoloaderInit8f1d5789e4ec6630d58ae63c3fabab53', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitf089bd3ae5f9f883a3ebe89eb643eced', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit8f1d5789e4ec6630d58ae63c3fabab53', 'loadClassLoader')); $vendorDir = dirname(__DIR__); $baseDir = dirname(dirname($vendorDir)); diff --git a/core/vendor/composer/installed.json b/core/vendor/composer/installed.json index 51c9889..3fdba43 100644 --- a/core/vendor/composer/installed.json +++ b/core/vendor/composer/installed.json @@ -2043,30 +2043,19 @@ }, { "name": "doctrine/common", - "version": "dev-bmaster", - "version_normalized": "dev-bmaster", + "version": "dev-master", + "version_normalized": "9999999-dev", "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.*", @@ -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", @@ -2105,12 +2105,10 @@ "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 fc873f9..b15c686 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 333d36b..3344d11 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 41cef10..4f4f215 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 1ed8a6b..0000000 --- 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 73ec64d..2b8e638 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 fd76490..4c5a239 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 0000000..45aee1c --- /dev/null +++ b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Reflection/ExampleAnnotationClass.php @@ -0,0 +1,14 @@ +