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

fix test suite

Browse Source
This commit is contained in:
Manuel Raynaud
2013-09-12 17:28:02 +02:00
parent 0ca5af597a
commit bad8a0439d
3 changed files with 52 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
core/lib/Thelia/Core/HttpKernel/Exception/NotFountHttpException.php Normal file
View File

@@ -0,0 +1,46 @@
<?php
/*************************************************************************************/
/* */
/* Thelia */
/* */
/* Copyright (c) OpenStudio */
/* email : info@thelia.net */
/* web : http://www.thelia.net */
/* */
/* This program is free software; you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
/* the Free Software Foundation; either version 3 of the License */
/* */
/* This program is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* */
/*************************************************************************************/
namespace Thelia\Core\HttpKernel\Exceptions;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException as BaseNotFountHttpException;
/**
* Class NotFountHttpException
* @author Manuel Raynaud <mraynaud@openstudio.fr>
*/
class NotFountHttpException extends BaseNotFountHttpException {
protected $adminContext = false;
public function __construct($message = null, \Exception $previous = null, $code = 0, $adminContext = false)
{
$this->adminContext = $adminContext;
parent::__construct($message, $previous, $code);
}
public function isAdminContext()
{
return $this->adminContext === true;
}
}

14
core/lib/Thelia/Model/Address.php
View File

@@ -58,6 +58,10 @@ class Address extends BaseAddress {
*/ */
public function preDelete(ConnectionInterface $con = null) public function preDelete(ConnectionInterface $con = null)
{ {
if($this->getIsDefault()) {
return false;
}
$this->dispatchEvent(TheliaEvents::BEFORE_DELETEADDRESS, new AddressEvent($this)); $this->dispatchEvent(TheliaEvents::BEFORE_DELETEADDRESS, new AddressEvent($this));
return true; return true;
} }
@@ -71,14 +75,4 @@ class Address extends BaseAddress {
$this->dispatchEvent(TheliaEvents::AFTER_DELETEADDRESS, new AddressEvent($this)); $this->dispatchEvent(TheliaEvents::AFTER_DELETEADDRESS, new AddressEvent($this));
} }
public function preSave()
{
$valid = true;
if($this->getIsDefault()) {
$valid = false;
}
return $valid;
}
} }

2
core/lib/Thelia/Tests/Action/CustomerTest.php
View File

@@ -86,6 +86,8 @@ class CustomerTest extends \PHPUnit_Framework_TestCase
$addressCreated = $customerCreated->getDefaultAddress(); $addressCreated = $customerCreated->getDefaultAddress();
$this->assertInstanceOf("Thelia\Model\Address", $addressCreated);
$this->assertEquals($customerCreateEvent->getFirstname(), $addressCreated->getFirstname()); $this->assertEquals($customerCreateEvent->getFirstname(), $addressCreated->getFirstname());
$this->assertEquals($customerCreateEvent->getLastname(), $addressCreated->getLastname()); $this->assertEquals($customerCreateEvent->getLastname(), $addressCreated->getLastname());
$this->assertEquals($customerCreateEvent->getTitle(), $addressCreated->getTitleId()); $this->assertEquals($customerCreateEvent->getTitle(), $addressCreated->getTitleId());