Skip to content

Commit

Permalink
updated vendors
Browse files Browse the repository at this point in the history
  • Loading branch information
fabpot committed May 17, 2011
1 parent cf65d19 commit 986a09e
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 14 deletions.
11 changes: 7 additions & 4 deletions compile
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,11 @@ $classes = array(
'Symfony\Component\HttpKernel\Exception\HttpExceptionInterface',
'Symfony\Component\HttpKernel\Exception\HttpException',
'Symfony\Component\HttpKernel\Exception\NotFoundHttpException',
'Symfony\Component\Routing\Matcher\Exception\Exception',
'Symfony\Component\Routing\Matcher\Exception\NotFoundException',
'Symfony\Component\Routing\Matcher\Exception\MethodNotAllowedException',
'Symfony\Component\Routing\Exception\ExceptionInterface',
'Symfony\Component\Routing\Exception\ResourceNotFoundException',
'Symfony\Component\Routing\Exception\MethodNotAllowedException',
'Symfony\Component\Routing\RequestContextAwareInterface',
'Symfony\Component\Routing\RequestContext',
'Pimple',
'Silex\Application',
'Silex\Extension\SymfonyBridgesExtension',
Expand Down Expand Up @@ -97,6 +99,7 @@ $classes = array(
'Symfony\Component\Routing\CompiledRoute',
'Symfony\Component\HttpKernel\Event\FilterControllerEvent',
'Symfony\Component\Routing\Matcher\RedirectableUrlMatcherInterface',
'Symfony\Component\Routing\Matcher\RedirectableUrlMatcher',
'Silex\RedirectableUrlMatcher',
'Twig_Environment',
'Twig_Markup',
Expand Down Expand Up @@ -165,7 +168,7 @@ EOF;

$templates = '';
$twig = new Twig_Environment(new Twig_Loader_Filesystem(__DIR__.'/src/templates'), array('cache' => sys_get_temp_dir()));
$twig->addExtension(new Symfony\Bridge\Twig\Extension\RoutingExtension(new Symfony\Component\Routing\Generator\UrlGenerator(new Symfony\Component\Routing\RouteCollection())));
$twig->addExtension(new Symfony\Bridge\Twig\Extension\RoutingExtension(new Symfony\Component\Routing\Generator\UrlGenerator(new Symfony\Component\Routing\RouteCollection(), new Symfony\Component\Routing\RequestContext())));
foreach (array('ccmonitor.twig.xml', 'error.twig', 'layout.twig', 'project.twig', 'projects.twig') as $name) {
$templates .= str_replace('<?php', '', $twig->compileSource($twig->getLoader()->getSource($name), $name));
}
Expand Down
12 changes: 6 additions & 6 deletions src/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@
));
})->bind('project');

$app->get('/dashboard/cctray.xml', function() use ($app) {
$content = $app['twig']->render('ccmonitor.twig.xml', array('projects' => $app['sismo']->getProjects()));

return new Response($content, 200, array('content-type' => 'text/xml'));
})->bind('ccmonitor');

$app->get('/{slug}/{sha}', function($slug, $sha) use ($app) {
if (!$app['sismo']->hasProject($slug)) {
throw new NotFoundHttpException(sprintf('Project "%s" not found.', $slug));
Expand All @@ -63,10 +69,4 @@
));
})->bind('commit');

$app->get('/dashboard/cctray.xml', function() use ($app) {
$content = $app['twig']->render('ccmonitor.twig.xml', array('projects' => $app['sismo']->getProjects()));

return new Response($content, 200, array('content-type' => 'text/xml'));
})->bind('ccmonitor');

return $app;
2 changes: 1 addition & 1 deletion vendor/Symfony/Bridge/Twig
Submodule Twig updated from 914793 to 8989eb
2 changes: 1 addition & 1 deletion vendor/Symfony/Component/Process
2 changes: 1 addition & 1 deletion vendor/silex
Submodule silex updated 56 files
+3 −0 .gitmodules
+7 −31 README.md
+1 −1 doc/contributing.rst
+14 −12 doc/extensions.rst
+87 −0 doc/extensions/doctrine.rst
+75 −0 doc/extensions/http_cache.rst
+5 −1 doc/extensions/index.rst
+1 −3 doc/extensions/monolog.rst
+18 −6 doc/extensions/session.rst
+132 −0 doc/extensions/translation.rst
+2 −4 doc/extensions/twig.rst
+4 −6 doc/extensions/url_generator.rst
+104 −0 doc/extensions/validator.rst
+2 −1 doc/index.rst
+1 −1 doc/intro.rst
+33 −7 doc/services.rst
+183 −0 doc/testing.rst
+198 −31 doc/usage.rst
+6 −5 example.htaccess
+83 −19 src/Silex/Application.php
+49 −7 src/Silex/Compiler.php
+35 −0 src/Silex/Controller.php
+3 −3 src/Silex/Extension/DoctrineExtension.php
+16 −13 src/Silex/Extension/FormExtension.php
+40 −0 src/Silex/Extension/HttpCacheExtension.php
+4 −4 src/Silex/Extension/MonologExtension.php
+3 −1 src/Silex/Extension/SessionExtension.php
+3 −3 src/Silex/Extension/TranslationExtension.php
+3 −8 src/Silex/Extension/UrlGeneratorExtension.php
+3 −3 src/Silex/Extension/ValidatorExtension.php
+32 −0 src/Silex/HttpCache.php
+57 −0 src/Silex/LazyApplication.php
+4 −34 src/Silex/RedirectableUrlMatcher.php
+27 −8 tests/Silex/Tests/ApplicationTest.php
+35 −17 tests/Silex/Tests/BeforeAfterFilterTest.php
+9 −0 tests/Silex/Tests/ControllerTest.php
+14 −14 tests/Silex/Tests/ErrorHandlerTest.php
+4 −4 tests/Silex/Tests/Extension/MonologExtensionTest.php
+3 −3 tests/Silex/Tests/Extension/SessionExtensionTest.php
+1 −1 tests/Silex/Tests/Extension/TwigExtensionTest.php
+79 −2 tests/Silex/Tests/Extension/UrlGeneratorExtensionTest.php
+89 −2 tests/Silex/Tests/FunctionalTest.php
+17 −17 tests/Silex/Tests/RouterTest.php
+2 −2 tests/Silex/Tests/WebTestCaseTest.php
+1 −1 vendor/Symfony/Component/BrowserKit
+1 −1 vendor/Symfony/Component/ClassLoader
+1 −1 vendor/Symfony/Component/CssSelector
+1 −1 vendor/Symfony/Component/DomCrawler
+1 −1 vendor/Symfony/Component/Finder
+1 −1 vendor/Symfony/Component/HttpFoundation
+1 −1 vendor/Symfony/Component/HttpKernel
+1 −0 vendor/Symfony/Component/Process
+1 −1 vendor/Symfony/Component/Routing
+1 −1 vendor/monolog
+1 −1 vendor/pimple
+1 −1 vendor/twig

0 comments on commit 986a09e

Please sign in to comment.