@@ -142,9 +142,11 @@ |
||
| 142 | 142 | throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $productItem->getId() ) ); |
| 143 | 143 | } |
| 144 | 144 | |
| 145 | - if( empty( $items ) && $requireVariant != false ) // count == 0 |
|
| 145 | + if( empty( $items ) && $requireVariant != false ) { |
|
| 146 | + // count == 0 |
|
| 146 | 147 | { |
| 147 | 148 | $msg = $context->getI18n()->dt( 'controller/frontend', 'No article found for selected attributes and product ID "%1$s"' ); |
| 149 | + } |
|
| 148 | 150 | throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $productItem->getId() ) ); |
| 149 | 151 | } |
| 150 | 152 | |
@@ -310,7 +310,9 @@ |
||
| 310 | 310 | $this->getObject()->addService( $service, $attributes ); |
| 311 | 311 | $basket->deleteService( $type ); |
| 312 | 312 | } |
| 313 | - catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically |
|
| 313 | + catch( \Exception $e ) |
|
| 314 | + { |
|
| 315 | +; } // Don't notify the user as appropriate services can be added automatically |
|
| 314 | 316 | } |
| 315 | 317 | } |
| 316 | 318 | |
@@ -311,7 +311,7 @@ |
||
| 311 | 311 | $this->getObject()->addService( $service, $attributes ); |
| 312 | 312 | $basket->deleteService( $type ); |
| 313 | 313 | } |
| 314 | - catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically |
|
| 314 | + catch( \Exception $e ) {; } // Don't notify the user as appropriate services can be added automatically |
|
| 315 | 315 | } |
| 316 | 316 | } |
| 317 | 317 | |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | interface Iface |
| 21 | 21 | { |
| 22 | 22 | public const ONE = 1; |
| 23 | - public const LIST = 2; |
|
| 23 | + public const list = 2; |
|
| 24 | 24 | public const TREE = 3; |
| 25 | 25 | |
| 26 | 26 | /** |
@@ -53,8 +53,7 @@ |
||
| 53 | 53 | */ |
| 54 | 54 | $groupIds = (array) $context->getConfig()->get( 'controller/frontend/customer/groupids', [] ); |
| 55 | 55 | $this->item = $this->manager->create()->setGroups( $groupIds ); |
| 56 | - } |
|
| 57 | - else |
|
| 56 | + } else |
|
| 58 | 57 | { |
| 59 | 58 | $this->item = $this->manager->get( $userid, [], true ); |
| 60 | 59 | } |
@@ -94,12 +94,12 @@ |
||
| 94 | 94 | $this->item->setCode( $code ); |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | - if ( $oldPassword = $values['customer.oldpassword'] ?? null) { |
|
| 97 | + if( $oldPassword = $values['customer.oldpassword'] ?? null ) { |
|
| 98 | 98 | $confirmed = $values['customer.newpassword'] === $values['customer.confirmnewpassword']; |
| 99 | 99 | $isNew = $values['customer.newpassword'] !== $values['customer.oldpassword']; |
| 100 | 100 | |
| 101 | 101 | $passHelper = $this->getContext()->password(); |
| 102 | - if ($passHelper->verify($oldPassword, $this->item->getPassword()) && $confirmed && $isNew) { |
|
| 102 | + if( $passHelper->verify( $oldPassword, $this->item->getPassword() ) && $confirmed && $isNew ) { |
|
| 103 | 103 | $this->item = $this->item->setPassword( $values['customer.newpassword'] ); |
| 104 | 104 | } |
| 105 | 105 | } |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | interface Iface |
| 21 | 21 | { |
| 22 | 22 | public const ONE = 1; |
| 23 | - public const LIST = 2; |
|
| 23 | + public const list = 2; |
|
| 24 | 24 | public const TREE = 3; |
| 25 | 25 | |
| 26 | 26 | /** |
@@ -37,12 +37,12 @@ |
||
| 37 | 37 | public function testChangePassword() |
| 38 | 38 | { |
| 39 | 39 | $oldPassword = $this->object->get()->getPassword(); |
| 40 | - $this->object = $this->object->add([ |
|
| 40 | + $this->object = $this->object->add( [ |
|
| 41 | 41 | "customer.oldpassword" => "test", |
| 42 | 42 | "customer.newpassword" => "test1", |
| 43 | 43 | "customer.confirmnewpassword" => "test1" |
| 44 | - ]); |
|
| 45 | - $this->assertNotSame($this->object->get()->getPassword(), $oldPassword); |
|
| 44 | + ] ); |
|
| 45 | + $this->assertNotSame( $this->object->get()->getPassword(), $oldPassword ); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | |