TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update phpdebugbar dependency

Browse Source
This commit is contained in:
Manuel Raynaud
2013-09-11 15:48:55 +02:00
parent 91f5cb12cd
commit c1edc0e4ff
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@@ -36,13 +36,12 @@
"simplepie/simplepie": "dev-master", "simplepie/simplepie": "dev-master",
"imagine/imagine": "dev-master", "imagine/imagine": "dev-master",
"symfony/serializer": "dev-master",
"symfony/icu": "1.0" "symfony/icu": "1.0"
}, },
"require-dev" : { "require-dev" : {
"phpunit/phpunit": "3.7.*", "phpunit/phpunit": "3.7.*",
"fzaninotto/faker": "dev-master", "fzaninotto/faker": "dev-master",
"maximebf/debugbar": "1.*" "maximebf/debugbar": "dev-master"
}, },
"minimum-stability": "stable", "minimum-stability": "stable",
"config" : { "config" : {

16
composer.lock generated
View File

@@ -3,8 +3,7 @@
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
], ],
"hash": "ba2f3e0943f00c7c3bf0c086bc611b0f", "hash": "28dfdc7a840f9e70df422581f82a871f",
"packages": [ "packages": [
{ {
"name": "imagine/imagine", "name": "imagine/imagine",
@@ -1621,16 +1620,16 @@
}, },
{ {
"name": "maximebf/debugbar", "name": "maximebf/debugbar",
"version": "1.5.1", "version": "dev-master",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/maximebf/php-debugbar.git", "url": "https://github.com/maximebf/php-debugbar.git",
"reference": "37dccc40da52bf9f85571c30cf302da696db0d05" "reference": "7fbe0a5d4ffc7f4e205c2b15542382308d34bd0d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/37dccc40da52bf9f85571c30cf302da696db0d05", "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/7fbe0a5d4ffc7f4e205c2b15542382308d34bd0d",
"reference": "37dccc40da52bf9f85571c30cf302da696db0d05", "reference": "7fbe0a5d4ffc7f4e205c2b15542382308d34bd0d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1666,7 +1665,7 @@
"keywords": [ "keywords": [
"debug" "debug"
], ],
"time": "2013-08-17 02:02:49" "time": "2013-09-11 13:01:19"
}, },
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",
@@ -2048,7 +2047,8 @@
"ptachoire/cssembed": 20, "ptachoire/cssembed": 20,
"simplepie/simplepie": 20, "simplepie/simplepie": 20,
"imagine/imagine": 20, "imagine/imagine": 20,
"fzaninotto/faker": 20 "fzaninotto/faker": 20,
"maximebf/debugbar": 20
}, },
"platform": { "platform": {
"php": ">=5.4" "php": ">=5.4"

2
core/lib/Thelia/Config/Resources/routing/front.xml
View File

@@ -34,7 +34,7 @@
<default key="_view">login</default> <default key="_view">login</default>
</route> </route>
<route id="customer.logout.process" path="/customer/logout"> <route id="customer.logout.process" path="/logout">
<default key="_controller">Thelia\Controller\Front\CustomerController::logoutAction</default> <default key="_controller">Thelia\Controller\Front\CustomerController::logoutAction</default>
</route> </route>

7
templates/default/layout.tpl
View File

@@ -84,8 +84,15 @@ URL: http://www.thelia.net
{/loop} {/loop}
</ul> </ul>
<ul class="nav navbar-nav navbar-cart navbar-right"> <ul class="nav navbar-nav navbar-cart navbar-right">
{loop type="auth" name="customer_info_block" roles="CUSTOMER" context="front"}
<li><a href="{url path="/logout"}" class="register">{intl l="Log out!"}</a></li>
<li><a href="{url path="/customer/account"}" class="login">{intl l="My Account"}</a></li>
{/loop}
{elseloop rel="customer_info_block" rel="customer_info_block"}
<li><a href="{url path="/register"}" class="register">{intl l="Register"}!</a></li> <li><a href="{url path="/register"}" class="register">{intl l="Register"}!</a></li>
<li><a href="{url path="/login"}" class="login">{intl l="Log In!"}</a></li> <li><a href="{url path="/login"}" class="login">{intl l="Log In!"}</a></li>
{/elseloop}
<li class="dropdown"> <li class="dropdown">
<a href="cart.html" class="dropdown-toggle cart" data-toggle="dropdown"> <a href="cart.html" class="dropdown-toggle cart" data-toggle="dropdown">
Cart <span class="badge">2</span> Cart <span class="badge">2</span>