diff --git a/core/composer.json b/core/composer.json
index 4a109a2..edea79f 100644
--- a/core/composer.json
+++ b/core/composer.json
@@ -23,7 +23,8 @@
"kriswallsmith/assetic": "1.1.0-alpha1",
"symfony-cmf/routing": "dev-master#ea4a10",
"easyrdf/easyrdf": "0.8.0-beta.1",
- "phpunit/phpunit": "3.7 as dev-3.7"
+ "phpunit/phpunit": "3.7 as dev-3.7",
+ "psr/log": "1.0.0"
},
"minimum-stability": "dev"
}
diff --git a/core/composer.lock b/core/composer.lock
index 8715a8e..d959d05 100644
--- a/core/composer.lock
+++ b/core/composer.lock
@@ -1,5 +1,5 @@
{
- "hash": "a8c56a3549ec70f775e4bf795e65a993",
+ "hash": "1e311d02ad51046d3f2da70fd4673cbb",
"packages": [
{
"name": "doctrine/common",
@@ -384,12 +384,12 @@
"source": {
"type": "git",
"url": "git://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "fa8ba7588bdaa48b93cd60629273ee6b9699b280"
+ "reference": "25232ac64f081abd7478ae2d63fdb757f45e92b9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/fa8ba7588bdaa48b93cd60629273ee6b9699b280",
- "reference": "fa8ba7588bdaa48b93cd60629273ee6b9699b280",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/25232ac64f081abd7478ae2d63fdb757f45e92b9",
+ "reference": "25232ac64f081abd7478ae2d63fdb757f45e92b9",
"shasum": ""
},
"require": {
@@ -402,7 +402,7 @@
"ext-dom": "*",
"ext-xdebug": ">=2.0.5"
},
- "time": "2013-02-12 10:55:13",
+ "time": "2013-02-14 10:33:04",
"type": "library",
"autoload": {
"classmap": [
@@ -525,7 +525,7 @@
"version": "1.0.x-dev",
"source": {
"type": "git",
- "url": "git://github.com/sebastianbergmann/php-timer.git",
+ "url": "https://github.com/sebastianbergmann/php-timer.git",
"reference": "ecf7920b27003a9412b07dad79dbb5ad1249e6c3"
},
"dist": {
@@ -777,7 +777,7 @@
"target-dir": "Symfony/Cmf/Component/Routing",
"source": {
"type": "git",
- "url": "https://github.com/symfony-cmf/Routing",
+ "url": "https://github.com/symfony-cmf/Routing.git",
"reference": "ea4a10"
},
"dist": {
@@ -831,7 +831,7 @@
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/ClassLoader/archive/v2.2.0-BETA2.zip",
+ "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/v2.2.0-BETA2",
"reference": "v2.2.0-BETA2",
"shasum": ""
},
@@ -1040,7 +1040,7 @@
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/HttpKernel/archive/v2.2.0-BETA2.zip",
+ "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/v2.2.0-BETA2",
"reference": "v2.2.0-BETA2",
"shasum": ""
},
@@ -1104,19 +1104,19 @@
"target-dir": "Symfony/Component/Process",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Process",
- "reference": "v2.1.7"
+ "url": "https://github.com/symfony/Process.git",
+ "reference": "d91b0501e6340f11aa4e920dbd4d765310993bb0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Process/zipball/v2.1.7",
- "reference": "v2.1.7",
+ "url": "https://api.github.com/repos/symfony/Process/zipball/d91b0501e6340f11aa4e920dbd4d765310993bb0",
+ "reference": "d91b0501e6340f11aa4e920dbd4d765310993bb0",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
- "time": "2013-01-16 09:27:54",
+ "time": "2013-02-18 21:27:57",
"type": "library",
"autoload": {
"psr-0": {
@@ -1151,7 +1151,7 @@
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/Routing/archive/v2.2.0-BETA2.zip",
+ "url": "https://api.github.com/repos/symfony/Routing/zipball/v2.2.0-BETA2",
"reference": "v2.2.0-BETA2",
"shasum": ""
},
@@ -1252,7 +1252,7 @@
"target-dir": "Symfony/Component/Translation",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Translation",
+ "url": "https://github.com/symfony/Translation.git",
"reference": "v2.2.0-RC2"
},
"dist": {
@@ -1372,7 +1372,7 @@
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/Yaml/archive/v2.2.0-BETA2.zip",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/v2.2.0-BETA2",
"reference": "v2.2.0-BETA2",
"shasum": ""
},
diff --git a/core/lib/Drupal/Core/ControllerResolver.php b/core/lib/Drupal/Core/ControllerResolver.php
index c1674fb..38e9fad 100644
--- a/core/lib/Drupal/Core/ControllerResolver.php
+++ b/core/lib/Drupal/Core/ControllerResolver.php
@@ -8,7 +8,7 @@
namespace Drupal\Core;
use Symfony\Component\HttpKernel\Controller\ControllerResolver as BaseControllerResolver;
-use Symfony\Component\HttpKernel\Log\LoggerInterface;
+use Psr\Log\LoggerInterface;
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -41,7 +41,7 @@ class ControllerResolver extends BaseControllerResolver {
*
* @param Symfony\Component\DependencyInjection\ContainerInterface $container
* A ContainerInterface instance.
- * @param Symfony\Component\HttpKernel\Log\LoggerInterface $logger
+ * @param \Psr\Log\LoggerInterface $logger
* (optional) A LoggerInterface instance.
*/
public function __construct(ContainerInterface $container, LoggerInterface $logger = NULL) {
diff --git a/core/lib/Drupal/Core/CoreBundle.php b/core/lib/Drupal/Core/CoreBundle.php
index 2ebe38f..2122387 100644
--- a/core/lib/Drupal/Core/CoreBundle.php
+++ b/core/lib/Drupal/Core/CoreBundle.php
@@ -130,7 +130,8 @@ public function build(ContainerBuilder $container) {
$container->register('event_dispatcher', 'Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher')
->addArgument(new Reference('service_container'));
$container->register('controller_resolver', 'Drupal\Core\ControllerResolver')
- ->addArgument(new Reference('service_container'));
+ ->addArgument(new Reference('service_container'))
+ ->addArgument(new Reference('logger.watchdog'));
$container
->register('cache.cache', 'Drupal\Core\Cache\CacheBackendInterface')
@@ -278,6 +279,8 @@ public function build(ContainerBuilder $container) {
$container->register('plugin.manager.condition', 'Drupal\Core\Condition\ConditionManager');
+ $container->register('logger.watchdog', 'Drupal\Core\WatchdogLogger');
+
$container->addCompilerPass(new RegisterMatchersPass());
$container->addCompilerPass(new RegisterRouteFiltersPass());
// Add a compiler pass for registering event subscribers.
@@ -326,7 +329,8 @@ protected function registerRouting(ContainerBuilder $container) {
->addMethodCall('setFinalMatcher', array(new Reference('router.matcher.final_matcher')));
$container->register('router.generator', 'Drupal\Core\Routing\UrlGenerator')
->addArgument(new Reference('router.route_provider'))
- ->addArgument(new Reference('path.alias_manager.cached'));
+ ->addArgument(new Reference('path.alias_manager.cached'))
+ -addArgument(new Reference('logger.watchdog'));
$container->register('router.dynamic', 'Symfony\Cmf\Component\Routing\DynamicRouter')
->addArgument(new Reference('router.request_context'))
->addArgument(new Reference('router.matcher'))
diff --git a/core/lib/Drupal/Core/EventSubscriber/RouteProcessorSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/RouteProcessorSubscriber.php
index 0061530..55ee2e4 100644
--- a/core/lib/Drupal/Core/EventSubscriber/RouteProcessorSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/RouteProcessorSubscriber.php
@@ -12,7 +12,6 @@
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
-use Symfony\Component\HttpKernel\Log\LoggerInterface;
use Symfony\Component\HttpKernel\KernelEvents;
use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
use Symfony\Component\Routing\Exception\ResourceNotFoundException;
diff --git a/core/lib/Drupal/Core/Routing/UrlGenerator.php b/core/lib/Drupal/Core/Routing/UrlGenerator.php
index 75779a2..a501300 100644
--- a/core/lib/Drupal/Core/Routing/UrlGenerator.php
+++ b/core/lib/Drupal/Core/Routing/UrlGenerator.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Routing;
-use Symfony\Component\HttpKernel\Log\LoggerInterface;
+use Psr\Log\LoggerInterface;
use Symfony\Cmf\Component\Routing\ProviderBasedGenerator;
use Symfony\Cmf\Component\Routing\RouteProviderInterface;
@@ -33,7 +33,7 @@ class UrlGenerator extends ProviderBasedGenerator {
* The route provider to be searched for routes.
* @param \Drupal\Core\Path\AliasManagerInterface $alias_manager
* The alias manager responsible for path aliasing.
- * @param \Symfony\Component\HttpKernel\Log\LoggerInterface $logger
+ * @param \Psr\Log\LoggerInterface $logger
* An optional logger for recording errors.
*/
public function __construct(RouteProviderInterface $provider, AliasManagerInterface $alias_manager, LoggerInterface $logger = NULL) {
diff --git a/core/lib/Drupal/Core/WatchdogLogger.php b/core/lib/Drupal/Core/WatchdogLogger.php
new file mode 100644
index 0000000..7b24e19
--- /dev/null
+++ b/core/lib/Drupal/Core/WatchdogLogger.php
@@ -0,0 +1,85 @@
+ $element) {
+ if ($key != 'exception') {
+ $variables['@' . $key] = $element;
+ }
+ }
+
+ watchdog($type, $message, $variables, $this->mapLevel($level), $link);
+ }
+
+ /**
+ * Converts a PSR Log level to a Watchdog log level.
+ *
+ * @param string $level
+ * A PSR-3 logging level string.
+ *
+ * @return int
+ * The corresponding Watchdog constant.
+ */
+ protected function mapLevel($level) {
+ if (empty($this->levelTranslation)) {
+ $this->levelTranslation = array(
+ LogLevel::ALERT => WATCHDOG_ALERT,
+ LogLevel::CRITICAL => WATCHDOG_CRITICAL,
+ LogLevel::DEBUG => WATCHDOG_DEBUG,
+ LogLevel::EMERGENCY => WATCHDOG_EMERGENCY,
+ LogLevel::ERROR => WATCHDOG_ERROR,
+ LogLevel::INFO => WATCHDOG_INFO,
+ LogLevel::NOTICE => WATCHDOG_NOTICE,
+ LogLevel::WARNING => WATCHDOG_WARNING,
+ );
+ }
+
+ return $this->levelTranslation[$level];
+ }
+
+}
diff --git a/core/vendor/autoload.php b/core/vendor/autoload.php
index 5a49ae7..e4ddefd 100644
--- a/core/vendor/autoload.php
+++ b/core/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInit481bddffaf22b51d159ec1b257c2bd7f::getLoader();
+return ComposerAutoloaderInit82c0fccb5e8d7ffd0fb8ea4288bb38e7::getLoader();
diff --git a/core/vendor/composer/autoload_real.php b/core/vendor/composer/autoload_real.php
index 24c4d51..8634152 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 ComposerAutoloaderInit481bddffaf22b51d159ec1b257c2bd7f
+class ComposerAutoloaderInit82c0fccb5e8d7ffd0fb8ea4288bb38e7
{
private static $loader;
@@ -19,9 +19,9 @@ public static function getLoader()
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit481bddffaf22b51d159ec1b257c2bd7f', 'loadClassLoader'));
+ spl_autoload_register(array('ComposerAutoloaderInit82c0fccb5e8d7ffd0fb8ea4288bb38e7', 'loadClassLoader'));
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit481bddffaf22b51d159ec1b257c2bd7f', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit82c0fccb5e8d7ffd0fb8ea4288bb38e7', 'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
diff --git a/core/vendor/composer/installed.json b/core/vendor/composer/installed.json
index d272cdb..dfe1c07 100644
--- a/core/vendor/composer/installed.json
+++ b/core/vendor/composer/installed.json
@@ -128,19 +128,19 @@
"target-dir": "Symfony/Component/Process",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Process",
- "reference": "v2.1.7"
+ "url": "https://github.com/symfony/Process.git",
+ "reference": "d91b0501e6340f11aa4e920dbd4d765310993bb0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Process/zipball/v2.1.7",
- "reference": "v2.1.7",
+ "url": "https://api.github.com/repos/symfony/Process/zipball/d91b0501e6340f11aa4e920dbd4d765310993bb0",
+ "reference": "d91b0501e6340f11aa4e920dbd4d765310993bb0",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
- "time": "2013-01-16 09:27:54",
+ "time": "2013-02-18 21:27:57",
"type": "library",
"installation-source": "source",
"autoload": {
@@ -269,25 +269,32 @@
]
},
{
- "name": "symfony/http-foundation",
+ "name": "symfony/event-dispatcher",
"version": "v2.2.0-BETA2",
"version_normalized": "2.2.0.0-beta2",
- "target-dir": "Symfony/Component/HttpFoundation",
+ "target-dir": "Symfony/Component/EventDispatcher",
"source": {
"type": "git",
- "url": "https://github.com/symfony/HttpFoundation",
+ "url": "https://github.com/symfony/EventDispatcher",
"reference": "v2.2.0-BETA2"
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/HttpFoundation/archive/v2.2.0-BETA2.zip",
+ "url": "https://github.com/symfony/EventDispatcher/archive/v2.2.0-BETA2.zip",
"reference": "v2.2.0-BETA2",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
- "time": "2013-01-21 16:56:55",
+ "require-dev": {
+ "symfony/dependency-injection": "2.2.*"
+ },
+ "suggest": {
+ "symfony/dependency-injection": "2.2.*",
+ "symfony/http-kernel": "2.2.*"
+ },
+ "time": "2013-01-17 15:25:59",
"type": "library",
"extra": {
"branch-alias": {
@@ -297,11 +304,8 @@
"installation-source": "dist",
"autoload": {
"psr-0": {
- "Symfony\\Component\\HttpFoundation\\": ""
- },
- "classmap": [
- "Symfony/Component/HttpFoundation/Resources/stubs"
- ]
+ "Symfony\\Component\\EventDispatcher\\": ""
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -317,36 +321,29 @@
"homepage": "http://symfony.com/contributors"
}
],
- "description": "Symfony HttpFoundation Component",
+ "description": "Symfony EventDispatcher Component",
"homepage": "http://symfony.com"
},
{
- "name": "symfony/event-dispatcher",
+ "name": "symfony/http-foundation",
"version": "v2.2.0-BETA2",
"version_normalized": "2.2.0.0-beta2",
- "target-dir": "Symfony/Component/EventDispatcher",
+ "target-dir": "Symfony/Component/HttpFoundation",
"source": {
"type": "git",
- "url": "https://github.com/symfony/EventDispatcher",
+ "url": "https://github.com/symfony/HttpFoundation",
"reference": "v2.2.0-BETA2"
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/EventDispatcher/archive/v2.2.0-BETA2.zip",
+ "url": "https://github.com/symfony/HttpFoundation/archive/v2.2.0-BETA2.zip",
"reference": "v2.2.0-BETA2",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
- "require-dev": {
- "symfony/dependency-injection": "2.2.*"
- },
- "suggest": {
- "symfony/dependency-injection": "2.2.*",
- "symfony/http-kernel": "2.2.*"
- },
- "time": "2013-01-17 15:25:59",
+ "time": "2013-01-21 16:56:55",
"type": "library",
"extra": {
"branch-alias": {
@@ -356,8 +353,11 @@
"installation-source": "dist",
"autoload": {
"psr-0": {
- "Symfony\\Component\\EventDispatcher\\": ""
- }
+ "Symfony\\Component\\HttpFoundation\\": ""
+ },
+ "classmap": [
+ "Symfony/Component/HttpFoundation/Resources/stubs"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -373,7 +373,7 @@
"homepage": "http://symfony.com/contributors"
}
],
- "description": "Symfony EventDispatcher Component",
+ "description": "Symfony HttpFoundation Component",
"homepage": "http://symfony.com"
},
{
@@ -388,7 +388,7 @@
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/HttpKernel/archive/v2.2.0-BETA2.zip",
+ "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/v2.2.0-BETA2",
"reference": "v2.2.0-BETA2",
"shasum": ""
},
@@ -459,7 +459,7 @@
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/Routing/archive/v2.2.0-BETA2.zip",
+ "url": "https://api.github.com/repos/symfony/Routing/zipball/v2.2.0-BETA2",
"reference": "v2.2.0-BETA2",
"shasum": ""
},
@@ -509,6 +509,57 @@
"homepage": "http://symfony.com"
},
{
+ "name": "symfony-cmf/routing",
+ "version": "dev-master",
+ "version_normalized": "9999999-dev",
+ "target-dir": "Symfony/Cmf/Component/Routing",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony-cmf/Routing.git",
+ "reference": "ea4a10"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/72df1da07b3c4edf16df169fb7987f504070fe0d",
+ "reference": "ea4a10",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.2",
+ "symfony/http-kernel": ">=2.1,<2.3-dev",
+ "symfony/routing": ">=2.1,<2.3-dev"
+ },
+ "time": "2013-01-24 16:09:01",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
+ "installation-source": "source",
+ "autoload": {
+ "psr-0": {
+ "Symfony\\Cmf\\Component\\Routing": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Symfony CMF Community",
+ "homepage": "https://github.com/symfony-cmf/Routing/contributors"
+ }
+ ],
+ "description": "Extends the Symfony2 routing component for dynamic routes and chaining several routers",
+ "homepage": "http://cmf.symfony.com",
+ "keywords": [
+ "database",
+ "routing"
+ ]
+ },
+ {
"name": "easyrdf/easyrdf",
"version": "0.8.0-beta.1",
"version_normalized": "0.8.0.0-beta1",
@@ -576,7 +627,7 @@
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/ClassLoader/archive/v2.2.0-BETA2.zip",
+ "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/v2.2.0-BETA2",
"reference": "v2.2.0-BETA2",
"shasum": ""
},
@@ -617,35 +668,43 @@
"homepage": "http://symfony.com"
},
{
- "name": "symfony/yaml",
- "version": "v2.2.0-BETA2",
- "version_normalized": "2.2.0.0-beta2",
- "target-dir": "Symfony/Component/Yaml",
+ "name": "symfony/translation",
+ "version": "2.2.x-dev",
+ "version_normalized": "2.2.9999999.9999999-dev",
+ "target-dir": "Symfony/Component/Translation",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Yaml",
- "reference": "v2.2.0-BETA2"
+ "url": "https://github.com/symfony/Translation.git",
+ "reference": "v2.2.0-RC2"
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/Yaml/archive/v2.2.0-BETA2.zip",
- "reference": "v2.2.0-BETA2",
+ "url": "https://api.github.com/repos/symfony/Translation/zipball/v2.2.0-RC2",
+ "reference": "v2.2.0-RC2",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
- "time": "2013-01-23 20:21:00",
+ "require-dev": {
+ "symfony/config": ">=2.0,<2.3-dev",
+ "symfony/yaml": ">=2.2,<3.0"
+ },
+ "suggest": {
+ "symfony/config": "2.2.*",
+ "symfony/yaml": "2.2.*"
+ },
+ "time": "2013-02-08 16:10:57",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.2-dev"
}
},
- "installation-source": "dist",
+ "installation-source": "source",
"autoload": {
"psr-0": {
- "Symfony\\Component\\Yaml\\": ""
+ "Symfony\\Component\\Translation\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -662,7 +721,7 @@
"homepage": "http://symfony.com/contributors"
}
],
- "description": "Symfony Yaml Component",
+ "description": "Symfony Translation Component",
"homepage": "http://symfony.com"
},
{
@@ -1035,43 +1094,35 @@
]
},
{
- "name": "symfony/translation",
- "version": "2.2.x-dev",
- "version_normalized": "2.2.9999999.9999999-dev",
- "target-dir": "Symfony/Component/Translation",
+ "name": "symfony/yaml",
+ "version": "v2.2.0-BETA2",
+ "version_normalized": "2.2.0.0-beta2",
+ "target-dir": "Symfony/Component/Yaml",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Translation",
- "reference": "v2.2.0-RC2"
+ "url": "https://github.com/symfony/Yaml",
+ "reference": "v2.2.0-BETA2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Translation/zipball/v2.2.0-RC2",
- "reference": "v2.2.0-RC2",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/v2.2.0-BETA2",
+ "reference": "v2.2.0-BETA2",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
- "require-dev": {
- "symfony/config": ">=2.0,<2.3-dev",
- "symfony/yaml": ">=2.2,<3.0"
- },
- "suggest": {
- "symfony/config": "2.2.*",
- "symfony/yaml": "2.2.*"
- },
- "time": "2013-02-08 16:10:57",
+ "time": "2013-01-23 20:21:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.2-dev"
}
},
- "installation-source": "source",
+ "installation-source": "dist",
"autoload": {
"psr-0": {
- "Symfony\\Component\\Translation\\": ""
+ "Symfony\\Component\\Yaml\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1088,7 +1139,7 @@
"homepage": "http://symfony.com/contributors"
}
],
- "description": "Symfony Translation Component",
+ "description": "Symfony Yaml Component",
"homepage": "http://symfony.com"
},
{
@@ -1194,7 +1245,7 @@
"version_normalized": "1.0.9999999.9999999-dev",
"source": {
"type": "git",
- "url": "git://github.com/sebastianbergmann/php-timer.git",
+ "url": "https://github.com/sebastianbergmann/php-timer.git",
"reference": "ecf7920b27003a9412b07dad79dbb5ad1249e6c3"
},
"dist": {
@@ -1335,12 +1386,12 @@
"source": {
"type": "git",
"url": "git://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "fa8ba7588bdaa48b93cd60629273ee6b9699b280"
+ "reference": "25232ac64f081abd7478ae2d63fdb757f45e92b9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/fa8ba7588bdaa48b93cd60629273ee6b9699b280",
- "reference": "fa8ba7588bdaa48b93cd60629273ee6b9699b280",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/25232ac64f081abd7478ae2d63fdb757f45e92b9",
+ "reference": "25232ac64f081abd7478ae2d63fdb757f45e92b9",
"shasum": ""
},
"require": {
@@ -1353,7 +1404,7 @@
"ext-dom": "*",
"ext-xdebug": ">=2.0.5"
},
- "time": "2013-02-12 10:55:13",
+ "time": "2013-02-14 10:33:04",
"type": "library",
"installation-source": "source",
"autoload": {
@@ -1459,56 +1510,5 @@
"irc": "irc://irc.freenode.net/phpunit",
"source": "https://github.com/msonnabaum/phpunit/tree/3.7.0"
}
- },
- {
- "name": "symfony-cmf/routing",
- "version": "dev-master",
- "version_normalized": "9999999-dev",
- "target-dir": "Symfony/Cmf/Component/Routing",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony-cmf/Routing",
- "reference": "ea4a10"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/72df1da07b3c4edf16df169fb7987f504070fe0d",
- "reference": "ea4a10",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.2",
- "symfony/http-kernel": ">=2.1,<2.3-dev",
- "symfony/routing": ">=2.1,<2.3-dev"
- },
- "time": "2013-01-24 16:09:01",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0-dev"
- }
- },
- "installation-source": "source",
- "autoload": {
- "psr-0": {
- "Symfony\\Cmf\\Component\\Routing": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Symfony CMF Community",
- "homepage": "https://github.com/symfony-cmf/Routing/contributors"
- }
- ],
- "description": "Extends the Symfony2 routing component for dynamic routes and chaining several routers",
- "homepage": "http://cmf.symfony.com",
- "keywords": [
- "database",
- "routing"
- ]
}
]
diff --git a/core/vendor/kriswallsmith/assetic/CHANGELOG-1.1.md b/core/vendor/kriswallsmith/assetic/CHANGELOG-1.1.md
old mode 100644
new mode 100755
diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sprockets/lib1/assets/images/image.gif b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sprockets/lib1/assets/images/image.gif
old mode 100644
new mode 100755
diff --git a/core/vendor/phpunit/php-code-coverage/.travis.yml b/core/vendor/phpunit/php-code-coverage/.travis.yml
index 397c8be..35a8eb1 100644
--- a/core/vendor/phpunit/php-code-coverage/.travis.yml
+++ b/core/vendor/phpunit/php-code-coverage/.travis.yml
@@ -11,7 +11,7 @@ before_script:
- git clone --branch=master --depth=100 --quiet git://github.com/sebastianbergmann/php-text-template.git vendor/php-text-template
- git clone --branch=master --depth=100 --quiet git://github.com/sebastianbergmann/php-token-stream.git vendor/php-token-stream
- git clone --branch=master --depth=100 --quiet git://github.com/sebastianbergmann/php-file-iterator.git vendor/php-file-iterator
- - git clone --branch=master --depth=100 --quiet git://github.com/sebastianbergmann/php-timer.git vendor/php-timer
+ - git clone --branch=1.0 --depth=100 --quiet git://github.com/sebastianbergmann/php-timer.git vendor/php-timer
- git clone --branch=master --depth=100 --quiet git://github.com/pear/pear-core.git vendor/pear-core
- git clone --branch=trunk --depth=100 --quiet git://github.com/pear/Console_Getopt.git vendor/console-getopt
diff --git a/core/vendor/phpunit/php-code-coverage/ChangeLog.markdown b/core/vendor/phpunit/php-code-coverage/ChangeLog.markdown
index 273fa03..bf8b44a 100644
--- a/core/vendor/phpunit/php-code-coverage/ChangeLog.markdown
+++ b/core/vendor/phpunit/php-code-coverage/ChangeLog.markdown
@@ -3,6 +3,12 @@ PHP_CodeCoverage 1.2
This is the list of changes for the PHP_CodeCoverage 1.2 release series.
+PHP_CodeCoverage 1.2.8
+----------------------
+
+* Reduced vertical whitespace in sourcecode view.
+* Upgraded to Bootstrap 2.2.2.
+
PHP_CodeCoverage 1.2.7
----------------------
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer.php b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer.php
index 28bc53c..3ed476f 100644
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer.php
+++ b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer.php
@@ -113,6 +113,7 @@ public function __construct($templatePath, $charset, $generator, $date, $lowUppe
*/
protected function renderItemTemplate(Text_Template $template, array $data)
{
+ $numSeperator = ' / ';
$classesBar = ' ';
$classesLevel = 'None';
$classesNumber = ' ';
@@ -120,7 +121,7 @@ protected function renderItemTemplate(Text_Template $template, array $data)
if (isset($data['numClasses']) && $data['numClasses'] > 0) {
$classesLevel = $this->getColorLevel($data['testedClassesPercent']);
- $classesNumber = $data['numTestedClasses'] . ' / ' .
+ $classesNumber = $data['numTestedClasses'] . $numSeperator .
$data['numClasses'];
$classesBar = $this->getCoverageBar(
@@ -135,7 +136,7 @@ protected function renderItemTemplate(Text_Template $template, array $data)
if ($data['numMethods'] > 0) {
$methodsLevel = $this->getColorLevel($data['testedMethodsPercent']);
- $methodsNumber = $data['numTestedMethods'] . ' / ' .
+ $methodsNumber = $data['numTestedMethods'] . $numSeperator .
$data['numMethods'];
$methodsBar = $this->getCoverageBar(
@@ -150,7 +151,7 @@ protected function renderItemTemplate(Text_Template $template, array $data)
if ($data['numExecutableLines'] > 0) {
$linesLevel = $this->getColorLevel($data['linesExecutedPercent']);
- $linesNumber = $data['numExecutedLines'] . ' / ' .
+ $linesNumber = $data['numExecutedLines'] . $numSeperator .
$data['numExecutableLines'];
$linesBar = $this->getCoverageBar(
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Version.php b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Version.php
index 5eb1480..5c5c102 100644
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Version.php
+++ b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Version.php
@@ -56,7 +56,7 @@
*/
class PHP_CodeCoverage_Version
{
- const VERSION = '1.2.7';
+ const VERSION = '1.2.8';
protected static $version;
/**
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/PHP/CodeCoverage/UtilTest.php b/core/vendor/phpunit/php-code-coverage/Tests/PHP/CodeCoverage/UtilTest.php
index 1a0e7f5..ed6b0f7 100644
--- a/core/vendor/phpunit/php-code-coverage/Tests/PHP/CodeCoverage/UtilTest.php
+++ b/core/vendor/phpunit/php-code-coverage/Tests/PHP/CodeCoverage/UtilTest.php
@@ -171,7 +171,10 @@ public function testGetLinesToBeIgnoredOneLineAnnotations()
6 => TRUE,
8 => TRUE,
9 => TRUE,
- 13 => TRUE,
+ 10 => TRUE,
+ 11 => TRUE,
+ 12 => TRUE,
+ 13 => TRUE
),
PHP_CodeCoverage_Util::getLinesToBeIgnored(
TEST_FILES_PATH . 'source_with_oneline_annotations.php'
diff --git a/core/vendor/phpunit/php-code-coverage/package.xml b/core/vendor/phpunit/php-code-coverage/package.xml
index 600ece9..de16a50 100644
--- a/core/vendor/phpunit/php-code-coverage/package.xml
+++ b/core/vendor/phpunit/php-code-coverage/package.xml
@@ -17,9 +17,9 @@
sb@sebastian-bergmann.de
yes
- 2012-12-02
+ 2013-02-14
- 1.2.7
+ 1.2.8
1.2.0
diff --git a/core/vendor/phpunit/phpunit/build/assertions.php b/core/vendor/phpunit/phpunit/build/assertions.php
old mode 100644
new mode 100755
diff --git a/core/vendor/phpunit/phpunit/phpunit.php b/core/vendor/phpunit/phpunit/phpunit.php
old mode 100644
new mode 100755
diff --git a/core/vendor/symfony/process/Symfony/Component/Process/Process.php b/core/vendor/symfony/process/Symfony/Component/Process/Process.php
index 4af26e8..668e55b 100644
--- a/core/vendor/symfony/process/Symfony/Component/Process/Process.php
+++ b/core/vendor/symfony/process/Symfony/Component/Process/Process.php
@@ -128,6 +128,10 @@ public function __construct($commandline, $cwd = null, array $env = null, $stdin
$this->commandline = $commandline;
$this->cwd = $cwd;
+ // on windows, if the cwd changed via chdir(), proc_open defaults to the dir where php was started
+ if (null === $this->cwd && defined('PHP_WINDOWS_VERSION_BUILD')) {
+ $this->cwd = getcwd();
+ }
if (null !== $env) {
$this->env = array();
foreach ($env as $key => $value) {
@@ -213,6 +217,9 @@ public function start($callback = null)
$this->fileHandles = array(
self::STDOUT => tmpfile(),
);
+ if (false === $this->fileHandles[self::STDOUT]) {
+ throw new RuntimeException('A temporary file could not be opened to write the process output to, verify that your TEMP environment variable is writable');
+ }
$this->readBytes = array(
self::STDOUT => 0,
);
diff --git a/core/vendor/twig/twig/test/Twig/Tests/integrationTest.php b/core/vendor/twig/twig/test/Twig/Tests/IntegrationTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/integrationTest.php
rename to core/vendor/twig/twig/test/Twig/Tests/IntegrationTest.php