@@ -159,8 +159,7 @@ |
||
| 159 | 159 | } |
| 160 | 160 | |
| 161 | 161 | $dbm->release( $conn, $dbname ); |
| 162 | - } |
|
| 163 | - catch( \Exception $e ) |
|
| 162 | + } catch( \Exception $e ) |
|
| 164 | 163 | { |
| 165 | 164 | $dbm->release( $conn, $dbname ); |
| 166 | 165 | throw $e; |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | * |
| 73 | 73 | * @param integer[] $siteids List of IDs for sites whose entries should be deleted |
| 74 | 74 | */ |
| 75 | - public function cleanup( array $siteids ) |
|
| 75 | + public function cleanup(array $siteids) |
|
| 76 | 76 | { |
| 77 | 77 | } |
| 78 | 78 | |
@@ -82,9 +82,9 @@ discard block |
||
| 82 | 82 | * |
| 83 | 83 | * @param array $ids List of IDs |
| 84 | 84 | */ |
| 85 | - public function deleteItems( array $ids ) |
|
| 85 | + public function deleteItems(array $ids) |
|
| 86 | 86 | { |
| 87 | - throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Deleting groups is not supported, please use the eZ Publish backend' ) ); |
|
| 87 | + throw new \Aimeos\MShop\Customer\Exception(sprintf('Deleting groups is not supported, please use the eZ Publish backend')); |
|
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | |
@@ -94,11 +94,11 @@ discard block |
||
| 94 | 94 | * @param boolean $withsub Return attributes of sub-managers too if true |
| 95 | 95 | * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface |
| 96 | 96 | */ |
| 97 | - public function getSearchAttributes( $withsub = true ) |
|
| 97 | + public function getSearchAttributes($withsub = true) |
|
| 98 | 98 | { |
| 99 | 99 | $path = 'mshop/customer/manager/group/submanagers'; |
| 100 | 100 | |
| 101 | - return $this->getSearchAttributesBase( $this->searchConfig, $path, [], $withsub ); |
|
| 101 | + return $this->getSearchAttributesBase($this->searchConfig, $path, [], $withsub); |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | |
@@ -109,9 +109,9 @@ discard block |
||
| 109 | 109 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
| 110 | 110 | * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions |
| 111 | 111 | */ |
| 112 | - public function getSubManager( $manager, $name = null ) |
|
| 112 | + public function getSubManager($manager, $name = null) |
|
| 113 | 113 | { |
| 114 | - return $this->getSubManagerBase( 'customer/group', $manager, ( $name === null ? 'Ezpublish' : $name ) ); |
|
| 114 | + return $this->getSubManagerBase('customer/group', $manager, ($name === null ? 'Ezpublish' : $name)); |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | |
@@ -121,9 +121,9 @@ discard block |
||
| 121 | 121 | * @param \Aimeos\MShop\Customer\Item\Group\Iface $item Customer group item |
| 122 | 122 | * @param boolean $fetch True if the new ID should be returned in the item |
| 123 | 123 | */ |
| 124 | - public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true ) |
|
| 124 | + public function saveItem(\Aimeos\MShop\Common\Item\Iface $item, $fetch = true) |
|
| 125 | 125 | { |
| 126 | - throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Saving groups is not supported, please use the eZ Publish backend' ) ); |
|
| 126 | + throw new \Aimeos\MShop\Customer\Exception(sprintf('Saving groups is not supported, please use the eZ Publish backend')); |
|
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | |
@@ -136,33 +136,33 @@ discard block |
||
| 136 | 136 | * @return array List of items implementing \Aimeos\MShop\Customer\Item\Group\Iface |
| 137 | 137 | * @throws \Aimeos\MShop\Exception If retrieving items failed |
| 138 | 138 | */ |
| 139 | - public function searchItems( \Aimeos\MW\Criteria\Iface $search, array $ref = [], &$total = null ) |
|
| 139 | + public function searchItems(\Aimeos\MW\Criteria\Iface $search, array $ref = [], &$total = null) |
|
| 140 | 140 | { |
| 141 | 141 | $map = []; |
| 142 | 142 | $context = $this->getContext(); |
| 143 | 143 | |
| 144 | 144 | $dbm = $context->getDatabaseManager(); |
| 145 | 145 | $dbname = $this->getResourceName(); |
| 146 | - $conn = $dbm->acquire( $dbname ); |
|
| 146 | + $conn = $dbm->acquire($dbname); |
|
| 147 | 147 | |
| 148 | 148 | try |
| 149 | 149 | { |
| 150 | - $required = array( 'customer.group' ); |
|
| 150 | + $required = array('customer.group'); |
|
| 151 | 151 | $level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL; |
| 152 | 152 | $cfgPathSearch = 'mshop/customer/manager/group/ezpublish/search'; |
| 153 | 153 | $cfgPathCount = 'mshop/customer/manager/group/ezpublish/count'; |
| 154 | 154 | |
| 155 | - $results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level ); |
|
| 155 | + $results = $this->searchItemsBase($conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level); |
|
| 156 | 156 | |
| 157 | - while( ( $row = $results->fetch() ) !== false ) { |
|
| 158 | - $map[$row['customer.group.id']] = $this->createItemBase( $row ); |
|
| 157 | + while (($row = $results->fetch()) !== false) { |
|
| 158 | + $map[$row['customer.group.id']] = $this->createItemBase($row); |
|
| 159 | 159 | } |
| 160 | 160 | |
| 161 | - $dbm->release( $conn, $dbname ); |
|
| 161 | + $dbm->release($conn, $dbname); |
|
| 162 | 162 | } |
| 163 | - catch( \Exception $e ) |
|
| 163 | + catch (\Exception $e) |
|
| 164 | 164 | { |
| 165 | - $dbm->release( $conn, $dbname ); |
|
| 165 | + $dbm->release($conn, $dbname); |
|
| 166 | 166 | throw $e; |
| 167 | 167 | } |
| 168 | 168 | |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | * @param \eZ\Publish\API\Repository\UserService $service eZ user service object |
| 29 | 29 | * @return \Aimeos\MShop\Context\Item\Iface Context item for chaining method calls |
| 30 | 30 | */ |
| 31 | - public function setEzUserService( \eZ\Publish\API\Repository\UserService $service ) |
|
| 31 | + public function setEzUserService(\eZ\Publish\API\Repository\UserService $service) |
|
| 32 | 32 | { |
| 33 | 33 | $this->ezUserService = $service; |
| 34 | 34 | return $this; |
@@ -42,8 +42,8 @@ discard block |
||
| 42 | 42 | */ |
| 43 | 43 | public function getEzUserService() |
| 44 | 44 | { |
| 45 | - if( !isset( $this->ezUserService ) ) { |
|
| 46 | - throw new \Aimeos\MShop\Exception( sprintf( 'eZ user service not available' ) ); |
|
| 45 | + if (!isset($this->ezUserService)) { |
|
| 46 | + throw new \Aimeos\MShop\Exception(sprintf('eZ user service not available')); |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | return $this->ezUserService; |
@@ -248,7 +248,7 @@ |
||
| 248 | 248 | * |
| 249 | 249 | * @param string $manager Name of the sub manager type in lower case |
| 250 | 250 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
| 251 | - * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
|
| 251 | + * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g stock, tags, locations, etc. |
|
| 252 | 252 | */ |
| 253 | 253 | public function getSubManager( $manager, $name = null ) |
| 254 | 254 | { |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | 'label' => 'Customer address ID', |
| 27 | 27 | 'code' => 'customer.address.id', |
| 28 | 28 | 'internalcode' => 'ezuad."id"', |
| 29 | - 'internaldeps' => array( 'LEFT JOIN "ezuser_address" AS ezuad ON ( ezu."contentobject_id" = ezuad."parentid" )' ), |
|
| 29 | + 'internaldeps' => array('LEFT JOIN "ezuser_address" AS ezuad ON ( ezu."contentobject_id" = ezuad."parentid" )'), |
|
| 30 | 30 | 'type' => 'integer', |
| 31 | 31 | 'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT, |
| 32 | 32 | 'public' => false, |
@@ -209,11 +209,11 @@ discard block |
||
| 209 | 209 | * |
| 210 | 210 | * @param array $siteids List of IDs for sites whose entries should be deleted |
| 211 | 211 | */ |
| 212 | - public function cleanup( array $siteids ) |
|
| 212 | + public function cleanup(array $siteids) |
|
| 213 | 213 | { |
| 214 | 214 | $path = 'mshop/customer/manager/address/submanagers'; |
| 215 | - foreach( $this->getContext()->getConfig()->get( $path, [] ) as $domain ) { |
|
| 216 | - $this->getObject()->getSubManager( $domain )->cleanup( $siteids ); |
|
| 215 | + foreach ($this->getContext()->getConfig()->get($path, []) as $domain) { |
|
| 216 | + $this->getObject()->getSubManager($domain)->cleanup($siteids); |
|
| 217 | 217 | } |
| 218 | 218 | } |
| 219 | 219 | |
@@ -223,9 +223,9 @@ discard block |
||
| 223 | 223 | * |
| 224 | 224 | * @param array $ids List of IDs |
| 225 | 225 | */ |
| 226 | - public function deleteItems( array $ids ) |
|
| 226 | + public function deleteItems(array $ids) |
|
| 227 | 227 | { |
| 228 | - $this->deleteItemsBase( $ids, $this->getConfigPath() . 'delete', false ); |
|
| 228 | + $this->deleteItemsBase($ids, $this->getConfigPath().'delete', false); |
|
| 229 | 229 | } |
| 230 | 230 | |
| 231 | 231 | |
@@ -235,11 +235,11 @@ discard block |
||
| 235 | 235 | * @param boolean $withsub Return also attributes of sub-managers if true |
| 236 | 236 | * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface |
| 237 | 237 | */ |
| 238 | - public function getSearchAttributes( $withsub = true ) |
|
| 238 | + public function getSearchAttributes($withsub = true) |
|
| 239 | 239 | { |
| 240 | 240 | $path = 'mshop/customer/manager/address/submanagers'; |
| 241 | 241 | |
| 242 | - return $this->getSearchAttributesBase( $this->getSearchConfig(), $path, [], $withsub ); |
|
| 242 | + return $this->getSearchAttributesBase($this->getSearchConfig(), $path, [], $withsub); |
|
| 243 | 243 | } |
| 244 | 244 | |
| 245 | 245 | |
@@ -250,9 +250,9 @@ discard block |
||
| 250 | 250 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
| 251 | 251 | * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
| 252 | 252 | */ |
| 253 | - public function getSubManager( $manager, $name = null ) |
|
| 253 | + public function getSubManager($manager, $name = null) |
|
| 254 | 254 | { |
| 255 | - return $this->getSubManagerBase( 'customer', 'address/' . $manager, ( $name === null ? 'Ezpublish' : $name ) ); |
|
| 255 | + return $this->getSubManagerBase('customer', 'address/'.$manager, ($name === null ? 'Ezpublish' : $name)); |
|
| 256 | 256 | } |
| 257 | 257 | |
| 258 | 258 | |
@@ -248,7 +248,7 @@ |
||
| 248 | 248 | * |
| 249 | 249 | * @param string $manager Name of the sub manager type in lower case |
| 250 | 250 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
| 251 | - * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
|
| 251 | + * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g stock, tags, locations, etc. |
|
| 252 | 252 | */ |
| 253 | 253 | public function getSubManager( $manager, $name = null ) |
| 254 | 254 | { |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | 'customer.lists.id'=> array( |
| 26 | 26 | 'code'=>'customer.lists.id', |
| 27 | 27 | 'internalcode'=>'ezuli."id"', |
| 28 | - 'internaldeps' => array( 'LEFT JOIN "ezuser_list" AS ezuli ON ( ezu."id" = ezuli."parentid" )' ), |
|
| 28 | + 'internaldeps' => array('LEFT JOIN "ezuser_list" AS ezuli ON ( ezu."id" = ezuli."parentid" )'), |
|
| 29 | 29 | 'label'=>'Customer list ID', |
| 30 | 30 | 'type'=> 'integer', |
| 31 | 31 | 'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_INT, |
@@ -133,14 +133,14 @@ discard block |
||
| 133 | 133 | * |
| 134 | 134 | * @param array $siteids List of IDs for sites whose entries should be deleted |
| 135 | 135 | */ |
| 136 | - public function cleanup( array $siteids ) |
|
| 136 | + public function cleanup(array $siteids) |
|
| 137 | 137 | { |
| 138 | 138 | $path = 'mshop/customer/manager/lists/submanagers'; |
| 139 | - foreach( $this->getContext()->getConfig()->get( $path, array( 'type' ) ) as $domain ) { |
|
| 140 | - $this->getObject()->getSubManager( $domain )->cleanup( $siteids ); |
|
| 139 | + foreach ($this->getContext()->getConfig()->get($path, array('type')) as $domain) { |
|
| 140 | + $this->getObject()->getSubManager($domain)->cleanup($siteids); |
|
| 141 | 141 | } |
| 142 | 142 | |
| 143 | - $this->cleanupBase( $siteids, $this->getConfigPath() . 'delete' ); |
|
| 143 | + $this->cleanupBase($siteids, $this->getConfigPath().'delete'); |
|
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | |
@@ -150,11 +150,11 @@ discard block |
||
| 150 | 150 | * @param boolean $withsub Return also attributes of sub-managers if true |
| 151 | 151 | * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface |
| 152 | 152 | */ |
| 153 | - public function getSearchAttributes( $withsub = true ) |
|
| 153 | + public function getSearchAttributes($withsub = true) |
|
| 154 | 154 | { |
| 155 | 155 | $path = 'mshop/customer/manager/lists/submanagers'; |
| 156 | 156 | |
| 157 | - return $this->getSearchAttributesBase( $this->getSearchConfig(), $path, array( 'type' ), $withsub ); |
|
| 157 | + return $this->getSearchAttributesBase($this->getSearchConfig(), $path, array('type'), $withsub); |
|
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | |
@@ -165,9 +165,9 @@ discard block |
||
| 165 | 165 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
| 166 | 166 | * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
| 167 | 167 | */ |
| 168 | - public function getSubManager( $manager, $name = null ) |
|
| 168 | + public function getSubManager($manager, $name = null) |
|
| 169 | 169 | { |
| 170 | - return $this->getSubManagerBase( 'customer', 'lists/' . $manager, ( $name === null ? 'Ezpublish' : $name ) ); |
|
| 170 | + return $this->getSubManagerBase('customer', 'lists/'.$manager, ($name === null ? 'Ezpublish' : $name)); |
|
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | |
@@ -177,18 +177,18 @@ discard block |
||
| 177 | 177 | * @param \Aimeos\MShop\Common\Item\Lists\Iface $item List item object which should be saved |
| 178 | 178 | * @param boolean $fetch True if the new ID should be returned in the item |
| 179 | 179 | */ |
| 180 | - public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true ) |
|
| 180 | + public function saveItem(\Aimeos\MShop\Common\Item\Iface $item, $fetch = true) |
|
| 181 | 181 | { |
| 182 | 182 | $iface = '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface'; |
| 183 | - if( !( $item instanceof $iface ) ) { |
|
| 184 | - throw new \Aimeos\MShop\Exception( sprintf( 'Object is not of required type "%1$s"', $iface ) ); |
|
| 183 | + if (!($item instanceof $iface)) { |
|
| 184 | + throw new \Aimeos\MShop\Exception(sprintf('Object is not of required type "%1$s"', $iface)); |
|
| 185 | 185 | } |
| 186 | 186 | |
| 187 | - if( $item->getDomain() === 'customer/group' ) { |
|
| 188 | - throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Adding groups to customers is not supported, please use the eZ Publish backend' ) ); |
|
| 187 | + if ($item->getDomain() === 'customer/group') { |
|
| 188 | + throw new \Aimeos\MShop\Customer\Exception(sprintf('Adding groups to customers is not supported, please use the eZ Publish backend')); |
|
| 189 | 189 | } |
| 190 | 190 | |
| 191 | - parent::saveItem( $item, $fetch ); |
|
| 191 | + parent::saveItem($item, $fetch); |
|
| 192 | 192 | } |
| 193 | 193 | |
| 194 | 194 | |
@@ -248,7 +248,7 @@ |
||
| 248 | 248 | * |
| 249 | 249 | * @param string $manager Name of the sub manager type in lower case |
| 250 | 250 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
| 251 | - * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
|
| 251 | + * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g stock, tags, locations, etc. |
|
| 252 | 252 | */ |
| 253 | 253 | public function getSubManager( $manager, $name = null ) |
| 254 | 254 | { |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | 'customer.lists.type.id' => array( |
| 26 | 26 | 'code'=>'customer.lists.type.id', |
| 27 | 27 | 'internalcode'=>'ezulity."id"', |
| 28 | - 'internaldeps'=>array( 'LEFT JOIN "ezuser_list_type" AS ezulity ON ( ezuli."typeid" = ezulity."id" )' ), |
|
| 28 | + 'internaldeps'=>array('LEFT JOIN "ezuser_list_type" AS ezulity ON ( ezuli."typeid" = ezulity."id" )'), |
|
| 29 | 29 | 'label'=>'Customer list type ID', |
| 30 | 30 | 'type'=> 'integer', |
| 31 | 31 | 'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT, |
@@ -96,14 +96,14 @@ discard block |
||
| 96 | 96 | * |
| 97 | 97 | * @param array $siteids List of IDs for sites whose entries should be deleted |
| 98 | 98 | */ |
| 99 | - public function cleanup( array $siteids ) |
|
| 99 | + public function cleanup(array $siteids) |
|
| 100 | 100 | { |
| 101 | 101 | $path = 'mshop/customer/manager/lists/type/submanagers'; |
| 102 | - foreach( $this->getContext()->getConfig()->get( $path, [] ) as $domain ) { |
|
| 103 | - $this->getObject()->getSubManager( $domain )->cleanup( $siteids ); |
|
| 102 | + foreach ($this->getContext()->getConfig()->get($path, []) as $domain) { |
|
| 103 | + $this->getObject()->getSubManager($domain)->cleanup($siteids); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | - $this->cleanupBase( $siteids, $this->getConfigPath() . 'delete' ); |
|
| 106 | + $this->cleanupBase($siteids, $this->getConfigPath().'delete'); |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | |
@@ -113,11 +113,11 @@ discard block |
||
| 113 | 113 | * @param boolean $withsub Return also attributes of sub-managers if true |
| 114 | 114 | * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface |
| 115 | 115 | */ |
| 116 | - public function getSearchAttributes( $withsub = true ) |
|
| 116 | + public function getSearchAttributes($withsub = true) |
|
| 117 | 117 | { |
| 118 | 118 | $path = 'mshop/customer/manager/lists/type/submanagers'; |
| 119 | 119 | |
| 120 | - return $this->getSearchAttributesBase( $this->getSearchConfig(), $path, [], $withsub ); |
|
| 120 | + return $this->getSearchAttributesBase($this->getSearchConfig(), $path, [], $withsub); |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | |
@@ -128,9 +128,9 @@ discard block |
||
| 128 | 128 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
| 129 | 129 | * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
| 130 | 130 | */ |
| 131 | - public function getSubManager( $manager, $name = null ) |
|
| 131 | + public function getSubManager($manager, $name = null) |
|
| 132 | 132 | { |
| 133 | - return $this->getSubManagerBase( 'customer', 'lists/type/' . $manager, ( $name === null ? 'Ezpublish' : $name ) ); |
|
| 133 | + return $this->getSubManagerBase('customer', 'lists/type/'.$manager, ($name === null ? 'Ezpublish' : $name)); |
|
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | |
@@ -8,122 +8,122 @@ |
||
| 8 | 8 | |
| 9 | 9 | return array( |
| 10 | 10 | 'table' => array( |
| 11 | - 'ezuser' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 11 | + 'ezuser' => function(\Doctrine\DBAL\Schema\Schema $schema) { |
|
| 12 | 12 | |
| 13 | - $table = $schema->createTable( 'ezuser' ); |
|
| 13 | + $table = $schema->createTable('ezuser'); |
|
| 14 | 14 | |
| 15 | - $table->addColumn( 'contentobject_id', 'integer', [] ); |
|
| 16 | - $table->addColumn( 'email', 'string', array( 'length' => 150 ) ); |
|
| 17 | - $table->addColumn( 'login', 'string', array( 'length' => 150 ) ); |
|
| 18 | - $table->addColumn( 'login_normalized', 'string', array( 'length' => 150 ) ); |
|
| 19 | - $table->addColumn( 'password_hash', 'string', array( 'length' => 50 ) ); |
|
| 20 | - $table->addColumn( 'password_hash_type', 'integer', array( 'default' => 1 ) ); |
|
| 15 | + $table->addColumn('contentobject_id', 'integer', []); |
|
| 16 | + $table->addColumn('email', 'string', array('length' => 150)); |
|
| 17 | + $table->addColumn('login', 'string', array('length' => 150)); |
|
| 18 | + $table->addColumn('login_normalized', 'string', array('length' => 150)); |
|
| 19 | + $table->addColumn('password_hash', 'string', array('length' => 50)); |
|
| 20 | + $table->addColumn('password_hash_type', 'integer', array('default' => 1)); |
|
| 21 | 21 | |
| 22 | - $table->setPrimaryKey( array( 'contentobject_id' ) ); |
|
| 23 | - $table->addUniqueIndex( array( 'login_normalized' ), 'ezuser_login' ); |
|
| 22 | + $table->setPrimaryKey(array('contentobject_id')); |
|
| 23 | + $table->addUniqueIndex(array('login_normalized'), 'ezuser_login'); |
|
| 24 | 24 | |
| 25 | 25 | return $schema; |
| 26 | 26 | }, |
| 27 | 27 | |
| 28 | - 'ezuser_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 29 | - |
|
| 30 | - $table = $schema->createTable( 'ezuser_address' ); |
|
| 31 | - |
|
| 32 | - $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); |
|
| 33 | - $table->addColumn( 'siteid', 'integer', [] ); |
|
| 34 | - $table->addColumn( 'parentid', 'integer', [] ); |
|
| 35 | - $table->addColumn( 'company', 'string', array( 'length' => 100 ) ); |
|
| 36 | - $table->addColumn( 'vatid', 'string', array( 'length' => 32 ) ); |
|
| 37 | - $table->addColumn( 'salutation', 'string', array( 'length' => 8 ) ); |
|
| 38 | - $table->addColumn( 'title', 'string', array( 'length' => 64 ) ); |
|
| 39 | - $table->addColumn( 'firstname', 'string', array( 'length' => 64 ) ); |
|
| 40 | - $table->addColumn( 'lastname', 'string', array( 'length' => 64 ) ); |
|
| 41 | - $table->addColumn( 'address1', 'string', array( 'length' => 255 ) ); |
|
| 42 | - $table->addColumn( 'address2', 'string', array( 'length' => 255 ) ); |
|
| 43 | - $table->addColumn( 'address3', 'string', array( 'length' => 255 ) ); |
|
| 44 | - $table->addColumn( 'postal', 'string', array( 'length' => 16 ) ); |
|
| 45 | - $table->addColumn( 'city', 'string', array( 'length' => 255 ) ); |
|
| 46 | - $table->addColumn( 'state', 'string', array( 'length' => 255 ) ); |
|
| 47 | - $table->addColumn( 'langid', 'string', array( 'length' => 5, 'notnull' => false ) ); |
|
| 48 | - $table->addColumn( 'countryid', 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) ); |
|
| 49 | - $table->addColumn( 'telephone', 'string', array( 'length' => 32 ) ); |
|
| 50 | - $table->addColumn( 'email', 'string', array( 'length' => 255 ) ); |
|
| 51 | - $table->addColumn( 'telefax', 'string', array( 'length' => 255 ) ); |
|
| 52 | - $table->addColumn( 'website', 'string', array( 'length' => 255 ) ); |
|
| 53 | - $table->addColumn( 'flag', 'integer', [] ); |
|
| 54 | - $table->addColumn( 'pos', 'smallint', [] ); |
|
| 55 | - $table->addColumn( 'mtime', 'datetime', [] ); |
|
| 56 | - $table->addColumn( 'ctime', 'datetime', [] ); |
|
| 57 | - $table->addColumn( 'editor', 'string', array('length' => 255 ) ); |
|
| 58 | - |
|
| 59 | - $table->setPrimaryKey( array( 'id' ), 'pk_ezpad_id' ); |
|
| 60 | - $table->addIndex( array( 'lastname', 'firstname' ), 'idx_ezpad_ln_fn' ); |
|
| 61 | - $table->addIndex( array( 'address1', 'address2' ), 'idx_ezpad_ad1_ad2' ); |
|
| 62 | - $table->addIndex( array( 'postal', 'city' ), 'idx_ezpad_post_ci' ); |
|
| 63 | - $table->addIndex( array( 'parentid' ), 'idx_ezpad_pid' ); |
|
| 64 | - $table->addIndex( array( 'city' ), 'idx_ezpad_city' ); |
|
| 65 | - |
|
| 66 | - $table->addForeignKeyConstraint( 'ezuser', array( 'parentid' ), array( 'contentobject_id' ), |
|
| 67 | - array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpad_pid' ); |
|
| 28 | + 'ezuser_address' => function(\Doctrine\DBAL\Schema\Schema $schema) { |
|
| 29 | + |
|
| 30 | + $table = $schema->createTable('ezuser_address'); |
|
| 31 | + |
|
| 32 | + $table->addColumn('id', 'integer', array('autoincrement' => true)); |
|
| 33 | + $table->addColumn('siteid', 'integer', []); |
|
| 34 | + $table->addColumn('parentid', 'integer', []); |
|
| 35 | + $table->addColumn('company', 'string', array('length' => 100)); |
|
| 36 | + $table->addColumn('vatid', 'string', array('length' => 32)); |
|
| 37 | + $table->addColumn('salutation', 'string', array('length' => 8)); |
|
| 38 | + $table->addColumn('title', 'string', array('length' => 64)); |
|
| 39 | + $table->addColumn('firstname', 'string', array('length' => 64)); |
|
| 40 | + $table->addColumn('lastname', 'string', array('length' => 64)); |
|
| 41 | + $table->addColumn('address1', 'string', array('length' => 255)); |
|
| 42 | + $table->addColumn('address2', 'string', array('length' => 255)); |
|
| 43 | + $table->addColumn('address3', 'string', array('length' => 255)); |
|
| 44 | + $table->addColumn('postal', 'string', array('length' => 16)); |
|
| 45 | + $table->addColumn('city', 'string', array('length' => 255)); |
|
| 46 | + $table->addColumn('state', 'string', array('length' => 255)); |
|
| 47 | + $table->addColumn('langid', 'string', array('length' => 5, 'notnull' => false)); |
|
| 48 | + $table->addColumn('countryid', 'string', array('length' => 2, 'notnull' => false, 'fixed' => true)); |
|
| 49 | + $table->addColumn('telephone', 'string', array('length' => 32)); |
|
| 50 | + $table->addColumn('email', 'string', array('length' => 255)); |
|
| 51 | + $table->addColumn('telefax', 'string', array('length' => 255)); |
|
| 52 | + $table->addColumn('website', 'string', array('length' => 255)); |
|
| 53 | + $table->addColumn('flag', 'integer', []); |
|
| 54 | + $table->addColumn('pos', 'smallint', []); |
|
| 55 | + $table->addColumn('mtime', 'datetime', []); |
|
| 56 | + $table->addColumn('ctime', 'datetime', []); |
|
| 57 | + $table->addColumn('editor', 'string', array('length' => 255)); |
|
| 58 | + |
|
| 59 | + $table->setPrimaryKey(array('id'), 'pk_ezpad_id'); |
|
| 60 | + $table->addIndex(array('lastname', 'firstname'), 'idx_ezpad_ln_fn'); |
|
| 61 | + $table->addIndex(array('address1', 'address2'), 'idx_ezpad_ad1_ad2'); |
|
| 62 | + $table->addIndex(array('postal', 'city'), 'idx_ezpad_post_ci'); |
|
| 63 | + $table->addIndex(array('parentid'), 'idx_ezpad_pid'); |
|
| 64 | + $table->addIndex(array('city'), 'idx_ezpad_city'); |
|
| 65 | + |
|
| 66 | + $table->addForeignKeyConstraint('ezuser', array('parentid'), array('contentobject_id'), |
|
| 67 | + array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_ezpad_pid'); |
|
| 68 | 68 | |
| 69 | 69 | return $schema; |
| 70 | 70 | }, |
| 71 | 71 | |
| 72 | - 'ezuser_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 72 | + 'ezuser_list_type' => function(\Doctrine\DBAL\Schema\Schema $schema) { |
|
| 73 | 73 | |
| 74 | - $table = $schema->createTable( 'ezuser_list_type' ); |
|
| 74 | + $table = $schema->createTable('ezuser_list_type'); |
|
| 75 | 75 | |
| 76 | - $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); |
|
| 77 | - $table->addColumn( 'siteid', 'integer', [] ); |
|
| 78 | - $table->addColumn( 'domain', 'string', array( 'length' => 32 ) ); |
|
| 79 | - $table->addColumn( 'code', 'string', array( 'length' => 32 ) ); |
|
| 80 | - $table->addColumn( 'label', 'string', array( 'length' => 255 ) ); |
|
| 81 | - $table->addColumn( 'status', 'smallint', [] ); |
|
| 82 | - $table->addColumn( 'mtime', 'datetime', [] ); |
|
| 83 | - $table->addColumn( 'ctime', 'datetime', [] ); |
|
| 84 | - $table->addColumn( 'editor', 'string', array( 'length' => 255 ) ); |
|
| 76 | + $table->addColumn('id', 'integer', array('autoincrement' => true)); |
|
| 77 | + $table->addColumn('siteid', 'integer', []); |
|
| 78 | + $table->addColumn('domain', 'string', array('length' => 32)); |
|
| 79 | + $table->addColumn('code', 'string', array('length' => 32)); |
|
| 80 | + $table->addColumn('label', 'string', array('length' => 255)); |
|
| 81 | + $table->addColumn('status', 'smallint', []); |
|
| 82 | + $table->addColumn('mtime', 'datetime', []); |
|
| 83 | + $table->addColumn('ctime', 'datetime', []); |
|
| 84 | + $table->addColumn('editor', 'string', array('length' => 255)); |
|
| 85 | 85 | |
| 86 | - $table->setPrimaryKey( array( 'id' ), 'pk_ezplity_id' ); |
|
| 87 | - $table->addUniqueIndex( array( 'siteid', 'domain', 'code' ), 'unq_ezplity_sid_dom_code' ); |
|
| 88 | - $table->addIndex( array( 'siteid', 'status' ), 'idx_ezplity_sid_status' ); |
|
| 89 | - $table->addIndex( array( 'siteid', 'label' ), 'idx_ezplity_sid_label' ); |
|
| 90 | - $table->addIndex( array( 'siteid', 'code' ), 'idx_ezplity_sid_code' ); |
|
| 86 | + $table->setPrimaryKey(array('id'), 'pk_ezplity_id'); |
|
| 87 | + $table->addUniqueIndex(array('siteid', 'domain', 'code'), 'unq_ezplity_sid_dom_code'); |
|
| 88 | + $table->addIndex(array('siteid', 'status'), 'idx_ezplity_sid_status'); |
|
| 89 | + $table->addIndex(array('siteid', 'label'), 'idx_ezplity_sid_label'); |
|
| 90 | + $table->addIndex(array('siteid', 'code'), 'idx_ezplity_sid_code'); |
|
| 91 | 91 | |
| 92 | 92 | return $schema; |
| 93 | 93 | }, |
| 94 | 94 | |
| 95 | - 'ezuser_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 96 | - |
|
| 97 | - $table = $schema->createTable( 'ezuser_list' ); |
|
| 98 | - |
|
| 99 | - $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); |
|
| 100 | - $table->addColumn( 'parentid', 'integer', [] ); |
|
| 101 | - $table->addColumn( 'siteid', 'integer', [] ); |
|
| 102 | - $table->addColumn( 'typeid', 'integer', [] ); |
|
| 103 | - $table->addColumn( 'domain', 'string', array( 'length' => 32 ) ); |
|
| 104 | - $table->addColumn( 'refid', 'string', array( 'length' => 32 ) ); |
|
| 105 | - $table->addColumn( 'start', 'datetime', array( 'notnull' => false ) ); |
|
| 106 | - $table->addColumn( 'end', 'datetime', array( 'notnull' => false ) ); |
|
| 107 | - $table->addColumn( 'config', 'text', array( 'length' => 0xffff ) ); |
|
| 108 | - $table->addColumn( 'pos', 'integer', [] ); |
|
| 109 | - $table->addColumn( 'status', 'smallint', [] ); |
|
| 110 | - $table->addColumn( 'mtime', 'datetime', [] ); |
|
| 111 | - $table->addColumn( 'ctime', 'datetime', [] ); |
|
| 112 | - $table->addColumn( 'editor', 'string', array( 'length' => 255 ) ); |
|
| 113 | - |
|
| 114 | - $table->setPrimaryKey( array( 'id' ), 'pk_ezpli_id' ); |
|
| 115 | - $table->addUniqueIndex( array( 'siteid', 'domain', 'refid', 'typeid', 'parentid' ), 'unq_ezpli_sid_dm_rid_tid_pid' ); |
|
| 116 | - $table->addIndex( array( 'siteid', 'status', 'start', 'end' ), 'idx_ezpli_sid_stat_start_end' ); |
|
| 117 | - $table->addIndex( array( 'parentid', 'siteid', 'refid', 'domain', 'typeid' ), 'idx_ezpli_pid_sid_rid_dom_tid' ); |
|
| 118 | - $table->addIndex( array( 'parentid', 'siteid', 'start' ), 'idx_ezpli_pid_sid_start' ); |
|
| 119 | - $table->addIndex( array( 'parentid', 'siteid', 'end' ), 'idx_ezpli_pid_sid_end' ); |
|
| 120 | - $table->addIndex( array( 'parentid', 'siteid', 'pos' ), 'idx_ezpli_pid_sid_pos' ); |
|
| 121 | - |
|
| 122 | - $table->addForeignKeyConstraint( 'ezuser', array( 'parentid' ), array( 'contentobject_id' ), |
|
| 123 | - array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpli_pid' ); |
|
| 124 | - |
|
| 125 | - $table->addForeignKeyConstraint( 'ezuser_list_type', array( 'typeid' ), array( 'id' ), |
|
| 126 | - array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpli_typeid' ); |
|
| 95 | + 'ezuser_list' => function(\Doctrine\DBAL\Schema\Schema $schema) { |
|
| 96 | + |
|
| 97 | + $table = $schema->createTable('ezuser_list'); |
|
| 98 | + |
|
| 99 | + $table->addColumn('id', 'integer', array('autoincrement' => true)); |
|
| 100 | + $table->addColumn('parentid', 'integer', []); |
|
| 101 | + $table->addColumn('siteid', 'integer', []); |
|
| 102 | + $table->addColumn('typeid', 'integer', []); |
|
| 103 | + $table->addColumn('domain', 'string', array('length' => 32)); |
|
| 104 | + $table->addColumn('refid', 'string', array('length' => 32)); |
|
| 105 | + $table->addColumn('start', 'datetime', array('notnull' => false)); |
|
| 106 | + $table->addColumn('end', 'datetime', array('notnull' => false)); |
|
| 107 | + $table->addColumn('config', 'text', array('length' => 0xffff)); |
|
| 108 | + $table->addColumn('pos', 'integer', []); |
|
| 109 | + $table->addColumn('status', 'smallint', []); |
|
| 110 | + $table->addColumn('mtime', 'datetime', []); |
|
| 111 | + $table->addColumn('ctime', 'datetime', []); |
|
| 112 | + $table->addColumn('editor', 'string', array('length' => 255)); |
|
| 113 | + |
|
| 114 | + $table->setPrimaryKey(array('id'), 'pk_ezpli_id'); |
|
| 115 | + $table->addUniqueIndex(array('siteid', 'domain', 'refid', 'typeid', 'parentid'), 'unq_ezpli_sid_dm_rid_tid_pid'); |
|
| 116 | + $table->addIndex(array('siteid', 'status', 'start', 'end'), 'idx_ezpli_sid_stat_start_end'); |
|
| 117 | + $table->addIndex(array('parentid', 'siteid', 'refid', 'domain', 'typeid'), 'idx_ezpli_pid_sid_rid_dom_tid'); |
|
| 118 | + $table->addIndex(array('parentid', 'siteid', 'start'), 'idx_ezpli_pid_sid_start'); |
|
| 119 | + $table->addIndex(array('parentid', 'siteid', 'end'), 'idx_ezpli_pid_sid_end'); |
|
| 120 | + $table->addIndex(array('parentid', 'siteid', 'pos'), 'idx_ezpli_pid_sid_pos'); |
|
| 121 | + |
|
| 122 | + $table->addForeignKeyConstraint('ezuser', array('parentid'), array('contentobject_id'), |
|
| 123 | + array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_ezpli_pid'); |
|
| 124 | + |
|
| 125 | + $table->addForeignKeyConstraint('ezuser_list_type', array('typeid'), array('id'), |
|
| 126 | + array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_ezpli_typeid'); |
|
| 127 | 127 | |
| 128 | 128 | return $schema; |
| 129 | 129 | }, |
@@ -18,14 +18,14 @@ discard block |
||
| 18 | 18 | |
| 19 | 19 | $includepaths = $aimeos->getIncludePaths(); |
| 20 | 20 | $includepaths[] = get_include_path(); |
| 21 | - set_include_path( implode( PATH_SEPARATOR, $includepaths ) ); |
|
| 21 | + set_include_path(implode(PATH_SEPARATOR, $includepaths)); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | |
| 25 | - public static function getContext( $site = 'unittest' ) |
|
| 25 | + public static function getContext($site = 'unittest') |
|
| 26 | 26 | { |
| 27 | - if( !isset( self::$context[$site] ) ) { |
|
| 28 | - self::$context[$site] = self::createContext( $site ); |
|
| 27 | + if (!isset(self::$context[$site])) { |
|
| 28 | + self::$context[$site] = self::createContext($site); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | return clone self::$context[$site]; |
@@ -34,13 +34,13 @@ discard block |
||
| 34 | 34 | |
| 35 | 35 | private static function getAimeos() |
| 36 | 36 | { |
| 37 | - if( !isset( self::$aimeos ) ) |
|
| 37 | + if (!isset(self::$aimeos)) |
|
| 38 | 38 | { |
| 39 | 39 | require_once 'Bootstrap.php'; |
| 40 | - spl_autoload_register( 'Aimeos\\Bootstrap::autoload' ); |
|
| 40 | + spl_autoload_register('Aimeos\\Bootstrap::autoload'); |
|
| 41 | 41 | |
| 42 | - $extdir = dirname( dirname( dirname( __DIR__ ) ) ); |
|
| 43 | - self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), true ); |
|
| 42 | + $extdir = dirname(dirname(dirname(__DIR__))); |
|
| 43 | + self::$aimeos = new \Aimeos\Bootstrap(array($extdir), true); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | return self::$aimeos; |
@@ -50,45 +50,45 @@ discard block |
||
| 50 | 50 | /** |
| 51 | 51 | * @param string $site |
| 52 | 52 | */ |
| 53 | - private static function createContext( $site ) |
|
| 53 | + private static function createContext($site) |
|
| 54 | 54 | { |
| 55 | 55 | $ctx = new \Aimeos\MShop\Context\Item\Ezpublish(); |
| 56 | 56 | $aimeos = self::getAimeos(); |
| 57 | 57 | |
| 58 | 58 | |
| 59 | 59 | $paths = $aimeos->getConfigPaths(); |
| 60 | - $paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config'; |
|
| 60 | + $paths[] = __DIR__.DIRECTORY_SEPARATOR.'config'; |
|
| 61 | 61 | |
| 62 | - $conf = new \Aimeos\MW\Config\PHPArray( [], $paths ); |
|
| 63 | - $ctx->setConfig( $conf ); |
|
| 62 | + $conf = new \Aimeos\MW\Config\PHPArray([], $paths); |
|
| 63 | + $ctx->setConfig($conf); |
|
| 64 | 64 | |
| 65 | 65 | |
| 66 | - $dbm = new \Aimeos\MW\DB\Manager\DBAL( $conf ); |
|
| 67 | - $ctx->setDatabaseManager( $dbm ); |
|
| 66 | + $dbm = new \Aimeos\MW\DB\Manager\DBAL($conf); |
|
| 67 | + $ctx->setDatabaseManager($dbm); |
|
| 68 | 68 | |
| 69 | 69 | |
| 70 | - $logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG ); |
|
| 71 | - $ctx->setLogger( $logger ); |
|
| 70 | + $logger = new \Aimeos\MW\Logger\File($site.'.log', \Aimeos\MW\Logger\Base::DEBUG); |
|
| 71 | + $ctx->setLogger($logger); |
|
| 72 | 72 | |
| 73 | 73 | |
| 74 | 74 | $cache = new \Aimeos\MW\Cache\None(); |
| 75 | - $ctx->setCache( $cache ); |
|
| 75 | + $ctx->setCache($cache); |
|
| 76 | 76 | |
| 77 | 77 | |
| 78 | - $i18n = new \Aimeos\MW\Translation\None( 'de' ); |
|
| 79 | - $ctx->setI18n( array( 'de' => $i18n ) ); |
|
| 78 | + $i18n = new \Aimeos\MW\Translation\None('de'); |
|
| 79 | + $ctx->setI18n(array('de' => $i18n)); |
|
| 80 | 80 | |
| 81 | 81 | |
| 82 | 82 | $session = new \Aimeos\MW\Session\None(); |
| 83 | - $ctx->setSession( $session ); |
|
| 83 | + $ctx->setSession($session); |
|
| 84 | 84 | |
| 85 | 85 | |
| 86 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx ); |
|
| 87 | - $localeItem = $localeManager->bootstrap( $site, '', '', false ); |
|
| 86 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx); |
|
| 87 | + $localeItem = $localeManager->bootstrap($site, '', '', false); |
|
| 88 | 88 | |
| 89 | - $ctx->setLocale( $localeItem ); |
|
| 89 | + $ctx->setLocale($localeItem); |
|
| 90 | 90 | |
| 91 | - $ctx->setEditor( 'ai-ezpublish:unittest' ); |
|
| 91 | + $ctx->setEditor('ai-ezpublish:unittest'); |
|
| 92 | 92 | |
| 93 | 93 | return $ctx; |
| 94 | 94 | } |