Commit 2a228e60 authored by catch's avatar catch

Issue #2173719 by dawehner, tim.plunkett: Remove the fork of doctrine/common.

parent a865f3a6
......@@ -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",
......
......@@ -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",
......
......@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
return ComposerAutoloaderInitf089bd3ae5f9f883a3ebe89eb643eced::getLoader();
return ComposerAutoloaderInitc8a0ebe8345566b52e82e4437041f111::getLoader();
......@@ -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));
......
......@@ -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"
}
]
}
]
......@@ -5,5 +5,6 @@ dist/
tests/Doctrine/Tests/Common/Proxy/generated/
vendor/
.idea
composer.lock
doctrine-common-*.tar
doctrine-common-*.tar.gz
......@@ -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
......@@ -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/" }
},
......
This diff is collapsed.
......@@ -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));
}
/**
......
......@@ -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);
......
<?php
namespace Doctrine\Tests\Common\Reflection;
use Doctrine\Common\Annotations\Annotation;
/**
* @Annotation(
* key = "value"
* )
*/
class ExampleAnnotationClass {
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment