From 421574b5a9792e4f9355de41ebbea4887aeb60be Mon Sep 17 00:00:00 2001 From: Nate Eagleson Date: Fri, 8 Feb 2013 18:48:06 -0500 Subject: [PATCH 01/37] Correctly support branch names with slashes Previously, branches with slashes in the name would consume all slashed segments in a URL, causing the routes to capture incorrect file paths. This solution is not particularly elegant - anywhere a route used both a commit-ish identifier and a path, we collapse those two params into a single param, and parse that param inside the route. It seems to be working reasonably reliably, but has not seen extensive testing. It is also not particularly pretty. If anyone sees ways to improve it, please, have at it. --- src/GitList/Controller/BlobController.php | 23 ++++-- src/GitList/Controller/CommitController.php | 25 +++--- src/GitList/Controller/MainController.php | 4 +- src/GitList/Controller/TreeController.php | 11 +-- src/GitList/Git/Repository.php | 33 ++++++++ src/GitList/Util/Routing.php | 87 +++++++++++++++++++++ views/breadcrumb.twig | 2 +- views/commit.twig | 4 +- views/file.twig | 6 +- views/menu.twig | 2 +- views/tree.twig | 6 +- 11 files changed, 167 insertions(+), 36 deletions(-) diff --git a/src/GitList/Controller/BlobController.php b/src/GitList/Controller/BlobController.php index 9a44a27..90f753f 100644 --- a/src/GitList/Controller/BlobController.php +++ b/src/GitList/Controller/BlobController.php @@ -12,8 +12,12 @@ class BlobController implements ControllerProviderInterface { $route = $app['controllers_factory']; - $route->get('{repo}/blob/{branch}/{file}', function($repo, $branch, $file) use ($app) { + $route->get('{repo}/blob/{commitish_path}', function($repo, $commitish_path) use ($app) { $repository = $app['git']->getRepository($app['git.repos'] . $repo); + + list($branch, $file) = $app['util.routing'] + ->parseCommitishPathParam($commitish_path, $repo); + list($branch, $file) = $app['util.repository']->extractRef($repository, $branch, $file); $blob = $repository->getBlob("$branch:\"$file\""); @@ -38,14 +42,18 @@ class BlobController implements ControllerProviderInterface 'branches' => $repository->getBranches(), 'tags' => $repository->getTags(), )); - })->assert('file', '.+') - ->assert('repo', $app['util.routing']->getRepositoryRegex()) - ->assert('branch', '[\w-._\/]+') + })->assert('repo', $app['util.routing']->getRepositoryRegex()) + ->assert('commitish_path', '.+') ->bind('blob'); - $route->get('{repo}/raw/{branch}/{file}', function($repo, $branch, $file) use ($app) { + $route->get('{repo}/raw/{commitish_path}', function($repo, $commitish_path) use ($app) { $repository = $app['git']->getRepository($app['git.repos'] . $repo); + + list($branch, $file) = $app['util.routing'] + ->parseCommitishPathParam($commitish_path, $repo); + list($branch, $file) = $app['util.repository']->extractRef($repository, $branch, $file); + $blob = $repository->getBlob("$branch:\"$file\"")->output(); $headers = array(); @@ -58,9 +66,8 @@ class BlobController implements ControllerProviderInterface } return new Response($blob, 200, $headers); - })->assert('file', '.+') - ->assert('repo', $app['util.routing']->getRepositoryRegex()) - ->assert('branch', '[\w-._\/]+') + })->assert('repo', $app['util.routing']->getRepositoryRegex()) + ->assert('commitish_path', $app['util.routing']->getCommitishPathRegex()) ->bind('blob_raw'); return $route; diff --git a/src/GitList/Controller/CommitController.php b/src/GitList/Controller/CommitController.php index 2383ccf..e778d08 100644 --- a/src/GitList/Controller/CommitController.php +++ b/src/GitList/Controller/CommitController.php @@ -12,13 +12,16 @@ class CommitController implements ControllerProviderInterface { $route = $app['controllers_factory']; - $route->get('{repo}/commits/{branch}/{file}', function($repo, $branch, $file) use ($app) { + $route->get('{repo}/commits/{commitish_path}', function($repo, $commitish_path) use ($app) { $repository = $app['git']->getRepository($app['git.repos'] . $repo); - if ($branch === null) { - $branch = $repository->getHead(); + if ($commitish_path === null) { + $commitish_path = $repository->getHead(); } + list($branch, $file) = $app['util.routing'] + ->parseCommitishPathParam($commitish_path, $repo); + list($branch, $file) = $app['util.repository']->extractRef($repository, $branch, $file); $type = $file ? "$branch -- \"$file\"" : $branch; @@ -45,10 +48,8 @@ class CommitController implements ControllerProviderInterface 'file' => $file, )); })->assert('repo', $app['util.routing']->getRepositoryRegex()) - ->assert('branch', '[\w-._\/]+') - ->assert('file', '.+') - ->value('branch', null) - ->value('file', '') + ->assert('commitish_path', $app['util.routing']->getCommitishPathRegex()) + ->value('commitish_path', null) ->bind('commits'); $route->post('{repo}/commits/{branch}/search', function(Request $request, $repo, $branch = '') use ($app) { @@ -73,7 +74,7 @@ class CommitController implements ControllerProviderInterface 'query' => $query )); })->assert('repo', $app['util.routing']->getRepositoryRegex()) - ->assert('branch', '[\w-._\/]+') + ->assert('branch', $app['util.routing']->getBranchRegex()) ->bind('searchcommits'); $route->get('{repo}/commit/{commit}', function($repo, $commit) use ($app) { @@ -90,9 +91,12 @@ class CommitController implements ControllerProviderInterface ->assert('commit', '[a-f0-9^]+') ->bind('commit'); - $route->get('{repo}/blame/{branch}/{file}', function($repo, $branch, $file) use ($app) { + $route->get('{repo}/blame/{branch_file}', function($repo, $branch_file) use ($app) { $repository = $app['git']->getRepository($app['git.repos'] . $repo); + list($branch, $file) = $app['util.routing'] + ->parseCommitishPathParam($branch_file, $repo); + list($branch, $file) = $app['util.repository']->extractRef($repository, $branch, $file); $blames = $repository->getBlame("$branch -- \"$file\""); @@ -106,8 +110,7 @@ class CommitController implements ControllerProviderInterface 'blames' => $blames, )); })->assert('repo', $app['util.routing']->getRepositoryRegex()) - ->assert('file', '.+') - ->assert('branch', '[\w-._\/]+') + ->assert('branch_file', $app['util.routing']->getCommitishPathRegex()) ->bind('blame'); return $route; diff --git a/src/GitList/Controller/MainController.php b/src/GitList/Controller/MainController.php index 3262b04..8e76ba4 100644 --- a/src/GitList/Controller/MainController.php +++ b/src/GitList/Controller/MainController.php @@ -46,7 +46,7 @@ class MainController implements ControllerProviderInterface 'authors' => $authors, )); })->assert('repo', $app['util.routing']->getRepositoryRegex()) - ->assert('branch', '[\w-._\/]+') + ->assert('branch', $app['util.routing']->getBranchRegex()) ->value('branch', null) ->bind('stats'); @@ -62,7 +62,7 @@ class MainController implements ControllerProviderInterface return new Response($html, 200, array('Content-Type' => 'application/rss+xml')); })->assert('repo', $app['util.routing']->getRepositoryRegex()) - ->assert('branch', '[\w-._\/]+') + ->assert('branch', $app['util.routing']->getBranchRegex()) ->bind('rss'); return $route; diff --git a/src/GitList/Controller/TreeController.php b/src/GitList/Controller/TreeController.php index 86be94b..1ffb767 100644 --- a/src/GitList/Controller/TreeController.php +++ b/src/GitList/Controller/TreeController.php @@ -13,12 +13,14 @@ class TreeController implements ControllerProviderInterface { $route = $app['controllers_factory']; - $route->get('{repo}/tree/{branch}/{tree}/', $treeController = function($repo, $branch = '', $tree = '') use ($app) { + $route->get('{repo}/tree/{commitish_path}/', $treeController = function($repo, $commitish_path = '') use ($app) { $repository = $app['git']->getRepository($app['git.repos'] . $repo); - if (!$branch) { - $branch = $repository->getHead(); + if (!$commitish_path) { + $commitish_path = $repository->getHead(); } + list($branch, $tree) = $app['util.routing']->parseCommitishPathParam($commitish_path, $repo); + list($branch, $tree) = $app['util.repository']->extractRef($repository, $branch, $tree); $files = $repository->getTree($tree ? "$branch:\"$tree\"/" : $branch); $breadcrumbs = $app['util.view']->getBreadcrumbs($tree); @@ -42,8 +44,7 @@ class TreeController implements ControllerProviderInterface 'readme' => $app['util.repository']->getReadme($repo, $branch), )); })->assert('repo', $app['util.routing']->getRepositoryRegex()) - ->assert('branch', '[\w-._\/]+') - ->assert('tree', '.+') + ->assert('commitish_path', $app['util.routing']->getCommitishPathRegex()) ->bind('tree'); $route->post('{repo}/tree/{branch}/search', function(Request $request, $repo, $branch = '', $tree = '') use ($app) { diff --git a/src/GitList/Git/Repository.php b/src/GitList/Git/Repository.php index 57c6095..3541b6f 100644 --- a/src/GitList/Git/Repository.php +++ b/src/GitList/Git/Repository.php @@ -10,6 +10,20 @@ use Symfony\Component\Filesystem\Filesystem; class Repository extends BaseRepository { + /** + * Return TRUE if the repo contains this commit. + * + * @param $commitHash Hash of commit whose existence we want to check + * @return boolean Whether or not the commit exists in this repo + */ + public function hasCommit($commitHash) + { + $logs = $this->getClient()->run($this, "show $commitHash"); + $logs = explode("\n", $logs); + + return strpos($logs[0], 'commit') === 0; + } + /** * Show the data from a specific commit * @@ -313,4 +327,23 @@ class Repository extends BaseRepository $fs->mkdir(dirname($output)); $this->getClient()->run($this, "archive --format=$format --output=$output $tree"); } + + /** + * Return TRUE if $path exists in $branch; return FALSE otherwise. + * + * @param string $commitish Commitish reference; branch, tag, SHA1, etc. + * @param string $path Path whose existence we want to verify. + * + * GRIPE Arguably belongs in Gitter, as it's generally useful functionality. + * Also, this really may not be the best way to do this. + */ + public function pathExists($commitish, $path) { + $output = $this->getClient()->run($this, "ls-tree $commitish $path"); + + if (strlen($output) > 0) { + return TRUE; + } + + return FALSE; + } } diff --git a/src/GitList/Util/Routing.php b/src/GitList/Util/Routing.php index d0a60ff..3f3c866 100644 --- a/src/GitList/Util/Routing.php +++ b/src/GitList/Util/Routing.php @@ -13,6 +13,93 @@ class Routing $this->app = $app; } + /* @brief Return $commitish, $path parsed from $commitish_path, based on + * what's in $repo. Raise a 404 if $branchpath does not represent a + * valid branch and path. + * + * A helper for parsing routes that use commit-ish names and paths + * separated by /, since route regexes are not enough to get that right. + */ + public function parseCommitishPathParam($commitish_path, $repo) { + $app = $this->app; + $repository = $app['git']->getRepository($app['git.repos'] . $repo); + + $commitish = null; + $path = null; + + $slash_pos = strpos($commitish_path, '/'); + if (strlen($commitish_path) >= 40 && + ($slash_pos === FALSE || + $slash_pos === 40)) { + // We may have a commit hash as our commitish. + $hash = substr($commitish_path, 0, 40); + if ($repository->hasCommit($hash)) { + $commitish = $hash; + } + } + + if ($commitish === null) { + // DEBUG Can you have a repo with no branches? How should we handle + // that? + $branches = $repository->getBranches(); + + $tags = $repository->getTags(); + if ($tags !== null && count($tags) > 0) { + $branches = array_merge($branches, $tags); + } + + $matched_branch = null; + $matched_branch_name_len = 0; + foreach ($branches as $branch) { + if (strpos($commitish_path, $branch) === 0 && + strlen($branch) > $matched_branch_name_len) { + $matched_branch = $branch; + $matched_branch_name_len = strlen($matched_branch); + } + } + + $commitish = $matched_branch; + } + + if ($commitish === null) { + $app->abort(404, "'$branch_path' does not appear to contain a " . + "commit-ish for '$repo.'"); + } + + $commitish_len = strlen($commitish); + $path = substr($commitish_path, $commitish_len); + if (strpos($path, '/') === 0) { + $path = substr($path, 1); + } + + $commit_has_path = $repository->pathExists($commitish, $path); + if ($commit_has_path !== TRUE) { + $app->abort(404, "\"$path\" does not exist in \"$commitish\"."); + } + + return array($commitish, $path); + } + + public function getBranchRegex() { + static $branch_regex = null; + + if ($branch_regex === null) { + $branch_regex = '[\w-._\/]+'; + } + + return $branch_regex; + } + + public function getCommitishPathRegex() { + static $commitish_path_regex = null; + + if ($commitish_path_regex === null) { + $commitish_path_regex = '.+'; + } + + return $commitish_path_regex; + } + public function getRepositoryRegex() { static $regex = null; diff --git a/views/breadcrumb.twig b/views/breadcrumb.twig index c7e954a..73fff7a 100644 --- a/views/breadcrumb.twig +++ b/views/breadcrumb.twig @@ -2,7 +2,7 @@
  • {{ repo }}
    • {% for breadcrumb in breadcrumbs %} / - {% if not loop.last %}{{ breadcrumb.dir }}{% endif %}{% if loop.last %}{{ breadcrumb.dir }}{% endif %} + {% if not loop.last %}{{ breadcrumb.dir }}{% endif %}{% if loop.last %}{{ breadcrumb.dir }}{% endif %} {% endfor %} {% block extra %}{% endblock %} diff --git a/views/commit.twig b/views/commit.twig index 058d037..fae6865 100644 --- a/views/commit.twig +++ b/views/commit.twig @@ -30,8 +30,8 @@
    {{ diff.file }}
    - History - View file @ {{ commit.shortHash }} + History + View file @ {{ commit.shortHash }}
    diff --git a/views/file.twig b/views/file.twig index 71adbec..6b18290 100644 --- a/views/file.twig +++ b/views/file.twig @@ -12,9 +12,9 @@
    - Raw - Blame - History + Raw + Blame + History
    {% if fileType == 'image' %} diff --git a/views/menu.twig b/views/menu.twig index d35bd4e..b920e65 100644 --- a/views/menu.twig +++ b/views/menu.twig @@ -1,5 +1,5 @@ diff --git a/views/tree.twig b/views/tree.twig index 10fcc4f..d53c736 100644 --- a/views/tree.twig +++ b/views/tree.twig @@ -32,7 +32,7 @@ {% if not parent %} .. {% else %} - .. + .. {% endif %} @@ -43,9 +43,9 @@ {{ file.name }} {{ file.mode }} From e6b2e4eb05281fe762b3a8931a65e51037c55596 Mon Sep 17 00:00:00 2001 From: Nate Eagleson Date: Fri, 8 Feb 2013 20:20:38 -0500 Subject: [PATCH 02/37] Fix minor grammar error in commit views Use the phrase "authored on " rather than "authored in ". --- views/commit.twig | 2 +- views/commits_list.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/views/commit.twig b/views/commit.twig index 058d037..eac59bc 100644 --- a/views/commit.twig +++ b/views/commit.twig @@ -14,7 +14,7 @@
    - {{ commit.author.name }} authored in {{ commit.date | date('d/m/Y \\a\\t H:i:s') }}
    Showing {{ commit.changedFiles }} changed files     + {{ commit.author.name }} authored on {{ commit.date | date('d/m/Y \\a\\t H:i:s') }}
    Showing {{ commit.changedFiles }} changed files
    diff --git a/views/commits_list.twig b/views/commits_list.twig index dbc6eec..0c5b2a3 100644 --- a/views/commits_list.twig +++ b/views/commits_list.twig @@ -13,7 +13,7 @@ View {{ item.shortHash }}

    {{ item.message }}

    - {{ item.author.name }} authored in {{ item.date | date('d/m/Y \\a\\t H:i:s') }} + {{ item.author.name }} authored on {{ item.date | date('d/m/Y \\a\\t H:i:s') }} {% endfor %} From dabf4d86d95e0e02faf10e1aca1070086318a2e8 Mon Sep 17 00:00:00 2001 From: Nate Eagleson Date: Thu, 14 Feb 2013 22:31:47 -0500 Subject: [PATCH 03/37] Do not crash when a repo has a detached HEAD Instead, we select a default branch - master by default, but the default branch can be configured using config.ini. Note that if the default branch does not exist in a repo, that should not cause any issues. Also adds phpunit to composer.json's require-dev section. --- composer.json | 13 +- composer.lock | 773 +++++++++++++++++--- config.ini-example | 1 + src/GitList/Application.php | 7 +- src/GitList/Controller/MainController.php | 6 + src/GitList/Git/Client.php | 33 + src/GitList/Git/Repository.php | 10 + src/GitList/Provider/GitServiceProvider.php | 1 + tests/InterfaceTest.php | 14 +- 9 files changed, 747 insertions(+), 111 deletions(-) diff --git a/composer.json b/composer.json index 49508ff..e9177b3 100644 --- a/composer.json +++ b/composer.json @@ -4,16 +4,23 @@ "twig/twig": "1.9.*", "symfony/twig-bridge": "2.1.*", "symfony/filesystem": "2.1.*", - "klaussilveira/gitter": "dev-master" + "klaussilveira/gitter": "dev-fix-get-branches" }, "require-dev": { "symfony/browser-kit": "2.1.*", - "symfony/css-selector": "2.1.*" + "symfony/css-selector": "2.1.*", + "phpunit/phpunit": "3.7.*" }, "minimum-stability": "dev", "autoload": { "psr-0": { "GitList": "src/" } - } + }, + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/NateEag/gitter.git" + } + ] } diff --git a/composer.lock b/composer.lock index 77469ae..f78ff25 100644 --- a/composer.lock +++ b/composer.lock @@ -1,18 +1,18 @@ { - "hash": "b1fc3d7e61707618f68e5cf940e97081", + "hash": "ed5320fb27429d26c0b32ae24d25bcfc", "packages": [ { "name": "klaussilveira/gitter", - "version": "dev-master", + "version": "dev-fix-get-branches", "source": { "type": "git", - "url": "https://github.com/klaussilveira/gitter", - "reference": "1c9b6e4dde81d21acffe99d9f4559ed3bc59f947" + "url": "https://github.com/NateEag/gitter.git", + "reference": "85f7841fdce478efae78cca090abe3488aa2d2e5" }, "dist": { "type": "zip", - "url": "https://github.com/klaussilveira/gitter/zipball/1c9b6e4dde81d21acffe99d9f4559ed3bc59f947", - "reference": "1c9b6e4dde81d21acffe99d9f4559ed3bc59f947", + "url": "https://api.github.com/repos/NateEag/gitter/zipball/85f7841fdce478efae78cca090abe3488aa2d2e5", + "reference": "85f7841fdce478efae78cca090abe3488aa2d2e5", "shasum": "" }, "require": { @@ -20,11 +20,11 @@ "symfony/process": ">=2.1" }, "require-dev": { + "phpunit/phpunit": ">=3.7.1", "symfony/filesystem": ">=2.1" }, - "time": "1351643953", + "time": "2013-02-15 01:30:05", "type": "library", - "installation-source": "source", "autoload": { "psr-0": { "Gitter": "lib/" @@ -46,7 +46,10 @@ "keywords": [ "git", "vcs" - ] + ], + "support": { + "source": "https://github.com/nateeag/gitter/tree/fix-get-branches" + } }, { "name": "pimple/pimple", @@ -54,29 +57,30 @@ "source": { "type": "git", "url": "git://github.com/fabpot/Pimple.git", - "reference": "b9f27b8dc18c08f00627dec02359b46a24791dc3" + "reference": "5a8936d9d31eb613f1a33753e5f22bffebe0bbc3" }, "dist": { "type": "zip", - "url": "https://github.com/fabpot/Pimple/zipball/b9f27b8dc18c08f00627dec02359b46a24791dc3", - "reference": "b9f27b8dc18c08f00627dec02359b46a24791dc3", + "url": "https://api.github.com/repos/fabpot/Pimple/zipball/5a8936d9d31eb613f1a33753e5f22bffebe0bbc3", + "reference": "5a8936d9d31eb613f1a33753e5f22bffebe0bbc3", "shasum": "" }, "require": { "php": ">=5.3.0" }, + "time": "2013-02-09 15:33:26", "type": "library", "extra": { "branch-alias": { "dev-master": "1.0.x-dev" } }, - "installation-source": "source", "autoload": { "psr-0": { "Pimple": "lib/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -89,10 +93,47 @@ "description": "Pimple is a simple Dependency Injection Container for PHP 5.3", "homepage": "http://pimple.sensiolabs.org", "keywords": [ - "dependency injection", - "container" + "container", + "dependency injection" + ] + }, + { + "name": "psr/log", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log", + "reference": "1.0.0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/php-fig/log/archive/1.0.0.zip", + "reference": "1.0.0", + "shasum": "" + }, + "time": "2012-12-21 11:40:51", + "type": "library", + "autoload": { + "psr-0": { + "Psr\\Log\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" ], - "time": "1347278988" + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "keywords": [ + "log", + "psr", + "psr-3" + ] }, { "name": "silex/silex", @@ -100,12 +141,12 @@ "source": { "type": "git", "url": "git://github.com/fabpot/Silex.git", - "reference": "69d710011ee8f9fa286854fcf636a07ad76b570b" + "reference": "c421eab3c4ca9d106cc5b68266d58adece8636cd" }, "dist": { "type": "zip", - "url": "https://github.com/fabpot/Silex/zipball/69d710011ee8f9fa286854fcf636a07ad76b570b", - "reference": "69d710011ee8f9fa286854fcf636a07ad76b570b", + "url": "https://api.github.com/repos/fabpot/Silex/zipball/c421eab3c4ca9d106cc5b68266d58adece8636cd", + "reference": "c421eab3c4ca9d106cc5b68266d58adece8636cd", "shasum": "" }, "require": { @@ -117,42 +158,43 @@ "symfony/routing": ">=2.1,<2.3-dev" }, "require-dev": { - "monolog/monolog": ">=1.0.0,<1.2-dev", - "twig/twig": ">=1.8.0,<2.0-dev", - "swiftmailer/swiftmailer": "4.2.*", "doctrine/dbal": ">=2.2.0,<2.4.0-dev", - "symfony/security": ">=2.1,<2.3-dev", - "symfony/config": ">=2.1,<2.3-dev", - "symfony/locale": ">=2.1,<2.3-dev", - "symfony/form": ">=2.1,<2.3-dev", + "swiftmailer/swiftmailer": "4.2.*", "symfony/browser-kit": ">=2.1,<2.3-dev", + "symfony/config": ">=2.1,<2.3-dev", "symfony/css-selector": ">=2.1,<2.3-dev", + "symfony/dom-crawler": ">=2.1,<2.3-dev", "symfony/finder": ">=2.1,<2.3-dev", + "symfony/form": ">=2.1,<2.3-dev", + "symfony/locale": ">=2.1,<2.3-dev", "symfony/monolog-bridge": ">=2.1,<2.3-dev", + "symfony/options-resolver": ">=2.1,<2.3-dev", "symfony/process": ">=2.1,<2.3-dev", + "symfony/security": ">=2.1,<2.3-dev", + "symfony/serializer": ">=2.1,<2.3-dev", "symfony/translation": ">=2.1,<2.3-dev", "symfony/twig-bridge": ">=2.1,<2.3-dev", "symfony/validator": ">=2.1,<2.3-dev", - "symfony/serializer": ">=2.1,<2.3-dev" + "twig/twig": ">=1.8.0,<2.0-dev" }, "suggest": { "symfony/browser-kit": ">=2.1,<2.3-dev", "symfony/css-selector": ">=2.1,<2.3-dev", "symfony/dom-crawler": ">=2.1,<2.3-dev" }, - "time": "1351540898", + "time": "2013-02-13 11:44:19", "type": "library", "extra": { "branch-alias": { "dev-master": "1.0.x-dev" } }, - "installation-source": "source", "autoload": { "psr-0": { "Silex": "src/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -175,42 +217,42 @@ }, { "name": "symfony/event-dispatcher", - "version": "dev-master", + "version": "2.2.x-dev", "target-dir": "Symfony/Component/EventDispatcher", "source": { "type": "git", "url": "https://github.com/symfony/EventDispatcher", - "reference": "24a1039d52b6b9f533cb73dcb96c7748262db686" + "reference": "v2.2.0-RC2" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/EventDispatcher/zipball/24a1039d52b6b9f533cb73dcb96c7748262db686", - "reference": "24a1039d52b6b9f533cb73dcb96c7748262db686", + "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.2.0-RC2", + "reference": "v2.2.0-RC2", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "symfony/dependency-injection": "2.2.*" + "symfony/dependency-injection": ">=2.0,<3.0" }, "suggest": { "symfony/dependency-injection": "2.2.*", "symfony/http-kernel": "2.2.*" }, - "time": "1349553479", + "time": "2013-02-11 11:26:43", "type": "library", "extra": { "branch-alias": { "dev-master": "2.2-dev" } }, - "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\EventDispatcher\\": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -234,29 +276,25 @@ "source": { "type": "git", "url": "https://github.com/symfony/Filesystem", - "reference": "v2.1.3" + "reference": "v2.1.7" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/Filesystem/zipball/v2.1.3", - "reference": "v2.1.3", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/v2.1.7", + "reference": "v2.1.7", "shasum": "" }, "require": { "php": ">=5.3.3" }, + "time": "2013-01-09 08:51:07", "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.1-dev" - } - }, - "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\Filesystem": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -271,35 +309,33 @@ } ], "description": "Symfony Filesystem Component", - "homepage": "http://symfony.com", - "time": "1350717030" + "homepage": "http://symfony.com" }, { "name": "symfony/http-foundation", - "version": "dev-master", + "version": "2.2.x-dev", "target-dir": "Symfony/Component/HttpFoundation", "source": { "type": "git", "url": "https://github.com/symfony/HttpFoundation", - "reference": "707e289629a10fde825bc4ba90aba743f79b173c" + "reference": "v2.2.0-RC2" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/HttpFoundation/zipball/707e289629a10fde825bc4ba90aba743f79b173c", - "reference": "707e289629a10fde825bc4ba90aba743f79b173c", + "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/v2.2.0-RC2", + "reference": "v2.2.0-RC2", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "1351508251", + "time": "2013-02-11 12:46:49", "type": "library", "extra": { "branch-alias": { "dev-master": "2.2-dev" } }, - "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\HttpFoundation\\": "" @@ -308,6 +344,7 @@ "Symfony/Component/HttpFoundation/Resources/stubs" ] }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -326,33 +363,35 @@ }, { "name": "symfony/http-kernel", - "version": "dev-master", + "version": "2.2.x-dev", "target-dir": "Symfony/Component/HttpKernel", "source": { "type": "git", "url": "https://github.com/symfony/HttpKernel", - "reference": "4dcb0bf602788342fb80c28c6e28be818839d417" + "reference": "cec254f40ea9baaa2b90de7ca6de236de76823eb" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/HttpKernel/zipball/4dcb0bf602788342fb80c28c6e28be818839d417", - "reference": "4dcb0bf602788342fb80c28c6e28be818839d417", + "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/cec254f40ea9baaa2b90de7ca6de236de76823eb", + "reference": "cec254f40ea9baaa2b90de7ca6de236de76823eb", "shasum": "" }, "require": { "php": ">=5.3.3", - "symfony/event-dispatcher": "2.2.*", - "symfony/http-foundation": "2.2.*" + "psr/log": ">=1.0,<2.0", + "symfony/event-dispatcher": ">=2.1,<3.0", + "symfony/http-foundation": ">=2.2,<2.3-dev" }, "require-dev": { "symfony/browser-kit": "2.2.*", - "symfony/class-loader": "2.2.*", - "symfony/config": "2.2.*", + "symfony/class-loader": ">=2.1,<3.0", + "symfony/config": ">=2.0,<3.0", "symfony/console": "2.2.*", - "symfony/dependency-injection": "2.2.*", - "symfony/finder": "2.2.*", - "symfony/process": "2.2.*", - "symfony/routing": "2.2.*" + "symfony/dependency-injection": ">=2.0,<3.0", + "symfony/finder": ">=2.0,<3.0", + "symfony/process": ">=2.0,<3.0", + "symfony/routing": ">=2.2,<2.3-dev", + "symfony/stopwatch": ">=2.2,<2.3-dev" }, "suggest": { "symfony/browser-kit": "2.2.*", @@ -362,19 +401,19 @@ "symfony/dependency-injection": "2.2.*", "symfony/finder": "2.2.*" }, - "time": "1351530455", + "time": "2013-02-13 01:35:51", "type": "library", "extra": { "branch-alias": { "dev-master": "2.2-dev" } }, - "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\HttpKernel\\": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -398,29 +437,30 @@ "source": { "type": "git", "url": "https://github.com/symfony/Process", - "reference": "b35a2a4fae02286df3275d7094a3d3d575122db8" + "reference": "c99475d555934461f079521d024d88a0d4e861eb" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/Process/zipball/b35a2a4fae02286df3275d7094a3d3d575122db8", - "reference": "b35a2a4fae02286df3275d7094a3d3d575122db8", + "url": "https://api.github.com/repos/symfony/Process/zipball/c99475d555934461f079521d024d88a0d4e861eb", + "reference": "c99475d555934461f079521d024d88a0d4e861eb", "shasum": "" }, "require": { "php": ">=5.3.3" }, + "time": "2013-01-31 21:39:01", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-master": "2.3-dev" } }, - "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\Process\\": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -435,51 +475,50 @@ } ], "description": "Symfony Process Component", - "homepage": "http://symfony.com", - "time": "1351356874" + "homepage": "http://symfony.com" }, { "name": "symfony/routing", - "version": "dev-master", + "version": "2.2.x-dev", "target-dir": "Symfony/Component/Routing", "source": { "type": "git", "url": "https://github.com/symfony/Routing", - "reference": "29792d8ac4ed7308acdeed4933cb6d91b7f6510f" + "reference": "v2.2.0-RC2" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/Routing/zipball/29792d8ac4ed7308acdeed4933cb6d91b7f6510f", - "reference": "29792d8ac4ed7308acdeed4933cb6d91b7f6510f", + "url": "https://api.github.com/repos/symfony/Routing/zipball/v2.2.0-RC2", + "reference": "v2.2.0-RC2", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "doctrine/common": ">=2.2,<2.4-dev", - "symfony/config": "2.2.*", - "symfony/yaml": "2.2.*", - "symfony/http-kernel": "2.2.*" + "doctrine/common": ">=2.2,<3.0", + "psr/log": ">=1.0,<2.0", + "symfony/config": ">=2.2,<2.3-dev", + "symfony/yaml": ">=2.0,<3.0" }, "suggest": { - "doctrine/common": ">=2.2,<2.4-dev", + "doctrine/common": "~2.2", "symfony/config": "2.2.*", "symfony/yaml": "2.2.*" }, - "time": "1351466734", + "time": "2013-02-11 11:24:47", "type": "library", "extra": { "branch-alias": { "dev-master": "2.2-dev" } }, - "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\Routing\\": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -503,12 +542,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/TwigBridge", - "reference": "v2.1.3" + "reference": "v2.1.7" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/TwigBridge/zipball/v2.1.3", - "reference": "v2.1.3", + "url": "https://api.github.com/repos/symfony/TwigBridge/zipball/v2.1.7", + "reference": "v2.1.7", "shasum": "" }, "require": { @@ -518,31 +557,27 @@ "require-dev": { "symfony/form": "2.1.*", "symfony/routing": "2.1.*", + "symfony/security": "2.1.*", "symfony/templating": "2.1.*", "symfony/translation": "2.1.*", - "symfony/yaml": "2.1.*", - "symfony/security": "2.1.*" + "symfony/yaml": "2.1.*" }, "suggest": { "symfony/form": "2.1.*", "symfony/routing": "2.1.*", + "symfony/security": "2.1.*", "symfony/templating": "2.1.*", "symfony/translation": "2.1.*", - "symfony/yaml": "2.1.*", - "symfony/security": "2.1.*" + "symfony/yaml": "2.1.*" }, + "time": "2013-01-17 15:20:05", "type": "symfony-bridge", - "extra": { - "branch-alias": { - "dev-master": "2.1-dev" - } - }, - "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Bridge\\Twig": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -557,8 +592,7 @@ } ], "description": "Symfony Twig Bridge", - "homepage": "http://symfony.com", - "time": "1349363877" + "homepage": "http://symfony.com" }, { "name": "twig/twig", @@ -584,7 +618,6 @@ "dev-master": "1.9-dev" } }, - "installation-source": "dist", "autoload": { "psr-0": { "Twig_": "lib/" @@ -610,7 +643,541 @@ ] } ], - "packages-dev": null, + "packages-dev": [ + { + "name": "phpunit/php-code-coverage", + "version": "1.2.x-dev", + "source": { + "type": "git", + "url": "git://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "25232ac64f081abd7478ae2d63fdb757f45e92b9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/25232ac64f081abd7478ae2d63fdb757f45e92b9", + "reference": "25232ac64f081abd7478ae2d63fdb757f45e92b9", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "phpunit/php-file-iterator": ">=1.3.0@stable", + "phpunit/php-text-template": ">=1.1.1@stable", + "phpunit/php-token-stream": ">=1.1.3@stable" + }, + "suggest": { + "ext-dom": "*", + "ext-xdebug": ">=2.0.5" + }, + "time": "2013-02-14 10:33:04", + "type": "library", + "autoload": { + "classmap": [ + "PHP/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ] + }, + { + "name": "phpunit/php-file-iterator", + "version": "dev-master", + "source": { + "type": "git", + "url": "git://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "2deb24c65ea78e126daa8d45b2089ddc29ec1d26" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/2deb24c65ea78e126daa8d45b2089ddc29ec1d26", + "reference": "2deb24c65ea78e126daa8d45b2089ddc29ec1d26", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2013-01-07 10:47:05", + "type": "library", + "autoload": { + "classmap": [ + "File/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "keywords": [ + "filesystem", + "iterator" + ] + }, + { + "name": "phpunit/php-text-template", + "version": "dev-master", + "source": { + "type": "git", + "url": "git://github.com/sebastianbergmann/php-text-template.git", + "reference": "1eeef106193d2f8c539728e566bb4793071a9e18" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/1eeef106193d2f8c539728e566bb4793071a9e18", + "reference": "1eeef106193d2f8c539728e566bb4793071a9e18", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2013-01-07 10:56:17", + "type": "library", + "autoload": { + "classmap": [ + "Text/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ] + }, + { + "name": "phpunit/php-timer", + "version": "1.0.x-dev", + "source": { + "type": "git", + "url": "git://github.com/sebastianbergmann/php-timer.git", + "reference": "ecf7920b27003a9412b07dad79dbb5ad1249e6c3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/ecf7920b27003a9412b07dad79dbb5ad1249e6c3", + "reference": "ecf7920b27003a9412b07dad79dbb5ad1249e6c3", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2013-01-30 06:08:51", + "type": "library", + "autoload": { + "classmap": [ + "PHP/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ] + }, + { + "name": "phpunit/php-token-stream", + "version": "dev-master", + "source": { + "type": "git", + "url": "git://github.com/sebastianbergmann/php-token-stream.git", + "reference": "c25dd88e1592e66dee2553c99ef244203d5a1b98" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c25dd88e1592e66dee2553c99ef244203d5a1b98", + "reference": "c25dd88e1592e66dee2553c99ef244203d5a1b98", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=5.3.3" + }, + "time": "2013-01-07 10:56:35", + "type": "library", + "autoload": { + "classmap": [ + "PHP/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Wrapper around PHP's tokenizer extension.", + "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "keywords": [ + "tokenizer" + ] + }, + { + "name": "phpunit/phpunit", + "version": "3.7.x-dev", + "source": { + "type": "git", + "url": "git://github.com/sebastianbergmann/phpunit.git", + "reference": "3.7.14" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3.7.14", + "reference": "3.7.14", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-pcre": "*", + "ext-reflection": "*", + "ext-spl": "*", + "php": ">=5.3.3", + "phpunit/php-code-coverage": ">=1.2.1,<1.3.0", + "phpunit/php-file-iterator": ">=1.3.1", + "phpunit/php-text-template": ">=1.1.1", + "phpunit/php-timer": ">=1.0.2,<1.1.0", + "phpunit/phpunit-mock-objects": ">=1.2.0,<1.3.0", + "symfony/yaml": ">=2.1.0,<2.2.0" + }, + "suggest": { + "ext-json": "*", + "ext-simplexml": "*", + "ext-tokenizer": "*", + "phpunit/php-invoker": ">=1.1.0,<1.2.0" + }, + "time": "2013-02-14 08:07:17", + "bin": [ + "composer/bin/phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.7.x-dev" + } + }, + "autoload": { + "classmap": [ + "PHPUnit/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "", + "../../symfony/yaml/" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "http://www.phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ] + }, + { + "name": "phpunit/phpunit-mock-objects", + "version": "1.2.x-dev", + "source": { + "type": "git", + "url": "git://github.com/sebastianbergmann/phpunit-mock-objects.git", + "reference": "d49b5683200b5db9b1c64cb06f52f50d147891c4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/d49b5683200b5db9b1c64cb06f52f50d147891c4", + "reference": "d49b5683200b5db9b1c64cb06f52f50d147891c4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "phpunit/php-text-template": ">=1.1.1@stable" + }, + "suggest": { + "ext-soap": "*" + }, + "time": "2013-02-05 07:46:41", + "type": "library", + "autoload": { + "classmap": [ + "PHPUnit/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Mock Object library for PHPUnit", + "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", + "keywords": [ + "mock", + "xunit" + ] + }, + { + "name": "symfony/browser-kit", + "version": "2.1.x-dev", + "target-dir": "Symfony/Component/BrowserKit", + "source": { + "type": "git", + "url": "https://github.com/symfony/BrowserKit", + "reference": "v2.1.7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/v2.1.7", + "reference": "v2.1.7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/dom-crawler": "2.1.*" + }, + "require-dev": { + "symfony/css-selector": "2.1.*", + "symfony/process": "2.1.*" + }, + "suggest": { + "symfony/process": "2.1.*" + }, + "time": "2013-01-09 08:51:07", + "type": "library", + "autoload": { + "psr-0": { + "Symfony\\Component\\BrowserKit": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony BrowserKit Component", + "homepage": "http://symfony.com" + }, + { + "name": "symfony/css-selector", + "version": "2.1.x-dev", + "target-dir": "Symfony/Component/CssSelector", + "source": { + "type": "git", + "url": "https://github.com/symfony/CssSelector", + "reference": "v2.1.7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/CssSelector/zipball/v2.1.7", + "reference": "v2.1.7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2013-01-09 08:51:07", + "type": "library", + "autoload": { + "psr-0": { + "Symfony\\Component\\CssSelector": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony CssSelector Component", + "homepage": "http://symfony.com" + }, + { + "name": "symfony/dom-crawler", + "version": "2.1.x-dev", + "target-dir": "Symfony/Component/DomCrawler", + "source": { + "type": "git", + "url": "https://github.com/symfony/DomCrawler", + "reference": "v2.1.7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/v2.1.7", + "reference": "v2.1.7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "symfony/css-selector": "2.1.*" + }, + "suggest": { + "symfony/css-selector": "2.1.*" + }, + "time": "2013-01-09 08:51:07", + "type": "library", + "autoload": { + "psr-0": { + "Symfony\\Component\\DomCrawler": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony DomCrawler Component", + "homepage": "http://symfony.com" + }, + { + "name": "symfony/yaml", + "version": "2.1.x-dev", + "target-dir": "Symfony/Component/Yaml", + "source": { + "type": "git", + "url": "https://github.com/symfony/Yaml", + "reference": "882b70fb7072e3f1fa95d249fd527a4e3998dc1a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/882b70fb7072e3f1fa95d249fd527a4e3998dc1a", + "reference": "882b70fb7072e3f1fa95d249fd527a4e3998dc1a", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2013-01-27 16:12:43", + "type": "library", + "autoload": { + "psr-0": { + "Symfony\\Component\\Yaml": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Yaml Component", + "homepage": "http://symfony.com" + } + ], "aliases": [ ], @@ -618,4 +1185,4 @@ "stability-flags": { "klaussilveira/gitter": 20 } -} \ No newline at end of file +} diff --git a/config.ini-example b/config.ini-example index 70815f7..2604f89 100644 --- a/config.ini-example +++ b/config.ini-example @@ -1,6 +1,7 @@ [git] client = '/usr/bin/git' ; Your git executable path repositories = '/var/www/projects/' ; Path to your repositories +default_branch = 'master' ; Default branch when HEAD is detached ; You can hide repositories from GitList, just copy this for each repository you want to hide ; hidden[] = '/var/www/projects/BetaTest' diff --git a/src/GitList/Application.php b/src/GitList/Application.php index 99e97f8..bfec00a 100644 --- a/src/GitList/Application.php +++ b/src/GitList/Application.php @@ -38,9 +38,10 @@ class Application extends SilexApplication 'twig.options' => array('cache' => $root . DIRECTORY_SEPARATOR . 'cache' . DIRECTORY_SEPARATOR . 'views'), )); $this->register(new GitServiceProvider(), array( - 'git.client' => $config->get('git', 'client'), - 'git.repos' => $config->get('git', 'repositories'), - 'git.hidden' => $config->get('git', 'hidden') ? $config->get('git', 'hidden') : array(), + 'git.client' => $config->get('git', 'client'), + 'git.repos' => $config->get('git', 'repositories'), + 'git.hidden' => $config->get('git', 'hidden') ? $config->get('git', 'hidden') : array(), + 'git.default_branch' => $config->get('git', 'default_branch') ? $config->get('git', 'default_branch') : 'master', )); $this->register(new ViewUtilServiceProvider()); $this->register(new RepositoryUtilServiceProvider()); diff --git a/src/GitList/Controller/MainController.php b/src/GitList/Controller/MainController.php index 8e76ba4..8352754 100644 --- a/src/GitList/Controller/MainController.php +++ b/src/GitList/Controller/MainController.php @@ -52,6 +52,11 @@ class MainController implements ControllerProviderInterface $route->get('{repo}/{branch}/rss/', function($repo, $branch) use ($app) { $repository = $app['git']->getRepository($app['git.repos'] . $repo); + + if ($branch === null) { + $branch = $repository->getHead(); + } + $commits = $repository->getPaginatedCommits($branch); $html = $app['twig']->render('rss.twig', array( @@ -63,6 +68,7 @@ class MainController implements ControllerProviderInterface return new Response($html, 200, array('Content-Type' => 'application/rss+xml')); })->assert('repo', $app['util.routing']->getRepositoryRegex()) ->assert('branch', $app['util.routing']->getBranchRegex()) + ->value('branch', null) ->bind('rss'); return $route; diff --git a/src/GitList/Git/Client.php b/src/GitList/Git/Client.php index 94d476a..0034f8f 100644 --- a/src/GitList/Git/Client.php +++ b/src/GitList/Git/Client.php @@ -6,6 +6,39 @@ use Gitter\Client as BaseClient; class Client extends BaseClient { + protected $default_branch; + + public function __construct($options = null) + { + parent::__construct($options); + + if (!isset($options['default_branch'])) { + $options['default_branch'] = 'master'; + } + + $this->setDefaultBranch($options['default_branch']); + } + + /** + * Set default branch as a string. + * + * @param string $branch Name of branch to use when repo's HEAD is detached. + */ + protected function setDefaultBranch($branch) + { + $this->default_branch = $branch; + + return $this; + } + + /** + * Return name of default branch as a string. + */ + public function getDefaultBranch() + { + return $this->default_branch; + } + /** * Creates a new repository on the specified path * diff --git a/src/GitList/Git/Repository.php b/src/GitList/Git/Repository.php index 3541b6f..ab5840b 100644 --- a/src/GitList/Git/Repository.php +++ b/src/GitList/Git/Repository.php @@ -24,6 +24,16 @@ class Repository extends BaseRepository return strpos($logs[0], 'commit') === 0; } + /** + * Get the current branch, returning a default value when HEAD is detached. + */ + public function getHead() + { + $client = $this->getClient(); + + return parent::getHead($client->getDefaultBranch()); + } + /** * Show the data from a specific commit * diff --git a/src/GitList/Provider/GitServiceProvider.php b/src/GitList/Provider/GitServiceProvider.php index 5427560..825b1f8 100644 --- a/src/GitList/Provider/GitServiceProvider.php +++ b/src/GitList/Provider/GitServiceProvider.php @@ -19,6 +19,7 @@ class GitServiceProvider implements ServiceProviderInterface $app['git'] = function () use ($app) { $options['path'] = $app['git.client']; $options['hidden'] = $app['git.hidden']; + $options['default_branch'] = $app['git.default_branch']; return new Client($options); }; diff --git a/tests/InterfaceTest.php b/tests/InterfaceTest.php index 6d8c85e..e4c403e 100644 --- a/tests/InterfaceTest.php +++ b/tests/InterfaceTest.php @@ -95,6 +95,16 @@ class InterfaceTest extends WebTestCase $repository->setConfig('user.email', 'luke@rebel.org'); $repository->addAll(); $repository->commit("Initial commit"); + + // Detached HEAD repository fixture + $git->createRepository(self::$tmpdir . 'detached-head'); + $repository = $git->getRepository(self::$tmpdir . '/detached-head'); + $repository->setConfig('user.name', 'Luke Skywalker'); + $repository->setConfig('user.email', 'luke@rebel.org'); + file_put_contents(self::$tmpdir . 'detached-head/README.md', "## detached head\ndetached-head is a *test* repository!"); + $repository->addAll(); + $repository->commit("First commit"); + $repository->checkout('HEAD'); } public function createApplication() @@ -126,8 +136,8 @@ class InterfaceTest extends WebTestCase $this->assertEquals('/nested/NestedRepo/master/rss/', $crawler->filter('.repository-header a')->eq(3)->attr('href')); $this->assertCount(1, $crawler->filter('div.repository-header:contains("foobar")')); $this->assertCount(1, $crawler->filter('div.repository-body:contains("This is a test repo!")')); - $this->assertEquals('/foobar/', $crawler->filter('.repository-header a')->eq(6)->attr('href')); - $this->assertEquals('/foobar/master/rss/', $crawler->filter('.repository-header a')->eq(7)->attr('href')); + $this->assertEquals('/foobar/', $crawler->filter('.repository-header a')->eq(8)->attr('href')); + $this->assertEquals('/foobar/master/rss/', $crawler->filter('.repository-header a')->eq(9)->attr('href')); } public function testRepositoryPage() From 0252ba287de241b19344187e8165adb881b59f56 Mon Sep 17 00:00:00 2001 From: Nate Eagleson Date: Sat, 16 Feb 2013 10:58:24 -0500 Subject: [PATCH 04/37] Add packages for making build to composer.json's require-dev Not all of the packages for doing a build are available via composer, but many of them are. This reduces the amount of work it takes to set up an environment to do a full build. --- composer.json | 5 +- composer.lock | 1035 ++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 938 insertions(+), 102 deletions(-) diff --git a/composer.json b/composer.json index 49508ff..5992141 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,10 @@ }, "require-dev": { "symfony/browser-kit": "2.1.*", - "symfony/css-selector": "2.1.*" + "symfony/css-selector": "2.1.*", + "phpunit/phpunit": "3.7.*", + "phpmd/phpmd": "1.4.0", + "phploc/phploc": "1.7.4" }, "minimum-stability": "dev", "autoload": { diff --git a/composer.lock b/composer.lock index 77469ae..6ad3169 100644 --- a/composer.lock +++ b/composer.lock @@ -1,18 +1,18 @@ { - "hash": "b1fc3d7e61707618f68e5cf940e97081", + "hash": "5d551d4122f4c231acabf1d23b1c4458", "packages": [ { "name": "klaussilveira/gitter", "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/klaussilveira/gitter", - "reference": "1c9b6e4dde81d21acffe99d9f4559ed3bc59f947" + "url": "https://github.com/klaussilveira/gitter.git", + "reference": "d35ad098ca64d458e62b502b5de6c96b9d782ed3" }, "dist": { "type": "zip", - "url": "https://github.com/klaussilveira/gitter/zipball/1c9b6e4dde81d21acffe99d9f4559ed3bc59f947", - "reference": "1c9b6e4dde81d21acffe99d9f4559ed3bc59f947", + "url": "https://api.github.com/repos/klaussilveira/gitter/zipball/d35ad098ca64d458e62b502b5de6c96b9d782ed3", + "reference": "d35ad098ca64d458e62b502b5de6c96b9d782ed3", "shasum": "" }, "require": { @@ -22,14 +22,14 @@ "require-dev": { "symfony/filesystem": ">=2.1" }, - "time": "1351643953", + "time": "2013-01-17 16:53:32", "type": "library", - "installation-source": "source", "autoload": { "psr-0": { "Gitter": "lib/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-2-Clause" ], @@ -54,29 +54,30 @@ "source": { "type": "git", "url": "git://github.com/fabpot/Pimple.git", - "reference": "b9f27b8dc18c08f00627dec02359b46a24791dc3" + "reference": "5a8936d9d31eb613f1a33753e5f22bffebe0bbc3" }, "dist": { "type": "zip", - "url": "https://github.com/fabpot/Pimple/zipball/b9f27b8dc18c08f00627dec02359b46a24791dc3", - "reference": "b9f27b8dc18c08f00627dec02359b46a24791dc3", + "url": "https://api.github.com/repos/fabpot/Pimple/zipball/5a8936d9d31eb613f1a33753e5f22bffebe0bbc3", + "reference": "5a8936d9d31eb613f1a33753e5f22bffebe0bbc3", "shasum": "" }, "require": { "php": ">=5.3.0" }, + "time": "2013-02-09 15:33:26", "type": "library", "extra": { "branch-alias": { "dev-master": "1.0.x-dev" } }, - "installation-source": "source", "autoload": { "psr-0": { "Pimple": "lib/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -89,10 +90,47 @@ "description": "Pimple is a simple Dependency Injection Container for PHP 5.3", "homepage": "http://pimple.sensiolabs.org", "keywords": [ - "dependency injection", - "container" + "container", + "dependency injection" + ] + }, + { + "name": "psr/log", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log", + "reference": "1.0.0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/php-fig/log/archive/1.0.0.zip", + "reference": "1.0.0", + "shasum": "" + }, + "time": "2012-12-21 11:40:51", + "type": "library", + "autoload": { + "psr-0": { + "Psr\\Log\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" ], - "time": "1347278988" + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "keywords": [ + "log", + "psr", + "psr-3" + ] }, { "name": "silex/silex", @@ -100,12 +138,12 @@ "source": { "type": "git", "url": "git://github.com/fabpot/Silex.git", - "reference": "69d710011ee8f9fa286854fcf636a07ad76b570b" + "reference": "c421eab3c4ca9d106cc5b68266d58adece8636cd" }, "dist": { "type": "zip", - "url": "https://github.com/fabpot/Silex/zipball/69d710011ee8f9fa286854fcf636a07ad76b570b", - "reference": "69d710011ee8f9fa286854fcf636a07ad76b570b", + "url": "https://api.github.com/repos/fabpot/Silex/zipball/c421eab3c4ca9d106cc5b68266d58adece8636cd", + "reference": "c421eab3c4ca9d106cc5b68266d58adece8636cd", "shasum": "" }, "require": { @@ -117,42 +155,43 @@ "symfony/routing": ">=2.1,<2.3-dev" }, "require-dev": { - "monolog/monolog": ">=1.0.0,<1.2-dev", - "twig/twig": ">=1.8.0,<2.0-dev", - "swiftmailer/swiftmailer": "4.2.*", "doctrine/dbal": ">=2.2.0,<2.4.0-dev", - "symfony/security": ">=2.1,<2.3-dev", - "symfony/config": ">=2.1,<2.3-dev", - "symfony/locale": ">=2.1,<2.3-dev", - "symfony/form": ">=2.1,<2.3-dev", + "swiftmailer/swiftmailer": "4.2.*", "symfony/browser-kit": ">=2.1,<2.3-dev", + "symfony/config": ">=2.1,<2.3-dev", "symfony/css-selector": ">=2.1,<2.3-dev", + "symfony/dom-crawler": ">=2.1,<2.3-dev", "symfony/finder": ">=2.1,<2.3-dev", + "symfony/form": ">=2.1,<2.3-dev", + "symfony/locale": ">=2.1,<2.3-dev", "symfony/monolog-bridge": ">=2.1,<2.3-dev", + "symfony/options-resolver": ">=2.1,<2.3-dev", "symfony/process": ">=2.1,<2.3-dev", + "symfony/security": ">=2.1,<2.3-dev", + "symfony/serializer": ">=2.1,<2.3-dev", "symfony/translation": ">=2.1,<2.3-dev", "symfony/twig-bridge": ">=2.1,<2.3-dev", "symfony/validator": ">=2.1,<2.3-dev", - "symfony/serializer": ">=2.1,<2.3-dev" + "twig/twig": ">=1.8.0,<2.0-dev" }, "suggest": { "symfony/browser-kit": ">=2.1,<2.3-dev", "symfony/css-selector": ">=2.1,<2.3-dev", "symfony/dom-crawler": ">=2.1,<2.3-dev" }, - "time": "1351540898", + "time": "2013-02-13 11:44:19", "type": "library", "extra": { "branch-alias": { "dev-master": "1.0.x-dev" } }, - "installation-source": "source", "autoload": { "psr-0": { "Silex": "src/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -175,42 +214,42 @@ }, { "name": "symfony/event-dispatcher", - "version": "dev-master", + "version": "2.2.x-dev", "target-dir": "Symfony/Component/EventDispatcher", "source": { "type": "git", "url": "https://github.com/symfony/EventDispatcher", - "reference": "24a1039d52b6b9f533cb73dcb96c7748262db686" + "reference": "v2.2.0-RC2" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/EventDispatcher/zipball/24a1039d52b6b9f533cb73dcb96c7748262db686", - "reference": "24a1039d52b6b9f533cb73dcb96c7748262db686", + "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.2.0-RC2", + "reference": "v2.2.0-RC2", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "symfony/dependency-injection": "2.2.*" + "symfony/dependency-injection": ">=2.0,<3.0" }, "suggest": { "symfony/dependency-injection": "2.2.*", "symfony/http-kernel": "2.2.*" }, - "time": "1349553479", + "time": "2013-02-11 11:26:43", "type": "library", "extra": { "branch-alias": { "dev-master": "2.2-dev" } }, - "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\EventDispatcher\\": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -234,29 +273,25 @@ "source": { "type": "git", "url": "https://github.com/symfony/Filesystem", - "reference": "v2.1.3" + "reference": "v2.1.7" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/Filesystem/zipball/v2.1.3", - "reference": "v2.1.3", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/v2.1.7", + "reference": "v2.1.7", "shasum": "" }, "require": { "php": ">=5.3.3" }, + "time": "2013-01-09 08:51:07", "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.1-dev" - } - }, - "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\Filesystem": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -271,35 +306,33 @@ } ], "description": "Symfony Filesystem Component", - "homepage": "http://symfony.com", - "time": "1350717030" + "homepage": "http://symfony.com" }, { "name": "symfony/http-foundation", - "version": "dev-master", + "version": "2.2.x-dev", "target-dir": "Symfony/Component/HttpFoundation", "source": { "type": "git", "url": "https://github.com/symfony/HttpFoundation", - "reference": "707e289629a10fde825bc4ba90aba743f79b173c" + "reference": "v2.2.0-RC2" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/HttpFoundation/zipball/707e289629a10fde825bc4ba90aba743f79b173c", - "reference": "707e289629a10fde825bc4ba90aba743f79b173c", + "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/v2.2.0-RC2", + "reference": "v2.2.0-RC2", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "1351508251", + "time": "2013-02-11 12:46:49", "type": "library", "extra": { "branch-alias": { "dev-master": "2.2-dev" } }, - "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\HttpFoundation\\": "" @@ -308,6 +341,7 @@ "Symfony/Component/HttpFoundation/Resources/stubs" ] }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -326,33 +360,35 @@ }, { "name": "symfony/http-kernel", - "version": "dev-master", + "version": "2.2.x-dev", "target-dir": "Symfony/Component/HttpKernel", "source": { "type": "git", "url": "https://github.com/symfony/HttpKernel", - "reference": "4dcb0bf602788342fb80c28c6e28be818839d417" + "reference": "cec254f40ea9baaa2b90de7ca6de236de76823eb" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/HttpKernel/zipball/4dcb0bf602788342fb80c28c6e28be818839d417", - "reference": "4dcb0bf602788342fb80c28c6e28be818839d417", + "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/cec254f40ea9baaa2b90de7ca6de236de76823eb", + "reference": "cec254f40ea9baaa2b90de7ca6de236de76823eb", "shasum": "" }, "require": { "php": ">=5.3.3", - "symfony/event-dispatcher": "2.2.*", - "symfony/http-foundation": "2.2.*" + "psr/log": ">=1.0,<2.0", + "symfony/event-dispatcher": ">=2.1,<3.0", + "symfony/http-foundation": ">=2.2,<2.3-dev" }, "require-dev": { "symfony/browser-kit": "2.2.*", - "symfony/class-loader": "2.2.*", - "symfony/config": "2.2.*", + "symfony/class-loader": ">=2.1,<3.0", + "symfony/config": ">=2.0,<3.0", "symfony/console": "2.2.*", - "symfony/dependency-injection": "2.2.*", - "symfony/finder": "2.2.*", - "symfony/process": "2.2.*", - "symfony/routing": "2.2.*" + "symfony/dependency-injection": ">=2.0,<3.0", + "symfony/finder": ">=2.0,<3.0", + "symfony/process": ">=2.0,<3.0", + "symfony/routing": ">=2.2,<2.3-dev", + "symfony/stopwatch": ">=2.2,<2.3-dev" }, "suggest": { "symfony/browser-kit": "2.2.*", @@ -362,19 +398,19 @@ "symfony/dependency-injection": "2.2.*", "symfony/finder": "2.2.*" }, - "time": "1351530455", + "time": "2013-02-13 01:35:51", "type": "library", "extra": { "branch-alias": { "dev-master": "2.2-dev" } }, - "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\HttpKernel\\": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -398,29 +434,30 @@ "source": { "type": "git", "url": "https://github.com/symfony/Process", - "reference": "b35a2a4fae02286df3275d7094a3d3d575122db8" + "reference": "c99475d555934461f079521d024d88a0d4e861eb" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/Process/zipball/b35a2a4fae02286df3275d7094a3d3d575122db8", - "reference": "b35a2a4fae02286df3275d7094a3d3d575122db8", + "url": "https://api.github.com/repos/symfony/Process/zipball/c99475d555934461f079521d024d88a0d4e861eb", + "reference": "c99475d555934461f079521d024d88a0d4e861eb", "shasum": "" }, "require": { "php": ">=5.3.3" }, + "time": "2013-01-31 21:39:01", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-master": "2.3-dev" } }, - "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\Process\\": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -435,51 +472,50 @@ } ], "description": "Symfony Process Component", - "homepage": "http://symfony.com", - "time": "1351356874" + "homepage": "http://symfony.com" }, { "name": "symfony/routing", - "version": "dev-master", + "version": "2.2.x-dev", "target-dir": "Symfony/Component/Routing", "source": { "type": "git", "url": "https://github.com/symfony/Routing", - "reference": "29792d8ac4ed7308acdeed4933cb6d91b7f6510f" + "reference": "v2.2.0-RC2" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/Routing/zipball/29792d8ac4ed7308acdeed4933cb6d91b7f6510f", - "reference": "29792d8ac4ed7308acdeed4933cb6d91b7f6510f", + "url": "https://api.github.com/repos/symfony/Routing/zipball/v2.2.0-RC2", + "reference": "v2.2.0-RC2", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "doctrine/common": ">=2.2,<2.4-dev", - "symfony/config": "2.2.*", - "symfony/yaml": "2.2.*", - "symfony/http-kernel": "2.2.*" + "doctrine/common": ">=2.2,<3.0", + "psr/log": ">=1.0,<2.0", + "symfony/config": ">=2.2,<2.3-dev", + "symfony/yaml": ">=2.0,<3.0" }, "suggest": { - "doctrine/common": ">=2.2,<2.4-dev", + "doctrine/common": "~2.2", "symfony/config": "2.2.*", "symfony/yaml": "2.2.*" }, - "time": "1351466734", + "time": "2013-02-11 11:24:47", "type": "library", "extra": { "branch-alias": { "dev-master": "2.2-dev" } }, - "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\Routing\\": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -503,12 +539,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/TwigBridge", - "reference": "v2.1.3" + "reference": "v2.1.7" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/TwigBridge/zipball/v2.1.3", - "reference": "v2.1.3", + "url": "https://api.github.com/repos/symfony/TwigBridge/zipball/v2.1.7", + "reference": "v2.1.7", "shasum": "" }, "require": { @@ -518,31 +554,27 @@ "require-dev": { "symfony/form": "2.1.*", "symfony/routing": "2.1.*", + "symfony/security": "2.1.*", "symfony/templating": "2.1.*", "symfony/translation": "2.1.*", - "symfony/yaml": "2.1.*", - "symfony/security": "2.1.*" + "symfony/yaml": "2.1.*" }, "suggest": { "symfony/form": "2.1.*", "symfony/routing": "2.1.*", + "symfony/security": "2.1.*", "symfony/templating": "2.1.*", "symfony/translation": "2.1.*", - "symfony/yaml": "2.1.*", - "symfony/security": "2.1.*" + "symfony/yaml": "2.1.*" }, + "time": "2013-01-17 15:20:05", "type": "symfony-bridge", - "extra": { - "branch-alias": { - "dev-master": "2.1-dev" - } - }, - "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Bridge\\Twig": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -557,8 +589,7 @@ } ], "description": "Symfony Twig Bridge", - "homepage": "http://symfony.com", - "time": "1349363877" + "homepage": "http://symfony.com" }, { "name": "twig/twig", @@ -584,7 +615,6 @@ "dev-master": "1.9-dev" } }, - "installation-source": "dist", "autoload": { "psr-0": { "Twig_": "lib/" @@ -610,7 +640,810 @@ ] } ], - "packages-dev": null, + "packages-dev": [ + { + "name": "pdepend/pdepend", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/pdepend/pdepend.git", + "reference": "85b3d7f2d2c6105a76daea0f5a0aee7c7a140b25" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pdepend/pdepend/zipball/85b3d7f2d2c6105a76daea0f5a0aee7c7a140b25", + "reference": "85b3d7f2d2c6105a76daea0f5a0aee7c7a140b25", + "shasum": "" + }, + "require": { + "php": ">=5.2.3" + }, + "time": "2013-01-25 15:09:33", + "bin": [ + "src/bin/pdepend" + ], + "type": "library", + "notification-url": "https://packagist.org/downloads/", + "description": "Official version of pdepend to be handled with Composer" + }, + { + "name": "phploc/phploc", + "version": "1.7.4", + "source": { + "type": "git", + "url": "git://github.com/sebastianbergmann/phploc.git", + "reference": "1.7.4" + }, + "dist": { + "type": "zip", + "url": "https://github.com/sebastianbergmann/phploc/archive/1.7.4.zip", + "reference": "1.7.4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/finder": "2.1.x-dev", + "zetacomponents/console-tools": "dev-master" + }, + "time": "2012-11-10 12:45:44", + "bin": [ + "composer/bin/phploc" + ], + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "A tool for quickly measuring the size of a PHP project.", + "homepage": "https://github.com/sebastianbergmann/phploc" + }, + { + "name": "phpmd/phpmd", + "version": "1.4.0", + "source": { + "type": "git", + "url": "git://github.com/phpmd/phpmd.git", + "reference": "1.4.0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/phpmd/phpmd/zipball/1.4.0", + "reference": "1.4.0", + "shasum": "" + }, + "require": { + "pdepend/pdepend": "*", + "php": ">=5.3.0" + }, + "time": "2012-09-07 14:52:24", + "bin": [ + "src/bin/phpmd" + ], + "type": "library", + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "../../pdepend/pdepend/src/main/php", + "src/main/php" + ], + "description": "Official version of PHPMD handled with Composer." + }, + { + "name": "phpunit/php-code-coverage", + "version": "1.2.x-dev", + "source": { + "type": "git", + "url": "git://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "25232ac64f081abd7478ae2d63fdb757f45e92b9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/25232ac64f081abd7478ae2d63fdb757f45e92b9", + "reference": "25232ac64f081abd7478ae2d63fdb757f45e92b9", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "phpunit/php-file-iterator": ">=1.3.0@stable", + "phpunit/php-text-template": ">=1.1.1@stable", + "phpunit/php-token-stream": ">=1.1.3@stable" + }, + "suggest": { + "ext-dom": "*", + "ext-xdebug": ">=2.0.5" + }, + "time": "2013-02-14 10:33:04", + "type": "library", + "autoload": { + "classmap": [ + "PHP/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ] + }, + { + "name": "phpunit/php-file-iterator", + "version": "dev-master", + "source": { + "type": "git", + "url": "git://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "2deb24c65ea78e126daa8d45b2089ddc29ec1d26" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/2deb24c65ea78e126daa8d45b2089ddc29ec1d26", + "reference": "2deb24c65ea78e126daa8d45b2089ddc29ec1d26", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2013-01-07 10:47:05", + "type": "library", + "autoload": { + "classmap": [ + "File/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "keywords": [ + "filesystem", + "iterator" + ] + }, + { + "name": "phpunit/php-text-template", + "version": "dev-master", + "source": { + "type": "git", + "url": "git://github.com/sebastianbergmann/php-text-template.git", + "reference": "1eeef106193d2f8c539728e566bb4793071a9e18" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/1eeef106193d2f8c539728e566bb4793071a9e18", + "reference": "1eeef106193d2f8c539728e566bb4793071a9e18", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2013-01-07 10:56:17", + "type": "library", + "autoload": { + "classmap": [ + "Text/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ] + }, + { + "name": "phpunit/php-timer", + "version": "1.0.x-dev", + "source": { + "type": "git", + "url": "git://github.com/sebastianbergmann/php-timer.git", + "reference": "ecf7920b27003a9412b07dad79dbb5ad1249e6c3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/ecf7920b27003a9412b07dad79dbb5ad1249e6c3", + "reference": "ecf7920b27003a9412b07dad79dbb5ad1249e6c3", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2013-01-30 06:08:51", + "type": "library", + "autoload": { + "classmap": [ + "PHP/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ] + }, + { + "name": "phpunit/php-token-stream", + "version": "dev-master", + "source": { + "type": "git", + "url": "git://github.com/sebastianbergmann/php-token-stream.git", + "reference": "c25dd88e1592e66dee2553c99ef244203d5a1b98" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c25dd88e1592e66dee2553c99ef244203d5a1b98", + "reference": "c25dd88e1592e66dee2553c99ef244203d5a1b98", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=5.3.3" + }, + "time": "2013-01-07 10:56:35", + "type": "library", + "autoload": { + "classmap": [ + "PHP/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Wrapper around PHP's tokenizer extension.", + "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "keywords": [ + "tokenizer" + ] + }, + { + "name": "phpunit/phpunit", + "version": "3.7.x-dev", + "source": { + "type": "git", + "url": "git://github.com/sebastianbergmann/phpunit.git", + "reference": "3.7.14" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3.7.14", + "reference": "3.7.14", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-pcre": "*", + "ext-reflection": "*", + "ext-spl": "*", + "php": ">=5.3.3", + "phpunit/php-code-coverage": ">=1.2.1,<1.3.0", + "phpunit/php-file-iterator": ">=1.3.1", + "phpunit/php-text-template": ">=1.1.1", + "phpunit/php-timer": ">=1.0.2,<1.1.0", + "phpunit/phpunit-mock-objects": ">=1.2.0,<1.3.0", + "symfony/yaml": ">=2.1.0,<2.2.0" + }, + "suggest": { + "ext-json": "*", + "ext-simplexml": "*", + "ext-tokenizer": "*", + "phpunit/php-invoker": ">=1.1.0,<1.2.0" + }, + "time": "2013-02-14 08:07:17", + "bin": [ + "composer/bin/phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.7.x-dev" + } + }, + "autoload": { + "classmap": [ + "PHPUnit/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "", + "../../symfony/yaml/" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "http://www.phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ] + }, + { + "name": "phpunit/phpunit-mock-objects", + "version": "1.2.x-dev", + "source": { + "type": "git", + "url": "git://github.com/sebastianbergmann/phpunit-mock-objects.git", + "reference": "d49b5683200b5db9b1c64cb06f52f50d147891c4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/d49b5683200b5db9b1c64cb06f52f50d147891c4", + "reference": "d49b5683200b5db9b1c64cb06f52f50d147891c4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "phpunit/php-text-template": ">=1.1.1@stable" + }, + "suggest": { + "ext-soap": "*" + }, + "time": "2013-02-05 07:46:41", + "type": "library", + "autoload": { + "classmap": [ + "PHPUnit/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Mock Object library for PHPUnit", + "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", + "keywords": [ + "mock", + "xunit" + ] + }, + { + "name": "symfony/browser-kit", + "version": "2.1.x-dev", + "target-dir": "Symfony/Component/BrowserKit", + "source": { + "type": "git", + "url": "https://github.com/symfony/BrowserKit", + "reference": "v2.1.7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/v2.1.7", + "reference": "v2.1.7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/dom-crawler": "2.1.*" + }, + "require-dev": { + "symfony/css-selector": "2.1.*", + "symfony/process": "2.1.*" + }, + "suggest": { + "symfony/process": "2.1.*" + }, + "time": "2013-01-09 08:51:07", + "type": "library", + "autoload": { + "psr-0": { + "Symfony\\Component\\BrowserKit": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony BrowserKit Component", + "homepage": "http://symfony.com" + }, + { + "name": "symfony/css-selector", + "version": "2.1.x-dev", + "target-dir": "Symfony/Component/CssSelector", + "source": { + "type": "git", + "url": "https://github.com/symfony/CssSelector", + "reference": "v2.1.7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/CssSelector/zipball/v2.1.7", + "reference": "v2.1.7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2013-01-09 08:51:07", + "type": "library", + "autoload": { + "psr-0": { + "Symfony\\Component\\CssSelector": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony CssSelector Component", + "homepage": "http://symfony.com" + }, + { + "name": "symfony/dom-crawler", + "version": "2.1.x-dev", + "target-dir": "Symfony/Component/DomCrawler", + "source": { + "type": "git", + "url": "https://github.com/symfony/DomCrawler", + "reference": "v2.1.7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/v2.1.7", + "reference": "v2.1.7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "symfony/css-selector": "2.1.*" + }, + "suggest": { + "symfony/css-selector": "2.1.*" + }, + "time": "2013-01-09 08:51:07", + "type": "library", + "autoload": { + "psr-0": { + "Symfony\\Component\\DomCrawler": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony DomCrawler Component", + "homepage": "http://symfony.com" + }, + { + "name": "symfony/finder", + "version": "2.1.x-dev", + "target-dir": "Symfony/Component/Finder", + "source": { + "type": "git", + "url": "https://github.com/symfony/Finder", + "reference": "v2.1.7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Finder/zipball/v2.1.7", + "reference": "v2.1.7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2013-01-09 08:51:07", + "type": "library", + "autoload": { + "psr-0": { + "Symfony\\Component\\Finder": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Finder Component", + "homepage": "http://symfony.com" + }, + { + "name": "symfony/yaml", + "version": "2.1.x-dev", + "target-dir": "Symfony/Component/Yaml", + "source": { + "type": "git", + "url": "https://github.com/symfony/Yaml", + "reference": "882b70fb7072e3f1fa95d249fd527a4e3998dc1a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/882b70fb7072e3f1fa95d249fd527a4e3998dc1a", + "reference": "882b70fb7072e3f1fa95d249fd527a4e3998dc1a", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2013-01-27 16:12:43", + "type": "library", + "autoload": { + "psr-0": { + "Symfony\\Component\\Yaml": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Yaml Component", + "homepage": "http://symfony.com" + }, + { + "name": "zetacomponents/base", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/zetacomponents/Base.git", + "reference": "642f63a8a72c32996f1aaf8a317fdf746bc32ce7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zetacomponents/Base/zipball/642f63a8a72c32996f1aaf8a317fdf746bc32ce7", + "reference": "642f63a8a72c32996f1aaf8a317fdf746bc32ce7", + "shasum": "" + }, + "require-dev": { + "zetacomponents/unit-test": "*" + }, + "time": "2012-05-21 11:21:36", + "type": "library", + "autoload": { + "classmap": [ + "src" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Sergey Alexeev" + }, + { + "name": "Sebastian Bergmann" + }, + { + "name": "Jan Borsodi" + }, + { + "name": "Raymond Bosman" + }, + { + "name": "Frederik Holljen" + }, + { + "name": "Kore Nordmann" + }, + { + "name": "Derick Rethans" + }, + { + "name": "Vadym Savchuk" + }, + { + "name": "Tobias Schlitt" + }, + { + "name": "Alexandru Stanoi" + } + ], + "description": "The Base package provides the basic infrastructure that all packages rely on. Therefore every component relies on this package.", + "homepage": "https://github.com/zetacomponents" + }, + { + "name": "zetacomponents/console-tools", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/zetacomponents/ConsoleTools.git", + "reference": "90156abef01e4215fda8b9740f77c322f126fb02" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zetacomponents/ConsoleTools/zipball/90156abef01e4215fda8b9740f77c322f126fb02", + "reference": "90156abef01e4215fda8b9740f77c322f126fb02", + "shasum": "" + }, + "require": { + "zetacomponents/base": "*" + }, + "require-dev": { + "zetacomponents/unit-test": "*" + }, + "time": "2012-05-21 09:55:34", + "type": "library", + "autoload": { + "classmap": [ + "src" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Sergey Alexeev" + }, + { + "name": "Sebastian Bergmann" + }, + { + "name": "Jan Borsodi" + }, + { + "name": "Raymond Bosman" + }, + { + "name": "Frederik Holljen" + }, + { + "name": "Kore Nordmann" + }, + { + "name": "Derick Rethans" + }, + { + "name": "Vadym Savchuk" + }, + { + "name": "Tobias Schlitt" + }, + { + "name": "Alexandru Stanoi" + } + ], + "description": "A set of classes to do different actions with the console (also called shell). It can render a progress bar, tables and a status bar and contains a class for parsing command line options.", + "homepage": "https://github.com/zetacomponents" + } + ], "aliases": [ ], @@ -618,4 +1451,4 @@ "stability-flags": { "klaussilveira/gitter": 20 } -} \ No newline at end of file +} From 3b9ae176d26b05f12fff0b9249aa01b836712cdb Mon Sep 17 00:00:00 2001 From: Nate Eagleson Date: Sat, 16 Feb 2013 11:07:41 -0500 Subject: [PATCH 05/37] Default require-dev packages to most recent minor version --- composer.json | 4 ++-- composer.lock | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 5992141..7d626a6 100644 --- a/composer.json +++ b/composer.json @@ -10,8 +10,8 @@ "symfony/browser-kit": "2.1.*", "symfony/css-selector": "2.1.*", "phpunit/phpunit": "3.7.*", - "phpmd/phpmd": "1.4.0", - "phploc/phploc": "1.7.4" + "phpmd/phpmd": "1.4.*", + "phploc/phploc": "1.7.*" }, "minimum-stability": "dev", "autoload": { diff --git a/composer.lock b/composer.lock index 6ad3169..9ec2683 100644 --- a/composer.lock +++ b/composer.lock @@ -1,5 +1,5 @@ { - "hash": "5d551d4122f4c231acabf1d23b1c4458", + "hash": "23b42eb82a97fc586f9c703879c08ac9", "packages": [ { "name": "klaussilveira/gitter", @@ -711,23 +711,23 @@ }, { "name": "phpmd/phpmd", - "version": "1.4.0", + "version": "1.4.1", "source": { "type": "git", "url": "git://github.com/phpmd/phpmd.git", - "reference": "1.4.0" + "reference": "1.4.1" }, "dist": { "type": "zip", - "url": "https://github.com/phpmd/phpmd/zipball/1.4.0", - "reference": "1.4.0", + "url": "https://github.com/phpmd/phpmd/archive/1.4.1.zip", + "reference": "1.4.1", "shasum": "" }, "require": { "pdepend/pdepend": "*", "php": ">=5.3.0" }, - "time": "2012-09-07 14:52:24", + "time": "2012-12-14 12:25:09", "bin": [ "src/bin/phpmd" ], From 6ee400f32e80bb5a7064fa0bfd05e4da2f076634 Mon Sep 17 00:00:00 2001 From: Nate Eagleson Date: Mon, 18 Feb 2013 22:39:18 -0500 Subject: [PATCH 06/37] Revert changes to composer.json and composer.lock Note that this commit depends on a pull request for gitter, and is therefore in an untestable state after reverting composer.json. Its predecessor should be testable, however. --- composer.json | 3 +- composer.lock | 781 +++++++------------------------------------------- 2 files changed, 108 insertions(+), 676 deletions(-) diff --git a/composer.json b/composer.json index e9177b3..e455ddb 100644 --- a/composer.json +++ b/composer.json @@ -8,8 +8,7 @@ }, "require-dev": { "symfony/browser-kit": "2.1.*", - "symfony/css-selector": "2.1.*", - "phpunit/phpunit": "3.7.*" + "symfony/css-selector": "2.1.*" }, "minimum-stability": "dev", "autoload": { diff --git a/composer.lock b/composer.lock index f78ff25..77469ae 100644 --- a/composer.lock +++ b/composer.lock @@ -1,18 +1,18 @@ { - "hash": "ed5320fb27429d26c0b32ae24d25bcfc", + "hash": "b1fc3d7e61707618f68e5cf940e97081", "packages": [ { "name": "klaussilveira/gitter", - "version": "dev-fix-get-branches", + "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/NateEag/gitter.git", - "reference": "85f7841fdce478efae78cca090abe3488aa2d2e5" + "url": "https://github.com/klaussilveira/gitter", + "reference": "1c9b6e4dde81d21acffe99d9f4559ed3bc59f947" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/NateEag/gitter/zipball/85f7841fdce478efae78cca090abe3488aa2d2e5", - "reference": "85f7841fdce478efae78cca090abe3488aa2d2e5", + "url": "https://github.com/klaussilveira/gitter/zipball/1c9b6e4dde81d21acffe99d9f4559ed3bc59f947", + "reference": "1c9b6e4dde81d21acffe99d9f4559ed3bc59f947", "shasum": "" }, "require": { @@ -20,11 +20,11 @@ "symfony/process": ">=2.1" }, "require-dev": { - "phpunit/phpunit": ">=3.7.1", "symfony/filesystem": ">=2.1" }, - "time": "2013-02-15 01:30:05", + "time": "1351643953", "type": "library", + "installation-source": "source", "autoload": { "psr-0": { "Gitter": "lib/" @@ -46,10 +46,7 @@ "keywords": [ "git", "vcs" - ], - "support": { - "source": "https://github.com/nateeag/gitter/tree/fix-get-branches" - } + ] }, { "name": "pimple/pimple", @@ -57,30 +54,29 @@ "source": { "type": "git", "url": "git://github.com/fabpot/Pimple.git", - "reference": "5a8936d9d31eb613f1a33753e5f22bffebe0bbc3" + "reference": "b9f27b8dc18c08f00627dec02359b46a24791dc3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Pimple/zipball/5a8936d9d31eb613f1a33753e5f22bffebe0bbc3", - "reference": "5a8936d9d31eb613f1a33753e5f22bffebe0bbc3", + "url": "https://github.com/fabpot/Pimple/zipball/b9f27b8dc18c08f00627dec02359b46a24791dc3", + "reference": "b9f27b8dc18c08f00627dec02359b46a24791dc3", "shasum": "" }, "require": { "php": ">=5.3.0" }, - "time": "2013-02-09 15:33:26", "type": "library", "extra": { "branch-alias": { "dev-master": "1.0.x-dev" } }, + "installation-source": "source", "autoload": { "psr-0": { "Pimple": "lib/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -93,47 +89,10 @@ "description": "Pimple is a simple Dependency Injection Container for PHP 5.3", "homepage": "http://pimple.sensiolabs.org", "keywords": [ - "container", - "dependency injection" - ] - }, - { - "name": "psr/log", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/log", - "reference": "1.0.0" - }, - "dist": { - "type": "zip", - "url": "https://github.com/php-fig/log/archive/1.0.0.zip", - "reference": "1.0.0", - "shasum": "" - }, - "time": "2012-12-21 11:40:51", - "type": "library", - "autoload": { - "psr-0": { - "Psr\\Log\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" + "dependency injection", + "container" ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interface for logging libraries", - "keywords": [ - "log", - "psr", - "psr-3" - ] + "time": "1347278988" }, { "name": "silex/silex", @@ -141,12 +100,12 @@ "source": { "type": "git", "url": "git://github.com/fabpot/Silex.git", - "reference": "c421eab3c4ca9d106cc5b68266d58adece8636cd" + "reference": "69d710011ee8f9fa286854fcf636a07ad76b570b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Silex/zipball/c421eab3c4ca9d106cc5b68266d58adece8636cd", - "reference": "c421eab3c4ca9d106cc5b68266d58adece8636cd", + "url": "https://github.com/fabpot/Silex/zipball/69d710011ee8f9fa286854fcf636a07ad76b570b", + "reference": "69d710011ee8f9fa286854fcf636a07ad76b570b", "shasum": "" }, "require": { @@ -158,43 +117,42 @@ "symfony/routing": ">=2.1,<2.3-dev" }, "require-dev": { - "doctrine/dbal": ">=2.2.0,<2.4.0-dev", + "monolog/monolog": ">=1.0.0,<1.2-dev", + "twig/twig": ">=1.8.0,<2.0-dev", "swiftmailer/swiftmailer": "4.2.*", - "symfony/browser-kit": ">=2.1,<2.3-dev", - "symfony/config": ">=2.1,<2.3-dev", - "symfony/css-selector": ">=2.1,<2.3-dev", - "symfony/dom-crawler": ">=2.1,<2.3-dev", - "symfony/finder": ">=2.1,<2.3-dev", - "symfony/form": ">=2.1,<2.3-dev", - "symfony/locale": ">=2.1,<2.3-dev", - "symfony/monolog-bridge": ">=2.1,<2.3-dev", - "symfony/options-resolver": ">=2.1,<2.3-dev", - "symfony/process": ">=2.1,<2.3-dev", + "doctrine/dbal": ">=2.2.0,<2.4.0-dev", "symfony/security": ">=2.1,<2.3-dev", - "symfony/serializer": ">=2.1,<2.3-dev", + "symfony/config": ">=2.1,<2.3-dev", + "symfony/locale": ">=2.1,<2.3-dev", + "symfony/form": ">=2.1,<2.3-dev", + "symfony/browser-kit": ">=2.1,<2.3-dev", + "symfony/css-selector": ">=2.1,<2.3-dev", + "symfony/finder": ">=2.1,<2.3-dev", + "symfony/monolog-bridge": ">=2.1,<2.3-dev", + "symfony/process": ">=2.1,<2.3-dev", "symfony/translation": ">=2.1,<2.3-dev", "symfony/twig-bridge": ">=2.1,<2.3-dev", "symfony/validator": ">=2.1,<2.3-dev", - "twig/twig": ">=1.8.0,<2.0-dev" + "symfony/serializer": ">=2.1,<2.3-dev" }, "suggest": { "symfony/browser-kit": ">=2.1,<2.3-dev", "symfony/css-selector": ">=2.1,<2.3-dev", "symfony/dom-crawler": ">=2.1,<2.3-dev" }, - "time": "2013-02-13 11:44:19", + "time": "1351540898", "type": "library", "extra": { "branch-alias": { "dev-master": "1.0.x-dev" } }, + "installation-source": "source", "autoload": { "psr-0": { "Silex": "src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -217,42 +175,42 @@ }, { "name": "symfony/event-dispatcher", - "version": "2.2.x-dev", + "version": "dev-master", "target-dir": "Symfony/Component/EventDispatcher", "source": { "type": "git", "url": "https://github.com/symfony/EventDispatcher", - "reference": "v2.2.0-RC2" + "reference": "24a1039d52b6b9f533cb73dcb96c7748262db686" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.2.0-RC2", - "reference": "v2.2.0-RC2", + "url": "https://github.com/symfony/EventDispatcher/zipball/24a1039d52b6b9f533cb73dcb96c7748262db686", + "reference": "24a1039d52b6b9f533cb73dcb96c7748262db686", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "symfony/dependency-injection": ">=2.0,<3.0" + "symfony/dependency-injection": "2.2.*" }, "suggest": { "symfony/dependency-injection": "2.2.*", "symfony/http-kernel": "2.2.*" }, - "time": "2013-02-11 11:26:43", + "time": "1349553479", "type": "library", "extra": { "branch-alias": { "dev-master": "2.2-dev" } }, + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\EventDispatcher\\": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -276,25 +234,29 @@ "source": { "type": "git", "url": "https://github.com/symfony/Filesystem", - "reference": "v2.1.7" + "reference": "v2.1.3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/v2.1.7", - "reference": "v2.1.7", + "url": "https://github.com/symfony/Filesystem/zipball/v2.1.3", + "reference": "v2.1.3", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "2013-01-09 08:51:07", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\Filesystem": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -309,33 +271,35 @@ } ], "description": "Symfony Filesystem Component", - "homepage": "http://symfony.com" + "homepage": "http://symfony.com", + "time": "1350717030" }, { "name": "symfony/http-foundation", - "version": "2.2.x-dev", + "version": "dev-master", "target-dir": "Symfony/Component/HttpFoundation", "source": { "type": "git", "url": "https://github.com/symfony/HttpFoundation", - "reference": "v2.2.0-RC2" + "reference": "707e289629a10fde825bc4ba90aba743f79b173c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/v2.2.0-RC2", - "reference": "v2.2.0-RC2", + "url": "https://github.com/symfony/HttpFoundation/zipball/707e289629a10fde825bc4ba90aba743f79b173c", + "reference": "707e289629a10fde825bc4ba90aba743f79b173c", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "2013-02-11 12:46:49", + "time": "1351508251", "type": "library", "extra": { "branch-alias": { "dev-master": "2.2-dev" } }, + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\HttpFoundation\\": "" @@ -344,7 +308,6 @@ "Symfony/Component/HttpFoundation/Resources/stubs" ] }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -363,35 +326,33 @@ }, { "name": "symfony/http-kernel", - "version": "2.2.x-dev", + "version": "dev-master", "target-dir": "Symfony/Component/HttpKernel", "source": { "type": "git", "url": "https://github.com/symfony/HttpKernel", - "reference": "cec254f40ea9baaa2b90de7ca6de236de76823eb" + "reference": "4dcb0bf602788342fb80c28c6e28be818839d417" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/cec254f40ea9baaa2b90de7ca6de236de76823eb", - "reference": "cec254f40ea9baaa2b90de7ca6de236de76823eb", + "url": "https://github.com/symfony/HttpKernel/zipball/4dcb0bf602788342fb80c28c6e28be818839d417", + "reference": "4dcb0bf602788342fb80c28c6e28be818839d417", "shasum": "" }, "require": { "php": ">=5.3.3", - "psr/log": ">=1.0,<2.0", - "symfony/event-dispatcher": ">=2.1,<3.0", - "symfony/http-foundation": ">=2.2,<2.3-dev" + "symfony/event-dispatcher": "2.2.*", + "symfony/http-foundation": "2.2.*" }, "require-dev": { "symfony/browser-kit": "2.2.*", - "symfony/class-loader": ">=2.1,<3.0", - "symfony/config": ">=2.0,<3.0", + "symfony/class-loader": "2.2.*", + "symfony/config": "2.2.*", "symfony/console": "2.2.*", - "symfony/dependency-injection": ">=2.0,<3.0", - "symfony/finder": ">=2.0,<3.0", - "symfony/process": ">=2.0,<3.0", - "symfony/routing": ">=2.2,<2.3-dev", - "symfony/stopwatch": ">=2.2,<2.3-dev" + "symfony/dependency-injection": "2.2.*", + "symfony/finder": "2.2.*", + "symfony/process": "2.2.*", + "symfony/routing": "2.2.*" }, "suggest": { "symfony/browser-kit": "2.2.*", @@ -401,19 +362,19 @@ "symfony/dependency-injection": "2.2.*", "symfony/finder": "2.2.*" }, - "time": "2013-02-13 01:35:51", + "time": "1351530455", "type": "library", "extra": { "branch-alias": { "dev-master": "2.2-dev" } }, + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\HttpKernel\\": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -437,30 +398,29 @@ "source": { "type": "git", "url": "https://github.com/symfony/Process", - "reference": "c99475d555934461f079521d024d88a0d4e861eb" + "reference": "b35a2a4fae02286df3275d7094a3d3d575122db8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Process/zipball/c99475d555934461f079521d024d88a0d4e861eb", - "reference": "c99475d555934461f079521d024d88a0d4e861eb", + "url": "https://github.com/symfony/Process/zipball/b35a2a4fae02286df3275d7094a3d3d575122db8", + "reference": "b35a2a4fae02286df3275d7094a3d3d575122db8", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "2013-01-31 21:39:01", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "2.2-dev" } }, + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\Process\\": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -475,50 +435,51 @@ } ], "description": "Symfony Process Component", - "homepage": "http://symfony.com" + "homepage": "http://symfony.com", + "time": "1351356874" }, { "name": "symfony/routing", - "version": "2.2.x-dev", + "version": "dev-master", "target-dir": "Symfony/Component/Routing", "source": { "type": "git", "url": "https://github.com/symfony/Routing", - "reference": "v2.2.0-RC2" + "reference": "29792d8ac4ed7308acdeed4933cb6d91b7f6510f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Routing/zipball/v2.2.0-RC2", - "reference": "v2.2.0-RC2", + "url": "https://github.com/symfony/Routing/zipball/29792d8ac4ed7308acdeed4933cb6d91b7f6510f", + "reference": "29792d8ac4ed7308acdeed4933cb6d91b7f6510f", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "doctrine/common": ">=2.2,<3.0", - "psr/log": ">=1.0,<2.0", - "symfony/config": ">=2.2,<2.3-dev", - "symfony/yaml": ">=2.0,<3.0" + "doctrine/common": ">=2.2,<2.4-dev", + "symfony/config": "2.2.*", + "symfony/yaml": "2.2.*", + "symfony/http-kernel": "2.2.*" }, "suggest": { - "doctrine/common": "~2.2", + "doctrine/common": ">=2.2,<2.4-dev", "symfony/config": "2.2.*", "symfony/yaml": "2.2.*" }, - "time": "2013-02-11 11:24:47", + "time": "1351466734", "type": "library", "extra": { "branch-alias": { "dev-master": "2.2-dev" } }, + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\Routing\\": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -542,12 +503,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/TwigBridge", - "reference": "v2.1.7" + "reference": "v2.1.3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/TwigBridge/zipball/v2.1.7", - "reference": "v2.1.7", + "url": "https://github.com/symfony/TwigBridge/zipball/v2.1.3", + "reference": "v2.1.3", "shasum": "" }, "require": { @@ -557,27 +518,31 @@ "require-dev": { "symfony/form": "2.1.*", "symfony/routing": "2.1.*", - "symfony/security": "2.1.*", "symfony/templating": "2.1.*", "symfony/translation": "2.1.*", - "symfony/yaml": "2.1.*" + "symfony/yaml": "2.1.*", + "symfony/security": "2.1.*" }, "suggest": { "symfony/form": "2.1.*", "symfony/routing": "2.1.*", - "symfony/security": "2.1.*", "symfony/templating": "2.1.*", "symfony/translation": "2.1.*", - "symfony/yaml": "2.1.*" + "symfony/yaml": "2.1.*", + "symfony/security": "2.1.*" }, - "time": "2013-01-17 15:20:05", "type": "symfony-bridge", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Bridge\\Twig": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -592,7 +557,8 @@ } ], "description": "Symfony Twig Bridge", - "homepage": "http://symfony.com" + "homepage": "http://symfony.com", + "time": "1349363877" }, { "name": "twig/twig", @@ -618,6 +584,7 @@ "dev-master": "1.9-dev" } }, + "installation-source": "dist", "autoload": { "psr-0": { "Twig_": "lib/" @@ -643,541 +610,7 @@ ] } ], - "packages-dev": [ - { - "name": "phpunit/php-code-coverage", - "version": "1.2.x-dev", - "source": { - "type": "git", - "url": "git://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "25232ac64f081abd7478ae2d63fdb757f45e92b9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/25232ac64f081abd7478ae2d63fdb757f45e92b9", - "reference": "25232ac64f081abd7478ae2d63fdb757f45e92b9", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "phpunit/php-file-iterator": ">=1.3.0@stable", - "phpunit/php-text-template": ">=1.1.1@stable", - "phpunit/php-token-stream": ">=1.1.3@stable" - }, - "suggest": { - "ext-dom": "*", - "ext-xdebug": ">=2.0.5" - }, - "time": "2013-02-14 10:33:04", - "type": "library", - "autoload": { - "classmap": [ - "PHP/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", - "homepage": "https://github.com/sebastianbergmann/php-code-coverage", - "keywords": [ - "coverage", - "testing", - "xunit" - ] - }, - { - "name": "phpunit/php-file-iterator", - "version": "dev-master", - "source": { - "type": "git", - "url": "git://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "2deb24c65ea78e126daa8d45b2089ddc29ec1d26" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/2deb24c65ea78e126daa8d45b2089ddc29ec1d26", - "reference": "2deb24c65ea78e126daa8d45b2089ddc29ec1d26", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "time": "2013-01-07 10:47:05", - "type": "library", - "autoload": { - "classmap": [ - "File/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "FilterIterator implementation that filters files based on a list of suffixes.", - "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", - "keywords": [ - "filesystem", - "iterator" - ] - }, - { - "name": "phpunit/php-text-template", - "version": "dev-master", - "source": { - "type": "git", - "url": "git://github.com/sebastianbergmann/php-text-template.git", - "reference": "1eeef106193d2f8c539728e566bb4793071a9e18" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/1eeef106193d2f8c539728e566bb4793071a9e18", - "reference": "1eeef106193d2f8c539728e566bb4793071a9e18", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "time": "2013-01-07 10:56:17", - "type": "library", - "autoload": { - "classmap": [ - "Text/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Simple template engine.", - "homepage": "https://github.com/sebastianbergmann/php-text-template/", - "keywords": [ - "template" - ] - }, - { - "name": "phpunit/php-timer", - "version": "1.0.x-dev", - "source": { - "type": "git", - "url": "git://github.com/sebastianbergmann/php-timer.git", - "reference": "ecf7920b27003a9412b07dad79dbb5ad1249e6c3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/ecf7920b27003a9412b07dad79dbb5ad1249e6c3", - "reference": "ecf7920b27003a9412b07dad79dbb5ad1249e6c3", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "time": "2013-01-30 06:08:51", - "type": "library", - "autoload": { - "classmap": [ - "PHP/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Utility class for timing", - "homepage": "https://github.com/sebastianbergmann/php-timer/", - "keywords": [ - "timer" - ] - }, - { - "name": "phpunit/php-token-stream", - "version": "dev-master", - "source": { - "type": "git", - "url": "git://github.com/sebastianbergmann/php-token-stream.git", - "reference": "c25dd88e1592e66dee2553c99ef244203d5a1b98" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c25dd88e1592e66dee2553c99ef244203d5a1b98", - "reference": "c25dd88e1592e66dee2553c99ef244203d5a1b98", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": ">=5.3.3" - }, - "time": "2013-01-07 10:56:35", - "type": "library", - "autoload": { - "classmap": [ - "PHP/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Wrapper around PHP's tokenizer extension.", - "homepage": "https://github.com/sebastianbergmann/php-token-stream/", - "keywords": [ - "tokenizer" - ] - }, - { - "name": "phpunit/phpunit", - "version": "3.7.x-dev", - "source": { - "type": "git", - "url": "git://github.com/sebastianbergmann/phpunit.git", - "reference": "3.7.14" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3.7.14", - "reference": "3.7.14", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-pcre": "*", - "ext-reflection": "*", - "ext-spl": "*", - "php": ">=5.3.3", - "phpunit/php-code-coverage": ">=1.2.1,<1.3.0", - "phpunit/php-file-iterator": ">=1.3.1", - "phpunit/php-text-template": ">=1.1.1", - "phpunit/php-timer": ">=1.0.2,<1.1.0", - "phpunit/phpunit-mock-objects": ">=1.2.0,<1.3.0", - "symfony/yaml": ">=2.1.0,<2.2.0" - }, - "suggest": { - "ext-json": "*", - "ext-simplexml": "*", - "ext-tokenizer": "*", - "phpunit/php-invoker": ">=1.1.0,<1.2.0" - }, - "time": "2013-02-14 08:07:17", - "bin": [ - "composer/bin/phpunit" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.7.x-dev" - } - }, - "autoload": { - "classmap": [ - "PHPUnit/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "", - "../../symfony/yaml/" - ], - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "The PHP Unit Testing framework.", - "homepage": "http://www.phpunit.de/", - "keywords": [ - "phpunit", - "testing", - "xunit" - ] - }, - { - "name": "phpunit/phpunit-mock-objects", - "version": "1.2.x-dev", - "source": { - "type": "git", - "url": "git://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "d49b5683200b5db9b1c64cb06f52f50d147891c4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/d49b5683200b5db9b1c64cb06f52f50d147891c4", - "reference": "d49b5683200b5db9b1c64cb06f52f50d147891c4", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "phpunit/php-text-template": ">=1.1.1@stable" - }, - "suggest": { - "ext-soap": "*" - }, - "time": "2013-02-05 07:46:41", - "type": "library", - "autoload": { - "classmap": [ - "PHPUnit/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Mock Object library for PHPUnit", - "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", - "keywords": [ - "mock", - "xunit" - ] - }, - { - "name": "symfony/browser-kit", - "version": "2.1.x-dev", - "target-dir": "Symfony/Component/BrowserKit", - "source": { - "type": "git", - "url": "https://github.com/symfony/BrowserKit", - "reference": "v2.1.7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/v2.1.7", - "reference": "v2.1.7", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "symfony/dom-crawler": "2.1.*" - }, - "require-dev": { - "symfony/css-selector": "2.1.*", - "symfony/process": "2.1.*" - }, - "suggest": { - "symfony/process": "2.1.*" - }, - "time": "2013-01-09 08:51:07", - "type": "library", - "autoload": { - "psr-0": { - "Symfony\\Component\\BrowserKit": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - } - ], - "description": "Symfony BrowserKit Component", - "homepage": "http://symfony.com" - }, - { - "name": "symfony/css-selector", - "version": "2.1.x-dev", - "target-dir": "Symfony/Component/CssSelector", - "source": { - "type": "git", - "url": "https://github.com/symfony/CssSelector", - "reference": "v2.1.7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/CssSelector/zipball/v2.1.7", - "reference": "v2.1.7", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "time": "2013-01-09 08:51:07", - "type": "library", - "autoload": { - "psr-0": { - "Symfony\\Component\\CssSelector": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - } - ], - "description": "Symfony CssSelector Component", - "homepage": "http://symfony.com" - }, - { - "name": "symfony/dom-crawler", - "version": "2.1.x-dev", - "target-dir": "Symfony/Component/DomCrawler", - "source": { - "type": "git", - "url": "https://github.com/symfony/DomCrawler", - "reference": "v2.1.7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/v2.1.7", - "reference": "v2.1.7", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "symfony/css-selector": "2.1.*" - }, - "suggest": { - "symfony/css-selector": "2.1.*" - }, - "time": "2013-01-09 08:51:07", - "type": "library", - "autoload": { - "psr-0": { - "Symfony\\Component\\DomCrawler": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - } - ], - "description": "Symfony DomCrawler Component", - "homepage": "http://symfony.com" - }, - { - "name": "symfony/yaml", - "version": "2.1.x-dev", - "target-dir": "Symfony/Component/Yaml", - "source": { - "type": "git", - "url": "https://github.com/symfony/Yaml", - "reference": "882b70fb7072e3f1fa95d249fd527a4e3998dc1a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/882b70fb7072e3f1fa95d249fd527a4e3998dc1a", - "reference": "882b70fb7072e3f1fa95d249fd527a4e3998dc1a", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "time": "2013-01-27 16:12:43", - "type": "library", - "autoload": { - "psr-0": { - "Symfony\\Component\\Yaml": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - } - ], - "description": "Symfony Yaml Component", - "homepage": "http://symfony.com" - } - ], + "packages-dev": null, "aliases": [ ], @@ -1185,4 +618,4 @@ "stability-flags": { "klaussilveira/gitter": 20 } -} +} \ No newline at end of file From 17f06d12e180fd574386df860950fa0667193c22 Mon Sep 17 00:00:00 2001 From: Nate Eagleson Date: Mon, 18 Feb 2013 22:47:51 -0500 Subject: [PATCH 07/37] Revert composer.lock since I updated a bunch of entries that did not need to be updated. --- composer.lock | 1043 +++++-------------------------------------------- 1 file changed, 105 insertions(+), 938 deletions(-) diff --git a/composer.lock b/composer.lock index 9ec2683..77469ae 100644 --- a/composer.lock +++ b/composer.lock @@ -1,18 +1,18 @@ { - "hash": "23b42eb82a97fc586f9c703879c08ac9", + "hash": "b1fc3d7e61707618f68e5cf940e97081", "packages": [ { "name": "klaussilveira/gitter", "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/klaussilveira/gitter.git", - "reference": "d35ad098ca64d458e62b502b5de6c96b9d782ed3" + "url": "https://github.com/klaussilveira/gitter", + "reference": "1c9b6e4dde81d21acffe99d9f4559ed3bc59f947" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/klaussilveira/gitter/zipball/d35ad098ca64d458e62b502b5de6c96b9d782ed3", - "reference": "d35ad098ca64d458e62b502b5de6c96b9d782ed3", + "url": "https://github.com/klaussilveira/gitter/zipball/1c9b6e4dde81d21acffe99d9f4559ed3bc59f947", + "reference": "1c9b6e4dde81d21acffe99d9f4559ed3bc59f947", "shasum": "" }, "require": { @@ -22,14 +22,14 @@ "require-dev": { "symfony/filesystem": ">=2.1" }, - "time": "2013-01-17 16:53:32", + "time": "1351643953", "type": "library", + "installation-source": "source", "autoload": { "psr-0": { "Gitter": "lib/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-2-Clause" ], @@ -54,30 +54,29 @@ "source": { "type": "git", "url": "git://github.com/fabpot/Pimple.git", - "reference": "5a8936d9d31eb613f1a33753e5f22bffebe0bbc3" + "reference": "b9f27b8dc18c08f00627dec02359b46a24791dc3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Pimple/zipball/5a8936d9d31eb613f1a33753e5f22bffebe0bbc3", - "reference": "5a8936d9d31eb613f1a33753e5f22bffebe0bbc3", + "url": "https://github.com/fabpot/Pimple/zipball/b9f27b8dc18c08f00627dec02359b46a24791dc3", + "reference": "b9f27b8dc18c08f00627dec02359b46a24791dc3", "shasum": "" }, "require": { "php": ">=5.3.0" }, - "time": "2013-02-09 15:33:26", "type": "library", "extra": { "branch-alias": { "dev-master": "1.0.x-dev" } }, + "installation-source": "source", "autoload": { "psr-0": { "Pimple": "lib/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -90,47 +89,10 @@ "description": "Pimple is a simple Dependency Injection Container for PHP 5.3", "homepage": "http://pimple.sensiolabs.org", "keywords": [ - "container", - "dependency injection" - ] - }, - { - "name": "psr/log", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/log", - "reference": "1.0.0" - }, - "dist": { - "type": "zip", - "url": "https://github.com/php-fig/log/archive/1.0.0.zip", - "reference": "1.0.0", - "shasum": "" - }, - "time": "2012-12-21 11:40:51", - "type": "library", - "autoload": { - "psr-0": { - "Psr\\Log\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" + "dependency injection", + "container" ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interface for logging libraries", - "keywords": [ - "log", - "psr", - "psr-3" - ] + "time": "1347278988" }, { "name": "silex/silex", @@ -138,12 +100,12 @@ "source": { "type": "git", "url": "git://github.com/fabpot/Silex.git", - "reference": "c421eab3c4ca9d106cc5b68266d58adece8636cd" + "reference": "69d710011ee8f9fa286854fcf636a07ad76b570b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Silex/zipball/c421eab3c4ca9d106cc5b68266d58adece8636cd", - "reference": "c421eab3c4ca9d106cc5b68266d58adece8636cd", + "url": "https://github.com/fabpot/Silex/zipball/69d710011ee8f9fa286854fcf636a07ad76b570b", + "reference": "69d710011ee8f9fa286854fcf636a07ad76b570b", "shasum": "" }, "require": { @@ -155,43 +117,42 @@ "symfony/routing": ">=2.1,<2.3-dev" }, "require-dev": { - "doctrine/dbal": ">=2.2.0,<2.4.0-dev", + "monolog/monolog": ">=1.0.0,<1.2-dev", + "twig/twig": ">=1.8.0,<2.0-dev", "swiftmailer/swiftmailer": "4.2.*", - "symfony/browser-kit": ">=2.1,<2.3-dev", - "symfony/config": ">=2.1,<2.3-dev", - "symfony/css-selector": ">=2.1,<2.3-dev", - "symfony/dom-crawler": ">=2.1,<2.3-dev", - "symfony/finder": ">=2.1,<2.3-dev", - "symfony/form": ">=2.1,<2.3-dev", - "symfony/locale": ">=2.1,<2.3-dev", - "symfony/monolog-bridge": ">=2.1,<2.3-dev", - "symfony/options-resolver": ">=2.1,<2.3-dev", - "symfony/process": ">=2.1,<2.3-dev", + "doctrine/dbal": ">=2.2.0,<2.4.0-dev", "symfony/security": ">=2.1,<2.3-dev", - "symfony/serializer": ">=2.1,<2.3-dev", + "symfony/config": ">=2.1,<2.3-dev", + "symfony/locale": ">=2.1,<2.3-dev", + "symfony/form": ">=2.1,<2.3-dev", + "symfony/browser-kit": ">=2.1,<2.3-dev", + "symfony/css-selector": ">=2.1,<2.3-dev", + "symfony/finder": ">=2.1,<2.3-dev", + "symfony/monolog-bridge": ">=2.1,<2.3-dev", + "symfony/process": ">=2.1,<2.3-dev", "symfony/translation": ">=2.1,<2.3-dev", "symfony/twig-bridge": ">=2.1,<2.3-dev", "symfony/validator": ">=2.1,<2.3-dev", - "twig/twig": ">=1.8.0,<2.0-dev" + "symfony/serializer": ">=2.1,<2.3-dev" }, "suggest": { "symfony/browser-kit": ">=2.1,<2.3-dev", "symfony/css-selector": ">=2.1,<2.3-dev", "symfony/dom-crawler": ">=2.1,<2.3-dev" }, - "time": "2013-02-13 11:44:19", + "time": "1351540898", "type": "library", "extra": { "branch-alias": { "dev-master": "1.0.x-dev" } }, + "installation-source": "source", "autoload": { "psr-0": { "Silex": "src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -214,42 +175,42 @@ }, { "name": "symfony/event-dispatcher", - "version": "2.2.x-dev", + "version": "dev-master", "target-dir": "Symfony/Component/EventDispatcher", "source": { "type": "git", "url": "https://github.com/symfony/EventDispatcher", - "reference": "v2.2.0-RC2" + "reference": "24a1039d52b6b9f533cb73dcb96c7748262db686" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.2.0-RC2", - "reference": "v2.2.0-RC2", + "url": "https://github.com/symfony/EventDispatcher/zipball/24a1039d52b6b9f533cb73dcb96c7748262db686", + "reference": "24a1039d52b6b9f533cb73dcb96c7748262db686", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "symfony/dependency-injection": ">=2.0,<3.0" + "symfony/dependency-injection": "2.2.*" }, "suggest": { "symfony/dependency-injection": "2.2.*", "symfony/http-kernel": "2.2.*" }, - "time": "2013-02-11 11:26:43", + "time": "1349553479", "type": "library", "extra": { "branch-alias": { "dev-master": "2.2-dev" } }, + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\EventDispatcher\\": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -273,25 +234,29 @@ "source": { "type": "git", "url": "https://github.com/symfony/Filesystem", - "reference": "v2.1.7" + "reference": "v2.1.3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/v2.1.7", - "reference": "v2.1.7", + "url": "https://github.com/symfony/Filesystem/zipball/v2.1.3", + "reference": "v2.1.3", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "2013-01-09 08:51:07", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\Filesystem": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -306,33 +271,35 @@ } ], "description": "Symfony Filesystem Component", - "homepage": "http://symfony.com" + "homepage": "http://symfony.com", + "time": "1350717030" }, { "name": "symfony/http-foundation", - "version": "2.2.x-dev", + "version": "dev-master", "target-dir": "Symfony/Component/HttpFoundation", "source": { "type": "git", "url": "https://github.com/symfony/HttpFoundation", - "reference": "v2.2.0-RC2" + "reference": "707e289629a10fde825bc4ba90aba743f79b173c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/v2.2.0-RC2", - "reference": "v2.2.0-RC2", + "url": "https://github.com/symfony/HttpFoundation/zipball/707e289629a10fde825bc4ba90aba743f79b173c", + "reference": "707e289629a10fde825bc4ba90aba743f79b173c", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "2013-02-11 12:46:49", + "time": "1351508251", "type": "library", "extra": { "branch-alias": { "dev-master": "2.2-dev" } }, + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\HttpFoundation\\": "" @@ -341,7 +308,6 @@ "Symfony/Component/HttpFoundation/Resources/stubs" ] }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -360,35 +326,33 @@ }, { "name": "symfony/http-kernel", - "version": "2.2.x-dev", + "version": "dev-master", "target-dir": "Symfony/Component/HttpKernel", "source": { "type": "git", "url": "https://github.com/symfony/HttpKernel", - "reference": "cec254f40ea9baaa2b90de7ca6de236de76823eb" + "reference": "4dcb0bf602788342fb80c28c6e28be818839d417" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/cec254f40ea9baaa2b90de7ca6de236de76823eb", - "reference": "cec254f40ea9baaa2b90de7ca6de236de76823eb", + "url": "https://github.com/symfony/HttpKernel/zipball/4dcb0bf602788342fb80c28c6e28be818839d417", + "reference": "4dcb0bf602788342fb80c28c6e28be818839d417", "shasum": "" }, "require": { "php": ">=5.3.3", - "psr/log": ">=1.0,<2.0", - "symfony/event-dispatcher": ">=2.1,<3.0", - "symfony/http-foundation": ">=2.2,<2.3-dev" + "symfony/event-dispatcher": "2.2.*", + "symfony/http-foundation": "2.2.*" }, "require-dev": { "symfony/browser-kit": "2.2.*", - "symfony/class-loader": ">=2.1,<3.0", - "symfony/config": ">=2.0,<3.0", + "symfony/class-loader": "2.2.*", + "symfony/config": "2.2.*", "symfony/console": "2.2.*", - "symfony/dependency-injection": ">=2.0,<3.0", - "symfony/finder": ">=2.0,<3.0", - "symfony/process": ">=2.0,<3.0", - "symfony/routing": ">=2.2,<2.3-dev", - "symfony/stopwatch": ">=2.2,<2.3-dev" + "symfony/dependency-injection": "2.2.*", + "symfony/finder": "2.2.*", + "symfony/process": "2.2.*", + "symfony/routing": "2.2.*" }, "suggest": { "symfony/browser-kit": "2.2.*", @@ -398,19 +362,19 @@ "symfony/dependency-injection": "2.2.*", "symfony/finder": "2.2.*" }, - "time": "2013-02-13 01:35:51", + "time": "1351530455", "type": "library", "extra": { "branch-alias": { "dev-master": "2.2-dev" } }, + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\HttpKernel\\": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -434,30 +398,29 @@ "source": { "type": "git", "url": "https://github.com/symfony/Process", - "reference": "c99475d555934461f079521d024d88a0d4e861eb" + "reference": "b35a2a4fae02286df3275d7094a3d3d575122db8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Process/zipball/c99475d555934461f079521d024d88a0d4e861eb", - "reference": "c99475d555934461f079521d024d88a0d4e861eb", + "url": "https://github.com/symfony/Process/zipball/b35a2a4fae02286df3275d7094a3d3d575122db8", + "reference": "b35a2a4fae02286df3275d7094a3d3d575122db8", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "2013-01-31 21:39:01", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "2.2-dev" } }, + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\Process\\": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -472,50 +435,51 @@ } ], "description": "Symfony Process Component", - "homepage": "http://symfony.com" + "homepage": "http://symfony.com", + "time": "1351356874" }, { "name": "symfony/routing", - "version": "2.2.x-dev", + "version": "dev-master", "target-dir": "Symfony/Component/Routing", "source": { "type": "git", "url": "https://github.com/symfony/Routing", - "reference": "v2.2.0-RC2" + "reference": "29792d8ac4ed7308acdeed4933cb6d91b7f6510f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Routing/zipball/v2.2.0-RC2", - "reference": "v2.2.0-RC2", + "url": "https://github.com/symfony/Routing/zipball/29792d8ac4ed7308acdeed4933cb6d91b7f6510f", + "reference": "29792d8ac4ed7308acdeed4933cb6d91b7f6510f", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "doctrine/common": ">=2.2,<3.0", - "psr/log": ">=1.0,<2.0", - "symfony/config": ">=2.2,<2.3-dev", - "symfony/yaml": ">=2.0,<3.0" + "doctrine/common": ">=2.2,<2.4-dev", + "symfony/config": "2.2.*", + "symfony/yaml": "2.2.*", + "symfony/http-kernel": "2.2.*" }, "suggest": { - "doctrine/common": "~2.2", + "doctrine/common": ">=2.2,<2.4-dev", "symfony/config": "2.2.*", "symfony/yaml": "2.2.*" }, - "time": "2013-02-11 11:24:47", + "time": "1351466734", "type": "library", "extra": { "branch-alias": { "dev-master": "2.2-dev" } }, + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\Routing\\": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -539,12 +503,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/TwigBridge", - "reference": "v2.1.7" + "reference": "v2.1.3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/TwigBridge/zipball/v2.1.7", - "reference": "v2.1.7", + "url": "https://github.com/symfony/TwigBridge/zipball/v2.1.3", + "reference": "v2.1.3", "shasum": "" }, "require": { @@ -554,27 +518,31 @@ "require-dev": { "symfony/form": "2.1.*", "symfony/routing": "2.1.*", - "symfony/security": "2.1.*", "symfony/templating": "2.1.*", "symfony/translation": "2.1.*", - "symfony/yaml": "2.1.*" + "symfony/yaml": "2.1.*", + "symfony/security": "2.1.*" }, "suggest": { "symfony/form": "2.1.*", "symfony/routing": "2.1.*", - "symfony/security": "2.1.*", "symfony/templating": "2.1.*", "symfony/translation": "2.1.*", - "symfony/yaml": "2.1.*" + "symfony/yaml": "2.1.*", + "symfony/security": "2.1.*" }, - "time": "2013-01-17 15:20:05", "type": "symfony-bridge", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Bridge\\Twig": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -589,7 +557,8 @@ } ], "description": "Symfony Twig Bridge", - "homepage": "http://symfony.com" + "homepage": "http://symfony.com", + "time": "1349363877" }, { "name": "twig/twig", @@ -615,6 +584,7 @@ "dev-master": "1.9-dev" } }, + "installation-source": "dist", "autoload": { "psr-0": { "Twig_": "lib/" @@ -640,810 +610,7 @@ ] } ], - "packages-dev": [ - { - "name": "pdepend/pdepend", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/pdepend/pdepend.git", - "reference": "85b3d7f2d2c6105a76daea0f5a0aee7c7a140b25" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/pdepend/pdepend/zipball/85b3d7f2d2c6105a76daea0f5a0aee7c7a140b25", - "reference": "85b3d7f2d2c6105a76daea0f5a0aee7c7a140b25", - "shasum": "" - }, - "require": { - "php": ">=5.2.3" - }, - "time": "2013-01-25 15:09:33", - "bin": [ - "src/bin/pdepend" - ], - "type": "library", - "notification-url": "https://packagist.org/downloads/", - "description": "Official version of pdepend to be handled with Composer" - }, - { - "name": "phploc/phploc", - "version": "1.7.4", - "source": { - "type": "git", - "url": "git://github.com/sebastianbergmann/phploc.git", - "reference": "1.7.4" - }, - "dist": { - "type": "zip", - "url": "https://github.com/sebastianbergmann/phploc/archive/1.7.4.zip", - "reference": "1.7.4", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "symfony/finder": "2.1.x-dev", - "zetacomponents/console-tools": "dev-master" - }, - "time": "2012-11-10 12:45:44", - "bin": [ - "composer/bin/phploc" - ], - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "A tool for quickly measuring the size of a PHP project.", - "homepage": "https://github.com/sebastianbergmann/phploc" - }, - { - "name": "phpmd/phpmd", - "version": "1.4.1", - "source": { - "type": "git", - "url": "git://github.com/phpmd/phpmd.git", - "reference": "1.4.1" - }, - "dist": { - "type": "zip", - "url": "https://github.com/phpmd/phpmd/archive/1.4.1.zip", - "reference": "1.4.1", - "shasum": "" - }, - "require": { - "pdepend/pdepend": "*", - "php": ">=5.3.0" - }, - "time": "2012-12-14 12:25:09", - "bin": [ - "src/bin/phpmd" - ], - "type": "library", - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "../../pdepend/pdepend/src/main/php", - "src/main/php" - ], - "description": "Official version of PHPMD handled with Composer." - }, - { - "name": "phpunit/php-code-coverage", - "version": "1.2.x-dev", - "source": { - "type": "git", - "url": "git://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "25232ac64f081abd7478ae2d63fdb757f45e92b9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/25232ac64f081abd7478ae2d63fdb757f45e92b9", - "reference": "25232ac64f081abd7478ae2d63fdb757f45e92b9", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "phpunit/php-file-iterator": ">=1.3.0@stable", - "phpunit/php-text-template": ">=1.1.1@stable", - "phpunit/php-token-stream": ">=1.1.3@stable" - }, - "suggest": { - "ext-dom": "*", - "ext-xdebug": ">=2.0.5" - }, - "time": "2013-02-14 10:33:04", - "type": "library", - "autoload": { - "classmap": [ - "PHP/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", - "homepage": "https://github.com/sebastianbergmann/php-code-coverage", - "keywords": [ - "coverage", - "testing", - "xunit" - ] - }, - { - "name": "phpunit/php-file-iterator", - "version": "dev-master", - "source": { - "type": "git", - "url": "git://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "2deb24c65ea78e126daa8d45b2089ddc29ec1d26" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/2deb24c65ea78e126daa8d45b2089ddc29ec1d26", - "reference": "2deb24c65ea78e126daa8d45b2089ddc29ec1d26", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "time": "2013-01-07 10:47:05", - "type": "library", - "autoload": { - "classmap": [ - "File/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "FilterIterator implementation that filters files based on a list of suffixes.", - "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", - "keywords": [ - "filesystem", - "iterator" - ] - }, - { - "name": "phpunit/php-text-template", - "version": "dev-master", - "source": { - "type": "git", - "url": "git://github.com/sebastianbergmann/php-text-template.git", - "reference": "1eeef106193d2f8c539728e566bb4793071a9e18" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/1eeef106193d2f8c539728e566bb4793071a9e18", - "reference": "1eeef106193d2f8c539728e566bb4793071a9e18", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "time": "2013-01-07 10:56:17", - "type": "library", - "autoload": { - "classmap": [ - "Text/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Simple template engine.", - "homepage": "https://github.com/sebastianbergmann/php-text-template/", - "keywords": [ - "template" - ] - }, - { - "name": "phpunit/php-timer", - "version": "1.0.x-dev", - "source": { - "type": "git", - "url": "git://github.com/sebastianbergmann/php-timer.git", - "reference": "ecf7920b27003a9412b07dad79dbb5ad1249e6c3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/ecf7920b27003a9412b07dad79dbb5ad1249e6c3", - "reference": "ecf7920b27003a9412b07dad79dbb5ad1249e6c3", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "time": "2013-01-30 06:08:51", - "type": "library", - "autoload": { - "classmap": [ - "PHP/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Utility class for timing", - "homepage": "https://github.com/sebastianbergmann/php-timer/", - "keywords": [ - "timer" - ] - }, - { - "name": "phpunit/php-token-stream", - "version": "dev-master", - "source": { - "type": "git", - "url": "git://github.com/sebastianbergmann/php-token-stream.git", - "reference": "c25dd88e1592e66dee2553c99ef244203d5a1b98" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c25dd88e1592e66dee2553c99ef244203d5a1b98", - "reference": "c25dd88e1592e66dee2553c99ef244203d5a1b98", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": ">=5.3.3" - }, - "time": "2013-01-07 10:56:35", - "type": "library", - "autoload": { - "classmap": [ - "PHP/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Wrapper around PHP's tokenizer extension.", - "homepage": "https://github.com/sebastianbergmann/php-token-stream/", - "keywords": [ - "tokenizer" - ] - }, - { - "name": "phpunit/phpunit", - "version": "3.7.x-dev", - "source": { - "type": "git", - "url": "git://github.com/sebastianbergmann/phpunit.git", - "reference": "3.7.14" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3.7.14", - "reference": "3.7.14", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-pcre": "*", - "ext-reflection": "*", - "ext-spl": "*", - "php": ">=5.3.3", - "phpunit/php-code-coverage": ">=1.2.1,<1.3.0", - "phpunit/php-file-iterator": ">=1.3.1", - "phpunit/php-text-template": ">=1.1.1", - "phpunit/php-timer": ">=1.0.2,<1.1.0", - "phpunit/phpunit-mock-objects": ">=1.2.0,<1.3.0", - "symfony/yaml": ">=2.1.0,<2.2.0" - }, - "suggest": { - "ext-json": "*", - "ext-simplexml": "*", - "ext-tokenizer": "*", - "phpunit/php-invoker": ">=1.1.0,<1.2.0" - }, - "time": "2013-02-14 08:07:17", - "bin": [ - "composer/bin/phpunit" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.7.x-dev" - } - }, - "autoload": { - "classmap": [ - "PHPUnit/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "", - "../../symfony/yaml/" - ], - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "The PHP Unit Testing framework.", - "homepage": "http://www.phpunit.de/", - "keywords": [ - "phpunit", - "testing", - "xunit" - ] - }, - { - "name": "phpunit/phpunit-mock-objects", - "version": "1.2.x-dev", - "source": { - "type": "git", - "url": "git://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "d49b5683200b5db9b1c64cb06f52f50d147891c4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/d49b5683200b5db9b1c64cb06f52f50d147891c4", - "reference": "d49b5683200b5db9b1c64cb06f52f50d147891c4", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "phpunit/php-text-template": ">=1.1.1@stable" - }, - "suggest": { - "ext-soap": "*" - }, - "time": "2013-02-05 07:46:41", - "type": "library", - "autoload": { - "classmap": [ - "PHPUnit/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Mock Object library for PHPUnit", - "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", - "keywords": [ - "mock", - "xunit" - ] - }, - { - "name": "symfony/browser-kit", - "version": "2.1.x-dev", - "target-dir": "Symfony/Component/BrowserKit", - "source": { - "type": "git", - "url": "https://github.com/symfony/BrowserKit", - "reference": "v2.1.7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/v2.1.7", - "reference": "v2.1.7", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "symfony/dom-crawler": "2.1.*" - }, - "require-dev": { - "symfony/css-selector": "2.1.*", - "symfony/process": "2.1.*" - }, - "suggest": { - "symfony/process": "2.1.*" - }, - "time": "2013-01-09 08:51:07", - "type": "library", - "autoload": { - "psr-0": { - "Symfony\\Component\\BrowserKit": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - } - ], - "description": "Symfony BrowserKit Component", - "homepage": "http://symfony.com" - }, - { - "name": "symfony/css-selector", - "version": "2.1.x-dev", - "target-dir": "Symfony/Component/CssSelector", - "source": { - "type": "git", - "url": "https://github.com/symfony/CssSelector", - "reference": "v2.1.7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/CssSelector/zipball/v2.1.7", - "reference": "v2.1.7", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "time": "2013-01-09 08:51:07", - "type": "library", - "autoload": { - "psr-0": { - "Symfony\\Component\\CssSelector": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - } - ], - "description": "Symfony CssSelector Component", - "homepage": "http://symfony.com" - }, - { - "name": "symfony/dom-crawler", - "version": "2.1.x-dev", - "target-dir": "Symfony/Component/DomCrawler", - "source": { - "type": "git", - "url": "https://github.com/symfony/DomCrawler", - "reference": "v2.1.7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/v2.1.7", - "reference": "v2.1.7", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "symfony/css-selector": "2.1.*" - }, - "suggest": { - "symfony/css-selector": "2.1.*" - }, - "time": "2013-01-09 08:51:07", - "type": "library", - "autoload": { - "psr-0": { - "Symfony\\Component\\DomCrawler": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - } - ], - "description": "Symfony DomCrawler Component", - "homepage": "http://symfony.com" - }, - { - "name": "symfony/finder", - "version": "2.1.x-dev", - "target-dir": "Symfony/Component/Finder", - "source": { - "type": "git", - "url": "https://github.com/symfony/Finder", - "reference": "v2.1.7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/Finder/zipball/v2.1.7", - "reference": "v2.1.7", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "time": "2013-01-09 08:51:07", - "type": "library", - "autoload": { - "psr-0": { - "Symfony\\Component\\Finder": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - } - ], - "description": "Symfony Finder Component", - "homepage": "http://symfony.com" - }, - { - "name": "symfony/yaml", - "version": "2.1.x-dev", - "target-dir": "Symfony/Component/Yaml", - "source": { - "type": "git", - "url": "https://github.com/symfony/Yaml", - "reference": "882b70fb7072e3f1fa95d249fd527a4e3998dc1a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/882b70fb7072e3f1fa95d249fd527a4e3998dc1a", - "reference": "882b70fb7072e3f1fa95d249fd527a4e3998dc1a", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "time": "2013-01-27 16:12:43", - "type": "library", - "autoload": { - "psr-0": { - "Symfony\\Component\\Yaml": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - } - ], - "description": "Symfony Yaml Component", - "homepage": "http://symfony.com" - }, - { - "name": "zetacomponents/base", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/zetacomponents/Base.git", - "reference": "642f63a8a72c32996f1aaf8a317fdf746bc32ce7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zetacomponents/Base/zipball/642f63a8a72c32996f1aaf8a317fdf746bc32ce7", - "reference": "642f63a8a72c32996f1aaf8a317fdf746bc32ce7", - "shasum": "" - }, - "require-dev": { - "zetacomponents/unit-test": "*" - }, - "time": "2012-05-21 11:21:36", - "type": "library", - "autoload": { - "classmap": [ - "src" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Sergey Alexeev" - }, - { - "name": "Sebastian Bergmann" - }, - { - "name": "Jan Borsodi" - }, - { - "name": "Raymond Bosman" - }, - { - "name": "Frederik Holljen" - }, - { - "name": "Kore Nordmann" - }, - { - "name": "Derick Rethans" - }, - { - "name": "Vadym Savchuk" - }, - { - "name": "Tobias Schlitt" - }, - { - "name": "Alexandru Stanoi" - } - ], - "description": "The Base package provides the basic infrastructure that all packages rely on. Therefore every component relies on this package.", - "homepage": "https://github.com/zetacomponents" - }, - { - "name": "zetacomponents/console-tools", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/zetacomponents/ConsoleTools.git", - "reference": "90156abef01e4215fda8b9740f77c322f126fb02" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zetacomponents/ConsoleTools/zipball/90156abef01e4215fda8b9740f77c322f126fb02", - "reference": "90156abef01e4215fda8b9740f77c322f126fb02", - "shasum": "" - }, - "require": { - "zetacomponents/base": "*" - }, - "require-dev": { - "zetacomponents/unit-test": "*" - }, - "time": "2012-05-21 09:55:34", - "type": "library", - "autoload": { - "classmap": [ - "src" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Sergey Alexeev" - }, - { - "name": "Sebastian Bergmann" - }, - { - "name": "Jan Borsodi" - }, - { - "name": "Raymond Bosman" - }, - { - "name": "Frederik Holljen" - }, - { - "name": "Kore Nordmann" - }, - { - "name": "Derick Rethans" - }, - { - "name": "Vadym Savchuk" - }, - { - "name": "Tobias Schlitt" - }, - { - "name": "Alexandru Stanoi" - } - ], - "description": "A set of classes to do different actions with the console (also called shell). It can render a progress bar, tables and a status bar and contains a class for parsing command line options.", - "homepage": "https://github.com/zetacomponents" - } - ], + "packages-dev": null, "aliases": [ ], @@ -1451,4 +618,4 @@ "stability-flags": { "klaussilveira/gitter": 20 } -} +} \ No newline at end of file From b2e6bab386c0265069d9d530a739fbc1cae1d38d Mon Sep 17 00:00:00 2001 From: Nate Eagleson Date: Mon, 18 Feb 2013 23:02:12 -0500 Subject: [PATCH 08/37] Update composer.lock for dev dependencies --- composer.lock | 877 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 836 insertions(+), 41 deletions(-) diff --git a/composer.lock b/composer.lock index 77469ae..742f03f 100644 --- a/composer.lock +++ b/composer.lock @@ -1,5 +1,5 @@ { - "hash": "b1fc3d7e61707618f68e5cf940e97081", + "hash": "23b42eb82a97fc586f9c703879c08ac9", "packages": [ { "name": "klaussilveira/gitter", @@ -22,9 +22,7 @@ "require-dev": { "symfony/filesystem": ">=2.1" }, - "time": "1351643953", "type": "library", - "installation-source": "source", "autoload": { "psr-0": { "Gitter": "lib/" @@ -46,7 +44,8 @@ "keywords": [ "git", "vcs" - ] + ], + "time": "2012-10-31 00:39:13" }, { "name": "pimple/pimple", @@ -71,7 +70,6 @@ "dev-master": "1.0.x-dev" } }, - "installation-source": "source", "autoload": { "psr-0": { "Pimple": "lib/" @@ -89,10 +87,10 @@ "description": "Pimple is a simple Dependency Injection Container for PHP 5.3", "homepage": "http://pimple.sensiolabs.org", "keywords": [ - "dependency injection", - "container" + "container", + "dependency injection" ], - "time": "1347278988" + "time": "2012-09-10 12:09:48" }, { "name": "silex/silex", @@ -117,37 +115,36 @@ "symfony/routing": ">=2.1,<2.3-dev" }, "require-dev": { - "monolog/monolog": ">=1.0.0,<1.2-dev", - "twig/twig": ">=1.8.0,<2.0-dev", - "swiftmailer/swiftmailer": "4.2.*", "doctrine/dbal": ">=2.2.0,<2.4.0-dev", - "symfony/security": ">=2.1,<2.3-dev", - "symfony/config": ">=2.1,<2.3-dev", - "symfony/locale": ">=2.1,<2.3-dev", - "symfony/form": ">=2.1,<2.3-dev", + "monolog/monolog": ">=1.0.0,<1.2-dev", + "swiftmailer/swiftmailer": "4.2.*", "symfony/browser-kit": ">=2.1,<2.3-dev", + "symfony/config": ">=2.1,<2.3-dev", "symfony/css-selector": ">=2.1,<2.3-dev", "symfony/finder": ">=2.1,<2.3-dev", + "symfony/form": ">=2.1,<2.3-dev", + "symfony/locale": ">=2.1,<2.3-dev", "symfony/monolog-bridge": ">=2.1,<2.3-dev", "symfony/process": ">=2.1,<2.3-dev", + "symfony/security": ">=2.1,<2.3-dev", + "symfony/serializer": ">=2.1,<2.3-dev", "symfony/translation": ">=2.1,<2.3-dev", "symfony/twig-bridge": ">=2.1,<2.3-dev", "symfony/validator": ">=2.1,<2.3-dev", - "symfony/serializer": ">=2.1,<2.3-dev" + "twig/twig": ">=1.8.0,<2.0-dev" }, "suggest": { "symfony/browser-kit": ">=2.1,<2.3-dev", "symfony/css-selector": ">=2.1,<2.3-dev", "symfony/dom-crawler": ">=2.1,<2.3-dev" }, - "time": "1351540898", + "time": "2012-10-29 20:01:38", "type": "library", "extra": { "branch-alias": { "dev-master": "1.0.x-dev" } }, - "installation-source": "source", "autoload": { "psr-0": { "Silex": "src/" @@ -198,14 +195,13 @@ "symfony/dependency-injection": "2.2.*", "symfony/http-kernel": "2.2.*" }, - "time": "1349553479", + "time": "2012-10-06 19:57:59", "type": "library", "extra": { "branch-alias": { "dev-master": "2.2-dev" } }, - "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\EventDispatcher\\": "" @@ -251,7 +247,6 @@ "dev-master": "2.1-dev" } }, - "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\Filesystem": "" @@ -272,7 +267,7 @@ ], "description": "Symfony Filesystem Component", "homepage": "http://symfony.com", - "time": "1350717030" + "time": "2012-10-20 07:10:30" }, { "name": "symfony/http-foundation", @@ -292,14 +287,13 @@ "require": { "php": ">=5.3.3" }, - "time": "1351508251", + "time": "2012-10-29 10:57:31", "type": "library", "extra": { "branch-alias": { "dev-master": "2.2-dev" } }, - "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\HttpFoundation\\": "" @@ -362,14 +356,13 @@ "symfony/dependency-injection": "2.2.*", "symfony/finder": "2.2.*" }, - "time": "1351530455", + "time": "2012-10-29 17:07:35", "type": "library", "extra": { "branch-alias": { "dev-master": "2.2-dev" } }, - "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\HttpKernel\\": "" @@ -415,7 +408,6 @@ "dev-master": "2.2-dev" } }, - "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\Process\\": "" @@ -436,7 +428,7 @@ ], "description": "Symfony Process Component", "homepage": "http://symfony.com", - "time": "1351356874" + "time": "2012-10-27 16:54:34" }, { "name": "symfony/routing", @@ -459,22 +451,21 @@ "require-dev": { "doctrine/common": ">=2.2,<2.4-dev", "symfony/config": "2.2.*", - "symfony/yaml": "2.2.*", - "symfony/http-kernel": "2.2.*" + "symfony/http-kernel": "2.2.*", + "symfony/yaml": "2.2.*" }, "suggest": { "doctrine/common": ">=2.2,<2.4-dev", "symfony/config": "2.2.*", "symfony/yaml": "2.2.*" }, - "time": "1351466734", + "time": "2012-10-28 23:25:34", "type": "library", "extra": { "branch-alias": { "dev-master": "2.2-dev" } }, - "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Component\\Routing\\": "" @@ -518,18 +509,18 @@ "require-dev": { "symfony/form": "2.1.*", "symfony/routing": "2.1.*", + "symfony/security": "2.1.*", "symfony/templating": "2.1.*", "symfony/translation": "2.1.*", - "symfony/yaml": "2.1.*", - "symfony/security": "2.1.*" + "symfony/yaml": "2.1.*" }, "suggest": { "symfony/form": "2.1.*", "symfony/routing": "2.1.*", + "symfony/security": "2.1.*", "symfony/templating": "2.1.*", "symfony/translation": "2.1.*", - "symfony/yaml": "2.1.*", - "symfony/security": "2.1.*" + "symfony/yaml": "2.1.*" }, "type": "symfony-bridge", "extra": { @@ -537,7 +528,6 @@ "dev-master": "2.1-dev" } }, - "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Bridge\\Twig": "" @@ -558,7 +548,7 @@ ], "description": "Symfony Twig Bridge", "homepage": "http://symfony.com", - "time": "1349363877" + "time": "2012-10-04 15:17:57" }, { "name": "twig/twig", @@ -584,7 +574,6 @@ "dev-master": "1.9-dev" } }, - "installation-source": "dist", "autoload": { "psr-0": { "Twig_": "lib/" @@ -610,7 +599,813 @@ ] } ], - "packages-dev": null, + "packages-dev": [ + { + "name": "pdepend/pdepend", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/pdepend/pdepend.git", + "reference": "85b3d7f2d2c6105a76daea0f5a0aee7c7a140b25" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pdepend/pdepend/zipball/85b3d7f2d2c6105a76daea0f5a0aee7c7a140b25", + "reference": "85b3d7f2d2c6105a76daea0f5a0aee7c7a140b25", + "shasum": "" + }, + "require": { + "php": ">=5.2.3" + }, + "time": "2013-01-25 15:09:33", + "bin": [ + "src/bin/pdepend" + ], + "type": "library", + "notification-url": "https://packagist.org/downloads/", + "description": "Official version of pdepend to be handled with Composer" + }, + { + "name": "phploc/phploc", + "version": "1.7.4", + "source": { + "type": "git", + "url": "git://github.com/sebastianbergmann/phploc.git", + "reference": "1.7.4" + }, + "dist": { + "type": "zip", + "url": "https://github.com/sebastianbergmann/phploc/archive/1.7.4.zip", + "reference": "1.7.4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/finder": "2.1.x-dev", + "zetacomponents/console-tools": "dev-master" + }, + "time": "2012-11-10 12:45:44", + "bin": [ + "composer/bin/phploc" + ], + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "A tool for quickly measuring the size of a PHP project.", + "homepage": "https://github.com/sebastianbergmann/phploc" + }, + { + "name": "phpmd/phpmd", + "version": "1.4.1", + "source": { + "type": "git", + "url": "git://github.com/phpmd/phpmd.git", + "reference": "1.4.1" + }, + "dist": { + "type": "zip", + "url": "https://github.com/phpmd/phpmd/archive/1.4.1.zip", + "reference": "1.4.1", + "shasum": "" + }, + "require": { + "pdepend/pdepend": "*", + "php": ">=5.3.0" + }, + "time": "2012-12-14 12:25:09", + "bin": [ + "src/bin/phpmd" + ], + "type": "library", + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "../../pdepend/pdepend/src/main/php", + "src/main/php" + ], + "description": "Official version of PHPMD handled with Composer." + }, + { + "name": "phpunit/php-code-coverage", + "version": "1.2.x-dev", + "source": { + "type": "git", + "url": "git://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "25232ac64f081abd7478ae2d63fdb757f45e92b9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/25232ac64f081abd7478ae2d63fdb757f45e92b9", + "reference": "25232ac64f081abd7478ae2d63fdb757f45e92b9", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "phpunit/php-file-iterator": ">=1.3.0@stable", + "phpunit/php-text-template": ">=1.1.1@stable", + "phpunit/php-token-stream": ">=1.1.3@stable" + }, + "suggest": { + "ext-dom": "*", + "ext-xdebug": ">=2.0.5" + }, + "time": "2013-02-14 10:33:04", + "type": "library", + "autoload": { + "classmap": [ + "PHP/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ] + }, + { + "name": "phpunit/php-file-iterator", + "version": "dev-master", + "source": { + "type": "git", + "url": "git://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "2deb24c65ea78e126daa8d45b2089ddc29ec1d26" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/2deb24c65ea78e126daa8d45b2089ddc29ec1d26", + "reference": "2deb24c65ea78e126daa8d45b2089ddc29ec1d26", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2013-01-07 10:47:05", + "type": "library", + "autoload": { + "classmap": [ + "File/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "keywords": [ + "filesystem", + "iterator" + ] + }, + { + "name": "phpunit/php-text-template", + "version": "dev-master", + "source": { + "type": "git", + "url": "git://github.com/sebastianbergmann/php-text-template.git", + "reference": "1eeef106193d2f8c539728e566bb4793071a9e18" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/1eeef106193d2f8c539728e566bb4793071a9e18", + "reference": "1eeef106193d2f8c539728e566bb4793071a9e18", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2013-01-07 10:56:17", + "type": "library", + "autoload": { + "classmap": [ + "Text/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ] + }, + { + "name": "phpunit/php-timer", + "version": "1.0.x-dev", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "ecf7920b27003a9412b07dad79dbb5ad1249e6c3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/ecf7920b27003a9412b07dad79dbb5ad1249e6c3", + "reference": "ecf7920b27003a9412b07dad79dbb5ad1249e6c3", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2013-01-30 06:08:51", + "type": "library", + "autoload": { + "classmap": [ + "PHP/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ] + }, + { + "name": "phpunit/php-token-stream", + "version": "dev-master", + "source": { + "type": "git", + "url": "git://github.com/sebastianbergmann/php-token-stream.git", + "reference": "c25dd88e1592e66dee2553c99ef244203d5a1b98" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c25dd88e1592e66dee2553c99ef244203d5a1b98", + "reference": "c25dd88e1592e66dee2553c99ef244203d5a1b98", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=5.3.3" + }, + "time": "2013-01-07 10:56:35", + "type": "library", + "autoload": { + "classmap": [ + "PHP/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Wrapper around PHP's tokenizer extension.", + "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "keywords": [ + "tokenizer" + ] + }, + { + "name": "phpunit/phpunit", + "version": "3.7.x-dev", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "bb334d7a1532f9576ab1facd076f0945c2cbcc27" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bb334d7a1532f9576ab1facd076f0945c2cbcc27", + "reference": "bb334d7a1532f9576ab1facd076f0945c2cbcc27", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-pcre": "*", + "ext-reflection": "*", + "ext-spl": "*", + "php": ">=5.3.3", + "phpunit/php-code-coverage": ">=1.2.1,<1.3.0", + "phpunit/php-file-iterator": ">=1.3.1", + "phpunit/php-text-template": ">=1.1.1", + "phpunit/php-timer": ">=1.0.2,<1.1.0", + "phpunit/phpunit-mock-objects": ">=1.2.0,<1.3.0", + "symfony/yaml": ">=2.1.0,<2.2.0" + }, + "require-dev": { + "pear-pear/pear": "1.9.4" + }, + "suggest": { + "ext-json": "*", + "ext-simplexml": "*", + "ext-tokenizer": "*", + "phpunit/php-invoker": ">=1.1.0,<1.2.0" + }, + "time": "2013-02-18 05:30:59", + "bin": [ + "composer/bin/phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.7.x-dev" + } + }, + "autoload": { + "classmap": [ + "PHPUnit/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "", + "../../symfony/yaml/" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "http://www.phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ] + }, + { + "name": "phpunit/phpunit-mock-objects", + "version": "1.2.x-dev", + "source": { + "type": "git", + "url": "git://github.com/sebastianbergmann/phpunit-mock-objects.git", + "reference": "d49b5683200b5db9b1c64cb06f52f50d147891c4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/d49b5683200b5db9b1c64cb06f52f50d147891c4", + "reference": "d49b5683200b5db9b1c64cb06f52f50d147891c4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "phpunit/php-text-template": ">=1.1.1@stable" + }, + "suggest": { + "ext-soap": "*" + }, + "time": "2013-02-05 07:46:41", + "type": "library", + "autoload": { + "classmap": [ + "PHPUnit/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Mock Object library for PHPUnit", + "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", + "keywords": [ + "mock", + "xunit" + ] + }, + { + "name": "symfony/browser-kit", + "version": "2.1.x-dev", + "target-dir": "Symfony/Component/BrowserKit", + "source": { + "type": "git", + "url": "https://github.com/symfony/BrowserKit.git", + "reference": "v2.1.7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/v2.1.7", + "reference": "v2.1.7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/dom-crawler": "2.1.*" + }, + "require-dev": { + "symfony/css-selector": "2.1.*", + "symfony/process": "2.1.*" + }, + "suggest": { + "symfony/process": "2.1.*" + }, + "time": "2013-01-09 08:51:07", + "type": "library", + "autoload": { + "psr-0": { + "Symfony\\Component\\BrowserKit": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony BrowserKit Component", + "homepage": "http://symfony.com" + }, + { + "name": "symfony/css-selector", + "version": "2.1.x-dev", + "target-dir": "Symfony/Component/CssSelector", + "source": { + "type": "git", + "url": "https://github.com/symfony/CssSelector.git", + "reference": "v2.1.7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/CssSelector/zipball/v2.1.7", + "reference": "v2.1.7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2013-01-09 08:51:07", + "type": "library", + "autoload": { + "psr-0": { + "Symfony\\Component\\CssSelector": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony CssSelector Component", + "homepage": "http://symfony.com" + }, + { + "name": "symfony/dom-crawler", + "version": "2.1.x-dev", + "target-dir": "Symfony/Component/DomCrawler", + "source": { + "type": "git", + "url": "https://github.com/symfony/DomCrawler.git", + "reference": "v2.1.7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/v2.1.7", + "reference": "v2.1.7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "symfony/css-selector": "2.1.*" + }, + "suggest": { + "symfony/css-selector": "2.1.*" + }, + "time": "2013-01-09 08:51:07", + "type": "library", + "autoload": { + "psr-0": { + "Symfony\\Component\\DomCrawler": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony DomCrawler Component", + "homepage": "http://symfony.com" + }, + { + "name": "symfony/finder", + "version": "2.1.x-dev", + "target-dir": "Symfony/Component/Finder", + "source": { + "type": "git", + "url": "https://github.com/symfony/Finder.git", + "reference": "v2.1.7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Finder/zipball/v2.1.7", + "reference": "v2.1.7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2013-01-09 08:51:07", + "type": "library", + "autoload": { + "psr-0": { + "Symfony\\Component\\Finder": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Finder Component", + "homepage": "http://symfony.com" + }, + { + "name": "symfony/yaml", + "version": "2.1.x-dev", + "target-dir": "Symfony/Component/Yaml", + "source": { + "type": "git", + "url": "https://github.com/symfony/Yaml.git", + "reference": "882b70fb7072e3f1fa95d249fd527a4e3998dc1a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/882b70fb7072e3f1fa95d249fd527a4e3998dc1a", + "reference": "882b70fb7072e3f1fa95d249fd527a4e3998dc1a", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2013-01-27 16:12:43", + "type": "library", + "autoload": { + "psr-0": { + "Symfony\\Component\\Yaml": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Yaml Component", + "homepage": "http://symfony.com" + }, + { + "name": "zetacomponents/base", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/zetacomponents/Base.git", + "reference": "642f63a8a72c32996f1aaf8a317fdf746bc32ce7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zetacomponents/Base/zipball/642f63a8a72c32996f1aaf8a317fdf746bc32ce7", + "reference": "642f63a8a72c32996f1aaf8a317fdf746bc32ce7", + "shasum": "" + }, + "require-dev": { + "zetacomponents/unit-test": "*" + }, + "time": "2012-05-21 11:21:36", + "type": "library", + "autoload": { + "classmap": [ + "src" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Sergey Alexeev" + }, + { + "name": "Sebastian Bergmann" + }, + { + "name": "Jan Borsodi" + }, + { + "name": "Raymond Bosman" + }, + { + "name": "Frederik Holljen" + }, + { + "name": "Kore Nordmann" + }, + { + "name": "Derick Rethans" + }, + { + "name": "Vadym Savchuk" + }, + { + "name": "Tobias Schlitt" + }, + { + "name": "Alexandru Stanoi" + } + ], + "description": "The Base package provides the basic infrastructure that all packages rely on. Therefore every component relies on this package.", + "homepage": "https://github.com/zetacomponents" + }, + { + "name": "zetacomponents/console-tools", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/zetacomponents/ConsoleTools.git", + "reference": "90156abef01e4215fda8b9740f77c322f126fb02" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zetacomponents/ConsoleTools/zipball/90156abef01e4215fda8b9740f77c322f126fb02", + "reference": "90156abef01e4215fda8b9740f77c322f126fb02", + "shasum": "" + }, + "require": { + "zetacomponents/base": "*" + }, + "require-dev": { + "zetacomponents/unit-test": "*" + }, + "time": "2012-05-21 09:55:34", + "type": "library", + "autoload": { + "classmap": [ + "src" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Sergey Alexeev" + }, + { + "name": "Sebastian Bergmann" + }, + { + "name": "Jan Borsodi" + }, + { + "name": "Raymond Bosman" + }, + { + "name": "Frederik Holljen" + }, + { + "name": "Kore Nordmann" + }, + { + "name": "Derick Rethans" + }, + { + "name": "Vadym Savchuk" + }, + { + "name": "Tobias Schlitt" + }, + { + "name": "Alexandru Stanoi" + } + ], + "description": "A set of classes to do different actions with the console (also called shell). It can render a progress bar, tables and a status bar and contains a class for parsing command line options.", + "homepage": "https://github.com/zetacomponents" + } + ], "aliases": [ ], @@ -618,4 +1413,4 @@ "stability-flags": { "klaussilveira/gitter": 20 } -} \ No newline at end of file +} From c0e63d14e68d4c4acfd88ebe36693bec06476598 Mon Sep 17 00:00:00 2001 From: Nate Eagleson Date: Mon, 18 Feb 2013 23:06:40 -0500 Subject: [PATCH 09/37] Fix raw blob view A previous change of mine had broken it. Also rename a route parameter in CommitController for consistency with other route params. --- src/GitList/Controller/CommitController.php | 6 +++--- views/file.twig | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/GitList/Controller/CommitController.php b/src/GitList/Controller/CommitController.php index e778d08..306b327 100644 --- a/src/GitList/Controller/CommitController.php +++ b/src/GitList/Controller/CommitController.php @@ -91,11 +91,11 @@ class CommitController implements ControllerProviderInterface ->assert('commit', '[a-f0-9^]+') ->bind('commit'); - $route->get('{repo}/blame/{branch_file}', function($repo, $branch_file) use ($app) { + $route->get('{repo}/blame/{commitish_path}', function($repo, $commitish_path) use ($app) { $repository = $app['git']->getRepository($app['git.repos'] . $repo); list($branch, $file) = $app['util.routing'] - ->parseCommitishPathParam($branch_file, $repo); + ->parseCommitishPathParam($commitish_path, $repo); list($branch, $file) = $app['util.repository']->extractRef($repository, $branch, $file); @@ -110,7 +110,7 @@ class CommitController implements ControllerProviderInterface 'blames' => $blames, )); })->assert('repo', $app['util.routing']->getRepositoryRegex()) - ->assert('branch_file', $app['util.routing']->getCommitishPathRegex()) + ->assert('commitish_path', $app['util.routing']->getCommitishPathRegex()) ->bind('blame'); return $route; diff --git a/views/file.twig b/views/file.twig index 6b18290..e1cc54e 100644 --- a/views/file.twig +++ b/views/file.twig @@ -13,12 +13,12 @@
    Raw - Blame + Blame History
    {% if fileType == 'image' %} -
    {{ file }}
    +
    {{ file }}
    {% elseif fileType == 'markdown' %}
    {{ blob }}
    From a262966672de14e284edf6a8ef4759ee538b73d6 Mon Sep 17 00:00:00 2001 From: Bruno Gurgel Date: Tue, 19 Feb 2013 17:47:48 -0300 Subject: [PATCH 10/37] Init builder ... --- pkg_builder/Makefile | 196 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 196 insertions(+) create mode 100644 pkg_builder/Makefile diff --git a/pkg_builder/Makefile b/pkg_builder/Makefile new file mode 100644 index 0000000..ae26983 --- /dev/null +++ b/pkg_builder/Makefile @@ -0,0 +1,196 @@ +# Main Info +NAME = gitlist +DESCRIPTION = "An elegant and modern git repository viewer" +LICENSE = New BSD + +#BUILD Info +PREFIX = /usr/share +PROJROOT = "$(shell pwd)" +SRCROOT = "$(shell pwd)/gitlist" +UPSTREAM_VERSION = $(shell cat ${SRCROOT}/release.info | head -n1 | cut -d"=" -f2) +BUILD_STAMP = $(shell date +"%Y%m%d%H%M%S") + +#Packager Info +PACKAGER = $(shell git config user.name) +PACKAGER_MAIL = $(shell git config user.email) + +#Debian Package Info +PACKAGE-VERSION= 1 +DEBIAN_BUILD_ROOT = ${PROJROOT}/debian/ +PROJECT_DEBIAN_LIKE_NAME=$(shell cat ${SRCROOT}/release.info | grep name | cut -d"=" -f2) +DEBIAN_NAME=$(PROJECT_DEBIAN_LIKE_NAME)$(shell echo "_")$(UPSTREAM_VERSION)-${PACKAGE-VERSION}$(shell echo "_all.deb") +DEBIAN_VERSION = +# Generating control file +define control +Package: $(PROJECT_DEBIAN_LIKE_NAME) +Version: $(UPSTREAM_VERSION)-${PACKAGE-VERSION} +Architecture: all +Section: web +Priority: optional +Maintainer: "${PACKAGER} <${PACKAGER_MAIL}>" +Description: ${DESCRIPTION} +endef +export control + +all: + @echo "... $(UPSTREAM_VERSION)" + @echo "... $(PACKAGER)" + @echo "... $(PACKAGER_MAIL)" + @echo "... $(DEBIAN_NAME)" + +help: + @echo "To use this make file just:" + @echo "Download the gitlist tarball and stract it into a folder called gitlist" + @echo "make [build_deb|build_rpm|build(apache|nginx|lighthttp)]" + +clean_deb: + @echo "Cleaning . . ." + @rm -rf ${DEBIAN_BUILD_ROOT}/*.deb + @rm -rf ${PROJROOT}/debian + +prepare_deb: clean_deb + @echo "############################### - Building DEB" + @mkdir ${DEBIAN_BUILD_ROOT} -pv + @mkdir ${DEBIAN_BUILD_ROOT}/DEBIAN -pv + @mkdir ${DEBIAN_BUILD_ROOT}${PREFIX}/${PROJECT_DEBIAN_LIKE_NAME} -pv + +copy_deb_files: prepare_deb + @echo "$$control" > ${DEBIAN_BUILD_ROOT}/DEBIAN/control + +copy_deb: copy_deb_files + @echo Sync files + @rsync -avz ${SRCROOT} ${DEBIAN_BUILD_ROOT}${PREFIX}/ + +md5sum_deb: copy_deb + @cd debian; find . -type f ! -regex '.*\.hg.*' ! -regex '.*?debian-binary.*' ! -regex '.*?DEBIAN.*' | xargs -d "\n" md5sum > DEBIAN/md5sums + +deb_uniq: md5sum_deb + @mkdir ${PROJROOT}/deb -p + @dpkg -b debian $(DEBIAN_NAME); + @mv $(DEBIAN_NAME) ${PROJROOT}/deb/ + @rm debian -rf + @echo 'sucess?' + + +build_deb: deb_uniq + +#RPM_DIR = rpm +#RPM_DIRS = SPECS RPMS SOURCES BUILD +# +#all: rpm +# +#init: clean +# @echo Creating directories... +# @echo $(DIST_DIR) +# @mkdir -p $(DIST_DIR) +# @for dir in $(RPM_DIRS); do \ +# echo $(RPM_DIR)/$$dir; \ +# mkdir -p $(RPM_DIR)/$$dir; \ +# done +# +#preptar:init +# @echo Copying files to generate tar... +# @echo creating directory: $(TAR_DIR)/ +# @mkdir $(TAR_DIR)/ -p +# @rsync -avz --exclude ".git" --exclude ".gitignore" --exclude "builder" ../ $(TAR_DIR)/ +# +#tar: preptar +# @echo Generating tarball... +# @cd $(PROJROOT)/$(TAR_DIR); \ +# tar cf $(PROJROOT)/$(RPM_DIR)/SOURCES/$(NAME).tar . +# +#rpm: tar +# @echo Calling rpmbuild... +# @echo Vesion: $(VERSION) +# @cp $(NAME).spec $(RPM_DIR)/SPECS/ +# +# @cd $(PROJROOT)/$(RPM_DIR)/SPECS ; \ +# rpmbuild -bb \ +# --buildroot="$(PROJROOT)/$(RPM_DIR)/BUILD/$(NAME)" \ +# --define "_topdir $(PROJROOT)/$(RPM_DIR)" \ +# --define "name $(NAME)" \ +# --define "prefixname $(PREFIX_NAME)" \ +# --define "summary $(SUMMARY)" \ +# --define "version $(VERSION)" \ +# --define "release $(RELEASE)" \ +# --define "url _$(URL)_" \ +# --define "license $(LICENSE)" \ +# --define "group $(GROUP)" \ +# --define "vendor $(VENDOR)" \ +# --define "packager $(PACKAGER)" \ +# --define "prefix $(PREFIX)" \ +# --define "source_dir $(PROJROOT)/$(RPM_DIR)/SOURCES" \ +# $(NAME).spec +# @echo Copying generated RPM to dist dir... +# @cp $(PROJROOT)/$(RPM_DIR)/RPMS/noarch/*.rpm $(PROJROOT)/$(DIST_DIR)/ +# @rm -rf $(TAR_DIR) +# @rm -rf $(RPM_DIR) +# +#clean: +# @echo Cleaning temporary dirs... +# @rm -rf $(TAR_DIR) +# @rm -rf $(RPM_DIR) +# @rm -rf $(DIST_DIR) +# +### Funções abaixo só serão utilizadas para gerar pacotes únicos de temas +# +#preptar_uniq: init +# @echo "############################### - INIT RPM" +# @echo Copying files to generate a unique theme tar... +# @echo creating directory: $(TAR_DIR)/ +# @mkdir $(TAR_DIR)/ -p +# @rsync -avz --exclude ".git" --exclude ".gitignore" --exclude "builder" ../$(dirname) $(TAR_DIR)/ +# +#tar_uniq: preptar_uniq +# @echo Generating tarball... +# @cd $(PROJROOT)/$(TAR_DIR); \ +# tar cf $(PROJROOT)/$(RPM_DIR)/SOURCES/$(fullname).tar $(dirname) +# +#rpm_uniq: tar_uniq +# @echo Calling rpmbuild... +# @echo Vesion: $(VERSION) +# @cp $(NAME).spec $(RPM_DIR)/SPECS/ +# +# @cd $(PROJROOT)/$(RPM_DIR)/SPECS ; \ +# rpmbuild -bb \ +# --buildroot="$(PROJROOT)/$(RPM_DIR)/BUILD/$(dirname)" \ +# --define "_topdir $(PROJROOT)/$(RPM_DIR)" \ +# --define "name $(fullname)" \ +# --define "prefixname $(PREFIX_NAME)" \ +# --define "summary $(SUMMARY)" \ +# --define "version $(VERSION)" \ +# --define "release $(RELEASE)" \ +# --define "url _$(URL)_" \ +# --define "license $(LICENSE)" \ +# --define "group $(GROUP)" \ +# --define "vendor $(VENDOR)" \ +# --define "packager $(PACKAGER)" \ +# --define "prefix $(PREFIX)" \ +# --define "source_dir $(PROJROOT)/$(RPM_DIR)/SOURCES" \ +# $(NAME).spec +# @echo Copying generated RPM to $(workspace)/rpm .... +# @mkdir $(workspace)/rpm -p +# @rm -rf $(workspace)/rpm/* +# @cp $(PROJROOT)/$(RPM_DIR)/RPMS/noarch/*.rpm $(workspace)/rpm/ +# @rm -rf $(TAR_DIR) +# @rm -rf $(RPM_DIR) +# +#### DebianGen +# +# + + +#deb_uniq: md5sum_deb +# @mkdir $(workspace)/deb -p +# @rm -rf $(workspace)/deb/* +# @dpkg -b debian $(DEBIAN_NAME); +# @cp $(DEBIAN_NAME) $(workspace)/deb/ +# @rm debian -rf +# @rm -rf $(PROJROOT)/*.deb +# @echo 'sucess?' +# +#deb_package: deb_uniq +# +#rpm_package: rpm_uniq +# +#build_pkgs: deb_uniq rpm_uniq From b7e05fa329ce0be3e2a5af4fcd5282ae52008af2 Mon Sep 17 00:00:00 2001 From: Bruno Gurgel Date: Wed, 20 Feb 2013 14:24:38 -0300 Subject: [PATCH 11/37] RPM e Debian build core + README --- pkg_builder/Makefile | 197 ++++++++++++++++--------------------------- 1 file changed, 74 insertions(+), 123 deletions(-) diff --git a/pkg_builder/Makefile b/pkg_builder/Makefile index ae26983..32ffce8 100644 --- a/pkg_builder/Makefile +++ b/pkg_builder/Makefile @@ -2,12 +2,15 @@ NAME = gitlist DESCRIPTION = "An elegant and modern git repository viewer" LICENSE = New BSD +GROUP = gitlist +VENDOR = gitlist.org +URL = "http://www.gitlist.org" #BUILD Info PREFIX = /usr/share PROJROOT = "$(shell pwd)" SRCROOT = "$(shell pwd)/gitlist" -UPSTREAM_VERSION = $(shell cat ${SRCROOT}/release.info | head -n1 | cut -d"=" -f2) +UPSTREAM_VERSION = $(shell cat tools/release.info | head -n1 | cut -d"=" -f2) BUILD_STAMP = $(shell date +"%Y%m%d%H%M%S") #Packager Info @@ -17,7 +20,7 @@ PACKAGER_MAIL = $(shell git config user.email) #Debian Package Info PACKAGE-VERSION= 1 DEBIAN_BUILD_ROOT = ${PROJROOT}/debian/ -PROJECT_DEBIAN_LIKE_NAME=$(shell cat ${SRCROOT}/release.info | grep name | cut -d"=" -f2) +PROJECT_DEBIAN_LIKE_NAME=$(shell cat tools/release.info | grep name | cut -d"=" -f2) DEBIAN_NAME=$(PROJECT_DEBIAN_LIKE_NAME)$(shell echo "_")$(UPSTREAM_VERSION)-${PACKAGE-VERSION}$(shell echo "_all.deb") DEBIAN_VERSION = # Generating control file @@ -65,132 +68,80 @@ md5sum_deb: copy_deb @cd debian; find . -type f ! -regex '.*\.hg.*' ! -regex '.*?debian-binary.*' ! -regex '.*?DEBIAN.*' | xargs -d "\n" md5sum > DEBIAN/md5sums deb_uniq: md5sum_deb - @mkdir ${PROJROOT}/deb -p + @mkdir ${PROJROOT}/pkg -p @dpkg -b debian $(DEBIAN_NAME); - @mv $(DEBIAN_NAME) ${PROJROOT}/deb/ + @mv $(DEBIAN_NAME) ${PROJROOT}/pkg/ @rm debian -rf - @echo 'sucess?' + @echo '### Wrote $(DEBIAN_NAME) in ${PROJROOT}/pkg/ . . . . . Success' build_deb: deb_uniq -#RPM_DIR = rpm -#RPM_DIRS = SPECS RPMS SOURCES BUILD -# -#all: rpm -# -#init: clean -# @echo Creating directories... -# @echo $(DIST_DIR) -# @mkdir -p $(DIST_DIR) -# @for dir in $(RPM_DIRS); do \ -# echo $(RPM_DIR)/$$dir; \ -# mkdir -p $(RPM_DIR)/$$dir; \ -# done -# -#preptar:init -# @echo Copying files to generate tar... -# @echo creating directory: $(TAR_DIR)/ -# @mkdir $(TAR_DIR)/ -p -# @rsync -avz --exclude ".git" --exclude ".gitignore" --exclude "builder" ../ $(TAR_DIR)/ -# -#tar: preptar -# @echo Generating tarball... -# @cd $(PROJROOT)/$(TAR_DIR); \ -# tar cf $(PROJROOT)/$(RPM_DIR)/SOURCES/$(NAME).tar . -# -#rpm: tar -# @echo Calling rpmbuild... -# @echo Vesion: $(VERSION) -# @cp $(NAME).spec $(RPM_DIR)/SPECS/ -# -# @cd $(PROJROOT)/$(RPM_DIR)/SPECS ; \ -# rpmbuild -bb \ -# --buildroot="$(PROJROOT)/$(RPM_DIR)/BUILD/$(NAME)" \ -# --define "_topdir $(PROJROOT)/$(RPM_DIR)" \ -# --define "name $(NAME)" \ -# --define "prefixname $(PREFIX_NAME)" \ -# --define "summary $(SUMMARY)" \ -# --define "version $(VERSION)" \ -# --define "release $(RELEASE)" \ -# --define "url _$(URL)_" \ -# --define "license $(LICENSE)" \ -# --define "group $(GROUP)" \ -# --define "vendor $(VENDOR)" \ -# --define "packager $(PACKAGER)" \ -# --define "prefix $(PREFIX)" \ -# --define "source_dir $(PROJROOT)/$(RPM_DIR)/SOURCES" \ -# $(NAME).spec -# @echo Copying generated RPM to dist dir... -# @cp $(PROJROOT)/$(RPM_DIR)/RPMS/noarch/*.rpm $(PROJROOT)/$(DIST_DIR)/ -# @rm -rf $(TAR_DIR) -# @rm -rf $(RPM_DIR) -# -#clean: -# @echo Cleaning temporary dirs... -# @rm -rf $(TAR_DIR) -# @rm -rf $(RPM_DIR) -# @rm -rf $(DIST_DIR) -# -### Funções abaixo só serão utilizadas para gerar pacotes únicos de temas -# -#preptar_uniq: init -# @echo "############################### - INIT RPM" -# @echo Copying files to generate a unique theme tar... -# @echo creating directory: $(TAR_DIR)/ -# @mkdir $(TAR_DIR)/ -p -# @rsync -avz --exclude ".git" --exclude ".gitignore" --exclude "builder" ../$(dirname) $(TAR_DIR)/ -# -#tar_uniq: preptar_uniq -# @echo Generating tarball... -# @cd $(PROJROOT)/$(TAR_DIR); \ -# tar cf $(PROJROOT)/$(RPM_DIR)/SOURCES/$(fullname).tar $(dirname) -# -#rpm_uniq: tar_uniq -# @echo Calling rpmbuild... -# @echo Vesion: $(VERSION) -# @cp $(NAME).spec $(RPM_DIR)/SPECS/ -# -# @cd $(PROJROOT)/$(RPM_DIR)/SPECS ; \ -# rpmbuild -bb \ -# --buildroot="$(PROJROOT)/$(RPM_DIR)/BUILD/$(dirname)" \ -# --define "_topdir $(PROJROOT)/$(RPM_DIR)" \ -# --define "name $(fullname)" \ -# --define "prefixname $(PREFIX_NAME)" \ -# --define "summary $(SUMMARY)" \ -# --define "version $(VERSION)" \ -# --define "release $(RELEASE)" \ -# --define "url _$(URL)_" \ -# --define "license $(LICENSE)" \ -# --define "group $(GROUP)" \ -# --define "vendor $(VENDOR)" \ -# --define "packager $(PACKAGER)" \ -# --define "prefix $(PREFIX)" \ -# --define "source_dir $(PROJROOT)/$(RPM_DIR)/SOURCES" \ -# $(NAME).spec -# @echo Copying generated RPM to $(workspace)/rpm .... -# @mkdir $(workspace)/rpm -p -# @rm -rf $(workspace)/rpm/* -# @cp $(PROJROOT)/$(RPM_DIR)/RPMS/noarch/*.rpm $(workspace)/rpm/ -# @rm -rf $(TAR_DIR) -# @rm -rf $(RPM_DIR) -# -#### DebianGen -# -# +#### RPM STUFF +RPM_NAME=$(PROJECT_DEBIAN_LIKE_NAME)$(shell echo "_")$(UPSTREAM_VERSION)-${PACKAGE-VERSION}$(shell echo "_all.rpm") + +DIST_DIR = dist +TAR_DIR = tar + +RPM_DIR = rpm +RPM_DIRS = SPECS RPMS SOURCES BUILD + +clean_rpm: + @echo Cleaning temporary dirs... + @rm -rf $(TAR_DIR) + @rm -rf $(RPM_DIR) + @rm -rf $(DIST_DIR) + +rpm_init: clean_rpm + @echo Creating directories... + @echo $(DIST_DIR) + @mkdir -p $(DIST_DIR) + @for dir in $(RPM_DIRS); do \ + echo $(RPM_DIR)/$$dir; \ + mkdir -p $(RPM_DIR)/$$dir; \ + done + +rpm_preptar: rpm_init + @echo Copying files to generate tar... + @echo creating directory: $(TAR_DIR)/ + @mkdir $(TAR_DIR)/ -p + @rsync -avz --exclude ".git" --exclude ".gitignore" --exclude "builder" gitlist $(TAR_DIR)/ + +rpm_tar: rpm_preptar + @echo Generating tarball... + @cd $(PROJROOT)/$(TAR_DIR); \ + tar cf $(PROJROOT)/$(RPM_DIR)/SOURCES/$(NAME).tar . + +rpm: rpm_tar + @echo Calling rpmbuild... + @echo Vesion: $(VERSION) + @cp tools/$(NAME).spec $(RPM_DIR)/SPECS/ + + @cd $(PROJROOT)/$(RPM_DIR)/SPECS ; \ + rpmbuild -bb \ + --buildroot="$(PROJROOT)/$(RPM_DIR)/BUILD/$(NAME)" \ + --define "_topdir $(PROJROOT)/$(RPM_DIR)" \ + --define "name $(NAME)" \ + --define "summary "$(DESCRIPTION)"" \ + --define "version $(UPSTREAM_VERSION)" \ + --define "release $(PACKAGE-VERSION)" \ + --define "url _$(URL)_" \ + --define "license $(LICENSE)" \ + --define "group $(GROUP)" \ + --define "vendor $(VENDOR)" \ + --define "packager $(PACKAGER)" \ + --define "prefix $(PREFIX)" \ + --define "source_dir $(PROJROOT)/$(RPM_DIR)/SOURCES" \ + $(NAME).spec + @echo Copying generated RPM to dist dir... + @mkdir ${PROJROOT}/pkg -p + @cp $(PROJROOT)/$(RPM_DIR)/RPMS/noarch/*.rpm $(PROJROOT)/pkg + @rm -rf $(TAR_DIR) + @rm -rf $(RPM_DIR) + @rm -rf $(DIST_DIR) + + + +build_rpm: rpm -#deb_uniq: md5sum_deb -# @mkdir $(workspace)/deb -p -# @rm -rf $(workspace)/deb/* -# @dpkg -b debian $(DEBIAN_NAME); -# @cp $(DEBIAN_NAME) $(workspace)/deb/ -# @rm debian -rf -# @rm -rf $(PROJROOT)/*.deb -# @echo 'sucess?' -# -#deb_package: deb_uniq -# -#rpm_package: rpm_uniq -# -#build_pkgs: deb_uniq rpm_uniq From d059c0165d13e41d4a8ba9500e4c497ee8e1ca87 Mon Sep 17 00:00:00 2001 From: Bruno Gurgel Date: Wed, 20 Feb 2013 14:26:08 -0300 Subject: [PATCH 12/37] README + tools --- pkg_builder/README | 13 ++++++++++++ pkg_builder/tools/gitlist.spec | 37 ++++++++++++++++++++++++++++++++++ pkg_builder/tools/release.info | 2 ++ 3 files changed, 52 insertions(+) create mode 100644 pkg_builder/README create mode 100644 pkg_builder/tools/gitlist.spec create mode 100644 pkg_builder/tools/release.info diff --git a/pkg_builder/README b/pkg_builder/README new file mode 100644 index 0000000..0d3e114 --- /dev/null +++ b/pkg_builder/README @@ -0,0 +1,13 @@ +== Package Stuff documentation + +Core package is a simple source package while a configuration package requires all the dependencies. + +DONE == +Core RPM package +Core DEB package + +TODO === +Apache Conf DEB package +Nginx Conf DEB package +Apache Conf RPM package +Nginx Conf RPM package diff --git a/pkg_builder/tools/gitlist.spec b/pkg_builder/tools/gitlist.spec new file mode 100644 index 0000000..d7d675c --- /dev/null +++ b/pkg_builder/tools/gitlist.spec @@ -0,0 +1,37 @@ +Name: %{name} +Summary: %{summary} +Version: %{version} +Release: %{release} +URL: %{url} +License: %{license} +Group: %{group} +Vendor: %{vendor} +Packager: %{user} +Prefix: %{prefix} +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Source0: %{name}.tar + +%description +%{summary} + +%prep +%setup -c + +%build + +%install +%{__rm} -rf %{buildroot} +%{__mkdir} -p %{buildroot}%{prefix} +%{__cp} -Ra * %{buildroot}%{prefix} + +%clean +rm -rf %{buildroot} + +%files +%defattr(0755,root,root) +%{prefix}/* + +%changelog +* Thu Jan 21 2013 Bruno Gurgel +- Initial diff --git a/pkg_builder/tools/release.info b/pkg_builder/tools/release.info new file mode 100644 index 0000000..4eac5e4 --- /dev/null +++ b/pkg_builder/tools/release.info @@ -0,0 +1,2 @@ +release=0.3 +name=gitlist From c19c24df1d8660644f58f4588cb7eb8e931b791f Mon Sep 17 00:00:00 2001 From: Bruno Gurgel Date: Wed, 20 Feb 2013 14:34:16 -0300 Subject: [PATCH 13/37] Edit readme --- pkg_builder/README | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/pkg_builder/README b/pkg_builder/README index 0d3e114..a19802b 100644 --- a/pkg_builder/README +++ b/pkg_builder/README @@ -1,7 +1,25 @@ -== Package Stuff documentation +# GitList Builder: Tools to build gitlist package + +## Dependencies + +To use this package builder you may need to install some development packages like: dpkg-dev or evem rpm. + + +## How to build + +The packages can be generated by running Makefile functions like: + +``` +$ make build_deb +$ make build_rpm +``` + +## Structure Core package is a simple source package while a configuration package requires all the dependencies. +## ToDo + DONE == Core RPM package Core DEB package From f36505bb9bf9d2df77085bec93f490f0368e1a03 Mon Sep 17 00:00:00 2001 From: Bruno Gurgel Date: Wed, 20 Feb 2013 14:35:16 -0300 Subject: [PATCH 14/37] rename --- pkg_builder/{README => README.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pkg_builder/{README => README.md} (100%) diff --git a/pkg_builder/README b/pkg_builder/README.md similarity index 100% rename from pkg_builder/README rename to pkg_builder/README.md From 1fb69faf10ec85b4493fbb22045ed3605eb09a7e Mon Sep 17 00:00:00 2001 From: Bruno Gurgel Date: Wed, 20 Feb 2013 14:42:36 -0300 Subject: [PATCH 15/37] Fix ... --- pkg_builder/README.md | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/pkg_builder/README.md b/pkg_builder/README.md index a19802b..d000ec1 100644 --- a/pkg_builder/README.md +++ b/pkg_builder/README.md @@ -1,9 +1,37 @@ # GitList Builder: Tools to build gitlist package +## Status + +### Ready to build + +* Core Deb Packages: +``` +$ make build_deb +``` + +* Core Rpm Packages: +``` +$ make build_rpm +``` + +### Not Ready (Comming soon) + +* Packages to install configuration files: +``` +$ make apache_deb +$ make apache_rpm +$ make nginx_deb +$ make nginx_rpm +``` + ## Dependencies -To use this package builder you may need to install some development packages like: dpkg-dev or evem rpm. +* To use this package builder you may need to install some development packages like: dpkg-dev or evem rpm; +* A tarball of a stable release; +## Instructions + +To use this builder just download the lastest stable release into this directory and build using the make functions avaible in make help ## How to build @@ -17,15 +45,3 @@ $ make build_rpm ## Structure Core package is a simple source package while a configuration package requires all the dependencies. - -## ToDo - -DONE == -Core RPM package -Core DEB package - -TODO === -Apache Conf DEB package -Nginx Conf DEB package -Apache Conf RPM package -Nginx Conf RPM package From 9f45711cae3e2cb5a2edaca2dd4e221cdca97740 Mon Sep 17 00:00:00 2001 From: Bruno Gurgel Date: Wed, 20 Feb 2013 14:43:50 -0300 Subject: [PATCH 16/37] Fix ... --- pkg_builder/README.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkg_builder/README.md b/pkg_builder/README.md index d000ec1..a2e801b 100644 --- a/pkg_builder/README.md +++ b/pkg_builder/README.md @@ -17,12 +17,11 @@ $ make build_rpm ### Not Ready (Comming soon) * Packages to install configuration files: -``` -$ make apache_deb -$ make apache_rpm -$ make nginx_deb -$ make nginx_rpm -``` + +* make apache_deb +* make apache_rpm +* make nginx_deb +* make nginx_rpm ## Dependencies From b8e1a5a7945a74804780117e49a538860373f90a Mon Sep 17 00:00:00 2001 From: Bruno Gurgel Date: Wed, 20 Feb 2013 14:44:23 -0300 Subject: [PATCH 17/37] Fix ... --- pkg_builder/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg_builder/README.md b/pkg_builder/README.md index a2e801b..ffb4b0c 100644 --- a/pkg_builder/README.md +++ b/pkg_builder/README.md @@ -16,7 +16,7 @@ $ make build_rpm ### Not Ready (Comming soon) -* Packages to install configuration files: +Packages to install configuration files: * make apache_deb * make apache_rpm From 876403f5662866cc54e064bee927448115837c20 Mon Sep 17 00:00:00 2001 From: Alexandre Gravel-Raymond Date: Mon, 25 Feb 2013 16:24:56 +0100 Subject: [PATCH 18/37] Use absolute URLs in RSS feeds --- views/rss.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/rss.twig b/views/rss.twig index e14e783..0fdc823 100644 --- a/views/rss.twig +++ b/views/rss.twig @@ -3,13 +3,13 @@ Latest commits in {{ repo }}:{{ branch }} RSS provided by GitList - {{ path('homepage') }} + {{ url('homepage') }} {% for commit in commits %} {{ commit.message }} {{ commit.author.name }} authored {{ commit.shortHash }} in {{ commit.date | date('d/m/Y \\a\\t H:i:s') }} - {{ path('commit', {repo: repo, commit: commit.hash}) }} + {{ url('commit', {repo: repo, commit: commit.hash}) }} {{ commit.date | date('r') }} {% endfor %} From 74c47f4ac8c73b3702e324f637736ea47a8bb9da Mon Sep 17 00:00:00 2001 From: Nate Eagleson Date: Thu, 28 Feb 2013 21:56:03 -0500 Subject: [PATCH 19/37] Make package tarballs be in their own directory This makes it harder to tarbomb a directory by accident. --- build.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index 114dec7..cbcfb8b 100644 --- a/build.xml +++ b/build.xml @@ -75,9 +75,12 @@ + + + + From 98637212c05d230503cd277f48f7a89f699a98fd Mon Sep 17 00:00:00 2001 From: Klaus Silveira Date: Tue, 12 Mar 2013 09:49:14 -0300 Subject: [PATCH 20/37] Updating dependencies --- composer.json | 10 +- composer.lock | 361 +++++++++++++++++++++++++++++--------------------- 2 files changed, 210 insertions(+), 161 deletions(-) diff --git a/composer.json b/composer.json index ab9fbf7..7d626a6 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "twig/twig": "1.9.*", "symfony/twig-bridge": "2.1.*", "symfony/filesystem": "2.1.*", - "klaussilveira/gitter": "dev-fix-get-branches" + "klaussilveira/gitter": "dev-master" }, "require-dev": { "symfony/browser-kit": "2.1.*", @@ -18,11 +18,5 @@ "psr-0": { "GitList": "src/" } - }, - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/NateEag/gitter.git" - } - ] + } } diff --git a/composer.lock b/composer.lock index 742f03f..4f7f46a 100644 --- a/composer.lock +++ b/composer.lock @@ -6,13 +6,13 @@ "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/klaussilveira/gitter", - "reference": "1c9b6e4dde81d21acffe99d9f4559ed3bc59f947" + "url": "https://github.com/klaussilveira/gitter.git", + "reference": "9e30a927d1edf28c3ee844b7d0657c4a9535cd12" }, "dist": { "type": "zip", - "url": "https://github.com/klaussilveira/gitter/zipball/1c9b6e4dde81d21acffe99d9f4559ed3bc59f947", - "reference": "1c9b6e4dde81d21acffe99d9f4559ed3bc59f947", + "url": "https://api.github.com/repos/klaussilveira/gitter/zipball/9e30a927d1edf28c3ee844b7d0657c4a9535cd12", + "reference": "9e30a927d1edf28c3ee844b7d0657c4a9535cd12", "shasum": "" }, "require": { @@ -20,6 +20,7 @@ "symfony/process": ">=2.1" }, "require-dev": { + "phpunit/phpunit": ">=3.7.1", "symfony/filesystem": ">=2.1" }, "type": "library", @@ -28,6 +29,7 @@ "Gitter": "lib/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-2-Clause" ], @@ -45,20 +47,20 @@ "git", "vcs" ], - "time": "2012-10-31 00:39:13" + "time": "2013-02-19 13:59:07" }, { "name": "pimple/pimple", "version": "dev-master", "source": { "type": "git", - "url": "git://github.com/fabpot/Pimple.git", - "reference": "b9f27b8dc18c08f00627dec02359b46a24791dc3" + "url": "https://github.com/fabpot/Pimple.git", + "reference": "v1.0.2" }, "dist": { "type": "zip", - "url": "https://github.com/fabpot/Pimple/zipball/b9f27b8dc18c08f00627dec02359b46a24791dc3", - "reference": "b9f27b8dc18c08f00627dec02359b46a24791dc3", + "url": "https://api.github.com/repos/fabpot/Pimple/zipball/v1.0.2", + "reference": "v1.0.2", "shasum": "" }, "require": { @@ -75,6 +77,7 @@ "Pimple": "lib/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -90,20 +93,58 @@ "container", "dependency injection" ], - "time": "2012-09-10 12:09:48" + "time": "2013-03-08 08:21:40" + }, + { + "name": "psr/log", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log", + "reference": "1.0.0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/php-fig/log/archive/1.0.0.zip", + "reference": "1.0.0", + "shasum": "" + }, + "type": "library", + "autoload": { + "psr-0": { + "Psr\\Log\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "keywords": [ + "log", + "psr", + "psr-3" + ], + "time": "2012-12-21 11:40:51" }, { "name": "silex/silex", "version": "dev-master", "source": { "type": "git", - "url": "git://github.com/fabpot/Silex.git", - "reference": "69d710011ee8f9fa286854fcf636a07ad76b570b" + "url": "https://github.com/fabpot/Silex.git", + "reference": "59e7dbd338b5caba9879ae11524da4a5905f80c1" }, "dist": { "type": "zip", - "url": "https://github.com/fabpot/Silex/zipball/69d710011ee8f9fa286854fcf636a07ad76b570b", - "reference": "69d710011ee8f9fa286854fcf636a07ad76b570b", + "url": "https://api.github.com/repos/fabpot/Silex/zipball/59e7dbd338b5caba9879ae11524da4a5905f80c1", + "reference": "59e7dbd338b5caba9879ae11524da4a5905f80c1", "shasum": "" }, "require": { @@ -116,15 +157,16 @@ }, "require-dev": { "doctrine/dbal": ">=2.2.0,<2.4.0-dev", - "monolog/monolog": ">=1.0.0,<1.2-dev", "swiftmailer/swiftmailer": "4.2.*", "symfony/browser-kit": ">=2.1,<2.3-dev", "symfony/config": ">=2.1,<2.3-dev", "symfony/css-selector": ">=2.1,<2.3-dev", + "symfony/dom-crawler": ">=2.1,<2.3-dev", "symfony/finder": ">=2.1,<2.3-dev", - "symfony/form": ">=2.1,<2.3-dev", + "symfony/form": ">=2.1.4,<2.3-dev", "symfony/locale": ">=2.1,<2.3-dev", "symfony/monolog-bridge": ">=2.1,<2.3-dev", + "symfony/options-resolver": ">=2.1,<2.3-dev", "symfony/process": ">=2.1,<2.3-dev", "symfony/security": ">=2.1,<2.3-dev", "symfony/serializer": ">=2.1,<2.3-dev", @@ -136,9 +178,9 @@ "suggest": { "symfony/browser-kit": ">=2.1,<2.3-dev", "symfony/css-selector": ">=2.1,<2.3-dev", - "symfony/dom-crawler": ">=2.1,<2.3-dev" + "symfony/dom-crawler": ">=2.1,<2.3-dev", + "symfony/form": "To make use of the FormServiceProvider, >= 2.1.4 is required" }, - "time": "2012-10-29 20:01:38", "type": "library", "extra": { "branch-alias": { @@ -150,6 +192,7 @@ "Silex": "src/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -168,34 +211,34 @@ "homepage": "http://silex.sensiolabs.org", "keywords": [ "microframework" - ] + ], + "time": "2013-03-08 16:56:52" }, { "name": "symfony/event-dispatcher", - "version": "dev-master", + "version": "2.2.x-dev", "target-dir": "Symfony/Component/EventDispatcher", "source": { "type": "git", - "url": "https://github.com/symfony/EventDispatcher", - "reference": "24a1039d52b6b9f533cb73dcb96c7748262db686" + "url": "https://github.com/symfony/EventDispatcher.git", + "reference": "v2.2.0-RC3" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/EventDispatcher/zipball/24a1039d52b6b9f533cb73dcb96c7748262db686", - "reference": "24a1039d52b6b9f533cb73dcb96c7748262db686", + "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.2.0-RC3", + "reference": "v2.2.0-RC3", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "symfony/dependency-injection": "2.2.*" + "symfony/dependency-injection": ">=2.0,<3.0" }, "suggest": { "symfony/dependency-injection": "2.2.*", "symfony/http-kernel": "2.2.*" }, - "time": "2012-10-06 19:57:59", "type": "library", "extra": { "branch-alias": { @@ -207,6 +250,7 @@ "Symfony\\Component\\EventDispatcher\\": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -221,7 +265,8 @@ } ], "description": "Symfony EventDispatcher Component", - "homepage": "http://symfony.com" + "homepage": "http://symfony.com", + "time": "2013-02-11 11:26:43" }, { "name": "symfony/filesystem", @@ -229,29 +274,25 @@ "target-dir": "Symfony/Component/Filesystem", "source": { "type": "git", - "url": "https://github.com/symfony/Filesystem", - "reference": "v2.1.3" + "url": "https://github.com/symfony/Filesystem.git", + "reference": "v2.1.8" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/Filesystem/zipball/v2.1.3", - "reference": "v2.1.3", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/v2.1.8", + "reference": "v2.1.8", "shasum": "" }, "require": { "php": ">=5.3.3" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.1-dev" - } - }, "autoload": { "psr-0": { "Symfony\\Component\\Filesystem": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -267,27 +308,26 @@ ], "description": "Symfony Filesystem Component", "homepage": "http://symfony.com", - "time": "2012-10-20 07:10:30" + "time": "2013-01-09 08:51:07" }, { "name": "symfony/http-foundation", - "version": "dev-master", + "version": "2.2.x-dev", "target-dir": "Symfony/Component/HttpFoundation", "source": { "type": "git", - "url": "https://github.com/symfony/HttpFoundation", - "reference": "707e289629a10fde825bc4ba90aba743f79b173c" + "url": "https://github.com/symfony/HttpFoundation.git", + "reference": "d154b0d9a6b5dac26413a314df1846abe197aaef" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/HttpFoundation/zipball/707e289629a10fde825bc4ba90aba743f79b173c", - "reference": "707e289629a10fde825bc4ba90aba743f79b173c", + "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/d154b0d9a6b5dac26413a314df1846abe197aaef", + "reference": "d154b0d9a6b5dac26413a314df1846abe197aaef", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "2012-10-29 10:57:31", "type": "library", "extra": { "branch-alias": { @@ -302,6 +342,7 @@ "Symfony/Component/HttpFoundation/Resources/stubs" ] }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -316,37 +357,40 @@ } ], "description": "Symfony HttpFoundation Component", - "homepage": "http://symfony.com" + "homepage": "http://symfony.com", + "time": "2013-03-01 10:42:10" }, { "name": "symfony/http-kernel", - "version": "dev-master", + "version": "2.2.x-dev", "target-dir": "Symfony/Component/HttpKernel", "source": { "type": "git", - "url": "https://github.com/symfony/HttpKernel", - "reference": "4dcb0bf602788342fb80c28c6e28be818839d417" + "url": "https://github.com/symfony/HttpKernel.git", + "reference": "2a354f11ea59f58024b087c371dd1d4f9246dc86" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/HttpKernel/zipball/4dcb0bf602788342fb80c28c6e28be818839d417", - "reference": "4dcb0bf602788342fb80c28c6e28be818839d417", + "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/2a354f11ea59f58024b087c371dd1d4f9246dc86", + "reference": "2a354f11ea59f58024b087c371dd1d4f9246dc86", "shasum": "" }, "require": { "php": ">=5.3.3", - "symfony/event-dispatcher": "2.2.*", - "symfony/http-foundation": "2.2.*" + "psr/log": ">=1.0,<2.0", + "symfony/event-dispatcher": ">=2.1,<3.0", + "symfony/http-foundation": ">=2.2,<2.3-dev" }, "require-dev": { "symfony/browser-kit": "2.2.*", - "symfony/class-loader": "2.2.*", - "symfony/config": "2.2.*", + "symfony/class-loader": ">=2.1,<3.0", + "symfony/config": ">=2.0,<3.0", "symfony/console": "2.2.*", - "symfony/dependency-injection": "2.2.*", - "symfony/finder": "2.2.*", - "symfony/process": "2.2.*", - "symfony/routing": "2.2.*" + "symfony/dependency-injection": ">=2.0,<3.0", + "symfony/finder": ">=2.0,<3.0", + "symfony/process": ">=2.0,<3.0", + "symfony/routing": ">=2.2,<2.3-dev", + "symfony/stopwatch": ">=2.2,<2.3-dev" }, "suggest": { "symfony/browser-kit": "2.2.*", @@ -356,7 +400,6 @@ "symfony/dependency-injection": "2.2.*", "symfony/finder": "2.2.*" }, - "time": "2012-10-29 17:07:35", "type": "library", "extra": { "branch-alias": { @@ -368,6 +411,7 @@ "Symfony\\Component\\HttpKernel\\": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -382,7 +426,8 @@ } ], "description": "Symfony HttpKernel Component", - "homepage": "http://symfony.com" + "homepage": "http://symfony.com", + "time": "2013-03-11 17:23:12" }, { "name": "symfony/process", @@ -390,13 +435,13 @@ "target-dir": "Symfony/Component/Process", "source": { "type": "git", - "url": "https://github.com/symfony/Process", - "reference": "b35a2a4fae02286df3275d7094a3d3d575122db8" + "url": "https://github.com/symfony/Process.git", + "reference": "6ebe4ba544cfc0dd25bfe49402da4d5267ee1b43" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/Process/zipball/b35a2a4fae02286df3275d7094a3d3d575122db8", - "reference": "b35a2a4fae02286df3275d7094a3d3d575122db8", + "url": "https://api.github.com/repos/symfony/Process/zipball/6ebe4ba544cfc0dd25bfe49402da4d5267ee1b43", + "reference": "6ebe4ba544cfc0dd25bfe49402da4d5267ee1b43", "shasum": "" }, "require": { @@ -405,7 +450,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-master": "2.3-dev" } }, "autoload": { @@ -413,6 +458,7 @@ "Symfony\\Component\\Process\\": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -428,38 +474,37 @@ ], "description": "Symfony Process Component", "homepage": "http://symfony.com", - "time": "2012-10-27 16:54:34" + "time": "2013-02-18 21:28:20" }, { "name": "symfony/routing", - "version": "dev-master", + "version": "2.2.x-dev", "target-dir": "Symfony/Component/Routing", "source": { "type": "git", - "url": "https://github.com/symfony/Routing", - "reference": "29792d8ac4ed7308acdeed4933cb6d91b7f6510f" + "url": "https://github.com/symfony/Routing.git", + "reference": "3a97436e581bae44d0eec454a74bbb4f93593e78" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/Routing/zipball/29792d8ac4ed7308acdeed4933cb6d91b7f6510f", - "reference": "29792d8ac4ed7308acdeed4933cb6d91b7f6510f", + "url": "https://api.github.com/repos/symfony/Routing/zipball/3a97436e581bae44d0eec454a74bbb4f93593e78", + "reference": "3a97436e581bae44d0eec454a74bbb4f93593e78", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "doctrine/common": ">=2.2,<2.4-dev", - "symfony/config": "2.2.*", - "symfony/http-kernel": "2.2.*", - "symfony/yaml": "2.2.*" + "doctrine/common": ">=2.2,<3.0", + "psr/log": ">=1.0,<2.0", + "symfony/config": ">=2.2,<2.3-dev", + "symfony/yaml": ">=2.0,<3.0" }, "suggest": { - "doctrine/common": ">=2.2,<2.4-dev", + "doctrine/common": "~2.2", "symfony/config": "2.2.*", "symfony/yaml": "2.2.*" }, - "time": "2012-10-28 23:25:34", "type": "library", "extra": { "branch-alias": { @@ -471,6 +516,7 @@ "Symfony\\Component\\Routing\\": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -485,7 +531,8 @@ } ], "description": "Symfony Routing Component", - "homepage": "http://symfony.com" + "homepage": "http://symfony.com", + "time": "2013-03-06 19:31:19" }, { "name": "symfony/twig-bridge", @@ -493,13 +540,13 @@ "target-dir": "Symfony/Bridge/Twig", "source": { "type": "git", - "url": "https://github.com/symfony/TwigBridge", - "reference": "v2.1.3" + "url": "https://github.com/symfony/TwigBridge.git", + "reference": "083b7b93d43315f6d23b049f76527da2d64d92c6" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/TwigBridge/zipball/v2.1.3", - "reference": "v2.1.3", + "url": "https://api.github.com/repos/symfony/TwigBridge/zipball/083b7b93d43315f6d23b049f76527da2d64d92c6", + "reference": "083b7b93d43315f6d23b049f76527da2d64d92c6", "shasum": "" }, "require": { @@ -523,16 +570,12 @@ "symfony/yaml": "2.1.*" }, "type": "symfony-bridge", - "extra": { - "branch-alias": { - "dev-master": "2.1-dev" - } - }, "autoload": { "psr-0": { "Symfony\\Bridge\\Twig": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -548,7 +591,7 @@ ], "description": "Symfony Twig Bridge", "homepage": "http://symfony.com", - "time": "2012-10-04 15:17:57" + "time": "2013-03-12 10:55:49" }, { "name": "twig/twig", @@ -567,7 +610,6 @@ "require": { "php": ">=5.2.4" }, - "time": "2012-08-25 10:32:57", "type": "library", "extra": { "branch-alias": { @@ -579,6 +621,7 @@ "Twig_": "lib/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3" ], @@ -596,7 +639,8 @@ "homepage": "http://twig.sensiolabs.org", "keywords": [ "templating" - ] + ], + "time": "2012-08-25 10:32:57" } ], "packages-dev": [ @@ -617,13 +661,13 @@ "require": { "php": ">=5.2.3" }, - "time": "2013-01-25 15:09:33", "bin": [ "src/bin/pdepend" ], "type": "library", "notification-url": "https://packagist.org/downloads/", - "description": "Official version of pdepend to be handled with Composer" + "description": "Official version of pdepend to be handled with Composer", + "time": "2013-01-25 15:09:33" }, { "name": "phploc/phploc", @@ -644,7 +688,6 @@ "symfony/finder": "2.1.x-dev", "zetacomponents/console-tools": "dev-master" }, - "time": "2012-11-10 12:45:44", "bin": [ "composer/bin/phploc" ], @@ -666,7 +709,8 @@ } ], "description": "A tool for quickly measuring the size of a PHP project.", - "homepage": "https://github.com/sebastianbergmann/phploc" + "homepage": "https://github.com/sebastianbergmann/phploc", + "time": "2012-11-10 12:45:44" }, { "name": "phpmd/phpmd", @@ -686,7 +730,6 @@ "pdepend/pdepend": "*", "php": ">=5.3.0" }, - "time": "2012-12-14 12:25:09", "bin": [ "src/bin/phpmd" ], @@ -696,20 +739,21 @@ "../../pdepend/pdepend/src/main/php", "src/main/php" ], - "description": "Official version of PHPMD handled with Composer." + "description": "Official version of PHPMD handled with Composer.", + "time": "2012-12-14 12:25:09" }, { "name": "phpunit/php-code-coverage", "version": "1.2.x-dev", "source": { "type": "git", - "url": "git://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "25232ac64f081abd7478ae2d63fdb757f45e92b9" + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "1.2.9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/25232ac64f081abd7478ae2d63fdb757f45e92b9", - "reference": "25232ac64f081abd7478ae2d63fdb757f45e92b9", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/1.2.9", + "reference": "1.2.9", "shasum": "" }, "require": { @@ -722,7 +766,6 @@ "ext-dom": "*", "ext-xdebug": ">=2.0.5" }, - "time": "2013-02-14 10:33:04", "type": "library", "autoload": { "classmap": [ @@ -749,14 +792,15 @@ "coverage", "testing", "xunit" - ] + ], + "time": "2013-02-26 18:55:56" }, { "name": "phpunit/php-file-iterator", "version": "dev-master", "source": { "type": "git", - "url": "git://github.com/sebastianbergmann/php-file-iterator.git", + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", "reference": "2deb24c65ea78e126daa8d45b2089ddc29ec1d26" }, "dist": { @@ -768,7 +812,6 @@ "require": { "php": ">=5.3.3" }, - "time": "2013-01-07 10:47:05", "type": "library", "autoload": { "classmap": [ @@ -794,14 +837,15 @@ "keywords": [ "filesystem", "iterator" - ] + ], + "time": "2013-01-07 10:47:05" }, { "name": "phpunit/php-text-template", "version": "dev-master", "source": { "type": "git", - "url": "git://github.com/sebastianbergmann/php-text-template.git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", "reference": "1eeef106193d2f8c539728e566bb4793071a9e18" }, "dist": { @@ -813,7 +857,6 @@ "require": { "php": ">=5.3.3" }, - "time": "2013-01-07 10:56:17", "type": "library", "autoload": { "classmap": [ @@ -838,7 +881,8 @@ "homepage": "https://github.com/sebastianbergmann/php-text-template/", "keywords": [ "template" - ] + ], + "time": "2013-01-07 10:56:17" }, { "name": "phpunit/php-timer", @@ -857,7 +901,6 @@ "require": { "php": ">=5.3.3" }, - "time": "2013-01-30 06:08:51", "type": "library", "autoload": { "classmap": [ @@ -882,14 +925,15 @@ "homepage": "https://github.com/sebastianbergmann/php-timer/", "keywords": [ "timer" - ] + ], + "time": "2013-01-30 06:08:51" }, { "name": "phpunit/php-token-stream", "version": "dev-master", "source": { "type": "git", - "url": "git://github.com/sebastianbergmann/php-token-stream.git", + "url": "https://github.com/sebastianbergmann/php-token-stream.git", "reference": "c25dd88e1592e66dee2553c99ef244203d5a1b98" }, "dist": { @@ -902,7 +946,6 @@ "ext-tokenizer": "*", "php": ">=5.3.3" }, - "time": "2013-01-07 10:56:35", "type": "library", "autoload": { "classmap": [ @@ -927,7 +970,8 @@ "homepage": "https://github.com/sebastianbergmann/php-token-stream/", "keywords": [ "tokenizer" - ] + ], + "time": "2013-01-07 10:56:35" }, { "name": "phpunit/phpunit", @@ -935,12 +979,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "bb334d7a1532f9576ab1facd076f0945c2cbcc27" + "reference": "2c67e52445416bb7c14046b432acd7eb79e4e612" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bb334d7a1532f9576ab1facd076f0945c2cbcc27", - "reference": "bb334d7a1532f9576ab1facd076f0945c2cbcc27", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2c67e52445416bb7c14046b432acd7eb79e4e612", + "reference": "2c67e52445416bb7c14046b432acd7eb79e4e612", "shasum": "" }, "require": { @@ -954,7 +998,7 @@ "phpunit/php-text-template": ">=1.1.1", "phpunit/php-timer": ">=1.0.2,<1.1.0", "phpunit/phpunit-mock-objects": ">=1.2.0,<1.3.0", - "symfony/yaml": ">=2.1.0,<2.2.0" + "symfony/yaml": ">=2.2.0" }, "require-dev": { "pear-pear/pear": "1.9.4" @@ -965,7 +1009,6 @@ "ext-tokenizer": "*", "phpunit/php-invoker": ">=1.1.0,<1.2.0" }, - "time": "2013-02-18 05:30:59", "bin": [ "composer/bin/phpunit" ], @@ -1001,14 +1044,15 @@ "phpunit", "testing", "xunit" - ] + ], + "time": "2013-03-11 07:06:05" }, { "name": "phpunit/phpunit-mock-objects", "version": "1.2.x-dev", "source": { "type": "git", - "url": "git://github.com/sebastianbergmann/phpunit-mock-objects.git", + "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", "reference": "d49b5683200b5db9b1c64cb06f52f50d147891c4" }, "dist": { @@ -1024,7 +1068,6 @@ "suggest": { "ext-soap": "*" }, - "time": "2013-02-05 07:46:41", "type": "library", "autoload": { "classmap": [ @@ -1050,7 +1093,8 @@ "keywords": [ "mock", "xunit" - ] + ], + "time": "2013-02-05 07:46:41" }, { "name": "symfony/browser-kit", @@ -1059,12 +1103,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/BrowserKit.git", - "reference": "v2.1.7" + "reference": "v2.1.8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/v2.1.7", - "reference": "v2.1.7", + "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/v2.1.8", + "reference": "v2.1.8", "shasum": "" }, "require": { @@ -1078,7 +1122,6 @@ "suggest": { "symfony/process": "2.1.*" }, - "time": "2013-01-09 08:51:07", "type": "library", "autoload": { "psr-0": { @@ -1100,7 +1143,8 @@ } ], "description": "Symfony BrowserKit Component", - "homepage": "http://symfony.com" + "homepage": "http://symfony.com", + "time": "2013-02-22 06:39:07" }, { "name": "symfony/css-selector", @@ -1109,18 +1153,17 @@ "source": { "type": "git", "url": "https://github.com/symfony/CssSelector.git", - "reference": "v2.1.7" + "reference": "v2.1.8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/CssSelector/zipball/v2.1.7", - "reference": "v2.1.7", + "url": "https://api.github.com/repos/symfony/CssSelector/zipball/v2.1.8", + "reference": "v2.1.8", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "2013-01-09 08:51:07", "type": "library", "autoload": { "psr-0": { @@ -1142,7 +1185,8 @@ } ], "description": "Symfony CssSelector Component", - "homepage": "http://symfony.com" + "homepage": "http://symfony.com", + "time": "2013-01-09 08:51:07" }, { "name": "symfony/dom-crawler", @@ -1151,12 +1195,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/DomCrawler.git", - "reference": "v2.1.7" + "reference": "227204697da76258a3f7f8d91d72568f4c55e31c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/v2.1.7", - "reference": "v2.1.7", + "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/227204697da76258a3f7f8d91d72568f4c55e31c", + "reference": "227204697da76258a3f7f8d91d72568f4c55e31c", "shasum": "" }, "require": { @@ -1168,7 +1212,6 @@ "suggest": { "symfony/css-selector": "2.1.*" }, - "time": "2013-01-09 08:51:07", "type": "library", "autoload": { "psr-0": { @@ -1190,7 +1233,8 @@ } ], "description": "Symfony DomCrawler Component", - "homepage": "http://symfony.com" + "homepage": "http://symfony.com", + "time": "2013-03-02 15:23:18" }, { "name": "symfony/finder", @@ -1199,18 +1243,17 @@ "source": { "type": "git", "url": "https://github.com/symfony/Finder.git", - "reference": "v2.1.7" + "reference": "69858f868c0caabe3d859c448f98d249541c0489" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Finder/zipball/v2.1.7", - "reference": "v2.1.7", + "url": "https://api.github.com/repos/symfony/Finder/zipball/69858f868c0caabe3d859c448f98d249541c0489", + "reference": "69858f868c0caabe3d859c448f98d249541c0489", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "2013-01-09 08:51:07", "type": "library", "autoload": { "psr-0": { @@ -1232,31 +1275,36 @@ } ], "description": "Symfony Finder Component", - "homepage": "http://symfony.com" + "homepage": "http://symfony.com", + "time": "2013-03-06 19:26:55" }, { "name": "symfony/yaml", - "version": "2.1.x-dev", + "version": "dev-master", "target-dir": "Symfony/Component/Yaml", "source": { "type": "git", "url": "https://github.com/symfony/Yaml.git", - "reference": "882b70fb7072e3f1fa95d249fd527a4e3998dc1a" + "reference": "f198ac28048eeceae852419c076123aaee59cd1c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/882b70fb7072e3f1fa95d249fd527a4e3998dc1a", - "reference": "882b70fb7072e3f1fa95d249fd527a4e3998dc1a", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/f198ac28048eeceae852419c076123aaee59cd1c", + "reference": "f198ac28048eeceae852419c076123aaee59cd1c", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "2013-01-27 16:12:43", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3-dev" + } + }, "autoload": { "psr-0": { - "Symfony\\Component\\Yaml": "" + "Symfony\\Component\\Yaml\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -1274,7 +1322,8 @@ } ], "description": "Symfony Yaml Component", - "homepage": "http://symfony.com" + "homepage": "http://symfony.com", + "time": "2013-01-31 21:39:01" }, { "name": "zetacomponents/base", @@ -1293,7 +1342,6 @@ "require-dev": { "zetacomponents/unit-test": "*" }, - "time": "2012-05-21 11:21:36", "type": "library", "autoload": { "classmap": [ @@ -1337,7 +1385,8 @@ } ], "description": "The Base package provides the basic infrastructure that all packages rely on. Therefore every component relies on this package.", - "homepage": "https://github.com/zetacomponents" + "homepage": "https://github.com/zetacomponents", + "time": "2012-05-21 11:21:36" }, { "name": "zetacomponents/console-tools", @@ -1359,7 +1408,6 @@ "require-dev": { "zetacomponents/unit-test": "*" }, - "time": "2012-05-21 09:55:34", "type": "library", "autoload": { "classmap": [ @@ -1403,7 +1451,8 @@ } ], "description": "A set of classes to do different actions with the console (also called shell). It can render a progress bar, tables and a status bar and contains a class for parsing command line options.", - "homepage": "https://github.com/zetacomponents" + "homepage": "https://github.com/zetacomponents", + "time": "2012-05-21 09:55:34" } ], "aliases": [ @@ -1412,5 +1461,11 @@ "minimum-stability": "dev", "stability-flags": { "klaussilveira/gitter": 20 - } + }, + "platform": [ + + ], + "platform-dev": [ + + ] } From 17eb0f2849c9ba353d21881708ff1994868e7b58 Mon Sep 17 00:00:00 2001 From: Klaus Silveira Date: Tue, 12 Mar 2013 09:51:19 -0300 Subject: [PATCH 21/37] Packaging-specific build target --- build.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index cbcfb8b..139d7d6 100644 --- a/build.xml +++ b/build.xml @@ -1,6 +1,7 @@ - + + @@ -15,6 +16,14 @@ + + + + + + + + From f4bc9b889203e5852fffef7991400fcbb85a9c54 Mon Sep 17 00:00:00 2001 From: Klaus Silveira Date: Tue, 12 Mar 2013 09:52:52 -0300 Subject: [PATCH 22/37] Fixes #269 --- views/commit.twig | 2 +- views/commits_list.twig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/views/commit.twig b/views/commit.twig index f3d0cac..0c0c74d 100644 --- a/views/commit.twig +++ b/views/commit.twig @@ -13,7 +13,7 @@

    {{ commit.message }}

    - + {{ commit.author.name }} authored on {{ commit.date | date('d/m/Y \\a\\t H:i:s') }}
    Showing {{ commit.changedFiles }} changed files
    diff --git a/views/commits_list.twig b/views/commits_list.twig index 0c5b2a3..f47f675 100644 --- a/views/commits_list.twig +++ b/views/commits_list.twig @@ -9,7 +9,7 @@ {% for item in commit %} - + View {{ item.shortHash }}

    {{ item.message }}

    @@ -37,4 +37,4 @@ {% endif %} -{% endif %} \ No newline at end of file +{% endif %} From 452c0d251e954c104c4938e42fe65d79bfcb58f1 Mon Sep 17 00:00:00 2001 From: Klaus Silveira Date: Tue, 12 Mar 2013 09:57:21 -0300 Subject: [PATCH 23/37] Do not run QA on package building, leave that for dev --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 139d7d6..0622ae9 100644 --- a/build.xml +++ b/build.xml @@ -1,7 +1,7 @@ - + From 67d6f2561a9d98f247d11a6c4a83d1a55cfa4eed Mon Sep 17 00:00:00 2001 From: Klaus Silveira Date: Tue, 12 Mar 2013 10:34:09 -0300 Subject: [PATCH 24/37] Cleaning up the build artifacts --- build.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build.xml b/build.xml index 0622ae9..481eeea 100644 --- a/build.xml +++ b/build.xml @@ -17,8 +17,6 @@ - - @@ -85,7 +83,7 @@ - + Date: Tue, 12 Mar 2013 11:46:29 -0300 Subject: [PATCH 25/37] Proper QA paths --- build.xml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/build.xml b/build.xml index 481eeea..23469f3 100644 --- a/build.xml +++ b/build.xml @@ -39,9 +39,7 @@ - - - + @@ -51,19 +49,17 @@ - + - + - - @@ -71,9 +67,7 @@ - - - + From e93e986b12b3b8338e95fcad617099ce7354b826 Mon Sep 17 00:00:00 2001 From: Klaus Silveira Date: Thu, 28 Mar 2013 23:07:50 -0300 Subject: [PATCH 26/37] Updating dependencies --- composer.json | 14 ++-- composer.lock | 225 ++++++++++++++++++++++++++++---------------------- 2 files changed, 133 insertions(+), 106 deletions(-) diff --git a/composer.json b/composer.json index 7d626a6..b5a37ab 100644 --- a/composer.json +++ b/composer.json @@ -1,14 +1,14 @@ { "require": { - "silex/silex": "1.0.*", - "twig/twig": "1.9.*", - "symfony/twig-bridge": "2.1.*", - "symfony/filesystem": "2.1.*", - "klaussilveira/gitter": "dev-master" + "silex/silex": "1.0.*@dev", + "twig/twig": "1.12.*", + "symfony/twig-bridge": "2.2.*", + "symfony/filesystem": "2.2.*", + "klaussilveira/gitter": "0.1.3" }, "require-dev": { - "symfony/browser-kit": "2.1.*", - "symfony/css-selector": "2.1.*", + "symfony/browser-kit": "2.2.*", + "symfony/css-selector": "2.2.*", "phpunit/phpunit": "3.7.*", "phpmd/phpmd": "1.4.*", "phploc/phploc": "1.7.*" diff --git a/composer.lock b/composer.lock index 4f7f46a..a057fed 100644 --- a/composer.lock +++ b/composer.lock @@ -1,27 +1,27 @@ { - "hash": "23b42eb82a97fc586f9c703879c08ac9", + "hash": "4d7bf1d32c612b74b8e7afdb6a9ada2d", "packages": [ { "name": "klaussilveira/gitter", - "version": "dev-master", + "version": "0.1.3", "source": { "type": "git", "url": "https://github.com/klaussilveira/gitter.git", - "reference": "9e30a927d1edf28c3ee844b7d0657c4a9535cd12" + "reference": "0.1.3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/klaussilveira/gitter/zipball/9e30a927d1edf28c3ee844b7d0657c4a9535cd12", - "reference": "9e30a927d1edf28c3ee844b7d0657c4a9535cd12", + "url": "https://api.github.com/repos/klaussilveira/gitter/zipball/0.1.3", + "reference": "0.1.3", "shasum": "" }, "require": { "php": ">=5.3.0", - "symfony/process": ">=2.1" + "symfony/process": ">=2.2" }, "require-dev": { "phpunit/phpunit": ">=3.7.1", - "symfony/filesystem": ">=2.1" + "symfony/filesystem": ">=2.2" }, "type": "library", "autoload": { @@ -47,7 +47,7 @@ "git", "vcs" ], - "time": "2013-02-19 13:59:07" + "time": "2013-03-29 01:18:34" }, { "name": "pimple/pimple", @@ -139,12 +139,12 @@ "source": { "type": "git", "url": "https://github.com/fabpot/Silex.git", - "reference": "59e7dbd338b5caba9879ae11524da4a5905f80c1" + "reference": "a5cb55ced63ece76550de1599ddcc60719373594" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Silex/zipball/59e7dbd338b5caba9879ae11524da4a5905f80c1", - "reference": "59e7dbd338b5caba9879ae11524da4a5905f80c1", + "url": "https://api.github.com/repos/fabpot/Silex/zipball/a5cb55ced63ece76550de1599ddcc60719373594", + "reference": "a5cb55ced63ece76550de1599ddcc60719373594", "shasum": "" }, "require": { @@ -212,7 +212,7 @@ "keywords": [ "microframework" ], - "time": "2013-03-08 16:56:52" + "time": "2013-03-27 09:31:32" }, { "name": "symfony/event-dispatcher", @@ -270,26 +270,31 @@ }, { "name": "symfony/filesystem", - "version": "2.1.x-dev", + "version": "2.2.x-dev", "target-dir": "Symfony/Component/Filesystem", "source": { "type": "git", "url": "https://github.com/symfony/Filesystem.git", - "reference": "v2.1.8" + "reference": "v2.2.0-RC3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/v2.1.8", - "reference": "v2.1.8", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/v2.2.0-RC3", + "reference": "v2.2.0-RC3", "shasum": "" }, "require": { "php": ">=5.3.3" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, "autoload": { "psr-0": { - "Symfony\\Component\\Filesystem": "" + "Symfony\\Component\\Filesystem\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -308,7 +313,7 @@ ], "description": "Symfony Filesystem Component", "homepage": "http://symfony.com", - "time": "2013-01-09 08:51:07" + "time": "2013-01-17 15:25:59" }, { "name": "symfony/http-foundation", @@ -317,12 +322,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/HttpFoundation.git", - "reference": "d154b0d9a6b5dac26413a314df1846abe197aaef" + "reference": "6af424d4fee81987e76bc76aa4e811859ca70bac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/d154b0d9a6b5dac26413a314df1846abe197aaef", - "reference": "d154b0d9a6b5dac26413a314df1846abe197aaef", + "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/6af424d4fee81987e76bc76aa4e811859ca70bac", + "reference": "6af424d4fee81987e76bc76aa4e811859ca70bac", "shasum": "" }, "require": { @@ -358,7 +363,7 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "http://symfony.com", - "time": "2013-03-01 10:42:10" + "time": "2013-03-23 07:49:54" }, { "name": "symfony/http-kernel", @@ -367,12 +372,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/HttpKernel.git", - "reference": "2a354f11ea59f58024b087c371dd1d4f9246dc86" + "reference": "3bfc8fda577fb671b2d9395a59fbc87f449fa61f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/2a354f11ea59f58024b087c371dd1d4f9246dc86", - "reference": "2a354f11ea59f58024b087c371dd1d4f9246dc86", + "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/3bfc8fda577fb671b2d9395a59fbc87f449fa61f", + "reference": "3bfc8fda577fb671b2d9395a59fbc87f449fa61f", "shasum": "" }, "require": { @@ -427,7 +432,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "http://symfony.com", - "time": "2013-03-11 17:23:12" + "time": "2013-03-23 10:43:44" }, { "name": "symfony/process", @@ -436,12 +441,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Process.git", - "reference": "6ebe4ba544cfc0dd25bfe49402da4d5267ee1b43" + "reference": "46b24c5905096914d467b769027e36433c7b5421" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Process/zipball/6ebe4ba544cfc0dd25bfe49402da4d5267ee1b43", - "reference": "6ebe4ba544cfc0dd25bfe49402da4d5267ee1b43", + "url": "https://api.github.com/repos/symfony/Process/zipball/46b24c5905096914d467b769027e36433c7b5421", + "reference": "46b24c5905096914d467b769027e36433c7b5421", "shasum": "" }, "require": { @@ -474,7 +479,7 @@ ], "description": "Symfony Process Component", "homepage": "http://symfony.com", - "time": "2013-02-18 21:28:20" + "time": "2013-03-23 08:06:49" }, { "name": "symfony/routing", @@ -483,12 +488,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Routing.git", - "reference": "3a97436e581bae44d0eec454a74bbb4f93593e78" + "reference": "a8599d5735c5f1f994cfbf91f59851add9c9f627" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Routing/zipball/3a97436e581bae44d0eec454a74bbb4f93593e78", - "reference": "3a97436e581bae44d0eec454a74bbb4f93593e78", + "url": "https://api.github.com/repos/symfony/Routing/zipball/a8599d5735c5f1f994cfbf91f59851add9c9f627", + "reference": "a8599d5735c5f1f994cfbf91f59851add9c9f627", "shasum": "" }, "require": { @@ -532,47 +537,54 @@ ], "description": "Symfony Routing Component", "homepage": "http://symfony.com", - "time": "2013-03-06 19:31:19" + "time": "2013-03-14 09:39:13" }, { "name": "symfony/twig-bridge", - "version": "2.1.x-dev", + "version": "2.2.x-dev", "target-dir": "Symfony/Bridge/Twig", "source": { "type": "git", "url": "https://github.com/symfony/TwigBridge.git", - "reference": "083b7b93d43315f6d23b049f76527da2d64d92c6" + "reference": "50bbc4a10d34a71325b58940c4887726b8a30841" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/TwigBridge/zipball/083b7b93d43315f6d23b049f76527da2d64d92c6", - "reference": "083b7b93d43315f6d23b049f76527da2d64d92c6", + "url": "https://api.github.com/repos/symfony/TwigBridge/zipball/50bbc4a10d34a71325b58940c4887726b8a30841", + "reference": "50bbc4a10d34a71325b58940c4887726b8a30841", "shasum": "" }, "require": { "php": ">=5.3.3", - "twig/twig": ">=1.9.1,<2.0-dev" + "twig/twig": ">=1.11.0,<2.0" }, "require-dev": { - "symfony/form": "2.1.*", - "symfony/routing": "2.1.*", - "symfony/security": "2.1.*", - "symfony/templating": "2.1.*", - "symfony/translation": "2.1.*", - "symfony/yaml": "2.1.*" + "symfony/form": "2.2.*", + "symfony/http-kernel": ">=2.2,<2.3-dev", + "symfony/routing": ">=2.2,<2.3-dev", + "symfony/security": ">=2.0,<2.3-dev", + "symfony/templating": ">=2.1,<3.0", + "symfony/translation": ">=2.0,<2.3-dev", + "symfony/yaml": ">=2.0,<3.0" }, "suggest": { - "symfony/form": "2.1.*", - "symfony/routing": "2.1.*", - "symfony/security": "2.1.*", - "symfony/templating": "2.1.*", - "symfony/translation": "2.1.*", - "symfony/yaml": "2.1.*" + "symfony/form": "2.2.*", + "symfony/http-kernel": "2.2.*", + "symfony/routing": "2.2.*", + "symfony/security": "2.2.*", + "symfony/templating": "2.2.*", + "symfony/translation": "2.2.*", + "symfony/yaml": "2.2.*" }, "type": "symfony-bridge", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, "autoload": { "psr-0": { - "Symfony\\Bridge\\Twig": "" + "Symfony\\Bridge\\Twig\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -591,20 +603,20 @@ ], "description": "Symfony Twig Bridge", "homepage": "http://symfony.com", - "time": "2013-03-12 10:55:49" + "time": "2013-03-15 10:14:31" }, { "name": "twig/twig", - "version": "v1.9.2", + "version": "dev-master", "source": { "type": "git", - "url": "git://github.com/fabpot/Twig.git", - "reference": "v1.9.2" + "url": "https://github.com/fabpot/Twig.git", + "reference": "e8991cc2f9c84b2b5c782203904898717d46e56a" }, "dist": { "type": "zip", - "url": "https://github.com/fabpot/Twig/zipball/v1.9.2", - "reference": "v1.9.2", + "url": "https://api.github.com/repos/fabpot/Twig/zipball/e8991cc2f9c84b2b5c782203904898717d46e56a", + "reference": "e8991cc2f9c84b2b5c782203904898717d46e56a", "shasum": "" }, "require": { @@ -613,7 +625,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.9-dev" + "dev-master": "1.12-dev" } }, "autoload": { @@ -640,7 +652,7 @@ "keywords": [ "templating" ], - "time": "2012-08-25 10:32:57" + "time": "2013-03-25 07:43:31" } ], "packages-dev": [ @@ -979,12 +991,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "2c67e52445416bb7c14046b432acd7eb79e4e612" + "reference": "3.7.19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2c67e52445416bb7c14046b432acd7eb79e4e612", - "reference": "2c67e52445416bb7c14046b432acd7eb79e4e612", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3.7.19", + "reference": "3.7.19", "shasum": "" }, "require": { @@ -998,7 +1010,7 @@ "phpunit/php-text-template": ">=1.1.1", "phpunit/php-timer": ">=1.0.2,<1.1.0", "phpunit/phpunit-mock-objects": ">=1.2.0,<1.3.0", - "symfony/yaml": ">=2.2.0" + "symfony/yaml": ">=2.0.0,<2.3.0" }, "require-dev": { "pear-pear/pear": "1.9.4" @@ -1045,7 +1057,7 @@ "testing", "xunit" ], - "time": "2013-03-11 07:06:05" + "time": "2013-03-25 11:45:06" }, { "name": "phpunit/phpunit-mock-objects", @@ -1098,34 +1110,39 @@ }, { "name": "symfony/browser-kit", - "version": "2.1.x-dev", + "version": "2.2.x-dev", "target-dir": "Symfony/Component/BrowserKit", "source": { "type": "git", "url": "https://github.com/symfony/BrowserKit.git", - "reference": "v2.1.8" + "reference": "d55e7ffd7f10bead48adb03b208bc67bd53926bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/v2.1.8", - "reference": "v2.1.8", + "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/d55e7ffd7f10bead48adb03b208bc67bd53926bb", + "reference": "d55e7ffd7f10bead48adb03b208bc67bd53926bb", "shasum": "" }, "require": { "php": ">=5.3.3", - "symfony/dom-crawler": "2.1.*" + "symfony/dom-crawler": ">=2.0,<3.0" }, "require-dev": { - "symfony/css-selector": "2.1.*", - "symfony/process": "2.1.*" + "symfony/css-selector": ">=2.0,<3.0", + "symfony/process": ">=2.0,<3.0" }, "suggest": { - "symfony/process": "2.1.*" + "symfony/process": "2.2.*" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, "autoload": { "psr-0": { - "Symfony\\Component\\BrowserKit": "" + "Symfony\\Component\\BrowserKit\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -1144,30 +1161,35 @@ ], "description": "Symfony BrowserKit Component", "homepage": "http://symfony.com", - "time": "2013-02-22 06:39:07" + "time": "2013-03-15 10:14:31" }, { "name": "symfony/css-selector", - "version": "2.1.x-dev", + "version": "2.2.x-dev", "target-dir": "Symfony/Component/CssSelector", "source": { "type": "git", "url": "https://github.com/symfony/CssSelector.git", - "reference": "v2.1.8" + "reference": "v2.2.0-RC3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/CssSelector/zipball/v2.1.8", - "reference": "v2.1.8", + "url": "https://api.github.com/repos/symfony/CssSelector/zipball/v2.2.0-RC3", + "reference": "v2.2.0-RC3", "shasum": "" }, "require": { "php": ">=5.3.3" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, "autoload": { "psr-0": { - "Symfony\\Component\\CssSelector": "" + "Symfony\\Component\\CssSelector\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -1186,36 +1208,41 @@ ], "description": "Symfony CssSelector Component", "homepage": "http://symfony.com", - "time": "2013-01-09 08:51:07" + "time": "2013-01-17 15:25:59" }, { "name": "symfony/dom-crawler", - "version": "2.1.x-dev", + "version": "dev-master", "target-dir": "Symfony/Component/DomCrawler", "source": { "type": "git", "url": "https://github.com/symfony/DomCrawler.git", - "reference": "227204697da76258a3f7f8d91d72568f4c55e31c" + "reference": "c9698b3b5b93d18250f627a9001c88fe5bc87908" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/227204697da76258a3f7f8d91d72568f4c55e31c", - "reference": "227204697da76258a3f7f8d91d72568f4c55e31c", + "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/c9698b3b5b93d18250f627a9001c88fe5bc87908", + "reference": "c9698b3b5b93d18250f627a9001c88fe5bc87908", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "symfony/css-selector": "2.1.*" + "symfony/css-selector": ">=2.0,<3.0" }, "suggest": { - "symfony/css-selector": "2.1.*" + "symfony/css-selector": "2.2.*" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3-dev" + } + }, "autoload": { "psr-0": { - "Symfony\\Component\\DomCrawler": "" + "Symfony\\Component\\DomCrawler\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -1234,7 +1261,7 @@ ], "description": "Symfony DomCrawler Component", "homepage": "http://symfony.com", - "time": "2013-03-02 15:23:18" + "time": "2013-03-23 07:35:36" }, { "name": "symfony/finder", @@ -1243,12 +1270,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Finder.git", - "reference": "69858f868c0caabe3d859c448f98d249541c0489" + "reference": "v2.1.9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Finder/zipball/69858f868c0caabe3d859c448f98d249541c0489", - "reference": "69858f868c0caabe3d859c448f98d249541c0489", + "url": "https://api.github.com/repos/symfony/Finder/zipball/v2.1.9", + "reference": "v2.1.9", "shasum": "" }, "require": { @@ -1280,17 +1307,17 @@ }, { "name": "symfony/yaml", - "version": "dev-master", + "version": "2.2.x-dev", "target-dir": "Symfony/Component/Yaml", "source": { "type": "git", "url": "https://github.com/symfony/Yaml.git", - "reference": "f198ac28048eeceae852419c076123aaee59cd1c" + "reference": "3f6d4ab3fd8226ab4ba0be9fc8a238f4338b79ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/f198ac28048eeceae852419c076123aaee59cd1c", - "reference": "f198ac28048eeceae852419c076123aaee59cd1c", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/3f6d4ab3fd8226ab4ba0be9fc8a238f4338b79ab", + "reference": "3f6d4ab3fd8226ab4ba0be9fc8a238f4338b79ab", "shasum": "" }, "require": { @@ -1299,7 +1326,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "2.2-dev" } }, "autoload": { @@ -1323,7 +1350,7 @@ ], "description": "Symfony Yaml Component", "homepage": "http://symfony.com", - "time": "2013-01-31 21:39:01" + "time": "2013-03-23 07:49:54" }, { "name": "zetacomponents/base", @@ -1460,7 +1487,7 @@ ], "minimum-stability": "dev", "stability-flags": { - "klaussilveira/gitter": 20 + "silex/silex": 20 }, "platform": [ From cb71550e7e698fb7cfa42ca6a5548834e14ada3a Mon Sep 17 00:00:00 2001 From: Klaus Silveira Date: Thu, 28 Mar 2013 23:09:05 -0300 Subject: [PATCH 27/37] Fixes #255 --- web/js/main.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/js/main.js b/web/js/main.js index ba9c827..7a44497 100755 --- a/web/js/main.js +++ b/web/js/main.js @@ -27,15 +27,16 @@ $(function () { function paginate() { var $pager = $('.pager'); + $pager.find('.next a').one('click', function (e) { e.preventDefault(); - $(this).css('pointer-events', 'none'); $.get(this.href, function (html) { $pager.after(html); $pager.remove(); paginate(); }); }); + $pager.find('.previous').remove(); } paginate(); From 1f103627c3a820191e77a8bb8f4189d0db9e8301 Mon Sep 17 00:00:00 2001 From: Klaus Silveira Date: Thu, 28 Mar 2013 23:11:16 -0300 Subject: [PATCH 28/37] Strict standards fix --- src/GitList/Git/Repository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GitList/Git/Repository.php b/src/GitList/Git/Repository.php index ab5840b..8bd51dc 100644 --- a/src/GitList/Git/Repository.php +++ b/src/GitList/Git/Repository.php @@ -27,7 +27,7 @@ class Repository extends BaseRepository /** * Get the current branch, returning a default value when HEAD is detached. */ - public function getHead() + public function getHead($default = null) { $client = $this->getClient(); From 132ba426162721aed7eab3fa2aac4686f7a64807 Mon Sep 17 00:00:00 2001 From: Klaus Silveira Date: Thu, 28 Mar 2013 23:49:18 -0300 Subject: [PATCH 29/37] CS fixes --- src/GitList/Application.php | 2 +- src/GitList/Config.php | 4 +- src/GitList/Controller/BlobController.php | 12 ++-- src/GitList/Controller/CommitController.php | 22 +++--- src/GitList/Controller/MainController.php | 8 +-- src/GitList/Controller/TreeController.php | 18 ++--- src/GitList/Git/Repository.php | 21 +++--- src/GitList/Util/Repository.php | 3 +- src/GitList/Util/Routing.php | 76 ++++++++++++--------- 9 files changed, 89 insertions(+), 77 deletions(-) diff --git a/src/GitList/Application.php b/src/GitList/Application.php index bfec00a..9671dd6 100644 --- a/src/GitList/Application.php +++ b/src/GitList/Application.php @@ -48,7 +48,7 @@ class Application extends SilexApplication $this->register(new UrlGeneratorServiceProvider()); $this->register(new RoutingUtilServiceProvider()); - $this['twig'] = $this->share($this->extend('twig', function($twig, $app) { + $this['twig'] = $this->share($this->extend('twig', function ($twig, $app) { $twig->addFilter('htmlentities', new \Twig_Filter_Function('htmlentities')); $twig->addFilter('md5', new \Twig_Filter_Function('md5')); diff --git a/src/GitList/Config.php b/src/GitList/Config.php index 33d5b39..60bbf5c 100644 --- a/src/GitList/Config.php +++ b/src/GitList/Config.php @@ -6,11 +6,13 @@ class Config { protected $data; - public static function fromFile($file) { + public static function fromFile($file) + { if (!file_exists($file)) { die(sprintf('Please, create the %1$s file.', $file)); } $data = parse_ini_file($file, true); + return new static($data); } diff --git a/src/GitList/Controller/BlobController.php b/src/GitList/Controller/BlobController.php index 90f753f..a954da0 100644 --- a/src/GitList/Controller/BlobController.php +++ b/src/GitList/Controller/BlobController.php @@ -12,11 +12,11 @@ class BlobController implements ControllerProviderInterface { $route = $app['controllers_factory']; - $route->get('{repo}/blob/{commitish_path}', function($repo, $commitish_path) use ($app) { + $route->get('{repo}/blob/{commitishPath}', function ($repo, $commitishPath) use ($app) { $repository = $app['git']->getRepository($app['git.repos'] . $repo); list($branch, $file) = $app['util.routing'] - ->parseCommitishPathParam($commitish_path, $repo); + ->parseCommitishPathParam($commitishPath, $repo); list($branch, $file) = $app['util.repository']->extractRef($repository, $branch, $file); @@ -43,14 +43,14 @@ class BlobController implements ControllerProviderInterface 'tags' => $repository->getTags(), )); })->assert('repo', $app['util.routing']->getRepositoryRegex()) - ->assert('commitish_path', '.+') + ->assert('commitishPath', '.+') ->bind('blob'); - $route->get('{repo}/raw/{commitish_path}', function($repo, $commitish_path) use ($app) { + $route->get('{repo}/raw/{commitishPath}', function ($repo, $commitishPath) use ($app) { $repository = $app['git']->getRepository($app['git.repos'] . $repo); list($branch, $file) = $app['util.routing'] - ->parseCommitishPathParam($commitish_path, $repo); + ->parseCommitishPathParam($commitishPath, $repo); list($branch, $file) = $app['util.repository']->extractRef($repository, $branch, $file); @@ -67,7 +67,7 @@ class BlobController implements ControllerProviderInterface return new Response($blob, 200, $headers); })->assert('repo', $app['util.routing']->getRepositoryRegex()) - ->assert('commitish_path', $app['util.routing']->getCommitishPathRegex()) + ->assert('commitishPath', $app['util.routing']->getCommitishPathRegex()) ->bind('blob_raw'); return $route; diff --git a/src/GitList/Controller/CommitController.php b/src/GitList/Controller/CommitController.php index 306b327..aaa6c85 100644 --- a/src/GitList/Controller/CommitController.php +++ b/src/GitList/Controller/CommitController.php @@ -12,15 +12,15 @@ class CommitController implements ControllerProviderInterface { $route = $app['controllers_factory']; - $route->get('{repo}/commits/{commitish_path}', function($repo, $commitish_path) use ($app) { + $route->get('{repo}/commits/{commitishPath}', function ($repo, $commitishPath) use ($app) { $repository = $app['git']->getRepository($app['git.repos'] . $repo); - if ($commitish_path === null) { - $commitish_path = $repository->getHead(); + if ($commitishPath === null) { + $commitishPath = $repository->getHead(); } list($branch, $file) = $app['util.routing'] - ->parseCommitishPathParam($commitish_path, $repo); + ->parseCommitishPathParam($commitishPath, $repo); list($branch, $file) = $app['util.repository']->extractRef($repository, $branch, $file); @@ -48,11 +48,11 @@ class CommitController implements ControllerProviderInterface 'file' => $file, )); })->assert('repo', $app['util.routing']->getRepositoryRegex()) - ->assert('commitish_path', $app['util.routing']->getCommitishPathRegex()) - ->value('commitish_path', null) + ->assert('commitishPath', $app['util.routing']->getCommitishPathRegex()) + ->value('commitishPath', null) ->bind('commits'); - $route->post('{repo}/commits/{branch}/search', function(Request $request, $repo, $branch = '') use ($app) { + $route->post('{repo}/commits/{branch}/search', function (Request $request, $repo, $branch = '') use ($app) { $repository = $app['git']->getRepository($app['git.repos'] . $repo); $query = $request->get('query'); $commits = $repository->searchCommitLog($query); @@ -77,7 +77,7 @@ class CommitController implements ControllerProviderInterface ->assert('branch', $app['util.routing']->getBranchRegex()) ->bind('searchcommits'); - $route->get('{repo}/commit/{commit}', function($repo, $commit) use ($app) { + $route->get('{repo}/commit/{commit}', function ($repo, $commit) use ($app) { $repository = $app['git']->getRepository($app['git.repos'] . $repo); $commit = $repository->getCommit($commit); $branch = $repository->getHead(); @@ -91,11 +91,11 @@ class CommitController implements ControllerProviderInterface ->assert('commit', '[a-f0-9^]+') ->bind('commit'); - $route->get('{repo}/blame/{commitish_path}', function($repo, $commitish_path) use ($app) { + $route->get('{repo}/blame/{commitishPath}', function ($repo, $commitishPath) use ($app) { $repository = $app['git']->getRepository($app['git.repos'] . $repo); list($branch, $file) = $app['util.routing'] - ->parseCommitishPathParam($commitish_path, $repo); + ->parseCommitishPathParam($commitishPath, $repo); list($branch, $file) = $app['util.repository']->extractRef($repository, $branch, $file); @@ -110,7 +110,7 @@ class CommitController implements ControllerProviderInterface 'blames' => $blames, )); })->assert('repo', $app['util.routing']->getRepositoryRegex()) - ->assert('commitish_path', $app['util.routing']->getCommitishPathRegex()) + ->assert('commitishPath', $app['util.routing']->getCommitishPathRegex()) ->bind('blame'); return $route; diff --git a/src/GitList/Controller/MainController.php b/src/GitList/Controller/MainController.php index 8352754..f7b5a85 100644 --- a/src/GitList/Controller/MainController.php +++ b/src/GitList/Controller/MainController.php @@ -12,7 +12,7 @@ class MainController implements ControllerProviderInterface { $route = $app['controllers_factory']; - $route->get('/', function() use ($app) { + $route->get('/', function () use ($app) { $repositories = array_map( function ($repo) use ($app) { $repo['relativePath'] = $app['util.routing']->getRelativePath($repo['path']); @@ -29,7 +29,7 @@ class MainController implements ControllerProviderInterface )); })->bind('homepage'); - $route->get('{repo}/stats/{branch}', function($repo, $branch) use ($app) { + $route->get('{repo}/stats/{branch}', function ($repo, $branch) use ($app) { $repository = $app['git']->getRepository($app['git.repos'] . $repo); if ($branch === null) { $branch = $repository->getHead(); @@ -43,14 +43,14 @@ class MainController implements ControllerProviderInterface 'branches' => $repository->getBranches(), 'tags' => $repository->getTags(), 'stats' => $stats, - 'authors' => $authors, + 'authors' => $authors, )); })->assert('repo', $app['util.routing']->getRepositoryRegex()) ->assert('branch', $app['util.routing']->getBranchRegex()) ->value('branch', null) ->bind('stats'); - $route->get('{repo}/{branch}/rss/', function($repo, $branch) use ($app) { + $route->get('{repo}/{branch}/rss/', function ($repo, $branch) use ($app) { $repository = $app['git']->getRepository($app['git.repos'] . $repo); if ($branch === null) { diff --git a/src/GitList/Controller/TreeController.php b/src/GitList/Controller/TreeController.php index 1ffb767..f807145 100644 --- a/src/GitList/Controller/TreeController.php +++ b/src/GitList/Controller/TreeController.php @@ -13,13 +13,13 @@ class TreeController implements ControllerProviderInterface { $route = $app['controllers_factory']; - $route->get('{repo}/tree/{commitish_path}/', $treeController = function($repo, $commitish_path = '') use ($app) { + $route->get('{repo}/tree/{commitishPath}/', $treeController = function ($repo, $commitishPath = '') use ($app) { $repository = $app['git']->getRepository($app['git.repos'] . $repo); - if (!$commitish_path) { - $commitish_path = $repository->getHead(); + if (!$commitishPath) { + $commitishPath = $repository->getHead(); } - list($branch, $tree) = $app['util.routing']->parseCommitishPathParam($commitish_path, $repo); + list($branch, $tree) = $app['util.routing']->parseCommitishPathParam($commitishPath, $repo); list($branch, $tree) = $app['util.repository']->extractRef($repository, $branch, $tree); $files = $repository->getTree($tree ? "$branch:\"$tree\"/" : $branch); @@ -44,10 +44,10 @@ class TreeController implements ControllerProviderInterface 'readme' => $app['util.repository']->getReadme($repo, $branch), )); })->assert('repo', $app['util.routing']->getRepositoryRegex()) - ->assert('commitish_path', $app['util.routing']->getCommitishPathRegex()) + ->assert('commitishPath', $app['util.routing']->getCommitishPathRegex()) ->bind('tree'); - $route->post('{repo}/tree/{branch}/search', function(Request $request, $repo, $branch = '', $tree = '') use ($app) { + $route->post('{repo}/tree/{branch}/search', function (Request $request, $repo, $branch = '', $tree = '') use ($app) { $repository = $app['git']->getRepository($app['git.repos'] . $repo); if (!$branch) { @@ -71,18 +71,18 @@ class TreeController implements ControllerProviderInterface ->assert('branch', '[\w-._\/]+') ->bind('search'); - $route->get('{repo}/{branch}/', function($repo, $branch) use ($app, $treeController) { + $route->get('{repo}/{branch}/', function ($repo, $branch) use ($app, $treeController) { return $treeController($repo, $branch); })->assert('repo', $app['util.routing']->getRepositoryRegex()) ->assert('branch', '[\w-._\/]+') ->bind('branch'); - $route->get('{repo}/', function($repo) use ($app, $treeController) { + $route->get('{repo}/', function ($repo) use ($app, $treeController) { return $treeController($repo); })->assert('repo', $app['util.routing']->getRepositoryRegex()) ->bind('repository'); - $route->get('{repo}/{format}ball/{branch}', function($repo, $format, $branch) use ($app) { + $route->get('{repo}/{format}ball/{branch}', function ($repo, $format, $branch) use ($app) { $repository = $app['git']->getRepository($app['git.repos'] . $repo); $tree = $repository->getBranchTree($branch); diff --git a/src/GitList/Git/Repository.php b/src/GitList/Git/Repository.php index 8bd51dc..08ba971 100644 --- a/src/GitList/Git/Repository.php +++ b/src/GitList/Git/Repository.php @@ -11,10 +11,10 @@ use Symfony\Component\Filesystem\Filesystem; class Repository extends BaseRepository { /** - * Return TRUE if the repo contains this commit. + * Return true if the repo contains this commit. * * @param $commitHash Hash of commit whose existence we want to check - * @return boolean Whether or not the commit exists in this repo + * @return boolean Whether or not the commit exists in this repo */ public function hasCommit($commitHash) { @@ -104,8 +104,8 @@ class Repository extends BaseRepository /** * Read diff logs and generate a collection of diffs * - * @param array $logs Array of log rows - * @return array Array of diffs + * @param array $logs Array of log rows + * @return array Array of diffs */ public function readDiffLogs(array $logs) { @@ -313,7 +313,7 @@ class Repository extends BaseRepository $data['size'] += $file[3]; } - if (($pos = strrpos($file[4], '.')) !== FALSE) { + if (($pos = strrpos($file[4], '.')) !== false) { $data['extensions'][] = substr($file[4], $pos); } } @@ -339,21 +339,22 @@ class Repository extends BaseRepository } /** - * Return TRUE if $path exists in $branch; return FALSE otherwise. + * Return true if $path exists in $branch; return false otherwise. * * @param string $commitish Commitish reference; branch, tag, SHA1, etc. - * @param string $path Path whose existence we want to verify. + * @param string $path Path whose existence we want to verify. * * GRIPE Arguably belongs in Gitter, as it's generally useful functionality. * Also, this really may not be the best way to do this. */ - public function pathExists($commitish, $path) { + public function pathExists($commitish, $path) + { $output = $this->getClient()->run($this, "ls-tree $commitish $path"); if (strlen($output) > 0) { - return TRUE; + return true; } - return FALSE; + return false; } } diff --git a/src/GitList/Util/Repository.php b/src/GitList/Util/Repository.php index 4ab0202..1782dac 100644 --- a/src/GitList/Util/Repository.php +++ b/src/GitList/Util/Repository.php @@ -189,7 +189,7 @@ class Repository * @param string $tree * @return array */ - public function extractRef($repository, $branch='', $tree='') + public function extractRef($repository, $branch = '', $tree = '') { $branch = trim($branch, '/'); $tree = trim($tree, '/'); @@ -219,5 +219,4 @@ class Repository return array($branch, $tree); } - } diff --git a/src/GitList/Util/Routing.php b/src/GitList/Util/Routing.php index 3f3c866..caeda25 100644 --- a/src/GitList/Util/Routing.php +++ b/src/GitList/Util/Routing.php @@ -1,6 +1,6 @@ app = $app; } - /* @brief Return $commitish, $path parsed from $commitish_path, based on + /* @brief Return $commitish, $path parsed from $commitishPath, based on * what's in $repo. Raise a 404 if $branchpath does not represent a * valid branch and path. * * A helper for parsing routes that use commit-ish names and paths * separated by /, since route regexes are not enough to get that right. */ - public function parseCommitishPathParam($commitish_path, $repo) { + public function parseCommitishPathParam($commitishPath, $repo) + { $app = $this->app; $repository = $app['git']->getRepository($app['git.repos'] . $repo); $commitish = null; $path = null; - $slash_pos = strpos($commitish_path, '/'); - if (strlen($commitish_path) >= 40 && - ($slash_pos === FALSE || - $slash_pos === 40)) { + $slashPosition = strpos($commitishPath, '/'); + if (strlen($commitishPath) >= 40 && + ($slashPosition === false || + $slashPosition === 40)) { // We may have a commit hash as our commitish. - $hash = substr($commitish_path, 0, 40); + $hash = substr($commitishPath, 0, 40); if ($repository->hasCommit($hash)) { $commitish = $hash; } @@ -48,56 +49,57 @@ class Routing $branches = array_merge($branches, $tags); } - $matched_branch = null; - $matched_branch_name_len = 0; + $matchedBranch = null; + $matchedBranchLength = 0; foreach ($branches as $branch) { - if (strpos($commitish_path, $branch) === 0 && - strlen($branch) > $matched_branch_name_len) { - $matched_branch = $branch; - $matched_branch_name_len = strlen($matched_branch); + if (strpos($commitishPath, $branch) === 0 && + strlen($branch) > $matchedBranchLength) { + $matchedBranch = $branch; + $matchedBranchLength = strlen($matchedBranch); } } - $commitish = $matched_branch; + $commitish = $matchedBranch; } if ($commitish === null) { - $app->abort(404, "'$branch_path' does not appear to contain a " . - "commit-ish for '$repo.'"); + $app->abort(404, "'$branch_path' does not appear to contain a commit-ish for '$repo'."); } - $commitish_len = strlen($commitish); - $path = substr($commitish_path, $commitish_len); + $commitishLength = strlen($commitish); + $path = substr($commitishPath, $commitishLength); if (strpos($path, '/') === 0) { $path = substr($path, 1); } - $commit_has_path = $repository->pathExists($commitish, $path); - if ($commit_has_path !== TRUE) { + $commitHasPath = $repository->pathExists($commitish, $path); + if ($commitHasPath !== true) { $app->abort(404, "\"$path\" does not exist in \"$commitish\"."); } return array($commitish, $path); } - public function getBranchRegex() { - static $branch_regex = null; + public function getBranchRegex() + { + static $branchRegex = null; - if ($branch_regex === null) { - $branch_regex = '[\w-._\/]+'; + if ($branchRegex === null) { + $branchRegex = '[\w-._\/]+'; } - return $branch_regex; + return $branchRegex; } - public function getCommitishPathRegex() { - static $commitish_path_regex = null; + public function getCommitishPathRegex() + { + static $commitishPathRegex = null; - if ($commitish_path_regex === null) { - $commitish_path_regex = '.+'; + if ($commitishPathRegex === null) { + $commitishPathRegex = '.+'; } - return $commitish_path_regex; + return $commitishPathRegex; } public function getRepositoryRegex() @@ -112,7 +114,14 @@ class Routing }, $this->app['git']->getRepositories($this->app['git.repos']) ); - usort($quotedPaths, function ($a, $b) { return strlen($b) - strlen($a); }); + + usort( + $quotedPaths, + function ($a, $b) { + return strlen($b) - strlen($a); + } + ); + $regex = implode('|', $quotedPaths); } @@ -122,13 +131,14 @@ class Routing /** * Strips the base path from a full repository path * - * @param string $repoPath Full path to the repository + * @param string $repoPath Full path to the repository * @return string Relative path to the repository from git.repositories */ public function getRelativePath($repoPath) { if (strpos($repoPath, $this->app['git.repos']) === 0) { $relativePath = substr($repoPath, strlen($this->app['git.repos'])); + return ltrim(strtr($relativePath, '\\', '/'), '/'); } else { throw new \InvalidArgumentException( From 90a854bf06ab82a3b6732b2a45fe64b6f7a91a9e Mon Sep 17 00:00:00 2001 From: Klaus Silveira Date: Thu, 28 Mar 2013 23:53:25 -0300 Subject: [PATCH 30/37] More CS fixes --- views/breadcrumb.twig | 2 +- views/commit.twig | 4 ++-- views/file.twig | 10 +++++----- views/menu.twig | 2 +- views/tree.twig | 12 ++++++------ web/css/style.css | 8 ++++---- web/js/main.js | 4 ++-- web/less/files.less | 6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/views/breadcrumb.twig b/views/breadcrumb.twig index 73fff7a..6dc3dce 100644 --- a/views/breadcrumb.twig +++ b/views/breadcrumb.twig @@ -2,7 +2,7 @@
  • {{ repo }}
    • {% for breadcrumb in breadcrumbs %} / - {% if not loop.last %}{{ breadcrumb.dir }}{% endif %}{% if loop.last %}{{ breadcrumb.dir }}{% endif %} + {% if not loop.last %}{{ breadcrumb.dir }}{% endif %}{% if loop.last %}{{ breadcrumb.dir }}{% endif %} {% endfor %} {% block extra %}{% endblock %} diff --git a/views/commit.twig b/views/commit.twig index 0c0c74d..f46f1cb 100644 --- a/views/commit.twig +++ b/views/commit.twig @@ -30,8 +30,8 @@
    {{ diff.file }}
    - History - View file @ {{ commit.shortHash }} + History + View file @ {{ commit.shortHash }}
    diff --git a/views/file.twig b/views/file.twig index e1cc54e..7801e6e 100644 --- a/views/file.twig +++ b/views/file.twig @@ -12,16 +12,16 @@
    - Raw - Blame - History + Raw + Blame + History
    {% if fileType == 'image' %} -
    {{ file }}
    +
    {{ file }}
    {% elseif fileType == 'markdown' %} -
    {{ blob }}
    +
    {{ blob }}
    {% else %} 
    {{ blob|htmlentities|raw }}
    diff --git a/views/menu.twig b/views/menu.twig index b920e65..074573e 100644 --- a/views/menu.twig +++ b/views/menu.twig @@ -1,5 +1,5 @@ diff --git a/views/tree.twig b/views/tree.twig index d53c736..ae23bed 100644 --- a/views/tree.twig +++ b/views/tree.twig @@ -32,7 +32,7 @@ {% if not parent %} .. {% else %} - .. + .. {% endif %} @@ -43,9 +43,9 @@ {{ file.name }} {{ file.mode }} @@ -55,11 +55,11 @@ {% if readme is defined and readme is not empty %} -
    -
    +
    +
    {{ readme.filename }}
    -
    {{ readme.content }}
    +
    {{ readme.content }}
    {% endif %} diff --git a/web/css/style.css b/web/css/style.css index f2fe4b0..31842ae 100644 --- a/web/css/style.css +++ b/web/css/style.css @@ -274,8 +274,8 @@ table .span24{float:none;width:1884px;margin-left:0;} .commit-list li:last-child{border-bottom:0;margin-bottom:25px;} .repository{margin-bottom:18px;border:1px solid #d7d7d7;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.repository .repository-header{border-bottom:1px solid #d7d7d7;text-shadow:1px 1px 1px #ffffff;padding:8px;font-weight:700;font-size:14px;} .repository .repository-body{padding:8px;background-color:#f7f7f7;}.repository .repository-body p{margin:0;} -.readme-view{width:100%;margin-bottom:18px;border:1px solid #cacaca;}.readme-view .readme-header{padding:8px;line-height:18px;text-align:left;vertical-align:bottom;background-color:#f4f4f4;background-image:-moz-linear-gradient(top, #fafafa, #eaeaea);background-image:-ms-linear-gradient(top, #fafafa, #eaeaea);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fafafa), to(#eaeaea));background-image:-webkit-linear-gradient(top, #fafafa, #eaeaea);background-image:-o-linear-gradient(top, #fafafa, #eaeaea);background-image:linear-gradient(top, #fafafa, #eaeaea);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fafafa', endColorstr='#eaeaea', GradientType=0);border-bottom:1px solid #d7d7d7;font-weight:bold;color:#555555;text-shadow:1px 1px 1px #ffffff;height:28px;}.readme-view .readme-header .meta{float:left;padding:4px 0;font-size:14px;} -.readme-view #readme-content{padding:30px;color:#000000;} +.md-view{width:100%;margin-bottom:18px;border:1px solid #cacaca;}.md-view .md-header{padding:8px;line-height:18px;text-align:left;vertical-align:bottom;background-color:#f4f4f4;background-image:-moz-linear-gradient(top, #fafafa, #eaeaea);background-image:-ms-linear-gradient(top, #fafafa, #eaeaea);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fafafa), to(#eaeaea));background-image:-webkit-linear-gradient(top, #fafafa, #eaeaea);background-image:-o-linear-gradient(top, #fafafa, #eaeaea);background-image:linear-gradient(top, #fafafa, #eaeaea);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fafafa', endColorstr='#eaeaea', GradientType=0);border-bottom:1px solid #d7d7d7;font-weight:bold;color:#555555;text-shadow:1px 1px 1px #ffffff;height:28px;}.md-view .md-header .meta{float:left;padding:4px 0;font-size:14px;} +.md-view #md-content{padding:30px;color:#000000;} .rss{display:inline-block;width:16px;height:16px;*margin-right:.3em;line-height:16px;vertical-align:text-top;background-image:url("../img/feed.png");background-position:0 0;background-repeat:no-repeat;}.rss:last-child{*margin-left:0;} [class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat;}[class^="icon-"]:last-child,[class*=" icon-"]:last-child{*margin-left:0;} .icon-white{background-image:url("../img/glyphicons-halflings-white.png");} @@ -760,13 +760,13 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} .CodeMirror-gutter-text{color:#aaa;text-align:right;padding:.4em .2em .4em .4em;white-space:pre !important;} .CodeMirror-lines{padding:.4em;white-space:pre;cursor:text;margin-left:5px;} .CodeMirror-lines *{pointer-events:none;} -.CodeMirror pre{-moz-border-radius:0;-webkit-border-radius:0;-o-border-radius:0;border-radius:0;border-width:0;margin:0;padding:0;background:transparent;font-family:inherit;font-size:inherit;padding:0;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;} +.CodeMirror pre{-moz-border-radius:0;-webkit-border-radius:0;-o-border-radius:0;border-radius:0;border-width:0;background:transparent;font-family:inherit;font-size:inherit;padding:0;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;} .CodeMirror-wrap pre{word-wrap:break-word;white-space:pre-wrap;word-break:normal;} .CodeMirror-wrap .CodeMirror-scroll{overflow-x:hidden;} .CodeMirror textarea{outline:none !important;} .CodeMirror pre.CodeMirror-cursor{z-index:10;position:absolute;visibility:hidden;border-left:1px solid black;border-right:none;width:0;} .cm-keymap-fat-cursor pre.CodeMirror-cursor{width:auto;border:0;background:transparent;background:rgba(0, 200, 0, 0.4);} -.cm-keymap-fat-cursor pre.CodeMirror-cursor:not(#nonsense_id){filter:progid:dximagetransform.microsoft.gradient(enabled=false);} +.cm-keymap-fat-cursor pre.CodeMirror-cursor:not(#nonsense_id){filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);} .CodeMirror-focused pre.CodeMirror-cursor{visibility:visible;} div.CodeMirror-selected{background:#d9d9d9;} .CodeMirror-focused div.CodeMirror-selected{background:#d7d4f0;} diff --git a/web/js/main.js b/web/js/main.js index 7a44497..e41f089 100755 --- a/web/js/main.js +++ b/web/js/main.js @@ -20,9 +20,9 @@ $(function () { }); } - if ($('#readme-content').length) { + if ($('#md-content').length) { var converter = new Showdown.converter(); - $('#readme-content').html(converter.makeHtml($('#readme-content').text())); + $('#md-content').html(converter.makeHtml($('#md-content').text())); } function paginate() { diff --git a/web/less/files.less b/web/less/files.less index 0047a79..84fc66a 100644 --- a/web/less/files.less +++ b/web/less/files.less @@ -160,12 +160,12 @@ } } -.readme-view { +.md-view { width: 100%; margin-bottom: @baseLineHeight; border: 1px solid @treeHeaderBorder; - .readme-header { + .md-header { padding: 8px; line-height: @baseLineHeight; text-align: left; @@ -183,7 +183,7 @@ } } - #readme-content { + #md-content { padding: 30px; color: @black; } From 02eb7cb185d4df1580713150b6e4f4d9c89198c5 Mon Sep 17 00:00:00 2001 From: Klaus Silveira Date: Thu, 28 Mar 2013 23:57:16 -0300 Subject: [PATCH 31/37] Proper MD rendering, fixes #256 --- views/tree.twig | 2 +- web/css/style.css | 6 ++++-- web/less/files.less | 47 ++++++++++++++++++++++++--------------------- 3 files changed, 30 insertions(+), 25 deletions(-) diff --git a/views/tree.twig b/views/tree.twig index ae23bed..9dfa8a5 100644 --- a/views/tree.twig +++ b/views/tree.twig @@ -55,7 +55,7 @@ {% if readme is defined and readme is not empty %} -
    +
    {{ readme.filename }}
    diff --git a/web/css/style.css b/web/css/style.css index 31842ae..407424e 100644 --- a/web/css/style.css +++ b/web/css/style.css @@ -274,8 +274,10 @@ table .span24{float:none;width:1884px;margin-left:0;} .commit-list li:last-child{border-bottom:0;margin-bottom:25px;} .repository{margin-bottom:18px;border:1px solid #d7d7d7;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.repository .repository-header{border-bottom:1px solid #d7d7d7;text-shadow:1px 1px 1px #ffffff;padding:8px;font-weight:700;font-size:14px;} .repository .repository-body{padding:8px;background-color:#f7f7f7;}.repository .repository-body p{margin:0;} -.md-view{width:100%;margin-bottom:18px;border:1px solid #cacaca;}.md-view .md-header{padding:8px;line-height:18px;text-align:left;vertical-align:bottom;background-color:#f4f4f4;background-image:-moz-linear-gradient(top, #fafafa, #eaeaea);background-image:-ms-linear-gradient(top, #fafafa, #eaeaea);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fafafa), to(#eaeaea));background-image:-webkit-linear-gradient(top, #fafafa, #eaeaea);background-image:-o-linear-gradient(top, #fafafa, #eaeaea);background-image:linear-gradient(top, #fafafa, #eaeaea);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fafafa', endColorstr='#eaeaea', GradientType=0);border-bottom:1px solid #d7d7d7;font-weight:bold;color:#555555;text-shadow:1px 1px 1px #ffffff;height:28px;}.md-view .md-header .meta{float:left;padding:4px 0;font-size:14px;} -.md-view #md-content{padding:30px;color:#000000;} +.readme-view{border:1px solid #cacaca;} +.md-view{width:100%;margin-bottom:18px;} +.md-header{padding:8px;line-height:18px;text-align:left;vertical-align:bottom;background-color:#f4f4f4;background-image:-moz-linear-gradient(top, #fafafa, #eaeaea);background-image:-ms-linear-gradient(top, #fafafa, #eaeaea);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fafafa), to(#eaeaea));background-image:-webkit-linear-gradient(top, #fafafa, #eaeaea);background-image:-o-linear-gradient(top, #fafafa, #eaeaea);background-image:linear-gradient(top, #fafafa, #eaeaea);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fafafa', endColorstr='#eaeaea', GradientType=0);border-bottom:1px solid #d7d7d7;font-weight:bold;color:#555555;text-shadow:1px 1px 1px #ffffff;height:28px;}.md-header .meta{float:left;padding:4px 0;font-size:14px;} +#md-content{padding:30px;color:#000000;} .rss{display:inline-block;width:16px;height:16px;*margin-right:.3em;line-height:16px;vertical-align:text-top;background-image:url("../img/feed.png");background-position:0 0;background-repeat:no-repeat;}.rss:last-child{*margin-left:0;} [class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat;}[class^="icon-"]:last-child,[class*=" icon-"]:last-child{*margin-left:0;} .icon-white{background-image:url("../img/glyphicons-halflings-white.png");} diff --git a/web/less/files.less b/web/less/files.less index 84fc66a..1ae5c16 100644 --- a/web/less/files.less +++ b/web/less/files.less @@ -160,31 +160,34 @@ } } +.readme-view { + border: 1px solid @treeHeaderBorder; +} + .md-view { width: 100%; margin-bottom: @baseLineHeight; - border: 1px solid @treeHeaderBorder; +} - .md-header { - padding: 8px; - line-height: @baseLineHeight; - text-align: left; - vertical-align: bottom; - #gradient > .vertical(@treeHeaderHighlight, @treeHeader); - border-bottom: 1px solid lighten(@treeHeaderBorder, 5%); - font-weight: bold; - color: @gray; - text-shadow: 1px 1px 1px rgba(255,255,255,1); - height:28px; - .meta { - float: left; - padding: 4px 0; - font-size: 14px; - } - } - - #md-content { - padding: 30px; - color: @black; +.md-header { + padding: 8px; + line-height: @baseLineHeight; + text-align: left; + vertical-align: bottom; + #gradient > .vertical(@treeHeaderHighlight, @treeHeader); + border-bottom: 1px solid lighten(@treeHeaderBorder, 5%); + font-weight: bold; + color: @gray; + text-shadow: 1px 1px 1px rgba(255,255,255,1); + height:28px; + .meta { + float: left; + padding: 4px 0; + font-size: 14px; } } + +#md-content { + padding: 30px; + color: @black; +} \ No newline at end of file From 99ad7b568c1d0021b5d12e9042697a9e692296db Mon Sep 17 00:00:00 2001 From: Klaus Silveira Date: Fri, 29 Mar 2013 00:04:36 -0300 Subject: [PATCH 32/37] Fixing problem parsing paths with spaces, fixes #281 --- src/GitList/Git/Repository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GitList/Git/Repository.php b/src/GitList/Git/Repository.php index 08ba971..c5d4909 100644 --- a/src/GitList/Git/Repository.php +++ b/src/GitList/Git/Repository.php @@ -349,7 +349,7 @@ class Repository extends BaseRepository */ public function pathExists($commitish, $path) { - $output = $this->getClient()->run($this, "ls-tree $commitish $path"); + $output = $this->getClient()->run($this, "ls-tree $commitish '$path'"); if (strlen($output) > 0) { return true; From f68f2edd45c5f8c36b720cf738a4397fbb48aed4 Mon Sep 17 00:00:00 2001 From: Klaus Silveira Date: Fri, 29 Mar 2013 00:09:01 -0300 Subject: [PATCH 33/37] Fixes #288 --- src/GitList/Git/Repository.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/GitList/Git/Repository.php b/src/GitList/Git/Repository.php index c5d4909..0abc8f0 100644 --- a/src/GitList/Git/Repository.php +++ b/src/GitList/Git/Repository.php @@ -314,7 +314,11 @@ class Repository extends BaseRepository } if (($pos = strrpos($file[4], '.')) !== false) { - $data['extensions'][] = substr($file[4], $pos); + $extension = substr($file[4], $pos); + + if (($pos = strrpos($extension, '/')) === false) { + $data['extensions'][] = $extension; + } } } From cf9aeaf7737a3346b388c740ee374d9d80fa1613 Mon Sep 17 00:00:00 2001 From: Klaus Silveira Date: Fri, 29 Mar 2013 00:20:28 -0300 Subject: [PATCH 34/37] Oops. I did it again. --- tests/InterfaceTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/InterfaceTest.php b/tests/InterfaceTest.php index e4c403e..e44e0b6 100644 --- a/tests/InterfaceTest.php +++ b/tests/InterfaceTest.php @@ -148,8 +148,8 @@ class InterfaceTest extends WebTestCase $this->assertTrue($client->getResponse()->isOk()); $this->assertCount(1, $crawler->filter('.tree tr:contains("README.md")')); $this->assertCount(1, $crawler->filter('.tree tr:contains("test.php")')); - $this->assertCount(1, $crawler->filter('.readme-header:contains("README.md")')); - $this->assertEquals("## GitTest\nGitTest is a *test* repository!", $crawler->filter('#readme-content')->eq(0)->text()); + $this->assertCount(1, $crawler->filter('.md-header:contains("README.md")')); + $this->assertEquals("## GitTest\nGitTest is a *test* repository!", $crawler->filter('#md-content')->eq(0)->text()); $this->assertEquals('/GitTest/blob/master/README.md', $crawler->filter('.tree tr td')->eq(0)->filter('a')->eq(0)->attr('href')); $this->assertEquals('/GitTest/blob/master/test.php', $crawler->filter('.tree tr td')->eq(3)->filter('a')->eq(0)->attr('href')); @@ -166,7 +166,7 @@ class InterfaceTest extends WebTestCase $this->assertEquals('/foobar/tree/master/myfolder/', $crawler->filter('.tree tr td')->eq(0)->filter('a')->eq(0)->attr('href')); $this->assertEquals('/foobar/tree/master/testfolder/', $crawler->filter('.tree tr td')->eq(3)->filter('a')->eq(0)->attr('href')); $this->assertEquals('/foobar/blob/master/bar.json', $crawler->filter('.tree tr td')->eq(6)->filter('a')->eq(0)->attr('href')); - $this->assertCount(0, $crawler->filter('.readme-header')); + $this->assertCount(0, $crawler->filter('.md-header')); $this->assertEquals('master', $crawler->filter('.dropdown-menu li')->eq(1)->text()); } From 4eaebed43bfe91ccd315e331a76b01c987ca383b Mon Sep 17 00:00:00 2001 From: Klaus Silveira Date: Fri, 29 Mar 2013 00:26:16 -0300 Subject: [PATCH 35/37] Proper branch name validation, fixes #272 --- src/GitList/Controller/TreeController.php | 6 +++--- src/GitList/Util/Routing.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/GitList/Controller/TreeController.php b/src/GitList/Controller/TreeController.php index f807145..f14ebf2 100644 --- a/src/GitList/Controller/TreeController.php +++ b/src/GitList/Controller/TreeController.php @@ -68,13 +68,13 @@ class TreeController implements ControllerProviderInterface 'tags' => $repository->getTags(), )); })->assert('repo', $app['util.routing']->getRepositoryRegex()) - ->assert('branch', '[\w-._\/]+') + ->assert('branch', $app['util.routing']->getBranchRegex()) ->bind('search'); $route->get('{repo}/{branch}/', function ($repo, $branch) use ($app, $treeController) { return $treeController($repo, $branch); })->assert('repo', $app['util.routing']->getRepositoryRegex()) - ->assert('branch', '[\w-._\/]+') + ->assert('branch', $app['util.routing']->getBranchRegex()) ->bind('branch'); $route->get('{repo}/', function ($repo) use ($app, $treeController) { @@ -111,7 +111,7 @@ class TreeController implements ControllerProviderInterface )); })->assert('format', '(zip|tar)') ->assert('repo', $app['util.routing']->getRepositoryRegex()) - ->assert('branch', '[\w-._\/]+') + ->assert('branch', $app['util.routing']->getBranchRegex()) ->bind('archive'); return $route; diff --git a/src/GitList/Util/Routing.php b/src/GitList/Util/Routing.php index caeda25..a1e33f5 100644 --- a/src/GitList/Util/Routing.php +++ b/src/GitList/Util/Routing.php @@ -85,7 +85,7 @@ class Routing static $branchRegex = null; if ($branchRegex === null) { - $branchRegex = '[\w-._\/]+'; + $branchRegex = '(?!/|.*([/.]\.|//|@\{|\\\\))[^\040\177 ~^:?*\[]+(? Date: Fri, 29 Mar 2013 00:35:24 -0300 Subject: [PATCH 36/37] Adding favicon, fixes #237 --- views/layout.twig | 1 + web/img/favicon.png | Bin 0 -> 884 bytes 2 files changed, 1 insertion(+) create mode 100644 web/img/favicon.png diff --git a/views/layout.twig b/views/layout.twig index 9addf44..fd066e9 100644 --- a/views/layout.twig +++ b/views/layout.twig @@ -4,6 +4,7 @@ {% block title %}Welcome!{% endblock %} + diff --git a/web/img/favicon.png b/web/img/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..8fe5ce5e36179769fad04c6e02400478888b297c GIT binary patch literal 884 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0V2lay32}Yyp$b9IJXAk;tNrlP zc;lt|*+(77`01wsA%Tof-fBO6)n9w5y$7oSiv04|fG7is0J%WDKoW?6T7c-arz(*A z=%e=AU*oH<`YTV>7oMs>EkN|$55xt^0!bhjDErM<9jNS?hYApV0ds*S0~tV<07;+% zAOe~XH1n;O+Gih)Pd;kzz0}`%sROM8D){IPauv{ocU~X^fefGmpt7g#K(DER4DQ5{Q@(cd^@87=@j1RU7i!cXA9bA0(Vw_a=j_Q+<$9Y)! zroB!)p19)K=O*67JEE65*!Y8gyz831x#bWqfB(hHm-GzRZJy+E@ruhMCo@am7q^|9 zfiS_@E5O+)kt5tWF)_s5EtX;FkyrY_NKNx}aSW-rReCW!|B!(ITY~r9>i2uU->ZIa z+vs##+-}OU1m=_fr)L#+opD`jfAiep>*eB%+tRM_&-=m4{&(H$e>MNOt!7`+6L!4t zW9~C0jtj?J1h$wk8>(5nn7T=p~p9MU=o_Me}OnyDMeFY_1n*_7T=4ieo7W9=yhu|_)Mx05uZ1mUByHoD2$oG_f14hRh*;SA(azs zOl~q=#^<@1JS{Ew-dO(h@@Kur-O9LY`jtn^9!nImFxH50HKb|DD*Gica54!WnDNfc zQ;CVmEIE&B#=Nh_N(uoA&(0<`{_Eb;$Xd7bblQH$;Qg(vX33eUrM+oY?0kQET;`~i z^(s8LYp1|bv0eWM_l=o$&CLnNL@hYd-aM{vczbuQZrx|@ss(LZ_F1*D0Hc?|)78&q Iol`;+0GV@tp#T5? literal 0 HcmV?d00001 From 919c953f832cdc9d6dd00ca35d094a9260121765 Mon Sep 17 00:00:00 2001 From: Klaus Silveira Date: Fri, 29 Mar 2013 00:44:06 -0300 Subject: [PATCH 37/37] Properly parsing commit body, fixes #137 --- src/GitList/Git/Repository.php | 10 +++++++--- views/commit.twig | 3 +++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/GitList/Git/Repository.php b/src/GitList/Git/Repository.php index 0abc8f0..dc8eec3 100644 --- a/src/GitList/Git/Repository.php +++ b/src/GitList/Git/Repository.php @@ -42,12 +42,16 @@ class Repository extends BaseRepository */ public function getCommit($commitHash) { - $logs = $this->getClient()->run($this, "show --pretty=format:\"%H%h%T%P%an%ae%at%cn%ce%ct\" $commitHash"); - $logs = explode("\n", $logs); + $logs = $this->getClient()->run($this, "show --pretty=format:\"%H%h%T%P%an%ae%at%cn%ce%ct\" $commitHash"); + $xmlEnd = strpos($logs, '') + 7; + $commitInfo = substr($logs, 0, $xmlEnd); + $commitData = substr($logs, $xmlEnd); + $logs = explode("\n", $commitData); + array_shift($logs); // Read commit metadata $format = new PrettyFormat; - $data = $format->parse($logs[0]); + $data = $format->parse($commitInfo); $commit = new Commit; $commit->importData($data[0]); diff --git a/views/commit.twig b/views/commit.twig index f46f1cb..8cbd3ac 100644 --- a/views/commit.twig +++ b/views/commit.twig @@ -13,6 +13,9 @@

    {{ commit.message }}

    + {% if commit.body is not empty %} +

    {{ commit.body | nl2br }}

    + {% endif %} {{ commit.author.name }} authored on {{ commit.date | date('d/m/Y \\a\\t H:i:s') }}
    Showing {{ commit.changedFiles }} changed files